pathway 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106b1a46d50cb3c4c01ec2e10a8c052990c383fba98e04ded0fe5699fc34cc0d
-  data.tar.gz: f700e70d0c8323abc370ce9c8fd990d93950af649d909f5b363f945cd4ac495f
+  metadata.gz: 27b3570a78198f711d1d781ec9f48cdf2cbe8846034abda268f5137f6c88f2fe
+  data.tar.gz: d10a76ae2edb906058ac291a8e106f05457bf89ce86558355f331ddbc058b5d1
 SHA512:
-  metadata.gz: 9f26b55deb5bb9eebd99cfde249326c8b4151389366975b7a34c5b8038fe519d59598fc5f4bfc5a02c5c45f698628ff0fd7c179efebf775c7887c6efc53c22c0
-  data.tar.gz: f18b3b945bd8fa15f2c06f25a6482a877b428828bf153a8241b4e7a031ca4cacddb8abde032c1232d23e7f73cac4cd48492ab05dfa8b0eb1a80377fe70003476
+  metadata.gz: 751de3262b354b783d190959c2c72d251c73226886d4e808fe47421283e93961fd124d51dd65bb52df206532e24c3daf007487df384c0f45e1ce323d7cc1d537
+  data.tar.gz: b21d812ee34395e29d160613e791fb0f2616351da56445653623429fbb9da091d8dba6d64bc2123de51799022aa9182a157ab985a848f68977a37d754e86c5b0

data/.circleci/config.yml

@@ -1,21 +1,38 @@
-version: 2
-jobs:
-  build:
-    working_directory: ~/pabloh/pathway
-    docker:
-    - image: circleci/ruby:2.5.7
+version: 2.0
+shared: &shared
     steps:
       - checkout
-      # Restore bundle cache
-      - type: cache-restore
-        key: pathway-{{ checksum "Gemfile.lock" }}
-      # Bundle install dependencies
-      - run: bundle install --path vendor/bundle
-      # Store bundle cache
-      - type: cache-save
-        key: pathway-{{ checksum "Gemfile.lock" }}
-        paths:
-          - vendor/bundle
-      # Run rspec
-      - type: shell
-        command: bundle exec rspec --format documentation --color --format progress spec
+      - run:
+          name: Bundle gems
+          command: |
+            echo '--no-rdoc --no-ri' > '.gemrc'
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - run:
+          name: Run tests
+          command: bundle exec rspec --format documentation --color --format progress spec
+
+jobs:
+  "ruby-2.4":
+    <<: *shared
+    docker:
+      - image: circleci/ruby:2.4
+
+  "ruby-2.5":
+    <<: *shared
+    docker:
+      - image: circleci/ruby:2.5
+
+  "ruby-2.6":
+    <<: *shared
+    docker:
+      - image: circleci/ruby:2.6
+        environment:
+          REPORT_COVERAGE: 'true'
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - "ruby-2.4"
+      - "ruby-2.5"
+      - "ruby-2.6"

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.11.0] - 2020-01-02
+### Changed
+- Add support for `dry-validation` 1.0 and above
+
 ## [0.10.0] - 2019-10-06
 ### Changed
 - Restrict support for `dry-validation` from 0.11.0 up to (excluding) 1.0.0

data/Gemfile

@@ -1,5 +1,3 @@
-ruby '2.5.7'
-
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in pathway.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/lib/pathway.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'dry/inflector'
 require 'contextualizer'

data/lib/pathway/plugins/dry_validation.rb

@@ -1,103 +1,25 @@
+# frozen_string_literal: true
+
 require 'dry/validation'
 
 module Pathway
   module Plugins
     module DryValidation
