lib/jsonapi/resource.rb in jsonapi-resources-0.5.4 vs lib/jsonapi/resource.rb in jsonapi-resources-0.5.5

@@ -470,22 +470,21 @@
         end
 
         records
       end
 
-      def filter_records(filters, options)
-        records = records(options)
+      def filter_records(filters, options, records = records(options))
         records = apply_filters(records, filters, options)
         apply_includes(records, options)
       end
 
       def sort_records(records, order_options)
         apply_sort(records, order_options)
       end
 
       def find_count(filters, options = {})
-        filter_records(filters, options).count
+        filter_records(filters, options).count(:all)
       end
 
       # Override this method if you have more complex requirements than this basic find method provides
       def find(filters, options = {})
         context = options[:context]
@@ -684,10 +683,10 @@
 
         attrs.each do |attr|
           check_reserved_relationship_name(attr)
 
           # Initialize from an ActiveRecord model's properties
-          if _model_class && _model_class < ActiveRecord::Base
+          if _model_class && _model_class.ancestors.collect{|ancestor| ancestor.name}.include?('ActiveRecord::Base')
             model_association = _model_class.reflect_on_association(attr)
             if model_association
               options[:class_name] ||= model_association.class_name
             end
           end