activeset 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643196795ab69a5f654e5dd52afc5356b51dee42
-  data.tar.gz: 015ca510f83e179a815839609a3687192f23b51d
+  metadata.gz: 31f1479fd17f9303641a356e7db5697e2b5b113c
+  data.tar.gz: a65c103541374642713b8a27fbeb7b0e4b09518e
 SHA512:
-  metadata.gz: 7e8244ed3ea19a1fa7c43fbb974603e803b02abd0c74a193a2b49f5206b61b139c2c30041b1b92d2c1efc5e973d4298d791ac43c3f086aadcdd9967d1bab9e30
-  data.tar.gz: 684f8413a2f8fe98c3df7e6a0de599d9547a562592a23652ce46ad93383885127ae605cd5625e10d8e94394d639ac5fb607918f412ccabcd72671debdf493959
+  metadata.gz: e089a327e4e5ce48a62c38b47889e5f696e1cf4641da3c69f04ffa9a69bc93ae1cdc98a6c0a36258207f0d4e3ed190bdc9c7d3e80eb562436cbc11a40e8ecdcc
+  data.tar.gz: 1c9781eaa496a291f361ca10e3e3ee44e6adf66d6353c00b8810d15b0962aeef0270241a3edf71fd9f2f5538f861757c13cfd7fffd6f9967593c37d748cf897f

data/.gitignore

@@ -10,3 +10,4 @@
 
 # rspec failure tracking
 .rspec_status
+*.gem

data/lib/active_set.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require 'active_set/version'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/hash/slice'
-require 'patches/core_ext/hash/flatten_keys'
 
 require 'active_set/filter/processor'
 require 'active_set/sort/processor'

data/lib/active_set/base_adapter.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative './structure_path'
+
 class BaseAdapter
-  def initialize(key, value)
-    @key = key
+  def initialize(keypath, value)
+    @structure_path = StructurePath.new(keypath)
     @value = value
   end
 end

data/lib/active_set/base_processor.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'patches/core_ext/hash/flatten_keys'
+
 class BaseProcessor
   def initialize(set, structure)
     @set = set
-    @structure = structure
+    @structure = structure.flatten_keys
   end
 end

data/lib/active_set/filter/enumerable_adapter.rb

@@ -7,7 +7,11 @@ class ActiveSet
     class EnumerableAdapter < BaseAdapter
       def process(set)
         @set = set
-        @set.select { |item| item.send(@key) == @value }
+        @set.select do |item|
+          attribute_value = @structure_path.value_for(item: item)
+          attribute_value.send(@structure_path.operator,
+                               @value)
+        end
       end
     end
   end

data/lib/active_set/filter/processor.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/object/blank'
+
 require_relative '../base_processor'
 require_relative './enumerable_adapter'
 
@@ -8,8 +10,8 @@ class ActiveSet
     class Processor < BaseProcessor
       def process
         @structure.reject { |_, v| v.blank? }
-                  .reduce(@set) do |set, (key, value)|
-                    adapter.new(key, value).process(set)
+                  .reduce(@set) do |set, (keypath, value)|
+                    adapter.new(keypath, value).process(set)
                   end
       end
 

data/lib/active_set/paginate/enumerable_adapter.rb

@@ -17,7 +17,7 @@ class ActiveSet
       end
 
       def page_number
-        @key
+        @structure_path.attribute.to_i
       end
     end
   end

data/lib/active_set/paginate/processor.rb

@@ -8,7 +8,7 @@ class ActiveSet
     class Processor < BaseProcessor
       def process
         return @set if @set.count < pagesize
-        adapter.new(@structure[:page], pagesize).process(@set)
+        adapter.new(page_number, pagesize).process(@set)
       end
 
       private
@@ -17,8 +17,12 @@ class ActiveSet
         EnumerableAdapter
       end
 
+      def page_number
+        @structure[[:page]] || 1
+      end
+
       def pagesize
-        @structure[:size] || 25
+        @structure[[:size]] || 25
       end
     end
   end

data/lib/active_set/sort/enumerable_adapter.rb

@@ -7,8 +7,10 @@ class ActiveSet
     class EnumerableAdapter < BaseAdapter
       def process(set)
         @set = set
-        @set.sort_by { |item| item.send(@key) }
-            .tap     { |c| c.reverse! if @value.to_s == 'desc' }
+        @set.sort_by do |item|
+          attribute_value = @structure_path.value_for(item: item)
+          attribute_value.is_a?(String) ? attribute_value.downcase : attribute_value
+        end.tap { |c| c.reverse! if @value.to_s == 'desc' }
       end
     end
   end

data/lib/active_set/sort/processor.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/object/blank'
+
 require_relative '../base_processor'
 require_relative './enumerable_adapter'
 
@@ -8,8 +10,8 @@ class ActiveSet
     class Processor < BaseProcessor
       def process
         @structure.reject { |_, value| value.blank? }
-                  .reduce(@set) do |set, (key, value)|
-                    adapter.new(key, value).process(set)
+                  .reduce(@set) do |set, (keypath, value)|
+                    adapter.new(keypath, value).process(set)
                   end
       end
 

data/lib/active_set/structure_path.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/object/try'
+
+class StructurePath
+  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.inject({}) { |a, e| { e => a } }
+  end
+
+  def value_for(item:)
+    @path.inject(item, :try)
+  end
+
+  def resource_for(item:)
+    to_a.inject(item, :try)
+  end
+
+  private
+
+  def operator_regex
+    %r{\((.*?)\)}
+  end
+end

data/lib/active_set/version.rb

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

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Hash
+  # Returns a flat hash where all nested keys are collapsed into a an array of keys.
+  #
+  #   hash = { person: { name: { first: 'Rob' }, age: '28' } }
+  #   hash.flatten_keys   # => {[:person, :name, :first]=>"Rob", [:person, :age]=>"28"}
+  #   hash                # => { person: { name: { first: 'Rob' }, age: '28' } }
+  def flatten_keys
+    _flatten_keys(self)
+  end
+
+  # Replaces current hash with a flat hash where all nested keys are collapsed into a an array of keys.
+  # Returns +nil+ if no changes were made, otherwise returns the hash.
+  #
+  #   hash = { person: { name: { first: 'Rob' }, age: '28' } }
+  #   hash.flatten_keys!   # => {[:person, :name, :first]=>"Rob", [:person, :age]=>"28"}
+  #   hash                 # => {[:person, :name, :first]=>"Rob", [:person, :age]=>"28"}
+  def flatten_keys!
+    replace(_flatten_keys(self))
+  end
+
+  private
+
+  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) }
+    res
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeset
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Stephen Margheim
@@ -93,7 +93,9 @@ files:
 - lib/active_set/paginate/processor.rb
 - lib/active_set/sort/enumerable_adapter.rb
 - lib/active_set/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
 licenses:
 - MIT