interactor-contracts 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4b6a4b9a1473818e3af68c266630d617bf119a6
-  data.tar.gz: 21a9105f05f823a824545aa231669c7215b6af34
+SHA256:
+  metadata.gz: 155341334dd614cae42bd73f08e6791280ba8481ce82fb99c1803ec6efff45b4
+  data.tar.gz: e57c5cd09039e621a0df9bec33b6fcfc98b543b5d99eaf0caebc2aeb1069abdf
 SHA512:
-  metadata.gz: ab017960b801b150397d026f4754eb231e3128c96e7119f1a3764d3bcc3cdf70cf2640ea630558b4433761f15be64c6a3200a3bcf95f36bc8db3f564be5c8082
-  data.tar.gz: 76c7ba6f0390f18ffebac61dfb14863d9f0920255c930dce9a4dbb3e22f498b9690ae115453a2075d3baf14345a1f6881b3b41072520e6778980fc30d7ec795b
+  metadata.gz: 67e22c927d40745bb42ffa6746e3f4685282c632e05f6fb18f266a686f5c10f2c339ddba5e98604d4718ce5bc47254654054775acc0d5af78ed55ef86e2e566b
+  data.tar.gz: 199b4e95400eadea32fcba1cec5517d859a06fc57ebd394ebbd5a2497d2f90d56cde7fa6878ce261d7d792bea9b7262c89ede01e21fdba501a02109ae6b2f0e1

data/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file. This projec
 
 [semver]: http://semver.org/spec/v2.0.0.html
 
+## [0.2.0] - 2019-05-27
+
+### Added
+
+* [#18](https://github.com/michaelherold/interactor-contracts/pull/18): Add possibility to inherit class with saving interactor-contracts behaviour - [@raykov](https://github.com/raykov).
+
+### Fixed
+
+* [#16](https://github.com/michaelherold/interactor-contracts/pull/16): Fix BreachSet#to_hash issue with hashed messages in Breaches - [@raykov](https://github.com/raykov).
+
+### Security
+
+* [#15](https://github.com/michaelherold/interactor-contracts/pull/15): Update vulnerable dependencies in the development harness. No user-facing change - [@michaelherold](https://github.com/michaelherold).
+
 ## [0.1.0] - 2017-02-25
 
 ### Added
@@ -21,5 +35,5 @@ All notable changes to this project will be documented in this file. This projec
 * [#4](https://github.com/michaelherold/interactor-contracts/pull/4): Added Danger as a collaboration tool - [@michaelherold](https://github.com/michaelherold).
 * [#6](https://github.com/michaelherold/interactor-contracts/pull/6): Updated the README - [@michaelherold](https://github.com/michaelherold).
 
-
+[0.2.0]: https://github.com/michaelherold/interactor-contracts/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/michaelherold/interactor-contracts/tree/v0.1.0

data/README.md

@@ -137,10 +137,9 @@ https://github.com/michaelherold/interactor-contracts.
 This library aims to support and is [tested against][travis] the following Ruby
 versions:
 
-* Ruby 2.1
-* Ruby 2.2
-* Ruby 2.3
 * Ruby 2.4
+* Ruby 2.5
+* Ruby 2.6
 * JRuby 9.1
 
 If something doesn't work on one of these versions, it's a bug.

data/interactor-contracts.gemspec

@@ -1,25 +1,25 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-require File.expand_path("../lib/interactor/contracts/version", __FILE__)
+require File.expand_path('../lib/interactor/contracts/version', __FILE__)
 
 Gem::Specification.new do |spec|
-  spec.name    = "interactor-contracts"
+  spec.name    = 'interactor-contracts'
   spec.version = Interactor::Contracts::VERSION
-  spec.authors = ["Michael Herold"]
-  spec.email   = ["michael.j.herold@gmail.com"]
+  spec.authors = ['Michael Herold']
+  spec.email   = ['michael.j.herold@gmail.com']
 
-  spec.summary     = "Add contacts to your interactors"
-  spec.description = "Add contacts to your interactors"
-  spec.homepage    = "https://github.com/michaelherold/interactor-contracts"
-  spec.license     = "MIT"
+  spec.summary     = 'Add contacts to your interactors'
+  spec.description = 'Add contacts to your interactors'
+  spec.homepage    = 'https://github.com/michaelherold/interactor-contracts'
+  spec.license     = 'MIT'
 
-  spec.files = %w(CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md)
-  spec.files += %w(interactor-contracts.gemspec)
-  spec.files += Dir["lib/**/*.rb"]
-  spec.require_paths = ["lib"]
+  spec.files = %w[CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md]
+  spec.files += %w[interactor-contracts.gemspec]
+  spec.files += Dir['lib/**/*.rb']
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "dry-validation", "~> 0.10"
-  spec.add_dependency "interactor", "~> 3"
+  spec.add_dependency 'dry-validation', '~> 0.10'
+  spec.add_dependency 'interactor', '~> 3'
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency 'bundler', '> 1.11'
 end

data/lib/interactor-contracts.rb

@@ -1,2 +1,3 @@
-# rubocop:disable Style/FileName
-require "interactor/contracts"
+# frozen_string_literal: true
+
+require 'interactor/contracts'

data/lib/interactor/contracts.rb

@@ -1,7 +1,9 @@
-require "dry-validation"
-require "interactor"
-require "interactor/contracts/dsl"
-require "interactor/contracts/errors"
+# frozen_string_literal: true
+
+require 'dry-validation'
+require 'interactor'
+require 'interactor/contracts/dsl'
+require 'interactor/contracts/errors'
 
 module Interactor
   # Create a contract for your interactor that specifies what it expects as
@@ -14,7 +16,7 @@ module Interactor
     # @return [void]
     def self.included(descendant)
       unless descendant.include?(Interactor)
-        fail NotAnInteractor, "#{descendant} does not include `Interactor'"
+        raise NotAnInteractor, "#{descendant} does not include `Interactor'"
       end
       descendant.extend(DSL)
     end
@@ -35,12 +37,10 @@ module Interactor
     # @param [#call] contracts a callable object
     # @return [void]
     def enforce_contracts(contracts)
-      outcome = contracts.call(context)
+      return unless (outcome = contracts.call(context)).failure?
 
-      unless outcome.success?
-        contract.consequences.each do |handler|
-          instance_exec(outcome.breaches, &handler)
-        end
+      contract.consequences.each do |handler|
+        instance_exec(outcome.breaches, &handler)
       end
     end
   end

data/lib/interactor/contracts/breach.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Interactor
   module Contracts
     # A wrapper for breached contract terms that encapsulates the failed
@@ -53,7 +55,7 @@ module Interactor
       # @api public
       # @return [Hash]
       def to_h
-        {property => messages}
+        { property => messages }
       end
     end
   end

data/lib/interactor/contracts/breach_set.rb

@@ -1,4 +1,6 @@
-require "delegate"
+# frozen_string_literal: true
+
+require 'delegate'
 
 module Interactor
   module Contracts
@@ -35,12 +37,17 @@ module Interactor
       # @api public
       # @return [Hash] a hash with property keys and message values
       def to_hash
-        reduce({}) do |result, (property, messages)|
-          result[property] = Array(result[property]) | messages
+        each_with_object({}) do |(property, messages), result|
+          result[property] =
+            if messages.is_a?(Hash)
+              Hash(result[property]).merge(messages)
+            else
+              Array(result[property]) | messages
+            end
           result
         end
       end
-      alias_method :to_h, :to_hash
+      alias to_h to_hash
     end
   end
 end

data/lib/interactor/contracts/contract.rb

@@ -1,4 +1,6 @@
-require "interactor/contracts/terms"
+# frozen_string_literal: true
+
+require 'interactor/contracts/terms'
 
 module Interactor
   module Contracts
@@ -20,6 +22,7 @@ module Interactor
         @consequences = consequences
         @expectations = expectations
       end
+      # rubocop:enable Metrics/LineLength
 
       # The assurances the Contract will fulfill
       #

data/lib/interactor/contracts/dsl.rb

@@ -1,4 +1,6 @@
-require "interactor/contracts/contract"
+# frozen_string_literal: true
+
+require 'interactor/contracts/contract'
 
 module Interactor
   module Contracts
@@ -75,6 +77,18 @@ module Interactor
         define_expectations_hook
       end
 
+      # Sets contract to given one and calls hooks
+      # define_assurances_hook and define_expectations_hook
+      #
+      # @api semipublic
+      # @param [Contract] contract
+      # @return [void]
+      def inherit_contract(contract)
+        @contract = contract
+        define_assurances_hook
+        define_expectations_hook
+      end
+
       # Defines a consequence that is called when a contract is breached
       #
       # @example
@@ -111,14 +125,14 @@ module Interactor
       # @api private
       # @return [TrueClass, FalseClass] true if the hook is defined
       attr_reader :defined_assurances_hook
-      alias_method :defined_assurances_hook?, :defined_assurances_hook
+      alias defined_assurances_hook? defined_assurances_hook
 
       # Flags whether the expectations hook has been defined
       #
       # @api private
       # @return [TrueClass, FalseClass] true if the hook is defined
       attr_reader :defined_expectations_hook
-      alias_method :defined_expectations_hook?, :defined_expectations_hook
+      alias defined_expectations_hook? defined_expectations_hook
 
       # Defines an after hook that validates the Interactor's output
       #
@@ -145,6 +159,15 @@ module Interactor
 
         @defined_expectations_hook = true
       end
+
+      # Defines a callback for class inheritance
+      #
+      # @api private
+      # @param [Class] child a child of inherited class
+      # @return [void]
+      def inherited(child)
+        child.inherit_contract(contract)
+      end
     end
   end
 end

data/lib/interactor/contracts/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Interactor
   module Contracts
     # Base error class used for all errors within the gem.

data/lib/interactor/contracts/outcome.rb

@@ -1,6 +1,8 @@
-require "forwardable"
-require "interactor/contracts/breach"
-require "interactor/contracts/breach_set"
+# frozen_string_literal: true
+
+require 'forwardable'
+require 'interactor/contracts/breach'
+require 'interactor/contracts/breach_set'
 
 module Interactor
   module Contracts
@@ -46,7 +48,7 @@ module Interactor
       # @api semipublic
       # @return [Array<Breach>] the breaches of the Terms' constraints
       def breaches
-        BreachSet.new(result.messages(:full => true).map do |property, messages|
+        BreachSet.new(result.messages(full: true).map do |property, messages|
           Breach.new(property, messages)
         end)
       end

data/lib/interactor/contracts/terms.rb

@@ -1,5 +1,7 @@
-require "dry-validation"
-require "interactor/contracts/outcome"
+# frozen_string_literal: true
+
+require 'dry-validation'
+require 'interactor/contracts/outcome'
 
 module Interactor
   module Contracts
@@ -28,7 +30,7 @@ module Interactor
       # @param [Block] term the term to add to the terms
       # @return [void]
       def add(&term)
-        @terms = Dry::Validation.Schema(@terms, {:build => false}, &term)
+        @terms = Dry::Validation.Schema(@terms, { build: false }, &term)
       end
 
       # Validates the terms against a given context

data/lib/interactor/contracts/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Interactor
   module Contracts
-    VERSION = "0.1.0".freeze
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interactor-contracts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Herold
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-25 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
@@ -42,14 +42,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.11'
 description: Add contacts to your interactors
@@ -93,10 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Add contacts to your interactors
 test_files: []
-has_rdoc: