activeset 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985ab81bdeb7fee9fb11607b4e50b4ec5ac4b1e3
-  data.tar.gz: 791083e078c49e5c38bbc6327dffc10ca9ff2967
+  metadata.gz: 40f42594ad16de88043af834c1fd25c435e35bcd
+  data.tar.gz: 064a4a104d040a1d28bafabdcf437a69bfe8baa5
 SHA512:
-  metadata.gz: 6c4e69fc91d470df0c4aab606aeb9fa790353600ed921c3e50ff9ec3aee14ba147ae2d4821482f6f3ecb2941a315c3341290f85775b4f19aa1d8ca0a80488142
-  data.tar.gz: e0d5b888645d88a1fdf0840238a586da1bec40146471a89114d5b5609c0fc065580276eb5a2487de8249135ccb098aabb44a7e9495b492480b25cc1c42585573
+  metadata.gz: 071f0b2aa19d7691660693a6cfdca52cb6bbf7fd3c4cbab7deea0d6e5c651e5c2445e4f47932f08f31bb006604489135ed8dc9c50bd008cf9e8d7d0b3d7c6807
+  data.tar.gz: f77c58fdef21bd82910ffaed576584cb736398170cf4ef1f9d637364b0144034dda06c7c35c48f71edce83102ceabd50c5c90975cc30b701998b9ced2dcaaa51

data/CHANGELOG

@@ -1,3 +1,6 @@
+v 0.4.4
+  - Ensure that the ActiveRecord filterer can handle Rails4 AR::Relations not responding to :methods on the underlying class
+  - Test scopes defined using the helper but also as simply class methods
 v 0.4.3
   - Properly specify the version dependency on ActiveSupport
 v 0.4.2

data/lib/active_set/processors/filter/active_record_adapter.rb

@@ -49,10 +49,12 @@ class ActiveSet
       end
 
       def attribute_model
-        @instruction.associations_array
-                    .reduce(@set) do |obj, assoc|
-                      obj.reflections[assoc.to_s]&.klass
-                    end
+        tmp_model = @instruction.associations_array
+                                .reduce(@set) do |obj, assoc|
+                                  obj.reflections[assoc.to_s]&.klass
+                                end
+        return tmp_model.klass if tmp_model.is_a?(ActiveRecord::Relation)
+        tmp_model
       end
 
       def arel_eager_load_associations

data/lib/active_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ActiveSet
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeset
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport