activeset 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b1fb5697f15f8789f8d174bdee4e946862cbd1
-  data.tar.gz: 2c05138de95c75628c2ddea4d24508ddbd511248
+  metadata.gz: fc73d4a0f511ddca2d0c895b7867816dc571102f
+  data.tar.gz: 02ac9b548790d30b2dac78a372b3ccc091769ed2
 SHA512:
-  metadata.gz: 788668ec2fb6bf0bc24db2d2675e9dfea2cd9e852cd4197d411e6113486a2b2ac88c165b74a0dc74b944c2246ab101f2137cdcb62797d5871019301e877fb090
-  data.tar.gz: 19a7388ad9014f195860aeb37732810a0dd5494d62a9721a0c4e18402d219ab81c004a4be97f4fe1ea9d835ab39ac0f6f915c472d29c37d13d39dbb92d296473
+  metadata.gz: 029232215b1cd1280f1b75757198bce5e97aa2e64603f2fa5c51aef8304407c7b56e1b0928a0e09fac080c9de272b00716842d94ad122a99f97d8f5337a1d58b
+  data.tar.gz: e73777713e06505233491977d66b4f48966e3ce5a50b4b99dcc242f00db13349e10ac3166a6ac5fff0da0cfcad02fffcf61359cba737b6e20c63d8694df8216a

data/CHANGELOG

@@ -1,3 +1,9 @@
+v 0.3.1
+  - Implement an Instructions object layer for handling the hashes passed into Processors
+v 0.3.0
+  - remove the typecasting functionality
+  - bug fixes
+  - improved specs
 v 0.2.0
   - allows for filtering and sorting enumerable collections via associated attributes
 v 0.1.0

data/lib/active_set/instructions/base.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative './entry'
+
+class ActiveSet
+  class Instructions
+    attr_reader :hash
+
+    def initialize(hash)
+      @hash = hash
+      @flattened_hash = hash.flatten_keys
+    end
+
+    def process_adapter(set:, adapter:)
+      @flattened_hash.reject { |_, v| v.blank? }
+                     .reduce(set) do |inner_set, (keypath, value)|
+                       instruction = Entry.new(keypath, value)
+                       adapter.new(instruction).process(inner_set)
+                     end
+    end
+
+    def get(keypath)
+      @hash.dig(*keypath)
+    end
+  end
+end

data/lib/active_set/instructions/entry.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/delegation'
+
+require_relative 'entry/keypath'
+require_relative 'entry/value'
+
+class ActiveSet
+  class Instructions
+    class Entry
+      attr_reader :keypath
+
+      delegate :attribute, :operator, :associations_array, :associations_hash, :value_for, :resource_for,
+               to: :keypath
+
+      def initialize(keypath, value)
+        @keypath = KeyPath.new(keypath)
+        @value = Value.new(value)
+      end
+
+      def value
+        @value.raw
+      end
+    end
+  end
+end

data/lib/active_set/instructions/entry/keypath.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/object/try'
+
+class ActiveSet
+  class Instructions
+    class Entry
+      class KeyPath
+        attr_reader :path
+
+        def initialize(path)
+          # `path` can be an Array (e.g. [:parent, :child, :grandchild])
+          # or a String (e.g. 'parent.child.grandchild')
+          @path = path.is_a?(String) ? path.split('.') : Array.wrap(path).map(&:to_s)
+        end
+
+        def attribute
+          attribute = @path.last
+          return attribute.sub(operator_regex, '') if attribute.match operator_regex
+          attribute
+        end
+
+        def operator
+          attribute = @path.last
+          return attribute[operator_regex, 1] if attribute.match operator_regex
+          '=='
+        end
+
+        def associations_array
+          @path.slice(0, @path.length - 1)
+        end
+
+        def associations_hash
+          associations_array.reverse.reduce({}) { |a, e| { e => a } }
+        end
+
+        def value_for(item:)
+          resource_for(item: item).send(attribute)
+        rescue
+          nil
+        end
+
+        def resource_for(item:)
+          associations_array.reduce(item, :try)
+        rescue
+          nil
+        end
+
+        private
+
+        def operator_regex
+          /\((.*?)\)/
+        end
+      end
+    end
+  end
+end

data/lib/active_set/instructions/entry/value.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActiveSet
+  class Instructions
+    class Entry
+      class Value
+        attr_reader :raw
+
+        def initialize(value)
+          @raw = value
+        end
+      end
+    end
+  end
+end

data/lib/active_set/processors/base_adapter.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../structure/path'
-
-class BaseAdapter
-  def initialize(keypath, value)
-    @structure_path = Structure::Path.new(keypath)
-    @value = value
+class ActiveSet
+  class BaseAdapter
+    def initialize(instruction)
+      @instruction = instruction
+    end
   end
 end

data/lib/active_set/processors/base_processor.rb

@@ -1,19 +1,22 @@
 # frozen_string_literal: true
 
 require 'patches/core_ext/hash/flatten_keys'
+require_relative '../instructions/base'
 
