pathway 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f95391a7c8c39954f8ffb8bbaa8c06294bd28c3553e595d4f91e3b44a109b3ee
-  data.tar.gz: 22118f62ae34e871d6258a59111614e83643d6557bde5cb1fb5381edff2fcab5
+  metadata.gz: 106b1a46d50cb3c4c01ec2e10a8c052990c383fba98e04ded0fe5699fc34cc0d
+  data.tar.gz: f700e70d0c8323abc370ce9c8fd990d93950af649d909f5b363f945cd4ac495f
 SHA512:
-  metadata.gz: 942055689e4836b0556f9b1d1b2aa010b5391c322a3948598047be7ee1b06c83e19bb026efd90f6388aed035a2c37784a26350fa991fe28cf53a7d7f91c4cf9f
-  data.tar.gz: 971070c4f8eec9bede60e354926a7114107b68cd2ead43083c319f7de709b62dd5013294344e105e64965598865cc8d91185462e5a15c880eefee051ca9ffdd3
+  metadata.gz: 9f26b55deb5bb9eebd99cfde249326c8b4151389366975b7a34c5b8038fe519d59598fc5f4bfc5a02c5c45f698628ff0fd7c179efebf775c7887c6efc53c22c0
+  data.tar.gz: f18b3b945bd8fa15f2c06f25a6482a877b428828bf153a8241b4e7a031ca4cacddb8abde032c1232d23e7f73cac4cd48492ab05dfa8b0eb1a80377fe70003476

data/.circleci/config.yml

@@ -0,0 +1,21 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/pabloh/pathway
+    docker:
+    - image: circleci/ruby:2.5.7
+    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

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.10.0] - 2019-10-06
+### Changed
+- Restrict support for `dry-validation` from 0.11.0 up to (excluding) 1.0.0
+- Changed behavior for `:transaction` step wrapper, on `:sequel_models` plugin, to allow to take a single step name instead of block.
+- Changed behavior for `:after_commit` step wrapper, on `:sequel_models` plugin, to allow to take a single step name instead of block.
+
 ## [0.9.1] - 2019-02-18
 ### Changed
 - Various improvements on documentation and gemspec.

data/Gemfile

@@ -1,4 +1,4 @@
-ruby '2.5.1'
+ruby '2.5.7'
 
 source "https://rubygems.org"
 

data/lib/pathway.rb

@@ -107,7 +107,7 @@ module Pathway
         alias :wrap :result
 
         def call(*)
-          fail "must implement at subclass"
+          fail 'must implement at subclass'
         end
 
         def error(type, message: nil, details: nil)

data/lib/pathway/plugins/dry_validation.rb

@@ -76,24 +76,28 @@ module Pathway
         operation.auto_wire_options = auto_wire_options
       end
 
-      if Gem.loaded_specs['dry-validation'].version >= Gem::Version.new('0.12')
-        DefaultFormClass = Dry::Validation::Schema::Params
+      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.Params(_form_class(base), _form_opts(opts), &block)
+            Dry::Validation.Form(_form_class(base), _form_opts(opts), &block)
           end
         end
-      else
-        DefaultFormClass = Dry::Validation::Schema::Form
+      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.Form(_form_class(base), _form_opts(opts), &block)
+            Dry::Validation.Params(_form_class(base), _form_opts(opts), &block)
           end
         end
+      else
+        fail 'unsupported dry-validation gem version'
       end
     end
   end

data/lib/pathway/plugins/sequel_models.rb

@@ -4,22 +4,34 @@ module Pathway
   module Plugins
     module SequelModels
       module DSLMethods
-        def transaction(&bl)
-          around(-> steps, _ {
-            db.transaction(savepoint: true) do
-              raise Sequel::Rollback if steps.call.failure?
-            end
-          }, &bl)
+        def transaction(step_name = nil, &bl)
+          fail 'must provide a step or a block but not both' if !step_name.nil? == block_given?
+
+          if step_name
+            transaction { step step_name }
+          else
+            around(-> steps, _ {
+              db.transaction(savepoint: true) do
+                raise Sequel::Rollback if steps.call.failure?
+              end
+            }, &bl)
+          end
         end
 
-        def after_commit(&bl)
-          around(-> steps, state {
-            dsl = self.class::DSL.new(State.new(self, state.to_h.dup), self)
+        def after_commit(step_name = nil, &bl)
+          fail 'must provide a step or a block but not both' if !step_name.nil? == block_given?
 
-            db.after_commit do
-              steps.call(dsl)
-            end
-          }, &bl)
+          if step_name
+            after_commit { step step_name }
+          else
+            around(-> steps, state {
+              dsl = self.class::DSL.new(State.new(self, state.to_h.dup), self)
+
+              db.after_commit do
+                steps.call(dsl)
+              end
+            }, &bl)
+          end
         end
       end
 

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

@@ -38,20 +38,20 @@ RSpec::Matchers.define :fail_on do |input|
   alias :and_details :details
 
   description do
-    "fail" + (@type ? " with :#@type error" : '')
+    'fail' + (@type ? " with :#@type error" : '')
   end
 
   failure_message do
     if !failure?
       "Expected operation to fail but it didn't"
     else
-      "Expected failed operation to " +
+      'Expected failed operation to ' +
         as_sentence(failure_descriptions, connector: '; ', last_connector: '; and ')
     end
   end
 
   failure_message_when_negated do
-    "Did not to expected operation to fail but it did"
+    'Did not to expected operation to fail but it did'
   end
 
   def failure?

data/lib/pathway/version.rb

@@ -1,3 +1,3 @@
 module Pathway
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

data/pathway.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/pabloh/pathway"
   spec.license       = "MIT"
 
-  spec.metadata = {
+  spec.metadata      = {
     "bug_tracker_uri" => "https://github.com/pabloh/pathway/issues",
     "source_code_uri" => "https://github.com/pabloh/pathway",
   }
@@ -31,7 +31,7 @@ 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"
+  spec.add_development_dependency "dry-validation", ">= 0.11", "< 1.0"
   spec.add_development_dependency "bundler", ">= 1.14.0"
   spec.add_development_dependency "sequel", "~> 4.46.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pathway
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Pablo Herrero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -42,16 +42,22 @@ dependencies:
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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
@@ -171,6 +177,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -221,8 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Define your business logic in simple steps.