-      module ClassMethods
-        attr_reader :form_class, :form_options
-        attr_accessor :auto_wire_options
-
-        def form(base = nil, **opts, &block)
-          if block_given?
-            base ||= _base_form
-            self.form_class = _block_definition(base, opts, &block)
-          elsif base
-            self.form_class = _form_class(base)
-          else
-            raise ArgumentError, 'Either a form class or a block must be provided'
-          end
-        end
-
-        def form_class= klass
-          @builded_form = klass.options.empty? ? klass.new : nil
-          @form_class = klass
-          @form_options = klass.options.keys
-        end
-
-        def build_form(opts = {})
-          @builded_form || form_class.new(opts)
-        end
-
-        def inherited(subclass)
-          super
-          subclass.form_class = form_class
-          subclass.auto_wire_options = auto_wire_options
-        end
-
-        private
-
-        def _base_form
-          superclass.respond_to?(:form_class) ? superclass.form_class : DefaultFormClass
-        end
-
-        def _form_class(form)
-          form.is_a?(Class) ? form : form.class
-        end
-
-        def _form_opts(opts = {})
-          opts.merge(build: false)
-        end
-      end
-
-      module InstanceMethods
-        extend Forwardable
-
-        delegate %i[build_form form_options auto_wire_options] => 'self.class'
-        alias :form :build_form
-
-        def validate(state, with: nil)
-          if auto_wire_options && form_options.any?
-            with ||= form_options.zip(form_options).to_h
-          end
-          opts = Hash(with).map { |opt, key| [opt, state[key]] }.to_h
-          validate_with(state[:input], opts)
-            .then { |params| state.update(params: params) }
-        end
-
-        def validate_with(params, opts = {})
-          val = form(opts).call(params)
-
-          val.success? ? wrap(val.output) : error(:validation, details: val.messages)
-        end
-      end
-
-      def self.apply(operation, auto_wire_options: false)
-        operation.form_class = DefaultFormClass
-        operation.auto_wire_options = auto_wire_options
-      end
-
-      if Gem.loaded_specs['dry-validation'].version < Gem::Version.new('0.11')
-        fail "unsupported dry-validation gem version"
-      elsif Gem.loaded_specs['dry-validation'].version < Gem::Version.new('0.12')
-        DefaultFormClass = Dry::Validation::Schema::Form
-
-        module ClassMethods
-          private
-          def _block_definition(base, opts, &block)
-            Dry::Validation.Form(_form_class(base), _form_opts(opts), &block)
-          end
-        end
-      elsif Gem.loaded_specs['dry-validation'].version < Gem::Version.new('1.0')
-        DefaultFormClass = Dry::Validation::Schema::Params
-
-        module ClassMethods
-          private
-          def _block_definition(base, opts, &block)
-            Dry::Validation.Params(_form_class(base), _form_opts(opts), &block)
-          end
-        end
-      else
-        fail 'unsupported dry-validation gem version'
+      def self.apply(operation, **kwargs)
+        #:nocov:
+        if Gem.loaded_specs['dry-validation'].version < Gem::Version.new('0.11')
+          fail 'unsupported dry-validation gem version'
+        elsif Gem.loaded_specs['dry-validation'].version < Gem::Version.new('0.12')
+          require 'pathway/plugins/dry_validation/v0_11'
+          operation.plugin(Plugins::DryValidation::V0_11, **kwargs)
+        elsif Gem.loaded_specs['dry-validation'].version < Gem::Version.new('1.0')
+          require 'pathway/plugins/dry_validation/v0_12'
+          operation.plugin(Plugins::DryValidation::V0_12, **kwargs)
+        else
+          require 'pathway/plugins/dry_validation/v1_0'
+          operation.plugin(Plugins::DryValidation::V1_0, **kwargs)
+        end
+        #:nocov:
       end
     end
   end

data/lib/pathway/plugins/dry_validation/v0_11.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Pathway
+  module Plugins
+    module DryValidation
+      module V0_11
+        module ClassMethods
+          attr_reader :form_class, :form_options
+          attr_accessor :auto_wire_options
+
+          def form(base = nil, **opts, &block)
+            if block_given?
+              base ||= _base_form
+              self.form_class = _block_definition(base, opts, &block)
+            elsif base
+              self.form_class = _form_class(base)
+            else
+              raise ArgumentError, 'Either a form class or a block must be provided'
+            end
+          end
+
+          def form_class= klass
+            @builded_form = klass.options.empty? ? klass.new : nil
+            @form_class = klass
+            @form_options = klass.options.keys
+          end
+
+          def build_form(opts = {})
+            @builded_form || form_class.new(opts)
+          end
+
+          def inherited(subclass)
+            super
+            subclass.form_class = form_class
+            subclass.auto_wire_options = auto_wire_options
+          end
+
+          private
+
+          def _base_form
+            superclass.respond_to?(:form_class) ? superclass.form_class : Dry::Validation::Schema::Form
+          end
+
+          def _form_class(form)
+            form.is_a?(Class) ? form : form.class
+          end
+
+          def _form_opts(opts = {})
+            opts.merge(build: false)
+          end
+
+          def _block_definition(base, opts, &block)
+            Dry::Validation.Form(_form_class(base), _form_opts(opts), &block)
+          end
+        end
+
+        module InstanceMethods
+          extend Forwardable
+
+          delegate %i[build_form form_options auto_wire_options] => 'self.class'
+          alias :form :build_form
+
+          def validate(state, with: nil)
+            if auto_wire_options && form_options.any?
+              with ||= form_options.zip(form_options).to_h
+            end
+            opts = Hash(with).map { |opt, key| [opt, state[key]] }.to_h
+            validate_with(state[:input], opts)
+              .then { |params| state.update(params: params) }
+          end
+
+          def validate_with(params, opts = {})
+            val = form(opts).call(params)
+
+            val.success? ? wrap(val.output) : error(:validation, details: val.messages)
+          end
+        end
+
+        def self.apply(operation, auto_wire_options: false)
+          operation.form_class = Dry::Validation::Schema::Form
+          operation.auto_wire_options = auto_wire_options
+        end
+      end
+    end
+  end
+end

data/lib/pathway/plugins/dry_validation/v0_12.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Pathway
+  module Plugins
+    module DryValidation
+      module V0_12
+        module ClassMethods
+          attr_reader :form_class, :form_options
+          attr_accessor :auto_wire_options
+
+          def form(base = nil, **opts, &block)
+            if block_given?
+              base ||= _base_form
+              self.form_class = _block_definition(base, opts, &block)
+            elsif base
+              self.form_class = _form_class(base)
+            else
+              raise ArgumentError, 'Either a form class or a block must be provided'
+            end
+          end
+
+          def form_class= klass
+            @builded_form = klass.options.empty? ? klass.new : nil
+            @form_class = klass
+            @form_options = klass.options.keys
+          end
+
+          def build_form(opts = {})
+            @builded_form || form_class.new(opts)
+          end
+
+          def inherited(subclass)
+            super
+            subclass.form_class = form_class
+            subclass.auto_wire_options = auto_wire_options
+          end
+
+          private
+
+          def _base_form
+            superclass.respond_to?(:form_class) ? superclass.form_class : Dry::Validation::Schema::Params
+          end
+
+          def _form_class(form)
+            form.is_a?(Class) ? form : form.class
+          end
+
+          def _form_opts(opts = {})
+            opts.merge(build: false)
+          end
+
+          def _block_definition(base, opts, &block)
+            Dry::Validation.Params(_form_class(base), _form_opts(opts), &block)
+          end
+        end
+
+        module InstanceMethods
+          extend Forwardable
+
+          delegate %i[build_form form_options auto_wire_options] => 'self.class'
+          alias :form :build_form
+
+          def validate(state, with: nil)
+            if auto_wire_options && form_options.any?
+              with ||= form_options.zip(form_options).to_h
+            end
+            opts = Hash(with).map { |opt, key| [opt, state[key]] }.to_h
+            validate_with(state[:input], opts)
+              .then { |params| state.update(params: params) }
+          end
+
+          def validate_with(params, opts = {})
+            val = form(opts).call(params)
+
+            val.success? ? wrap(val.output) : error(:validation, details: val.messages)
+          end
+        end
+
+        def self.apply(operation, auto_wire_options: false)
+          operation.form_class = Dry::Validation::Schema::Params
+          operation.auto_wire_options = auto_wire_options
+        end
+      end
+    end
+  end
+end

data/lib/pathway/plugins/dry_validation/v1_0.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Pathway
+  module Plugins
+    module DryValidation
+      module V1_0
+        module ClassMethods
+          attr_reader :contract_class, :contract_options
+          attr_accessor :auto_wire_options
+
+          def contract(base = nil, &block)
+            if block_given?
+              base ||= _base_contract
+              self.contract_class = Class.new(base, &block)
+            elsif base
+              self.contract_class = base
+            else
+              raise ArgumentError, 'Either a contract class or a block must be provided'
+            end
+          end
+
+          def params(*args, &block)
+            contract { params(*args, &block) }
+          end
+
+          def contract_class= klass
+            @contract_class = klass
+            @contract_options = (klass.dry_initializer.options - Dry::Validation::Contract.dry_initializer.options).map(&:target)
+            @builded_contract = @contract_options.empty? && klass.schema ? klass.new : nil
+          end
+
+          def build_contract(opts = {})
+            @builded_contract || contract_class.new(opts)
+          end
+
+          def inherited(subclass)
+            super
+            subclass.contract_class = contract_class
+            subclass.auto_wire_options = auto_wire_options
+          end
+
+          private
+
+          def _base_contract
+            superclass.respond_to?(:contract_class) ? superclass.contract_class : Dry::Validation::Contract
+          end
+        end
+
+        module InstanceMethods
+          extend Forwardable
+
+          delegate %i[build_contract contract_options auto_wire_options] => 'self.class'
+          alias :contract :build_contract
+
+          def validate(state, with: nil)
+            if auto_wire_options && contract_options.any?
+              with ||= contract_options.zip(contract_options).to_h
+            end
+            opts = Hash(with).map { |to, from| [to, state[from]] }.to_h
+            validate_with(state[:input], opts)
+              .then { |params| state.update(params: params) }
+          end
+
+          def validate_with(input, opts = {})
+            result = contract(opts).call(input)
+
+            result.success? ? wrap(result.values.to_h) : error(:validation, details: result.errors.to_h)
+          end
+        end
+
+        def self.apply(operation, auto_wire_options: false)
+          operation.contract_class = Dry::Validation::Contract
+          operation.auto_wire_options = auto_wire_options
+        end
+      end
+    end
+  end
+end

data/lib/pathway/plugins/responder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pathway
   module Plugins
     module Responder

data/lib/pathway/plugins/sequel_models.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sequel/model'
 
 module Pathway

data/lib/pathway/plugins/simple_auth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pathway
   module Plugins
     module SimpleAuth

data/lib/pathway/result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pathway
   class Result
     extend Forwardable

data/lib/pathway/rspec.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers'

data/lib/pathway/rspec/matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/succeed_on'
 require 'pathway/rspec/matchers/fail_on'
 require 'pathway/rspec/matchers/accept_optional_fields'

data/lib/pathway/rspec/matchers/accept_optional_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/form_schema_helpers'
 
 RSpec::Matchers.define :accept_optional_fields do |*fields|

data/lib/pathway/rspec/matchers/fail_on.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/list_helpers'
 
 RSpec::Matchers.define :fail_on do |input|
@@ -51,7 +53,7 @@ RSpec::Matchers.define :fail_on do |input|
   end
 
   failure_message_when_negated do
-    'Did not to expected operation to fail but it did'
+    'Did not expected operation to fail but it did'
   end
 
   def failure?

data/lib/pathway/rspec/matchers/field_list_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/list_helpers'
 
 module Pathway
@@ -10,11 +12,11 @@ module Pathway
       end
 
       def were_was(list)
-        list.size > 1 ? "were" : "was"
+        list.size > 1 ? 'were' : 'was'
       end
 
       def pluralize_fields
-        @fields.size > 1 ? "fields" : "field"
+        @fields.size > 1 ? 'fields' : 'field'
       end
     end
   end

data/lib/pathway/rspec/matchers/form_schema_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/field_list_helpers'
 
 module Pathway
@@ -5,8 +7,14 @@ module Pathway
     module FormSchemaHelpers
       include FieldListHelpers
 
-      def rules
-        @form.rules
+      if defined?(::Dry::Validation::Contract)
+        def rules
+          @form.schema.rules
+        end
+      else
+        def rules
+          @form.rules
+        end
       end
 
       def not_defined_list

data/lib/pathway/rspec/matchers/list_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pathway
   module Rspec
     module ListHelpers
@@ -5,7 +7,7 @@ module Pathway
         as_sentence(items.map(&:inspect))
       end
 
-      def as_sentence(items, connector: ", ", last_connector: " and ")
+      def as_sentence(items, connector: ', ', last_connector: ' and ')
         *rest, last = items
 
         result = String.new

data/lib/pathway/rspec/matchers/require_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/form_schema_helpers'
 
 RSpec::Matchers.define :require_fields do |*fields|

data/lib/pathway/rspec/matchers/succeed_on.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :succeed_on do |input|
   match do |operation|
     @operation, @input = operation, input
@@ -29,7 +31,7 @@ RSpec::Matchers.define :succeed_on do |input|
   end
 
   failure_message_when_negated do
-    "Did not to expected operation to be successful but it was"
+    'Did not to expected operation to be successful but it was'
   end
 
   def success?

data/lib/pathway/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pathway
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/pathway.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "pathway/version"
@@ -31,10 +32,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-inflector", ">= 0.1.0"
   spec.add_dependency "contextualizer", "~> 0.0.4"
 
-  spec.add_development_dependency "dry-validation", ">= 0.11", "< 1.0"
+  spec.add_development_dependency "dry-validation", ">= 0.11"
   spec.add_development_dependency "bundler", ">= 1.14.0"
-  spec.add_development_dependency "sequel", "~> 4.46.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "sequel", "~> 5.25.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pathway
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Pablo Herrero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -45,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.46.0
+        version: 5.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.46.0
+        version: 5.25.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +186,9 @@ files:
 - bin/setup
 - lib/pathway.rb
 - lib/pathway/plugins/dry_validation.rb
+- lib/pathway/plugins/dry_validation/v0_11.rb
+- lib/pathway/plugins/dry_validation/v0_12.rb
+- lib/pathway/plugins/dry_validation/v1_0.rb
 - lib/pathway/plugins/responder.rb
 - lib/pathway/plugins/sequel_models.rb
 - lib/pathway/plugins/simple_auth.rb