rack-reducer 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a41029921e31a738165238e25af3300edc47c9a131b537ce597a313ba2060b4d
-  data.tar.gz: 2b1c09a05bb3f5af59344d9e65bbdb166a54c1d8d8bffbe34ba3bb8e768d6c4e
+SHA1:
+  metadata.gz: 0be5dfa4acf3c9a2c7755c67f2bbc15a2126b5d3
+  data.tar.gz: 6bd09c026cd5e5b9fb1d8ac0425d2e525afb3a36
 SHA512:
-  metadata.gz: 7c6c6a069e7a9b6b9cdb1cf423143175cfa257215f69a2c7aaa7e027ac935d14073ed8192030af702f263441d38046671f26f635bd559d3cfe3c0743a1cb12a8
-  data.tar.gz: 9839e1d5a9cd4f4557ad0a87c24c1cee4a4ec5357f085baa894c81c7e8981eadc01f65de84656818ce13357ea7a6ef9d7cabef22c0a7b2d96e65cd1d32a455b3
+  metadata.gz: e03f7c4766706254c287c7dbb0b664cf29d8c3b7d1e210189d4c17a9cd3a013c579d4e5ee2d0cda56cbf146e639d7515aff3092cb6832621e058375316a2d692
+  data.tar.gz: 15c82a76f5a7218393656ddb4abfaa5584bc11b483326452d08ff16a4a9c3efdecbd07ed810af51401a03b07a95dadd89b76199dfc4564afb04c1f4db9a7b2ec

data/lib/rack/reducer.rb

@@ -1,6 +1,3 @@
-# frozen_string_literal: true
-
-require 'rack/request'
 require_relative 'reducer/reduction'
 require_relative 'reducer/middleware'
 

data/lib/rack/reducer/middleware.rb

@@ -1,5 +1,4 @@
-# frozen_string_literal: true
-
+require 'rack/request'
 require_relative 'reduction'
 
 module Rack

data/lib/rack/reducer/parser.rb

@@ -1,11 +1,15 @@
-# frozen_string_literal: true
-
 module Rack
   module Reducer
     # convert params from Sinatra, Rails, Roda, etc into a symbol hash
     module Parser
       def self.call(data)
-        data.is_a?(Hash) ? data : hashify(data)
+        data.is_a?(Hash) ? symbolize(data) : hashify(data)
+      end
+
+      def self.symbolize(data)
+        data.each_with_object({}) do |(key, val), hash|
+          hash[key.to_sym] = val.is_a?(Hash) ? symbolize(val) : val
+        end
       end
 
       # turns out a Rails params hash is not really a hash
@@ -13,7 +17,7 @@ module Rack
       # are automatically sanitized by the lambda keywords
       def self.hashify(data)
         fn = %i[to_unsafe_h to_h].find { |name| data.respond_to?(name) }
-        data.send(fn)
+        symbolize(data.send(fn))
       end
     end
   end

data/lib/rack/reducer/reduction.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'refinements'
 require_relative 'parser'
 
@@ -8,7 +6,7 @@ module Rack
     # call `reduce` on a params hash, filtering data via lambdas with
     # matching keyword arguments
     class Reduction
-      using Refinements # augment Hash & Proc inside this scope
+      using Refinements # define Proc#required_argument_names, #satisfies?, etc
 
       DEFAULTS = {
         dataset: [],
@@ -18,7 +16,7 @@ module Rack
 
       def initialize(options)
         @props = DEFAULTS.merge(options)
-        @params = Parser.call(@props[:params]).symbolize_keys
+        @params = Parser.call(@props[:params])
       end
 
       def reduce
@@ -27,10 +25,10 @@ module Rack
 
       private
 
-      def apply_filter(data, fn)
-        requirements = fn.required_argument_names.to_set
-        return data unless @params.satisfies?(requirements)
-        data.instance_exec(@params.slice(*fn.all_argument_names), &fn)
+      def apply_filter(data, filter)
+        return data unless filter.satisfies?(@params)
+
+        data.instance_exec(@params.slice(*filter.all_argument_names), &filter)
       end
     end
   end

data/lib/rack/reducer/refinements.rb

@@ -1,29 +1,29 @@
-# frozen_string_literal: true
-
 module Rack
   module Reducer
-    # refine a few core classes in Rack::Reducer's scope only
+    # refine Proc and hash in this scope only
     module Refinements
-      refine Hash do
-        def symbolize_keys
-          each_with_object({}) do |(key, val), hash|
-            hash[key.to_sym] = val.is_a?(Hash) ? val.symbolize_keys : val
-          end
-        end
-
-        def satisfies?(requirements)
-          slice(*requirements).keys.to_set == requirements
-        end
-      end
-
       refine Proc do
         def required_argument_names
-          parameters.select { |arg| arg[0] == :keyreq }.map(&:last)
+          parameters.select { |type, _| type == :keyreq }.map(&:last)
         end
 
         def all_argument_names
           parameters.map(&:last)
         end
+
+        def satisfies?(params)
+          keywords = required_argument_names
+          params.slice(*keywords).keys.to_set == keywords.to_set
+        end
+      end
+
+      # backport Hash#slice for older rubies
+      unless {}.respond_to?(:slice)
+        refine Hash do
+          def slice(*keys)
+            [keys, values_at(*keys)].transpose.select { |_k, val| val }.to_h
+          end
+        end
       end
     end
   end

data/lib/rack/reducer/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  module Reducer
+    VERSION = '1.0.0'.freeze
+  end
+end

data/spec/behavior.rb

@@ -1,4 +1,4 @@
-shared_examples_for Rack::Reducer do
+RSpec.shared_examples_for Rack::Reducer do
   let(:app) { described_class }
 
   it 'responds with unfiltered data when filter params are empty' do

data/spec/benchmarks.rb

@@ -1,56 +1,41 @@
-require 'spec_helper'
-require_relative 'fixtures'
+require_relative 'spec_helper'
 require 'sinatra/base'
 require 'json'
 require 'benchmark/ips'
 
-class App < Sinatra::Base
-  get '/conditionals' do
-    @artists = DB[:artists]
-    if (genre = params[:genre])
-      @artists = @artists.grep(:genre, "%#{genre}%", case_insensitive: true)
-    end
-    if (name = params[:name])
-      @artists = @artists.grep(:name, "%#{name}%", case_insensitive: true)
-    end
-
-    @artists.to_json
+Conditionals = lambda do |params = {}|
+  @artists = DB[:artists]
+  if (genre = params[:genre])
+    @artists = @artists.grep(:genre, "%#{genre}%", case_insensitive: true)
   end
+  if (name = params[:name])
+    @artists = @artists.grep(:name, "%#{name}%", case_insensitive: true)
+  end
+
+  @artists.to_json
+end
 
-  get '/reduction' do
-    @artists = Rack::Reducer.call(params, dataset: DB[:artists], filters: [
-      ->(genre:) { grep(:genre, "%#{genre}%", case_insensitive: true) },
-      ->(name:) { grep(:name, "%#{name}%", case_insensitive: true) },
-    ])
+Reduction = lambda do |params = {}|
+  @artists = Rack::Reducer.call(params, dataset: DB[:artists], filters: [
+    ->(genre:) { grep(:genre, "%#{genre}%", case_insensitive: true) },
+    ->(name:) { grep(:name, "%#{name}%", case_insensitive: true) },
+  ])
 
-    @artists.to_json
-  end
+  @artists.to_json
 end
 
-describe 'Performance' do
-  let(:app) { App }
-
-  it 'compares favorably to spaghetti code when params are empty' do
-    Benchmark.ips(3) do |bm|
-      bm.report('conditionals, empty params') do
-        get '/conditionals'
-      end
-      bm.report('reduction, empty params') do
-        get '/reduction'
-      end
-      bm.compare!
-    end
+Benchmark.ips(3) do |bm|
+  bm.report('conditionals, empty params') { Conditionals.call }
+
+  bm.report('reduction, empty params') { Reduction.call }
+
+  bm.report('conditionals, full params') do
+    Conditionals.call({ name: 'blake', genre: 'electric' })
   end
 
-  it 'compares favorably to spaghetti code when params are full' do
-    Benchmark.ips(3) do |bm|
-      bm.report('conditionals, full params') do
-        get '/conditionals?name=blake&genre=electronic'
-      end
-      bm.report('reduction, full params') do
-        get '/reduction?name=blake&genre=electronic'
-      end
-      bm.compare!
-    end
+  bm.report('reduction, full params') do
+    Reduction.call({ name: 'blake', genre: 'electric' })
   end
+
+  bm.compare!
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'bundler/setup'
 Bundler.setup
+require 'rspec'
 require 'pry'
 require 'rack/test'
 require 'rack/reducer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-reducer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: hanami
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.61'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.61'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +243,7 @@ dependencies:
 description: Dynamically filter, sort, and paginate data via URL params, in any Rack
   app.
 email:
-- chris.frank@thefutureproject.org
+- chris.frank@future.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -226,6 +254,7 @@ files:
 - lib/rack/reducer/parser.rb
 - lib/rack/reducer/reduction.rb
 - lib/rack/reducer/refinements.rb
+- lib/rack/reducer/version.rb
 - spec/_hanami_example/apps/web/application.rb
 - spec/_hanami_example/apps/web/config/routes.rb
 - spec/_hanami_example/apps/web/controllers/artists/index.rb
@@ -288,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.4.5.5
 signing_key: 
 specification_version: 4
 summary: Dynamically filter data via URL params, in any Rack app.