pathway 0.11.3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f136383bd165f1ff88c16e5cb70fb16342b84e5b4e8b76bd49bf0fd91707e2ab
-  data.tar.gz: b4b5cc55ea74d704c66976004e968f72d721c928af86bc8e5660ede8c8d61073
+  metadata.gz: a2a1f9207d8b2db81dbf655234010e4cb8c622299cb69c1dfaa9486f824a7e86
+  data.tar.gz: 25e380e764a1b1585b86ae847b2cbc107a83fa23f1a1205e4e1e5e1a2c021c50
 SHA512:
-  metadata.gz: b83238e83c8f2835f5fa817b6c7e9bc91d68dd9362b97a371d2d22e5ff9a7f8695c26ac4a03fda5b23afebc4d6474744db85ad713c0f49eb2fec95b5696f206e
-  data.tar.gz: b8fd39d4709179ecacd79c89741e6402610afad146117acc82eea7ba2f0376fefcfd5d990a848bd55c0acfdccd64b5313e2497893078818091d8c28b136dd8e2
+  metadata.gz: 393014838fece86b27409c08ef0f5ccb9d7dacf5f5012d956bbf0e7ca3869175e4090c6dd23cf6c8f61bfcecd15839a738b87afcf911c226a06ea36e8cb91dc3
+  data.tar.gz: 1dd63c594d299837fb1b595f14fd2056ac39f81fdd508254c331fb9ef4b3a67262e0f47683bb5e0296708076d88c12aef0dd981c8864391d43f0bc6083ad9422

data/.github/workflows/tests.yml

@@ -0,0 +1,28 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.6, 2.7, 3.0, 3.1]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake
+    - name: Coveralls GitHub Action
+      if: matrix.ruby-version == '3.1'
+      uses: coverallsapp/github-action@1.1.3
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.12.0] - 2022-05-31
+### Changed
+- Improve compatibility with Ruby 3.0
+- Add plugin `:auto_deconstruct_state` to help migrating old apps to Ruby 3.0
+
 ## [0.11.3] - 2020-07-22
 ### Changed
 - Use default error message on `:fetch_model` step, at `:sequel_models` plugin, if model type cannot be determined

data/README.md

@@ -1,7 +1,7 @@
 # Pathway
 
 [![Gem Version](https://badge.fury.io/rb/pathway.svg)](https://badge.fury.io/rb/pathway)
-[![CircleCI](https://circleci.com/gh/pabloh/pathway/tree/master.svg?style=shield)](https://circleci.com/gh/pabloh/pathway/tree/master)
+[![Tests](https://github.com/pabloh/pathway/workflows/Tests/badge.svg)](https://github.com/oabloh/pathway/actions?query=workflow%3ATests)
 [![Coverage Status](https://coveralls.io/repos/github/pabloh/pathway/badge.svg?branch=master)](https://coveralls.io/github/pabloh/pathway?branch=master)
 
 Pathway encapsulates your business logic into simple operation objects (AKA application services on the [DDD](https://en.wikipedia.org/wiki/Domain-driven_design) lingo).
@@ -273,11 +273,11 @@ class CreateNugget < Pathway::Operation
 
   def create_nugget(:params, **)
     Nugget.create(owner: current_user, **params)
-  def
+  end
 
   def notify(:nugget, **)
     Notifier.notify(:new_nugget, nugget)
-  else
+  end
 end
 ```
 

data/lib/pathway/plugins/auto_deconstruct_state/ruby3.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Pathway
+  module Plugins
+    module AutoDeconstructState
+      module DSLMethods
+        private
+
+        def _callable(callable)
+          if callable.is_a?(Symbol) && @operation.respond_to?(callable, true) &&
+            @operation.method(callable).parameters.all? { _1 in [:key|:keyreq|:keyrest|:block,*] }
+
+            -> state { @operation.send(callable, **state) }
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pathway/plugins/auto_deconstruct_state.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+if RUBY_VERSION =~ /^3\./
+  require 'pathway/plugins/auto_deconstruct_state/ruby3'
+end
+
+module Pathway
+  module Plugins
+    module AutoDeconstructState
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Pathway
             end
           end
 
-          def params(*args, &block)
+          ruby2_keywords def params(*args, &block)
             contract { params(*args, &block) }
           end
 
@@ -29,8 +29,8 @@ module Pathway
             @builded_contract = @contract_options.empty? && klass.schema ? klass.new : nil
           end
 
-          def build_contract(opts = {})
-            @builded_contract || contract_class.new(opts)
+          def build_contract(**opts)
+            @builded_contract || contract_class.new(**opts)
           end
 
           def inherited(subclass)
@@ -57,12 +57,12 @@ module Pathway
               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)
+            validate_with(state[:input], **opts)
               .then { |params| state.update(params: params) }
           end
 
-          def validate_with(input, opts = {})
-            result = contract(opts).call(input)
+          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

data/lib/pathway/plugins/responder.rb

@@ -4,8 +4,8 @@ module Pathway
   module Plugins
     module Responder
       module ClassMethods
-        def call(ctx, *params, &bl)
-          result = super(ctx, *params)
+        ruby2_keywords def call(*args, &bl)
+          result = super(*args)
           block_given? ? Responder.respond(result, &bl) : result
         end
       end

data/lib/pathway/plugins/sequel_models.rb

@@ -84,8 +84,8 @@ module Pathway
         end
       end
 
-      def self.apply(operation, model: nil, **args)
-        operation.model(model, args) if model
+      def self.apply(operation, model: nil, **kwargs)
+        operation.model(model, **kwargs) if model
       end
     end
   end

data/lib/pathway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pathway
-  VERSION = '0.11.3'
+  VERSION = '0.12.0'
 end

data/lib/pathway.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ruby2_keywords'
 require 'forwardable'
 require 'dry/inflector'
 require 'contextualizer'
@@ -9,21 +10,23 @@ require 'pathway/result'
 module Pathway
   Inflector = Dry::Inflector.new
   class Operation
-    def self.plugin(name, *args)
-      require "pathway/plugins/#{Inflector.underscore(name)}" if name.is_a?(Symbol)
+    class << self
+      ruby2_keywords def plugin(name, *args)
+        require "pathway/plugins/#{Inflector.underscore(name)}" if name.is_a?(Symbol)
 
-      plugin = name.is_a?(Module) ? name : Plugins.const_get(Inflector.camelize(name))
+        plugin = name.is_a?(Module) ? name : Plugins.const_get(Inflector.camelize(name))
 
-      self.extend plugin::ClassMethods if plugin.const_defined? :ClassMethods
-      self.include plugin::InstanceMethods if plugin.const_defined? :InstanceMethods
-      self::DSL.include plugin::DSLMethods if plugin.const_defined? :DSLMethods
+        self.extend plugin::ClassMethods if plugin.const_defined? :ClassMethods
+        self.include plugin::InstanceMethods if plugin.const_defined? :InstanceMethods
+        self::DSL.include plugin::DSLMethods if plugin.const_defined? :DSLMethods
 
-      plugin.apply(self, *args) if plugin.respond_to?(:apply)
-    end
+        plugin.apply(self, *args) if plugin.respond_to?(:apply)
+      end
 
-    def self.inherited(subclass)
-      super
-      subclass.const_set :DSL, Class.new(self::DSL)
+      def inherited(subclass)
+        super
+        subclass.const_set :DSL, Class.new(self::DSL)
+      end
     end
 
     class DSL
@@ -90,7 +93,7 @@ module Pathway
           end
         end
 
-        def call(ctx, *params)
+        ruby2_keywords def call(ctx, *params)
           new(ctx).call(*params)
         end
 
@@ -137,7 +140,7 @@ module Pathway
         end
 
         # Execute step and preserve the former state
-        def step(callable, *args)
+        ruby2_keywords def step(callable, *args)
           bl = _callable(callable)
 
           @result = @result.tee { |state| bl.call(state, *args) }
@@ -190,9 +193,9 @@ module Pathway
         def _callable(callable)
           case callable
           when Proc
-            -> *args { @operation.instance_exec(*args, &callable) }
+            -> *args { @operation.instance_exec(*args, &callable) }.ruby2_keywords
           when Symbol
-            -> *args { @operation.send(callable, *args) }
+            -> *args { @operation.send(callable, *args) }.ruby2_keywords
           else
             callable
           end

data/pathway.gemspec

@@ -31,13 +31,15 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "dry-inflector", ">= 0.1.0"
   spec.add_dependency "contextualizer", "~> 0.0.4"
+  spec.add_dependency "ruby2_keywords"
 
   spec.add_development_dependency "dry-validation", ">= 0.11"
-  spec.add_development_dependency "bundler", ">= 1.14.0"
-  spec.add_development_dependency "sequel", "~> 5.25.0"
+  spec.add_development_dependency "bundler", "~> 2.3.7"
+  spec.add_development_dependency "sequel", "~> 5.0"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "rspec", "~> 3.11"
+  spec.add_development_dependency "simplecov-lcov", '~> 0.8.0'
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pry-doc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pathway
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
 platform: ruby
 authors:
 - Pablo Herrero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +70,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 2.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.25.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.25.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,16 +114,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,7 +199,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -185,6 +213,8 @@ files:
 - bin/rspec
 - bin/setup
 - lib/pathway.rb
+- lib/pathway/plugins/auto_deconstruct_state.rb
+- lib/pathway/plugins/auto_deconstruct_state/ruby3.rb
 - lib/pathway/plugins/dry_validation.rb
 - lib/pathway/plugins/dry_validation/v0_11.rb
 - lib/pathway/plugins/dry_validation/v0_12.rb
@@ -225,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Define your business logic in simple steps.

data/.circleci/config.yml

@@ -1,38 +0,0 @@
-version: 2.0
-shared: &shared
-    steps:
-      - checkout
-      - 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"