salestation 0.13.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bceb665efc56da15d2a5ef0523bb99b6d54ee68abf99530262f4c6c90bbd345f
-  data.tar.gz: 2c8257fe1fb5c5f851c4c11d832517b3eafe4223ea225cd2aad30bf030de8557
+  metadata.gz: c129ac9a73dc7d09bf7fdc7b4511b6eeb34283887d83e950233cd44f13248792
+  data.tar.gz: 86cad63b60207ce1f73a4752af80f9d55cb01ee3c535ac4990ab1a0250470cf1
 SHA512:
-  metadata.gz: 67853444ea1fa18ea9c0e57d4088435de7a5b36319cd2a0cf865207450d997af66065765fa2b500845400b5def00a4a485fd2a2d73dd45391f60cd459d0fb4da
-  data.tar.gz: 7d6f38b300d2edcb25f23cabeecc3f5c9ac63f69da7174e6119bf37c3407d4bf62d2a67c01e974c6d542c9d5ab62981639556e3bc5a7142f2aca3c107178fabc
+  metadata.gz: 38ccd7f281a2a86ba758ad9b306986ce93b08b55fda317670b06cf33e4dfce6cadb97a57962ca638f071d9bcc86f995da8519586b4541ff0ad14264f09edb6a7
+  data.tar.gz: e7d668a2e2f4ef5d245a46d8b70a89798b98fdd1ff969fe4a1a925c3e0c8bdebd6fd72a9964fddf01a3b77f76fe7fa44c468e3ab0f139d3e1a96a8af4f75199b

data/README.md

@@ -96,11 +96,10 @@ def create_app_request
 end
 
 post '/hello/:name' do |name|
-  coercions = {age: ->(age) { age.to_s }}
-
-  extractor = BodyParamExtractor[:age, coercions: coercions]
+  extractor = BodyParamExtractor[:age]
     .merge(ConstantInput[name: name])
     .merge(HeadersExtractor[{'authorization' => :auth}])
+    .coerce(age: ->(age) { age.to_s })
 
   response = extractor.call(request)
     .map(create_app_request)

data/lib/salestation/web/extractors.rb

@@ -15,6 +15,10 @@ module Salestation
         def merge(other)
           CombinedInputExtractor.new([self, other])
         end
+
+        def coerce(rules)
+          InputCoercer.new(self, rules)
+        end
       end
 
       class CombinedInputExtractor
@@ -41,6 +45,41 @@ module Salestation
         def merge(other_extractor)
           CombinedInputExtractor.new(@extractors + [other_extractor])
         end
+
+        def coerce(rules)
+          InputCoercer.new(self, rules)
+        end
+      end
+
+      # Handles coercing input values
+      #
+      # @example
+      #  extractor = BodyParamExtractor[:x, :y]
+      #    .coerce(x: ->(value) { "x_#{value}"})
+      #  input = {
+      #   'x' => 'a',
+      #   'y' => 'b',
+      #  }
+      #  # rack_request is Rack::Request with 'rack.request.form_hash' set to input
+      #  extractor.call(rack_request).value #=> {x: 'x_a', y: 'b'}
+      class InputCoercer
+        def initialize(extractor, rules)
+          @extractor = extractor
+          @rules = rules
+        end
+
+        def call(rack_request)
+          @extractor
+            .call(rack_request)
+            .map(&method(:coerce))
+        end
+
+        def coerce(input)
+          @rules.each do |field, coercer|
+            input[field] = coercer.call(@rules[field]) if input.key?(field)
+          end
+          Deterministic::Result::Success(input)
+        end
       end
 
       class HeadersExtractor
@@ -64,30 +103,53 @@ module Salestation
       class ParamExtractor
         include Deterministic
 
-        def self.[](*keys, coercions: {}, rack_key:)
+        def self.[](filters:, rack_key:)
           InputExtractor.new do |rack_request|
             request_hash = rack_request.env[rack_key] || {}
-
-            input = keys
-              .select { |key| request_hash.key?(key.to_s) }
-              .map { |key| [key, request_hash[key.to_s]] }
-              .map { |key, value| coercions.key?(key) ? [key, coercions[key].call(value)] : [key, value] }
-              .to_h
-
+            input = extract(filters, request_hash)
             Result::Success(input)
           end
         end
+
+        def self.extract(filters, request_hash)
+          filters.each_with_object({}) do |filter, extracted_data|
+            case filter
+            when Symbol
+              stringified_key = filter.to_s
+              extracted_data[filter] = request_hash[stringified_key] if request_hash.key?(stringified_key)
+            when Hash
+              filter.each do |key, nested_filters|
+                extracted_data[key] = extract(nested_filters, request_hash[key.to_s])
+              end
+            end
+          end
+        end
       end
 
       class QueryParamExtractor
-        def self.[](*keys, coercions: {})
-          ParamExtractor[*keys, coercions: coercions, rack_key: 'rack.request.query_hash']
+        def self.[](*filters)
+          ParamExtractor[filters: filters, rack_key: 'rack.request.query_hash']
         end
       end
 
+      # Extracts and symbolizes params from request body
+      #
+      # @example
+      #  extractor = BodyParamExtractor[:x, :y, {foo: [:bar, :baz]}]
+      #  input = {
+      #   'x' => '1',
+      #   'y' => '2',
+      #   'z' => '3',
+      #   'foo' => {
+      #     'bar' => 'qq'
+      #    }
+      #  }
+      #  # rack_request is Rack::Request with 'rack.request.form_hash' set to input
+      #  extractor.call(rack_request).value #=> {x: 1, y: 2, foo: {bar: 'qq}}
+      #
       class BodyParamExtractor
-        def self.[](*keys, coercions: {})
-          ParamExtractor[*keys, coercions: coercions, rack_key: 'rack.request.form_hash']
+        def self.[](*filters)
+          ParamExtractor[filters: filters, rack_key: 'rack.request.form_hash']
         end
       end
 

data/salestation.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "salestation"
-  spec.version       = "0.13.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["SaleMove TechMovers"]
   spec.email         = ["techmovers@salemove.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salestation
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 1.0.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler