salestation 4.5.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50948c2e3f36bfe0779cb2458cf42cc6d7dd8e9b38b77a00e7bf0e975f7f2140
-  data.tar.gz: 490a6207820bdc32b745e1d3d6c9cbbdb33e547783f557aa14ff89791b351173
+  metadata.gz: 63f86b3537b2db5857f54ef439442a3ca0ef1a4f078d602989783814fd70b718
+  data.tar.gz: 2836da19672da049c461769c8482e4c9cab2e3ce6d6292293051639c0a0cb8e7
 SHA512:
-  metadata.gz: d99f0b753951b98f0905d2084d432071d33d2a2370ae07726225db8d90f8dc8d5bdb6acc453ff2654a2bc81dc23ba27f125202eb1bbc8adceb09faca73638755
-  data.tar.gz: 2d41a2673bc8a59fb78e97ecff19b4c58ed11c01e66111a538ee3e8c1d5c18b9ad504437368a5a5538e7cfb879efe94b6ef19678c8977348c5dbecc62b8b9489
+  metadata.gz: dc79ff3f36806274195543e4fc0e13f27d098d1239b3c0706cd6a7ed3f643a764a71b2b34426ccfbe19ebc9f29b0018a8c8619a1c2f9729c180df70a2b640906
+  data.tar.gz: 4b4d65d3e6158c9ff0025f2e5548b650dab2d0ca3bf4c5dca3f51b11943be552c44eadda05cb5830962157ef2d1200e8067b731eebbc74bb501d83e8a39d7753

data/lib/salestation/app/input_verification.rb

@@ -5,13 +5,29 @@ module Salestation
     module InputVerification
       def verify_input(schema)
         -> (request) do
-          result = schema.call(request.input)
-          if result.success?
-            request.replace_input(result.output)
+          input = request.input
+          result = schema.call(input)
+
+          dry_validation_version = Gem.loaded_specs['dry-validation'].version
+          if dry_validation_version < Gem::Version.new('1.0')
+            Mapper.from_dry_validation_result(result.output, result.errors, custom_error_map)
+            if result.success?
+              request.replace_input(result.output)
+            else
+              Deterministic::Result::Failure(
+                Errors::InvalidInput.new(errors: result.errors, hints: result.hints)
+              )
+            end
+          elsif dry_validation_version <= Gem::Version.new('1.8')
+            if result.success?
+              request.replace_input(input)
+            else
+              Deterministic::Result::Failure(
+                Errors::InvalidInput.new(errors: result.errors.to_h, hints: result.hints.to_h)
+              )
+            end
           else
-            Deterministic::Result::Failure(
-              Errors::InvalidInput.new(errors: result.errors, hints: result.hints)
-            )
+            raise 'Unsupported dry-validation version'
           end
         end
       end

data/lib/salestation/web/extractors.rb

@@ -197,12 +197,26 @@ module Salestation
             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] = value.nil? ? nil : extract(nested_filters, value)
+                  extracted_data[key] =
+                    if !value.is_a?(Hash)
+                      value
+                    else
+                      extract(nested_filters, value)
+                    end
                 end
               end
             end
@@ -219,17 +233,22 @@ module Salestation
       # Extracts and symbolizes params from request body
       #
       # @example
-      #  extractor = BodyParamExtractor[:x, :y, {foo: [:bar, :baz]}]
+      #  extractor = BodyParamExtractor[:x, :y, {foo: [:bar, :baz]}, :aaa]
       #  input = {
       #   'x' => '1',
       #   'y' => '2',
       #   'z' => '3',
       #   'foo' => {
       #     'bar' => 'qq'
-      #    }
+      #    },
+      #   'aaa' => [
+      #      {
+      #        'bb' => 'cc'
+      #      }
+      #    ]
       #  }
       #  # 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}}
+      #  extractor.call(rack_request).value #=> {x: 1, y: 2, foo: {bar: 'qq'}, aaa: [{bb: 'cc'}]}
       #
       class BodyParamExtractor
         def self.[](*filters)

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       = "4.5.0"
+  spec.version       = "5.0.0"
   spec.authors       = ["Glia TechMovers"]
   spec.email         = ["techmovers@glia.com"]
 
@@ -24,7 +24,7 @@ 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.6.0"
+  spec.add_development_dependency "dry-validation", "~> 1.7.0"
 
   spec.add_dependency 'deterministic'
   spec.add_dependency 'dry-struct'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salestation
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Glia TechMovers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: deterministic
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -204,8 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []