salestation 4.0.3 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a16ccdf085040d1bb82a78c416621b0d5b6fcf691a3b568b80cc6b54a4d9e61e
-  data.tar.gz: b53ae89dd854e7694e90d9b090bb4a96f082b7c8c1f42a3f0be57781260b0698
+  metadata.gz: 7040f8a09ba6da03ee7ce9a976a0c7f93fa6a69f0b616f2d14025c5400513ef7
+  data.tar.gz: 1933947472a870eef803d8f6da98bd132e8d97c18c0da8b19cd7ec22aea62bdf
 SHA512:
-  metadata.gz: 468261b62a6493fabdd47cf3737dce28f306c1ccc6eaa84d76267cb62625bcf7a98e934d099977d2c2dc92273e512cf0d95249834b29ec0e18826fdcd20e9677
-  data.tar.gz: d8cb168a96c15f6448febb8a24f43be4194b9bdffc83090a102a0fbd28cdc6f192ad3867c18d860f92cf972bfc3ba78b8efe1231d0196667ad3ad8daf9c5b702
+  metadata.gz: febb0b0cf49adbf47bd10873f12d9761083012d1e2fab1d7a7c965b22de2e74ae777bc6b97e2ee8f92888455b7131a4ced3a39af6ff5188e499b83380371d3e8
+  data.tar.gz: fbeb03c1224633c378b0c2af6c700f1ea25bd98a42ca5acfdec746120cf5fdc2ffba74bff77fa9ca7474580e3eaedced6f8c057fdf374309f1a28de57217eee8

data/README.md

@@ -184,6 +184,29 @@ You can configure per-request tags by defining `salestation.statsd.tags` in sina
   end
 ```
 
+## RSpec helpers
+
+
+To use Salestation RSpec matchers you first need to include them:
+
+```
+require 'salestation/rspec'
+
+RSpec.configure do |config|
+  config.include Salestation::RSpec::Matchers
+end
+```
+
+After that it's possible to match against error results like this:
+
+```
+expect(result).to be_failure
+  .with_conflict
+  .containing(message: 'Oh noes')
+```
+
+See lib/salestation/rspec.rb for more examples.
+
 ## Development
 
 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.

data/lib/salestation/app/errors.rb

@@ -12,44 +12,44 @@ module Salestation
       end
 
       class InvalidInput < Error
-        attribute :errors, Types::Strict::Hash
-        attribute :hints, Types::Coercible::Hash.default({}.freeze)
+        attribute? :errors, Types::Strict::Hash
+        attribute? :hints, Types::Coercible::Hash.default({}.freeze)
         attribute? :debug_message, Types::Strict::String
         attribute? :form_errors, Types::Strict::Bool.default(false)
       end
 
       class DependencyCurrentlyUnavailable < Error
-        attribute :message, Types::Strict::String
+        attribute? :message, Types::Strict::String
         attribute? :debug_message, Types::Strict::String
       end
 
       class RequestedResourceNotFound < Error
-        attribute :message, Types::Strict::String
+        attribute? :message, Types::Strict::String
         attribute? :debug_message, Types::Strict::String
       end
 
       class Forbidden < Error
-        attribute :message, Types::Strict::String
+        attribute? :message, Types::Strict::String
         attribute? :debug_message, Types::Strict::String
       end
 
       class Conflict < Error
-        attribute :message, Types::Strict::String
-        attribute :debug_message, Types::Strict::String
+        attribute? :message, Types::Strict::String
+        attribute? :debug_message, Types::Strict::String
       end
 
       class NotAcceptable < Error
-        attribute :message, Types::Strict::String
-        attribute :debug_message, Types::Strict::String
+        attribute? :message, Types::Strict::String
+        attribute? :debug_message, Types::Strict::String
       end
 
       class UnsupportedMediaType < Error
-        attribute :message, Types::Strict::String
-        attribute :debug_message, Types::Strict::String
+        attribute? :message, Types::Strict::String
+        attribute? :debug_message, Types::Strict::String
       end
 
       class RequestEntityTooLarge < Error
-        attribute :message, Types::Strict::String
+        attribute? :message, Types::Strict::String
         attribute? :debug_message, Types::Strict::String
       end
     end

data/lib/salestation/rspec.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'rspec/expectations'
+require 'salestation/app'
+
+require_relative './rspec/failure_matcher'
+require_relative './rspec/glia_input_validation_error_matcher'
+
+module Salestation
+  module RSpec
+    # Usage:
+    #
+    # In your RSpec configuration first include the matchers:
+    #
+    #   RSpec.configure do |config|
+    #     config.include Salestation::RSpec::Matchers
+    #   end
+    #
+    # Then you can use the matchers like this:
+    #
+    #   expect(result).to be_failure
+    #     .with_conflict
+    #     .containing(message: 'Oh noes')
+    #
+    # or when using Glia Errors:
+    #
+    #   expect(result).to be_failure
+    #     .with_requested_resource_not_found
+    #     .containing(Glia::Errors::ResourceNotFoundError.new(resource: :user))
+    #
+    # or when matching input errors from Glia Errors:
+    #
+    #   expect(result).to be_failure
+    #     .with_invalid_input
+    #     .containing(glia_input_validation_error.on(:name).with_type(Glia::Errors::INVALID_VALUE_ERROR))
+    #
+    # or you could even match multiple input errors at the same time:
+    #   expect(result).to be_failure
+    #     .with_invalid_input
+    #     .containing(
+    #       glia_input_validation_error
+    #         .on(:name).with_type(Glia::Errors::INVALID_VALUE_ERROR)
+    #         .on(:email)
+    #         .on(:phone_number).with_type(Glia::Errors::INVALID_FORMAT_ERROR)
+    #     )
+    #
+    # Everything after be_failure is optional. You could also use `.containing`
+    # multiple times like this:
+    #
+    #   expect(result).to be_failure
+    #     .containing(Glia::Errors::ResourceNotFoundError.new(resource: :user))
+    #     .containing(hash_including(message: 'Overriden message'))
+    #
+    module Matchers
+      def be_failure
+        FailureMatcher.new
+      end
+
+      def glia_input_validation_error
+        GliaInputValidationErrorMatcher.new
+      end
+    end
+  end
+end

data/lib/salestation/rspec/failure_matcher.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'rspec/expectations'
+
+module Salestation
+  module RSpec
+    class FailureMatcher
+      include ::RSpec::Matchers::Composable
+
+      attr_reader :expected, :actual, :failure_message
+
+      def initialize
+        @contents_matchers = []
+      end
+
+      def with(error_class)
+        @error_class = error_class
+        self
+      end
+
+      # From: active_support/inflector/methods.rb
+      def self.underscore(camel_cased_word)
+        return camel_cased_word unless /[A-Z-]|::/.match?(camel_cased_word)
+        word = camel_cased_word.to_s.gsub("::", "/")
+        word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        word.tr!("-", "_")
+        word.downcase!
+        word
+      end
+      private_class_method :underscore
+
+      # Defined methods using error class names:
+      #   with_conflict
+      #   with_invalid_input
+      #   ...
+      Salestation::App::Errors.constants.each do |class_name|
+        define_method(:"with_#{underscore(class_name.to_s)}") do
+          with(Salestation::App::Errors.const_get(class_name))
+          self
+        end
+      end
+
+      def containing(matcher)
+        @contents_matchers << matcher
+        self
+      end
+
+      def matches?(actual)
+        check_failure(actual) &&
+          check_error_type(actual) &&
+          check_contents(actual)
+      end
+
+      def diffable?
+        true
+      end
+
+      private
+
+      def check_failure(actual)
+        return true if actual.class == Deterministic::Result::Failure
+
+        @failure_message = "Expected Failure(...), but got #{actual.inspect}"
+        @expected = Deterministic::Result::Failure
+        @actual = actual.class
+        false
+      end
+
+      def check_error_type(actual)
+        return true unless @error_class
+        return true if actual.value.class == @error_class
+
+        @failure_message = "Expected failure to include #{@error_class}, but got #{actual.value.inspect}"
+        @expected = @error_class
+        @actual = actual.value.class
+        false
+      end
+
+      def check_contents(actual)
+        return true if @contents_matchers.empty?
+
+        has_error = @contents_matchers.detect do |contents_matcher|
+          if contents_matcher.is_a?(Hash) || rspec_matcher?(contents_matcher)
+            verify_contents_using_regular_matcher!(contents_matcher, actual)
+          else
+            verify_contents_using_base_error!(contents_matcher, actual)
+          end
+        end
+
+        !has_error
+      end
+
+      # Returns true when error was detected
+      def verify_contents_using_regular_matcher!(contents_matcher, actual)
+        return false if values_match?(contents_matcher, actual.value.to_h)
+
+        @failure_message = "Contents in #{actual.value.class} do not match"
+        @expected = contents_matcher
+        @actual = actual.value.to_h
+
+        true
+      end
+
+      # Returns true when error was detected
+      def verify_contents_using_base_error!(contents_matcher, actual)
+        # Compare hashes if possible, otherwise expect it to respond to `#matches?`.
+        contents_matcher = contents_matcher.to_h if contents_matcher.respond_to?(:to_h)
+
+        return false if values_match?(contents_matcher, actual.value[:base_error])
+
+        @failure_message = "Expected failure to be based on #{contents_matcher}, but got #{actual.value.inspect}"
+        @expected = contents_matcher
+        @actual = actual.value[:base_error].to_h
+
+        true
+      end
+
+      def rspec_matcher?(matcher)
+        # Didn't find a better way to detect matchers like HashIncludingMatcher
+        matcher.class.to_s.start_with?('RSpec')
+      end
+    end
+  end
+end