-class BaseProcessor
-  def self.queue_adapter(adapter)
-    @adapters ||= []
-    @adapters |= [adapter]
-  end
+class ActiveSet
+  class BaseProcessor
+    def self.queue_adapter(adapter)
+      @adapters ||= []
+      @adapters |= [adapter]
+    end
 
-  def initialize(set, structure)
-    @set = set
-    @structure = structure.flatten_keys
-  end
+    def initialize(set, instructions)
+      @set = set
+      @instructions = Instructions.new(instructions)
+    end
 
-  def adapters
-    self.class.instance_variable_get(:@adapters)
+    def adapters
+      self.class.instance_variable_get(:@adapters)
+    end
   end
 end

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

@@ -19,34 +19,34 @@ class ActiveSet
       def attribute_is_field?
         return false unless attribute_model
         attribute_model.attribute_names
-                       .include?(@structure_path.attribute)
+                       .include?(@instruction.attribute)
       end
 
       def query
-        @set.includes(@structure_path.to_h)
-            .references(@structure_path.to_h)
+        @set.includes(@instruction.associations_hash)
+            .references(@instruction.associations_hash)
             .where(arel_operation)
       end
 
       def arel_operation
-        Arel::Nodes::InfixOperation.new(@structure_path.operator,
+        Arel::Nodes::InfixOperation.new(@instruction.operator,
                                         arel_column,
                                         arel_value)
       end
 
       def attribute_model
-        @structure_path.to_a
-                       .reduce(@set) do |obj, assoc|
-                         obj.reflections[assoc.to_s]&.klass
-                       end
+        @instruction.associations_array
+                    .reduce(@set) do |obj, assoc|
+                      obj.reflections[assoc.to_s]&.klass
+                    end
       end
 
       def arel_column
-        arel_table[@structure_path.attribute]
+        arel_table[@instruction.attribute]
       end
 
       def arel_value
-        Arel.sql(ActiveRecord::Base.connection.quote(@value))
+        Arel.sql(ActiveRecord::Base.connection.quote(@instruction.value))
       end
 
       def arel_table

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

@@ -7,7 +7,7 @@ class ActiveSet
     class EnumerableAdapter < BaseAdapter
       def process(set)
         set.select do |item|
-          value_for(item).send(@structure_path.operator,
+          value_for(item).send(@instruction.operator,
                                passed_value)
         end
       end
@@ -15,11 +15,11 @@ class ActiveSet
       private
 
       def value_for(item)
-        convert_datetime_values_to_integer(@structure_path.value_for(item: item))
+        convert_datetime_values_to_integer(@instruction.value_for(item: item))
       end
 
       def passed_value
-        convert_datetime_values_to_integer(@value)
+        convert_datetime_values_to_integer(@instruction.value)
       end
 
       def convert_datetime_values_to_integer(value)

data/lib/active_set/processors/filter_processor.rb

@@ -13,10 +13,7 @@ class ActiveSet
 
     def process
       adapters.reduce(@set) do |outer_set, adapter|
-        @structure.reject { |_, v| v.blank? }
-                  .reduce(outer_set) do |inner_set, (keypath, value)|
-                    adapter.new(keypath, value).process(inner_set)
-                  end
+        @instructions.process_adapter(set: outer_set, adapter: adapter)
       end
     end
   end

data/lib/active_set/processors/paginate/enumerable_adapter.rb

@@ -13,11 +13,11 @@ class ActiveSet
       private
 
       def pagesize
-        @value
+        @instruction.value
       end
 
       def page_number
-        @structure_path.attribute.to_i
+        @instruction.attribute.to_i
       end
     end
   end

data/lib/active_set/processors/paginate_processor.rb

@@ -7,7 +7,7 @@ class ActiveSet
   class PaginateProcessor < BaseProcessor
     def process
       return @set if @set.count < pagesize
-      adapter.new(page_number, pagesize).process(@set)
+      adapter.new(instruction).process(@set)
     end
 
     private
@@ -16,12 +16,16 @@ class ActiveSet
       EnumerableAdapter
     end
 
+    def instruction
+      Instructions::Entry.new(page_number, pagesize)
+    end
+
     def page_number
-      @structure[[:page]] || 1
+      @instructions.get(:page) || 1
     end
 
     def pagesize
-      @structure[[:size]] || 25
+      @instructions.get(:size) || 25
     end
   end
 end

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

@@ -11,8 +11,8 @@ class ActiveSet
         return @set unless @set.respond_to? :to_sql
         return @set unless attribute_is_field?
 
-        @set.includes(@structure_path.to_h)
-            .references(@structure_path.to_h)
+        @set.includes(@instruction.associations_hash)
+            .references(@instruction.associations_hash)
             .merge(arel_operation)
       end
 
@@ -21,32 +21,32 @@ class ActiveSet
       def attribute_is_field?
         return false unless attribute_model
         attribute_model.attribute_names
-                       .include?(@structure_path.attribute)
-      end
-
-      def case_insensitive?
-        @structure_path.operator.to_s == 'i'
+                       .include?(@instruction.attribute)
       end
 
       def arel_operation
         column = case_insensitive? ? arel_column.lower : arel_column
-        attribute_model.order(column.send(@value))
+        attribute_model.order(column.send(@instruction.value))
       end
 
       def attribute_model
-        @structure_path.to_a
-                       .reduce(@set) do |obj, assoc|
-                         obj.reflections[assoc.to_s]&.klass
-                       end
+        @instruction.associations_array
+                    .reduce(@set) do |obj, assoc|
+                      obj.reflections[assoc.to_s]&.klass
+                    end
       end
 
       def arel_column
-        arel_table[@structure_path.attribute]
+        arel_table[@instruction.attribute]
       end
 
       def arel_table
         Arel::Table.new(attribute_model.table_name)
       end
+
+      def case_insensitive?
+        @instruction.operator.to_s == 'i'
+      end
     end
   end
 end

data/lib/active_set/processors/sort/enumerable_adapter.rb

@@ -8,9 +8,9 @@ class ActiveSet
     class EnumerableAdapter < BaseAdapter
       def process(set)
         set.sort_by do |item|
-          attribute_value = @structure_path.value_for(item: item)
+          attribute_value = @instruction.value_for(item: item)
           case_insensitive?(attribute_value) ? insensify(attribute_value) : attribute_value
-        end.tap { |c| c.reverse! if @value.to_s == 'desc' }
+        end.tap { |c| c.reverse! if @instruction.value.to_s == 'desc' }
       end
 
       private
@@ -19,7 +19,7 @@ class ActiveSet
         # Cannot sort pure Booleans or Nils, so we _must_ cast to Strings
         return true if value.is_a?(TrueClass) || value.is_a?(FalseClass)
         return true if value.is_a?(NilClass)
-        @structure_path.operator.to_s == 'i'
+        @instruction.operator.to_s == 'i'
       end
 
       def insensify(value)

data/lib/active_set/processors/sort_processor.rb

@@ -13,10 +13,7 @@ class ActiveSet
 
     def process
       adapters.reduce(@set) do |outer_set, adapter|
-        @structure.reject { |_, v| v.blank? }
-                  .reduce(outer_set) do |inner_set, (keypath, value)|
-                    adapter.new(keypath, value).process(inner_set)
-                  end
+        @instructions.process_adapter(set: outer_set, adapter: adapter)
       end
     end
   end

data/lib/active_set/version.rb

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

data/lib/patches/core_ext/hash/flatten_keys.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/array/wrap'
+
 class Hash
   # Returns a flat hash where all nested keys are collapsed into a an array of keys.
   #
@@ -24,7 +26,7 @@ class Hash
 
   def _flatten_keys(h, keys = [], res = {})
     return res.merge!(keys => h) unless h.is_a? Hash
-    h.each { |k, r| _flatten_keys(r, keys + [k], res) }
+    h.each { |k, r| _flatten_keys(r, keys + Array.wrap(k), res) }
     res
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeset
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,6 +171,10 @@ files:
 - bin/setup
 - config.ru
 - lib/active_set.rb
+- lib/active_set/instructions/base.rb
+- lib/active_set/instructions/entry.rb
+- lib/active_set/instructions/entry/keypath.rb
+- lib/active_set/instructions/entry/value.rb
 - lib/active_set/processors/base_adapter.rb
 - lib/active_set/processors/base_processor.rb
 - lib/active_set/processors/filter/active_record_adapter.rb
@@ -181,7 +185,6 @@ files:
 - lib/active_set/processors/sort/active_record_adapter.rb
 - lib/active_set/processors/sort/enumerable_adapter.rb
 - lib/active_set/processors/sort_processor.rb
-- lib/active_set/structure/path.rb
 - lib/active_set/version.rb
 - lib/patches/core_ext/hash/flatten_keys.rb
 homepage: https://github.com/fractaledmind/activeset

data/lib/active_set/structure/path.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/try'
-
-module Structure
-  class Path
-    attr_reader :path
-
-    def initialize(path)
-      # `path` can be an Array (e.g. [:parent, :child, :grandchild])
-      # or a String (e.g. 'parent.child.grandchild')
-      @path = path.is_a?(String) ? path.split('.') : Array.wrap(path).map(&:to_s)
-    end
-
-    def attribute
-      attribute = @path.last
-      return attribute.sub(operator_regex, '') if attribute.match operator_regex
-      attribute
-    end
-
-    def operator
-      attribute = @path.last
-      return attribute[operator_regex, 1] if attribute.match operator_regex
-      '=='
-    end
-
-    def to_a
-      @path.slice(0, @path.length - 1)
-    end
-
-    def to_h
-      to_a.reverse.reduce({}) { |a, e| { e => a } }
-    end
-
-    def value_for(item:)
-      resource_for(item: item).send(attribute)
-    rescue
-      nil
-    end
-
-    def resource_for(item:)
-      to_a.reduce(item, :try)
-    rescue
-      nil
-    end
-
-    private
-
-    def operator_regex
-      /\((.*?)\)/
-    end
-  end
-end