active_facets 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63e1ea8c7c86286554a205c84e6ddc7224be9b00
-  data.tar.gz: dbc2ed04992db135f887f8bc56bc21ec0fe30f37
+  metadata.gz: 84aaee9f8be13da53c3dbc1000012eeae6dd2837
+  data.tar.gz: b65c1280f5c33d77ecde385901c51f88d591a881
 SHA512:
-  metadata.gz: 773bafd97bc95b401a0b12dbc6a0edd5ac82f18f769e7dc2715725cc226fd6ca0888ed6ba7198b5532fcdb6d32df2bc68cd4f91901307660844dd4999ebda1b1
-  data.tar.gz: 99d24b3b9c658b458329ee385147f7aded91b1593ace925b5d1f50d35db62a69da21dc175a363bd2dbdefd84dfa0f766f07149de996b4dc2063163ca4ed9b9cf
+  metadata.gz: 5b060f4a3173117eaa143d14c786794748035b1a4e1e992080f64fd4b8e393635a6122a9ed0e017471e058aa528fb52ae80a51166655f641bb4d401b3ee5a829
+  data.tar.gz: f9588af0a223e4c19ba75954afe424e2e1bc0b0bb8a3ec3777288f3c89d710daa470fb8b32f304aca35ca8691362a3c23e760349faf988cc7056b320845f20a0

data/lib/active_facets.rb

@@ -5,6 +5,7 @@ require 'active_record'
 require 'active_facets/errors/attribute_error'
 require 'active_facets/errors/configuration_error'
 require 'active_facets/errors/lookup_error'
+require 'active_facets/filter'
 require 'active_facets/acts_as_active_facet'
 require 'active_facets/serializer/base'
 require 'active_facets/serializer/facade'
@@ -53,7 +54,7 @@ module ActiveFacets
   end
 
   def self.global_filter(name)
-    ActiveFacets::ActsAsActiveFacet::Filters.global_filters[name] = Proc.new
+    ActiveFacets::Filter.register_global(name, Proc.new)
   end
 
   def self.resource_mapper

data/lib/active_facets/acts_as_active_facet.rb

@@ -10,36 +10,6 @@ module ActiveFacets
     included do
     end
 
-    module Filters
-      mattr_accessor :filters, :global_filters
-      self.filters, self.global_filters = {}, {}
-
-      def self.apply_globals_to(receiver)
-        global_filters.each do |filter_name, filter_method|
-          filter_method_name = receiver.acts_as_active_facet_options[:filter_method_name]
-          receiver.send(filter_method_name, filter_name, &filter_method)
-        end
-      end
-
-      # @return [Hash] all filters registered on this resource (and superclass)
-      def self.registered_filters_for(receiver)
-        receiver_filters = filters[receiver.name] ||= {}
-        receiver_filters.reverse_merge(registered_filters_for(receiver.superclass)) if has_registered_filters_for?(receiver.superclass)
-        receiver_filters
-      end
-
-      def self.register_filter_for(receiver, filter_name, filter_method_name)
-        receiver_filters = filters[receiver.name] ||= {}
-        receiver_filters[filter_name.to_sym] = filter_method_name.to_sym
-        receiver_filters
-      end
-
-      def self.has_registered_filters_for?(receiver)
-        filters.key?(receiver.name)
-      end
-
-    end
-
     module ClassMethods
       def acts_as_active_facet(options = {})
 
@@ -80,14 +50,15 @@ module ActiveFacets
             filter_method_name ||= "registered_filter_#{filter_name}"
             define_singleton_method(filter_method_name, filter_method) if filter_method
 
-            ActiveFacets::ActsAsActiveFacet::Filters.register_filter_for(self, filter_name, filter_method_name)
+            ActiveFacets::Filter.register(self, filter_name, filter_method_name)
           end
 
           # Applies all filters registered with this resource on a ProxyCollection
           # @param filter_values [Hash] keys = registerd filter name, values = filter arguments
+          # TODO:: change scoped to self(or similar) to preserve the current relation
           define_method(acts_as_active_facet_options[:apply_filters_method_name]) do |filter_values = nil|
             filter_values = (filter_values || {}).with_indifferent_access
-            ActiveFacets::ActsAsActiveFacet::Filters.registered_filters_for(self).inject(self) do |result, (k,v)|
+            ActiveFacets::Filter.registered_filters_for(self).inject(scoped) do |result, (k,v)|
               filter = ActiveFacets::ResourceManager.instance.resource_map(self).detect { |map_entry|
                 filter_values.keys.include? "#{k}_#{map_entry}"
               }

data/lib/active_facets/config.rb

@@ -252,7 +252,6 @@ module ActiveFacets
     def merge_field_sets(a, b)
       na = normalize_field_set(a)
       nb = normalize_field_set(b)
-      binding.pry unless nb
       nb.inject(na.dup) do |result, (field_set, nested_field_sets)|
         result[field_set] = merge_field_sets(na[field_set], nested_field_sets)
         result

data/lib/active_facets/filter.rb

@@ -0,0 +1,36 @@
+#TODO --jdc comment this class
+module ActiveFacets
+  class Filter
+    cattr_accessor :filters, :global_filters
+    self.filters, self.global_filters = {}, {}
+
+    def self.register_global(name, proc)
+      global_filters[name] = proc
+    end
+
+    def self.register(receiver, filter_name, filter_method_name)
+      receiver_filters = filters[receiver.name] ||= {}
+      receiver_filters[filter_name.to_sym] = filter_method_name.to_sym
+      receiver_filters
+    end
+
+    def self.apply_globals_to(receiver)
+      global_filters.each do |filter_name, filter_method|
+        filter_method_name = receiver.acts_as_active_facet_options[:filter_method_name]
+        receiver.send(filter_method_name, filter_name, &filter_method)
+      end
+    end
+
+    #TODO --jdc memoize
+    # @return [Hash] all filters registered on this resource (and superclass)
+    def self.registered_filters_for(receiver)
+      receiver_filters = filters[receiver.name] ||= {}
+      receiver_filters.reverse_merge(registered_filters_for(receiver.superclass)) if filters_registered_for?(receiver.superclass)
+      receiver_filters
+    end
+
+    def self.filters_registered_for?(receiver)
+      filters.key?(receiver.name)
+    end
+  end
+end

data/lib/active_facets/serializer/facade.rb

@@ -101,7 +101,6 @@ module ActiveFacets
       # @return [JSON]
       def serialize!
         json = {}.with_indifferent_access
-
         config.field_set_itterator(fields) do |scope, nested_scopes|
           begin
             json[scope] = get_resource_attribute scope, nested_scopes if allowed_field?(scope)
@@ -109,7 +108,6 @@ module ActiveFacets
             # Deliberately do nothing. Ignore scopes that do not map to resource methods (or aliases)
           end
         end
-
         apply_custom_serializers! json
       end
 

data/lib/active_facets/version.rb

@@ -1,3 +1,3 @@
 module ActiveFacets
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_facets
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - The Honest Company
@@ -281,6 +281,7 @@ files:
 - lib/active_facets/errors/attribute_error.rb
 - lib/active_facets/errors/configuration_error.rb
 - lib/active_facets/errors/lookup_error.rb
+- lib/active_facets/filter.rb
 - lib/active_facets/resource_manager.rb
 - lib/active_facets/serializer/base.rb
 - lib/active_facets/serializer/facade.rb