data/lib/salestation/rspec/glia_input_validation_error_matcher.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rspec/expectations'
+
+module Salestation
+  module RSpec
+    class GliaInputValidationErrorMatcher
+      include ::RSpec::Matchers::Composable
+
+      attr_reader :expected, :actual, :failure_message
+
+      def initialize
+        @fields = []
+        @field_error_types = {}
+      end
+
+      def on(field)
+        @fields << field
+        self
+      end
+
+      def with_type(*types)
+        @field_error_types[@fields.last] = types
+        self
+      end
+
+      def matches?(actual)
+        @fields.all? do |field|
+          check_field_exists(field, actual) &&
+            check_field_error_types(field, actual)
+        end
+      end
+
+      private
+
+      def check_field_exists(field, actual)
+        actual[:error_details].key?(field)
+      end
+
+      def check_field_error_types(field, actual)
+        return true unless @field_error_types[field]
+
+        actual_error_types = actual[:error_details].fetch(field).map { |f| f.fetch(:type) }
+
+        (@field_error_types[field] - actual_error_types).empty?
+      end
+    end
+  end
+end

data/lib/salestation/web/input_validators/accept_header.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'http/accept'
+
 module Salestation
   class Web < Module
     module InputValidators
@@ -15,9 +17,11 @@ module Salestation
         end
 
         def call(header_value)
-          header_valid = @allowed_headers.empty? || @allowed_headers.include?(header_value)
+          return Success(nil) if @allowed_headers.empty?
+
+          mime_types = HTTP::Accept::MediaTypes.parse(header_value).map(&:mime_type)
 
-          if header_valid
+          if (@allowed_headers & mime_types).any?
             Success(nil)
           else
             Failure(App::Errors::NotAcceptable.new(

data/lib/salestation/web/request_logger.rb

@@ -11,6 +11,7 @@ module Salestation
       CONTENT_TYPE = 'CONTENT_TYPE'
       HTTP_USER_AGENT = 'HTTP_USER_AGENT'
       HTTP_ACCEPT = 'HTTP_ACCEPT'
+      HTTP_ORIGIN = 'HTTP_ORIGIN'
       SERVER_NAME = 'SERVER_NAME'
 
       def initialize(app, logger, log_response_body: false, level: :info)
@@ -53,6 +54,7 @@ module Salestation
           content_type: env[CONTENT_TYPE],
           http_agent:   env[HTTP_USER_AGENT],
           http_accept:  env[HTTP_ACCEPT],
+          http_origin:  env[HTTP_ORIGIN],
           server_name:  env[SERVER_NAME],
           status:       status,
           duration:     duration(from: began_at),

data/lib/salestation/web/responses.rb

@@ -31,15 +31,23 @@ module Salestation
 
       class Error < Response
         attribute :status, Types::Strict::Integer
-        attribute :message, Types::Strict::String
-        attribute :debug_message, Types::Coercible::String.default('')
+        attribute? :message, Types::String.optional
+        attribute? :debug_message, Types::Coercible::String.default('')
         attribute :context, Types::Hash.default({}.freeze)
         attribute :headers, Types::Hash.default({}.freeze)
         attribute? :base_error, Types::Coercible::Hash
 
         def body
           # Merge into `base_error` to ensure standard fields are not overriden
-          (base_error || {}).merge(message: message, debug_message: debug_message)
+          merge_not_nil(base_error || {}, :message, message)
+            .merge(debug_message: debug_message)
+        end
+
+        private
+
+        def merge_not_nil(map, key, value)
+          map[key] = value if value
+          map
         end
       end
 
@@ -58,9 +66,9 @@ module Salestation
       end
 
       class UnprocessableEntityFromSchemaErrors
-        def self.create(errors:, hints:, base_error: nil, form_errors: false)
-          message = parse_errors(errors)
-          debug_message = parse_hints(hints)
+        def self.create(errors: nil, hints: nil, base_error: nil, form_errors: false)
+          message = errors ? parse_errors(errors) : nil
+          debug_message = hints ? parse_hints(hints) : nil
 
           UnprocessableEntity.new(
             message: message,

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.0.3"
+  spec.version       = "4.4.0"
   spec.authors       = ["Glia TechMovers"]
   spec.email         = ["techmovers@glia.com"]
 
@@ -23,8 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10.4"
+  spec.add_development_dependency "glia-errors", "~> 0.8"
+  spec.add_development_dependency "dry-validation"
 
   spec.add_dependency 'deterministic'
   spec.add_dependency 'dry-struct'
   spec.add_dependency 'dry-types'
+  spec.add_dependency 'http-accept', '~> 2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salestation
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.4.0
 platform: ruby
 authors:
 - Glia TechMovers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.4
+- !ruby/object:Gem::Dependency
+  name: glia-errors
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deterministic
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http-accept
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: ''
 email:
 - techmovers@glia.com
@@ -128,6 +170,9 @@ files:
 - lib/salestation/app/input_verification.rb
 - lib/salestation/app/request.rb
 - lib/salestation/result_helper.rb
+- lib/salestation/rspec.rb
+- lib/salestation/rspec/failure_matcher.rb
+- lib/salestation/rspec/glia_input_validation_error_matcher.rb
 - lib/salestation/web.rb
 - lib/salestation/web/active_record_connection_management.rb
 - lib/salestation/web/error_mapper.rb
@@ -143,7 +188,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -158,8 +203,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.0.9
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []