salestation 4.4.2 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de4efec567a218753f1b529394006e24294cba52a8f63c68c3a3a311cc04e87
-  data.tar.gz: 8a906d43283751e9e173a6f99ca8a36a2ab64f663d04470158272d8f7c153b1c
+  metadata.gz: a1245b9d949f1d4f8cfb1ce04208f72cd4b0601e9bc798f65a86a83199deb1e1
+  data.tar.gz: d35c8d0364840fb99a3667d007e9cc2ae9c80111bdd86b245f159ab337a98932
 SHA512:
-  metadata.gz: dccaa52c41c6aceaca03284c9a185920e2b297449ce5a04696458df7d76a3828a1cf6b650d7a73b749d509d4a0833e1469da14f4954f625fa0ebf9ef917660ee
-  data.tar.gz: 3b3bc59d4f1e4bc221bbb30b83e74a74aee0ac00c2cd47e69e660ebaf003f16838e050ab8f49ebdc278e1ed82a6389adce2621d4f7092045262a3fce8be3205f
+  metadata.gz: c1fe8ec62ba1562d3ab7d24b96657c2eebc47c898e226f4a5af84050a3f839cdb850828e79da6caed07f958a3560881cf068690cff3f1c27fad55b12793c2c33
+  data.tar.gz: be76d4e7151eeb1dcd378fd65c0f12d1c519cceb652eb8cb702f6db3692a7491e8190aecd0434fea27671b04ef379765fa062d1bffe91bd5c0ebeec0c0a5795c

data/.github/workflows/publish.yml

@@ -0,0 +1,22 @@
+name: Publish Gem
+
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+
+      - name: Release Gem
+        uses: discourse/publish-rubygems-action@b55d7b91b55e61752dc6cbc2972f8e16fe6c1a02
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: rake release

data/README.md

@@ -210,7 +210,7 @@ See lib/salestation/rspec.rb for more examples.
 
 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.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. A new version is created when a change is merged into the master branch that changes the version number in `salestation.gemspec`. A Github Action will create a tag for the version and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

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

@@ -21,6 +21,10 @@ module Salestation
         def coerce(rules)
           InputCoercer.new(self, rules)
         end
+
+        def rename(rules)
+          InputRenamer.new(self, rules)
+        end
       end
 
       class CombinedInputExtractor
@@ -88,6 +92,76 @@ module Salestation
         end
       end
 
+      # Handles renaming input keys
+      #
+      # When renaming we want to ensure that the new key provided for the rename does not already
+      # exist in the input. When it does and it has a not nil value, then rename will not happen,
+      # unless `override: true` is also applied. When the new key exists with nil value,
+      # rename will happen.
+      # By default override is set to false: when input already has value set for the new key,
+      # the old key will be discarded instead of overwriting the value.
+      # For deprecating (renaming for deprecation purposes), one should extract both new and old key
+      # from the input before calling the rename function, to get expected result, as only then the
+      # values can be compared in rename.
+      #
+      # @example
+      #  original_input = {
+      #    x: 'a',
+      #    y: 'b'
+      #  }
+      #
+      #  extractor = BodyParamExtractor[:x, :y]
+      #    .rename(x: :z)
+      #  input = {
+      #    z: 'a',
+      #    y: 'b'
+      #  }
+      #
+      #  extractor = BodyParamExtractor[:x, :y]
+      #    .rename(x: :y)
+      #  input = {
+      #    y: 'b'
+      #  }
+      #  extractor = BodyParamExtractor[:x, :y]
+      #    .rename(x: {new_key: :y, override: true})
+      #  input = {
+      #    y: 'a'
+      #  }
+      class InputRenamer
+        def initialize(extractor, rules)
+          @extractor = extractor
+          @rules = map_rules(rules)
+        end
+
+        def call(rack_request)
+          @extractor
+            .call(rack_request)
+            .map(&method(:rename))
+        end
+
+        def rename(input)
+          @rules.each do |old_key, rule|
+            new_key = rule[:new_key]
+            override = rule[:override]
+
+            if input[new_key].nil? || override
+              input[new_key] = input[old_key]
+            end
+
+            input.delete(old_key)
+          end
+          Deterministic::Result::Success(input)
+        end
+
+        private
+
+        def map_rules(rules)
+          rules.map do |field, rule|
+            [field, rule.is_a?(Hash) ? rule : {new_key: rule, override: false}]
+          end.to_h
+        end
+      end
+
       class HeadersExtractor
         include Deterministic
 

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.4.2"
+  spec.version       = "4.6.1"
   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.4.2
+  version: 4.6.1
 platform: ruby
 authors:
 - Glia TechMovers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2022-04-27 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
@@ -157,6 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/publish.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -188,7 +189,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -203,8 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []