actionset 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94c2718c8e23f7c7366d789850324fe3980bd686
-  data.tar.gz: a416c81e64c3f35fe254f0b4fa294eb8fa97bedf
+  metadata.gz: bcf22ea0b6bf2bc8736afb56c36e8223d1aa70df
+  data.tar.gz: 56fec8d7cc74be2aaa9a5b54504b16fadb78a154
 SHA512:
-  metadata.gz: 8336b7f82a1b640ae3ac99aba35c85c9067fb331329f96d0e84b49e98fa0ad9dd92c81c34d6420d77114096c82ae49699ed4d8f66bffd2750ee99718f9117fbb
-  data.tar.gz: 16933793296c6a5015b1dc2e48386cd3e2294bc9738d3c2674b606fbec62af476ba72e7c7417c893e5e6cec39fed41db53c8a513c8116cb60ddfe2cf001e87ae
+  metadata.gz: fe390e2de9dcaec0cc4f0d9b293acc70cb6019c56362a14ba1062947ed04fa32562e9adaa3eff6e2f7a670ce7086b7c411214e9cb388f8527365eba726e25791
+  data.tar.gz: e81f275a7a8f82efad37b7c9ac741523f8fca6e0d8b8f8ab5b0b63e7d4a171d0f24332ea169386658e18bce83e360d1ba5e7101b1e03a40516c167dce4c784a2

data/CHANGELOG

@@ -1,3 +1,6 @@
+v 0.3.5
+  - Don't rely on an instance variable for the `filter_structure`
+  - Use the `ensure_active_set` method inside of `process_set`
 v 0.3.4
   - Ensure that the sort_link_for helper method make the title param optional
   - Ensure that the view helpers are properly included into the ActionView context

data/lib/action_set.rb

@@ -27,14 +27,13 @@ module ActionSet
 
   module InstanceMethods
     def process_set(set)
-      @set = set
-      paginate_set(sort_set(filter_set(ActiveSet.new(set))))
+      paginate_set(sort_set(filter_set(ensure_active_set(set))))
     end
 
     def filter_set(set)
       set_filters_ivar
       active_set = ensure_active_set(set)
-      active_set = active_set.filter(filter_structure) if filter_params.any?
+      active_set = active_set.filter(filter_structure(set)) if filter_params.any?
       active_set
     end
 
@@ -64,10 +63,10 @@ module ActionSet
 
     private
 
-    def filter_structure
+    def filter_structure(set)
       filter_params.flatten_keys.reject { |_, v| v.blank? }.each_with_object({}) do |(keypath, value), memo|
         instruction = ActiveSet::Instructions::Entry.new(keypath, value)
-        item_with_value = @set.find { |i| !instruction.value_for(item: i).nil? }
+        item_with_value = set.find { |i| !instruction.value_for(item: i).nil? }
         item_value = instruction.value_for(item: item_with_value)
         typecast_value = ActionSet::Instructions::EntryValue.new(value)
                                                             .cast(to: item_value.class)

data/lib/action_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionSet
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionset
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeset