actionset 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d8befffeaabf8526df7cdd15f501f2e9e99732b
-  data.tar.gz: 9dc431b8b1af60ed1d6d57d8ba9e66ac6e6a0688
+  metadata.gz: dffd9096dbb67844e4cee728dee2dbea434a32e2
+  data.tar.gz: a6bcb0b49df525a8d3e6e74f06a067310674fd87
 SHA512:
-  metadata.gz: 076e19f851950c2a0c2ac377c51a04eaf16198060ce8a1e6a766339f659c61eab1ae125c34005db809b27b0b0c02aad85e9ad1502f13c11ad04a821be6d40d0d
-  data.tar.gz: c2de49f8fb3a36ecf86dfc00c51a880b675ea8f7db129de84a0eace0565c9175528cd53fcf25096ff04151c727189ce09c53ac54b50221df20784e8ba8e52270
+  metadata.gz: f7400ae1649bde246c247752feabb37adc3c290ce464aee8271980c265965be920ac2cdae6c06b009fbbc59df371ec7e1aad075f4035a2e624ead3f6254e0011
+  data.tar.gz: ca373cfc982b4455ec40c5df823c94ccc4a16e0c2fc1fafeb2eb3cc9ea65b8be664df7135d6ef52c9e1b5cca12e959ae23eda6815809cb62e93baae0acec5d96

data/.rubocop.yml

@@ -1,5 +1,8 @@
 AllCops:
   TargetRubyVersion: 2.4
+  Exclude:
+    - 'actionset.gemspec'
+    - 'spec/**/*'
 Metrics/LineLength:
   Max: 120
   # To make it possible to copy or click on URIs in the code, we allow lines
@@ -10,13 +13,10 @@ Metrics/LineLength:
     - https
 Style/Documentation:
   Enabled: false
+Metrics/MethodLength:
+  Enabled: false
 Style/SignalException:
   EnforcedStyle: semantic
-Metrics/BlockLength:
-  Exclude:
-    - 'activeset.gemspec'
-    - 'spec/**/*_spec.rb'
-    - '**/schema.rb'
 Naming/VariableNumber:
   EnforcedStyle: snake_case
 Style/DateTime:

data/CHANGELOG

@@ -1,3 +1,5 @@
+v 0.8.2
+  - add `ActiveSet.configuration.on_asc_sort_nils_come` configuration
 v 0.8.1
   - add a case-insensitive filtering/sorting option (`/i/`)
   - standardize how filtering by class scopes behaves

data/Gemfile.lock

@@ -1,57 +1,57 @@
 PATH
   remote: .
   specs:
-    actionset (0.8.1)
+    actionset (0.8.2)
       activesupport (>= 4.0.2)
       railties
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.6.1)
-      actionpack (= 5.1.6.1)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6.1)
-      actionpack (= 5.1.6.1)
-      actionview (= 5.1.6.1)
-      activejob (= 5.1.6.1)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.6.1)
-      actionview (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6.1)
-      activesupport (= 5.1.6.1)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.6.1)
-      activesupport (= 5.1.6.1)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
       globalid (>= 0.3.6)
-    activemodel (5.1.6.1)
-      activesupport (= 5.1.6.1)
-    activerecord (5.1.6.1)
-      activemodel (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
-    activesupport (5.1.6.1)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
     arel (8.0.0)
     ast (2.4.0)
     builder (3.2.3)
-    capybara (3.12.0)
+    capybara (3.19.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -63,27 +63,27 @@ GEM
       json
       simplecov
       url
-    combustion (0.7.0)
+    combustion (1.1.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
-    database_cleaner (1.6.2)
+    database_cleaner (1.7.0)
     diff-lcs (1.3)
-    docile (1.1.5)
-    erubi (1.7.1)
-    factory_bot (4.8.2)
-      activesupport (>= 3.0.0)
-    faker (1.8.7)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_bot (5.0.2)
+      activesupport (>= 4.2.0)
+    faker (1.9.3)
       i18n (>= 0.7)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     hirb (0.7.3)
-    i18n (1.2.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
+    jaro_winkler (1.5.2)
+    json (2.2.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -94,60 +94,59 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.9.0)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
     public_suffix (3.0.3)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.6.1)
-      actioncable (= 5.1.6.1)
-      actionmailer (= 5.1.6.1)
-      actionpack (= 5.1.6.1)
-      actionview (= 5.1.6.1)
-      activejob (= 5.1.6.1)
-      activemodel (= 5.1.6.1)
-      activerecord (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
       bundler (>= 1.3.0)
-      railties (= 5.1.6.1)
+      railties (= 5.1.7)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.6.1)
-      actionpack (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (12.3.2)
     ransack (2.1.1)
       actionpack (>= 5.0)
       activerecord (>= 5.0)
       activesupport (>= 5.0)
       i18n
-    regexp_parser (1.3.0)
+    regexp_parser (1.4.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -156,17 +155,16 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.61.1)
+    rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
     ruby-progressbar (1.10.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-console (0.4.2)
@@ -181,12 +179,12 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.1)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.5.0)
     url (0.3.2)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)

data/README.md

@@ -108,6 +108,32 @@ For pagination, like filtering, we don't enforce any view-layer specifics. You s
 </nav>
 ```
 
+## Configuration
+
+### ActiveSet.configuration.on_asc_sort_nils_come
+
+Example usage in an initializer:
+
+```
+  ActiveSet.configure do |c|
+    c.on_asc_sort_nils_come = :first
+  end
+```
+
+When `ActiveSet.configuration.on_asc_sort_nils_come == :last` (this is the default), null values will be sorted as if larger than any non-null value.
+
+```
+ASC => [-2, -1, 1, 2, nil]
+DESC => [nil, 2, 1, -1, -2]
+```
+
+Otherwise sort nulls as if smaller than any non-null value.
+
+```
+ASC => [nil, -2, -1, 1, 2]
+DESC => [2, 1, -1, -2, nil]
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/actionset.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.platform      = Gem::Platform::RUBY
   spec.name          = 'actionset'
-  spec.version       = '0.8.1'
+  spec.version       = '0.8.2'
   spec.authors       = ['Stephen Margheim']
   spec.email         = ['stephen.margheim@gmail.com']
 

data/lib/action_set.rb

@@ -53,7 +53,7 @@ module ActionSet
     private
 
     def filter_instructions_for(set)
-      filter_params.flatten_keys.reject { |_, v| v.try(:empty?) }.each_with_object({}) do |(keypath, value), memo|
+      flatten_keys_of(filter_params).reject { |_, v| v.try(:empty?) }.each_with_object({}) do |(keypath, value), memo|
         typecast_value = if value.respond_to?(:each)
                            value.map { |v| filter_typecasted_value_for(keypath, v, set) }
                          else

data/lib/active_set.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/hash/reverse_merge'
-require 'patches/core_ext/hash/flatten_keys'
-require 'helpers/throws'
+require 'helpers/flatten_keys_of'
 require 'active_set/attribute_instruction'
 require 'active_set/filtering/operation'
 require 'active_set/sorting/operation'
@@ -12,6 +11,30 @@ require 'active_set/exporting/operation'
 class ActiveSet
   include Enumerable
 
+  class Configuration
+    attr_accessor :on_asc_sort_nils_come
+
+    def initialize
+      @on_asc_sort_nils_come = :last
+    end
+  end
+
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+  def self.reset_configuration
+    @configuration = Configuration.new
+  end
+
   attr_reader :set, :view, :instructions
 
   def initialize(set, view: nil, instructions: {})

data/lib/active_set/active_record_set_instruction.rb

@@ -31,23 +31,27 @@ class ActiveSet
       end
     end
 
+    # rubocop:disable Lint/UnderscorePrefixedVariableName
     def arel_column
       _arel_column = arel_table[@attribute_instruction.attribute]
       return _arel_column.lower if case_insensitive_operation?
 
       _arel_column
     end
+    # rubocop:enable Lint/UnderscorePrefixedVariableName
 
     def arel_operator
       @attribute_instruction.operator(default: :eq)
     end
 
+    # rubocop:disable Lint/UnderscorePrefixedVariableName
     def arel_value
       _arel_value = @attribute_instruction.value
       return _arel_value.downcase if case_insensitive_operation?
 
       _arel_value
     end
+    # rubocop:enable Lint/UnderscorePrefixedVariableName
 
     def case_insensitive_operation?
       @attribute_instruction.case_insensitive? && arel_type.presence_in(%i[string text])

data/lib/active_set/attribute_instruction.rb

@@ -92,7 +92,7 @@ class ActiveSet
     private
 
     def operator_regex
-      %r{\((.*?)\)}
+      /\((.*?)\)/
     end
 
     def options_regex

data/lib/active_set/enumerable_set_instruction.rb

@@ -10,16 +10,18 @@ class ActiveSet
 
     def attribute_value_for(item)
       item_value = @attribute_instruction
-                    .value_for(item: item)
+                   .value_for(item: item)
       item_value = item_value.downcase if case_insensitive_operation_for?(item_value)
       item_value
     end
 
+    # rubocop:disable Lint/UnderscorePrefixedVariableName
     def attribute_value
       _attribute_value = @attribute_instruction.value
       _attribute_value = _attribute_value.downcase if case_insensitive_operation_for?(_attribute_value)
       _attribute_value
     end
+    # rubocop:enable Lint/UnderscorePrefixedVariableName
 
     def case_insensitive_operation_for?(value)
       return false unless @attribute_instruction.case_insensitive?

data/lib/active_set/filtering/operation.rb

@@ -12,10 +12,8 @@ class ActiveSet
         @instructions_hash = instructions_hash
       end
 
-      # rubocop:disable Metrics/MethodLength
       def execute
-        attribute_instructions = @instructions_hash
-                                 .flatten_keys
+        attribute_instructions = flatten_keys_of(@instructions_hash)
                                  .map { |k, v| AttributeInstruction.new(k, v) }
 
         activerecord_filtered_set = attribute_instructions.reduce(@set) do |set, attribute_instruction|
@@ -36,7 +34,6 @@ class ActiveSet
           maybe_set_or_false
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       def operation_instructions
         @instructions_hash.symbolize_keys

data/lib/active_set/sorting/active_record_strategy.rb

@@ -41,17 +41,21 @@ class ActiveSet
       private
 
       # https://stackoverflow.com/a/44912964/2884386
-      # Force null values to be sorted as if larger than any non-null value
+      # When ActiveSet.configuration.on_asc_sort_nils_come == :last
+      # null values to be sorted as if larger than any non-null value.
       # ASC => [-2, -1, 1, 2, nil]
       # DESC => [nil, 2, 1, -1, -2]
+      # Otherwise sort nulls as if smaller than any non-null value.
+      # ASC => [nil, -2, -1, 1, 2]
+      # DESC => [2, 1, -1, -2, nil]
       def order_operation_for(set_instruction)
         attribute_model = set_instruction.attribute_model
 
         arel_column = set_instruction.arel_column
         arel_direction = direction_operator(set_instruction.value)
-        nil_sorter = arel_column.send(arel_direction == :asc ? :eq : :not_eq, nil)
 
-        attribute_model.order(nil_sorter).order(arel_column.send(arel_direction))
+        attribute_model.order(nil_sorter_for(arel_column, arel_direction))
+                       .order(arel_column.send(arel_direction))
       end
 
       def direction_operator(direction)
@@ -59,6 +63,16 @@ class ActiveSet
 
         :asc
       end
+
+      def nil_sorter_for(column, direction)
+        nil_sorter_operator = if ActiveSet.configuration.on_asc_sort_nils_come == :last
+                                direction == :asc ? :eq : :not_eq
+                              else
+                                direction == :asc ? :not_eq : :eq
+                              end
+
+        column.send(nil_sorter_operator, nil)
+      end
     end
   end
 end

data/lib/active_set/sorting/enumerable_strategy.rb

@@ -21,11 +21,15 @@ class ActiveSet
             value_for_comparison = sortable_numeric_for(set_instruction, item)
             direction_multiplier = direction_multiplier(set_instruction.value)
 
-            # Force null values to be sorted as if larger than any non-null value
+            # When ActiveSet.configuration.on_asc_sort_nils_come == :last
+            # null values to be sorted as if larger than any non-null value.
             # ASC => [-2, -1, 1, 2, nil]
             # DESC => [nil, 2, 1, -1, -2]
+            # Otherwise sort nulls as if smaller than any non-null value.
+            # ASC => [nil, -2, -1, 1, 2]
+            # DESC => [2, 1, -1, -2, nil]
             if value_for_comparison.nil?
-              [direction_multiplier, 0]
+              [direction_multiplier * nil_sorter, 0]
             else
               [0, value_for_comparison * direction_multiplier]
             end
@@ -44,6 +48,12 @@ class ActiveSet
 
         1
       end
+
+      def nil_sorter
+        return 1 if ActiveSet.configuration.on_asc_sort_nils_come == :last
+
+        -1
+      end
     end
   end
 end

data/lib/active_set/sorting/operation.rb

@@ -13,8 +13,7 @@ class ActiveSet
       end
 
       def execute
-        attribute_instructions = @instructions_hash
-                                 .flatten_keys
+        attribute_instructions = flatten_keys_of(@instructions_hash)
                                  .map { |k, v| AttributeInstruction.new(k, v) }
 
         activerecord_strategy = ActiveRecordStrategy.new(@set, attribute_instructions)

data/lib/helpers/flatten_keys_of.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/array/wrap'
+
+# Returns a flat hash where all nested keys are flattened into an array of keys.
+#
+#   hash = { key: 'value', nested: { key: 'nested_value' }, array: [0, 1, 2] }
+#   flatten_keys_of(hash)
+#   => { [:key]=>"value", [:nested, :key]=>"nested_value", [:array]=>[0, 1, 2] }
+#
+# Can also pass a Proc to change how nested keys are flattened:
+#   flatten_keys_of(hash, flattener: ->(*keys) { keys.join('.') })
+#   => { "key"=>"value", "nested.key"=>"nested_value", "array"=>[0, 1, 2] }
+#   flatten_keys_of(hash, flattener: ->(*keys) { keys.join('-') })
+#   => { "key"=>"value", "nested-key"=>"nested_value", "array"=>[0, 1, 2] }
+#   flatten_keys_of(hash, flattener: ->(*keys) { keys.map(&:to_s).reduce { |memo, key| memo + "[#{key}]" } })
+#   => { "key"=>"value", "nested[key]"=>"nested_value", "array"=>[0, 1, 2] }
+#
+# Can also determine if array values should be flattened as well:
+#   hash = { person: { age: '28', siblings: ['Tom', 'Sally'] } }
+#   flatten_keys_of(hash, flatten_arrays: true)
+#   => { [:key]=>"value", [:nested, :key]=>"nested_value", [:array, 0]=>0, [:array, 1]=>1, [:array, 2]=>2 }
+#   flatten_keys_of(hash, flattener: ->(*keys) { keys.join('.') }, flatten_arrays: true)
+#   => { "key"=>"value", "nested.key"=>"nested_value", "array.0"=>0, "array.1"=>1, "array.2"=>2 }
+
+# refactored from https://stackoverflow.com/a/23861946/2884386
+def flatten_keys_of(input, keys = [], output = {}, flattener: ->(*keys) { keys }, flatten_arrays: false)
+  if input.is_a?(Hash)
+    input.each do |key, value|
+      flatten_keys_of(
+        value,
+        keys + Array.wrap(key),
+        output,
+        flattener: flattener,
+        flatten_arrays: flatten_arrays
+      )
+    end
+  elsif input.is_a?(Array) && flatten_arrays
+    input.each_with_index do |value, index|
+      flatten_keys_of(
+        value,
+        keys + Array.wrap(index),
+        output,
+        flattener: flattener,
+        flatten_arrays: flatten_arrays
+      )
+    end
+  else
+    return output.merge!(flattener.call(*keys) => input)
+  end
+
+  output
+end

data/lib/helpers/transform_to_sortable_numeric.rb

@@ -13,7 +13,7 @@
 # transform_to_sortable_numeric(Date.new(2000, 12, 25))
 # => 977720400000
 
-# rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+# rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 def transform_to_sortable_numeric(value)
   # https://www.justinweiss.com/articles/4-simple-memoization-patterns-in-ruby-and-one-gem/#and-what-about-parameters
   @sortable_numeric ||= Hash.new do |h, key|
@@ -35,8 +35,7 @@ def transform_to_sortable_numeric(value)
   end
   @sortable_numeric[value]
 end
-# rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-# rubocop:enable Style/AsciiComments
+# rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
 def string_to_sortable_numeric(string)
   string                                          # 'aB09ü'
@@ -46,6 +45,7 @@ def string_to_sortable_numeric(string)
     .reduce(&:concat)                             # "097.066048057252"
     .to_r                                         # (24266512014313/250000000000)
 end
+# rubocop:enable Style/AsciiComments
 
 def time_to_sortable_numeric(time)
   # https://stackoverflow.com/a/30604935/2884386

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionset
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -295,9 +295,8 @@ files:
 - lib/active_set/sorting/active_record_strategy.rb
 - lib/active_set/sorting/enumerable_strategy.rb
 - lib/active_set/sorting/operation.rb
-- lib/helpers/throws.rb
+- lib/helpers/flatten_keys_of.rb
 - lib/helpers/transform_to_sortable_numeric.rb
-- lib/patches/core_ext/hash/flatten_keys.rb
 - pagination.png
 homepage: https://github.com/fractaledmind/actionset
 licenses:

data/lib/helpers/throws.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-# Returns a Boolean for whether the block raises the Exception expected
-#
-# throws?(StandardError) { raise }
-# => true
-# throws?(NameError) { raise NameError }
-# => true
-# throws?(NoMethodError) { raise NameError }
-# => false
-# throws?(StandardError) { 'foo' }
-# => false
-
-def throws?(exception)
-  yield
-  false
-rescue StandardError => e
-  e.is_a? exception
-end

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

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/array/wrap'
-
-class Hash
-  # Returns a flat hash where all nested keys are collapsed into an array of keys.
-  #
-  #   hash = { person: { name: { first: 'Rob' }, age: '28' } }
-  #   hash.flatten_keys_to_array
-  #   => {[:person, :name, :first] => "Rob", [:person, :age]=>"28" }
-  def flatten_keys_to_array
-    _flatten_keys(self)
-  end
-  alias flatten_keys flatten_keys_to_array
-
-  # Returns a flat hash where all nested keys are collapsed into a dot-separated string of keys.
-  #
-  #   hash = { person: { name: { first: 'Rob' }, age: '28' } }
-  #   hash.flatten_keys_to_dotpath
-  #   => { 'person.name.first' => "Rob", 'person.age'=>"28" }
-  def flatten_keys_to_dotpath
-    _flatten_keys(self, ->(*keys) { keys.join('.') })
-  end
-
-  # Returns a flat hash where all nested keys are collapsed into a dast-separated string of keys.
-  #
-  #   hash = { person: { name: { first: 'Rob' }, age: '28' } }
-  #   hash.flatten_keys_to_html_attribute
-  #   => { 'person-name-first' => "Rob", 'person-age'=>"28" }
-  def flatten_keys_to_html_attribute
-    _flatten_keys(self, ->(*keys) { keys.join('-') })
-  end
-
-  # Returns a flat hash where all nested keys are collapsed into a string of keys
-  # fitting the Rails request param pattern.
-  #
-  #   hash = { person: { name: { first: 'Rob' }, age: '28' } }
-  #   hash.flatten_keys_to_rails_param
-  #   => { 'person[name][first]' => "Rob", 'person[age]'=>"28" }
-  def flatten_keys_to_rails_param
-    _flatten_keys(self, ->(*keys) { keys.map(&:to_s).reduce { |memo, key| memo + "[#{key}]" } })
-  end
-
-  private
-
-  # refactored from https://stackoverflow.com/a/23861946/2884386
-  def _flatten_keys(input, keypath_gen = ->(*keys) { keys }, keys = [], output = {})
-    if input.is_a? Hash
-      input.each { |k, v| _flatten_keys(v, keypath_gen, keys + Array(k), output) }
-    # elsif input.is_a? Array
-    #   input.each_with_index { |v, i| _flatten_keys(v, keypath_gen, keys + Array(i), output) }
-    else
-      return output.merge!(keypath_gen.call(*keys) => input)
-    end
-
-    output
-  end
-end