salestation 4.4.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 533d617c2c637187cc4cb8e9f1131d5dd54fb046c08a279724c99135268b2ad9
-  data.tar.gz: 61ff5a8e9d6a93c11dcf2333c4a88e145a8b13a5d2b62bc99a25e665f16a814f
+  metadata.gz: 0a374933b6b6c2191a57c6cceeb4dfed40263dee8378587f47b15a9b036f9867
+  data.tar.gz: d66178d5ac10fdf0a4ffc317cf28521912629d09105aa03feeaa191ef8183060
 SHA512:
-  metadata.gz: 41deda5681c52b1fe10f40f4a68606ddc42accd68f816e5ce4cdeef0797400eb73fc65462338d218481c018554095af5b907005af0dc7cb1d89bbc7ff0ff4e9e
-  data.tar.gz: 66a543f73b6373b3ba6f40e664f385c651605fcdc0ce637af685341d3238abb852283144c40be6c1aaa8b3ff7252f65f6141f761e086273dcd20a4763da7b54a
+  metadata.gz: 69ef7cb09a68ee274d797079f3f4fe241cc28aab7ece3d8f18a59b9b478a276444c4e058029967e02d716d743b6ecf33a8f50ca09cc0ca271ff42c7f42f50e81
+  data.tar.gz: 9bef5feb7d0cf02e11639c26115846770e69ba1233db20a2090fba46e93a17259fc6eca1cabc71693a1efcd192b4edc53ad357082405e06743d2b35f859253cd

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

@@ -6,12 +6,27 @@ module Salestation
       def verify_input(schema)
         -> (request) do
           result = schema.call(request.input)
-          if result.success?
-            request.replace_input(result.output)
+
+          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(result.to_h)
+            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/lib/salestation/web/input_validator.rb

@@ -6,7 +6,7 @@ module Salestation
       include Deterministic::Prelude
 
       def self.[](**validations)
-        new(validations)
+        new(**validations)
       end
 
       def initialize(**validations)

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.1"
+  spec.version       = "4.6.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"
+  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.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Glia TechMovers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '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.0.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []