salestation 5.1.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43663c5f6d78d7238e66e9ac88a06a49facfcaf45a329534e44e20891ea1baa9
-  data.tar.gz: 97661dd29a53ab956cbe0c78522b382d052bd4c6f339208fe126f7d3c51f8526
+  metadata.gz: 3978171d3a2b78287dd0f3b86049f8253d1f66199545002701b1f4bd46295a64
+  data.tar.gz: 469b3e6ddfe9c1b399eda6f63827b7b674142f6a67ac16b03ad0f8ddb5e5e88a
 SHA512:
-  metadata.gz: ee4cf2f592d41548e187277789ec6d3484748dc7cc152f3a9b4e4b63b438314e5fe96ab3aeb92dbd4729a485b4d9e73b518904459309b19f3da7a507595100ce
-  data.tar.gz: 22a1c5415ded67ebc22c5f67ef6332706571a156000aac7e5195101c73be14dc950b5f208fb24b19e27c94b70c3c854dc8a5da485a01b030d578e9ccaac92c57
+  metadata.gz: 9a5140a9348d79cfde31b44dd7c8d24bbea0135d2d8371272a1ed86db6690be64f3248be27f1a845d3d6f64ab5b8c59809534cae6d68af6223c3d6f0edafcf11
+  data.tar.gz: 14ad1ff09a48d7d6c7be4c7bf5781cf922990dd43dac6f6df46aaa78939ed94875bcdeb9544ec85cac82252453975cc1ad5457bf644aa5ef6fc54e484fc39dec

data/README.md

@@ -104,6 +104,14 @@ Multiple extractors can be merged together. If two or more extractors use the sa
 
 `coercions` can optionally be provided to `BodyParamExtractor` and `QueryParamExtractor`. These can be used to transform the values of the extracted parameters.
 
+#### ParamExtractor
+
+ParamExtractor, which is also used by `BodyParamExtractor` and `QueryParamExtractor`, 
+extracts only the content of such root level keys that are specified when creating the
+extractor instance. All other root level keys are discarded. Everything inside the 
+whitelisted root level keys is automatically whitelisted.
+
+
 Define a route
 
 ```ruby

data/lib/salestation/web/extractors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "symbolizer"
 
 module Salestation
   class Web < Module
@@ -192,35 +193,18 @@ module Salestation
         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)
-              if extracted_data[filter].is_a?(Array)
-                extracted_data[filter] = extracted_data[filter].map{ |hash|
-                  if hash.is_a?(Hash)
-                    hash.transform_keys(&:to_sym) if hash.is_a?(Hash)
-                  else
-                    hash
-                  end
-                }
-              end
-            when Hash
-              filter.each do |key, nested_filters|
-                stringified_key = key.to_s
-                if request_hash.key?(stringified_key)
-                  value = request_hash.fetch(stringified_key)
-                  extracted_data[key] =
-                    if !value.is_a?(Hash)
-                      value
-                    else
-                      extract(nested_filters, value)
-                    end
-                end
-              end
-            end
-          end
+          # Filter as a hash is used in some existing implementations that did not expect full 
+          # recursive symbolizing of keys. In this case hash objects at the highest level of object 
+          # are represented as hash of filter keys. This is no longer needed, but we support it 
+          # to avoid a breaking change.
+
+          filters_flat = filters
+                          .flat_map {|filter| filter.is_a?(Hash) ? filter.keys : filter}
+                          .map(&:to_s)
+
+          request_hash = request_hash.select {|k,v| filters_flat.include?(k)}
+
+          Symbolizer.symbolize(request_hash)
         end
       end
 

data/lib/salestation/web/ip_address.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Salestation
+  class Web < Module
+    module IPAddress
+      def self.extract(request)
+        if request['HTTP_X_FORWARDED_FOR'].nil?
+          request['REMOTE_ADDR']
+        else
+          request['HTTP_X_FORWARDED_FOR'].split(',').first
+        end
+      end
+    end
+  end
+end

data/lib/salestation/web.rb

@@ -44,6 +44,7 @@ module Salestation
 end
 
 require_relative './web/extractors'
+require_relative './web/ip_address'
 require_relative './web/responses'
 require_relative './web/error_mapper'
 require_relative './result_helper'

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       = "5.1.0"
+  spec.version       = "5.3.0"
   spec.authors       = ["Glia TechMovers"]
   spec.email         = ["techmovers@glia.com"]
 
@@ -24,10 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10.4"
   spec.add_development_dependency "glia-errors", "~> 0.11.4"
-  spec.add_development_dependency "dry-validation", "~> 1.7.0"
+  spec.add_development_dependency "dry-validation", "~> 1.7"
 
   spec.add_dependency 'deterministic'
   spec.add_dependency 'dry-struct'
   spec.add_dependency 'dry-types'
   spec.add_dependency 'http-accept', '~> 2.1'
+  spec.add_dependency 'symbolizer'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salestation
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: deterministic
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: symbolizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - techmovers@glia.com
@@ -181,6 +195,7 @@ files:
 - lib/salestation/web/input_validator.rb
 - lib/salestation/web/input_validators/accept_header.rb
 - lib/salestation/web/input_validators/content_type_header.rb
+- lib/salestation/web/ip_address.rb
 - lib/salestation/web/request_logger.rb
 - lib/salestation/web/responses.rb
 - lib/salestation/web/statsd_middleware.rb