dry-transaction 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010cc004830363a29fd3701799a706d8734e37196acdf9e515a87519c7f1aef8
-  data.tar.gz: fd9b26e42dd9690c8fc56d372555378f8013a86d8f0b56426b00bccd9220aa10
+  metadata.gz: d9c1425876b4a098f950d9522921485ff19fcc5a4e72821e9d0c201a2fe50c32
+  data.tar.gz: 03abc2d074b6ee1b413a2576b3f9165017112cc22763b1868345c282ff7c8a5c
 SHA512:
-  metadata.gz: 0ccdb31bf78be6abb87c19eca848acbe54120a4308a84c7c498724c7428e2aa91e6f54480ca89fe6674cc08fddc56eaff15015b32afe09b9ffeb9f499d46850d
-  data.tar.gz: fe27e8c8fe12217585d333e8263b7c8c3be2d1f74191c68a2ec6c9e9583ca3fb0324b34a91a78e661540b3276c1403c1f9826a2254d4f6ebcc927e008c1f7c2f
+  metadata.gz: 0e33116591724aa2bc18722aedabe06cf55bec9c5291aba661209a96c2d83c483513defdba07906bb95ab3482e1bab2ce1956a56751a6e5d8a06971cd57a557b
+  data.tar.gz: 1fd41ea16ce2d78b519a2cf0d20cdb0156b8040e6eb17578ed18d1d9b1e2f01be7a86a9b70e551cceb4482c1f7596c1ccbafaad1b8600e332e6b004241e2ac27

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.15.0 2022-11-16
+
+
+### Changed
+
+- Dependencies were bumped to exclude dry-container (@flash-gordon)
+
+[Compare v0.14.0...v0.15.0](https://github.com/dry-rb/dry-transaction/compare/v0.14.0...v0.15.0)
+
 ## 0.14.0 2022-10-21
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/dry-transaction.gemspec

@@ -22,16 +22,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-transaction/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-transaction/blob/main/CHANGELOG.md"
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-transaction"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-transaction/issues"
 
   spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "dry-container", ">= 0.2.8"
-  spec.add_runtime_dependency "dry-events", ">= 0.4.0"
-  spec.add_runtime_dependency "dry-matcher", ">= 0.7.0"
-  spec.add_runtime_dependency "dry-monads", ">= 0.5.0"
+  spec.add_runtime_dependency "dry-core", "~> 1.0"
+  spec.add_runtime_dependency "dry-events", "~> 1.0"
+  spec.add_runtime_dependency "dry-matcher", "~> 0.10"
+  spec.add_runtime_dependency "dry-monads", "~> 1.6"
 
 end

data/lib/dry/transaction/builder.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/transaction/step'
-require 'dry/transaction/dsl'
-require 'dry/transaction/instance_methods'
-require 'dry/transaction/operation_resolver'
+require "dry/transaction/step"
+require "dry/transaction/dsl"
+require "dry/transaction/instance_methods"
+require "dry/transaction/operation_resolver"
 
 module Dry
   module Transaction
@@ -11,7 +11,8 @@ module Dry
       attr_reader :dsl_mod
       attr_reader :resolver_mod
 
-      def initialize(container: nil, step_adapters:)
+      def initialize(step_adapters:, container: nil)
+        super()
         @dsl_mod = DSL.new(step_adapters: step_adapters)
         @resolver_mod = OperationResolver.new(container)
       end

data/lib/dry/transaction/dsl.rb

@@ -4,6 +4,7 @@ module Dry
   module Transaction
     class DSL < Module
       def initialize(step_adapters:)
+        super()
         @step_adapters = step_adapters
 
         define_steps
@@ -11,7 +12,7 @@ module Dry
       end
 
       def inspect
-        "Dry::Transaction::DSL(#{@step_adapters.keys.sort.join(', ')})"
+        "Dry::Transaction::DSL(#{@step_adapters.keys.sort.join(", ")})"
       end
 
       private
@@ -35,7 +36,7 @@ module Dry
                 name: step_name,
                 operation_name: operation_name,
                 operation: nil, # operations are resolved only when transactions are instantiated
-                options: options,
+                options: options
               )
             end
           end

data/lib/dry/transaction/instance_methods.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
-require 'dry/transaction/result_matcher'
-require 'dry/transaction/stack'
+require "dry/transaction/result_matcher"
+require "dry/transaction/stack"
 
 module Dry
   module Transaction
     module InstanceMethods
-      include Dry::Monads::Result::Mixin
+      include Dry::Monads[:result]
 
       attr_reader :steps
       attr_reader :operations
       attr_reader :listeners
       attr_reader :stack
 
-      def initialize(steps: (self.class.steps), listeners: nil, **operations)
+      def initialize(steps: self.class.steps, listeners: nil, **operations)
         @steps = steps.map { |step|
           operation = resolve_operation(step, **operations)
           step.with(operation: operation)
@@ -78,12 +77,16 @@ module Dry
         super unless step
 
         operation = operations[step.name]
-        raise NotImplementedError, "no operation +#{step.operation_name}+ defined for step +#{step.name}+" unless operation
+        unless operation
+          raise NotImplementedError,
+                "no operation +#{step.operation_name}+ defined for step +#{step.name}+"
+        end
 
         operation.(*args, &block)
       end
 
       def resolve_operation(step, **operations)
+        # rubocop:disable Lint/DuplicateBranch
         if step.internal? && operations[step.name]
           operations[step.name]
         elsif methods.include?(step.name) || private_methods.include?(step.name)
@@ -91,10 +94,11 @@ module Dry
         elsif operations[step.name].respond_to?(:call)
           operations[step.name]
         elsif operations[step.name]
-          raise InvalidStepError.new(step.name)
+          raise InvalidStepError, step.name
         else
-          raise MissingStepError.new(step.name)
+          raise MissingStepError, step.name
         end
+        # rubocop:enable Lint/DuplicateBranch
       end
 
       def assert_valid_step_args(step_args)

data/lib/dry/transaction/operation.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
-require 'dry/matcher'
-require 'dry/matcher/result_matcher'
+require "dry/matcher/result_matcher"
 
 module Dry
   module Transaction
     module Operation
       def self.included(klass)
         klass.class_eval do
-          include Dry::Monads::Result::Mixin
+          include Dry::Monads[:result]
           include Dry::Matcher.for(:call, with: Dry::Matcher::ResultMatcher)
         end
       end

data/lib/dry/transaction/operation_resolver.rb

@@ -6,9 +6,9 @@ module Dry
       def initialize(container)
         module_exec(container) do |ops_container|
           define_method :initialize do |**kwargs|
-            operation_kwargs = self.class.steps.select(&:operation_name).map { |step|
+            operation_kwargs = self.class.steps.select(&:operation_name).to_h { |step|
               operation = kwargs.fetch(step.name) {
-                if ops_container && ops_container.key?(step.operation_name)
+                if ops_container&.key?(step.operation_name)
                   ops_container[step.operation_name]
                 else
                   nil
@@ -16,7 +16,7 @@ module Dry
               }
 
               [step.name, operation]
-            }.to_h
+            }
 
             super(**kwargs, **operation_kwargs)
           end

data/lib/dry/transaction/result_matcher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/matcher'
+require "dry/matcher"
 
 module Dry
   module Transaction

data/lib/dry/transaction/step.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/monads'
-require 'dry/events'
-require 'dry/transaction/step_failure'
-require 'dry/transaction/step_adapter'
+require "dry/transaction/step_failure"
+require "dry/transaction/step_adapter"
 
 module Dry
   module Transaction
@@ -13,7 +11,7 @@ module Dry
       RETURN = -> x { x }
 
       include Dry::Events::Publisher[name || object_id]
-      include Dry::Monads::Result::Mixin
+      include Dry::Monads[:result]
 
       register_event(:step)
       register_event(:step_succeeded)
@@ -24,12 +22,15 @@ module Dry
       attr_reader :operation_name
       attr_reader :call_args
 
-      def initialize(adapter:, name:, operation_name:, operation: nil, options:, call_args: [])
-        @adapter = StepAdapter[adapter, operation, { **options, step_name: name, operation_name: operation_name }]
+      # rubocop:disable Metrics/ParameterLists
+      def initialize(adapter:, name:, operation_name:, options:, operation: nil, call_args: [])
+        @adapter = StepAdapter[adapter, operation,
+                               {**options, step_name: name, operation_name: operation_name}]
         @name = name
         @operation_name = operation_name
         @call_args = call_args
       end
+      # rubocop:enable Metrics/ParameterLists
 
       def with(operation: UNDEFINED, call_args: UNDEFINED)
         return self if operation == UNDEFINED && call_args == UNDEFINED
@@ -43,7 +44,7 @@ module Dry
           operation_name: operation_name,
           operation: new_operation,
           options: adapter.options,
-          call_args: new_call_args,
+          call_args: new_call_args
         )
       end
 

data/lib/dry/transaction/step_adapter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/transaction/callable'
+require "dry/transaction/callable"
 
 module Dry
   module Transaction

data/lib/dry/transaction/step_adapters/around.rb

@@ -1,20 +1,17 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
-require 'dry/transaction/errors'
-
 module Dry
   module Transaction
     class StepAdapters
       # @api private
       class Around
-        include Dry::Monads::Result::Mixin
+        include Dry::Monads[:result]
 
         def call(operation, options, args, &block)
           result = operation.(*args, &block)
 
           unless result.is_a?(Dry::Monads::Result)
-            raise InvalidResultError.new(options[:step_name])
+            raise InvalidResultError, options[:step_name]
           end
 
           result

data/lib/dry/transaction/step_adapters/check.rb

@@ -5,7 +5,7 @@ module Dry
     class StepAdapters
       # @api private
       class Check
-        include Dry::Monads::Result::Mixin
+        include Dry::Monads[:result]
 
         def call(operation, _options, args)
           input = args[0]

data/lib/dry/transaction/step_adapters/map.rb

@@ -5,7 +5,7 @@ module Dry
     class StepAdapters
       # @api private
       class Map
-        include Dry::Monads::Result::Mixin
+        include Dry::Monads[:result]
 
         def call(operation, _options, args)
           Success(operation.(*args))

data/lib/dry/transaction/step_adapters/raw.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
-require 'dry/transaction/errors'
-require 'dry/transaction/step_adapters/around'
+require "dry/monads/result"
+require "dry/transaction/errors"
+require "dry/transaction/step_adapters/around"
 
 module Dry
   module Transaction

data/lib/dry/transaction/step_adapters/tee.rb

@@ -5,7 +5,7 @@ module Dry
     class StepAdapters
       # @api private
       class Tee
-        include Dry::Monads::Result::Mixin
+        include Dry::Monads[:result]
 
         def call(operation, _options, args)
           operation.(*args)

data/lib/dry/transaction/step_adapters/try.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'dry/transaction/errors'
+require "dry/transaction/errors"
 
 module Dry
   module Transaction
     class StepAdapters
       # @api private
       class Try
-        include Dry::Monads::Result::Mixin
+        include Dry::Monads[:result]
 
         def call(operation, options, args)
           unless options[:catch]
-            raise MissingCatchListError.new(options[:step_name])
+            raise MissingCatchListError, options[:step_name]
           end
 
           result = operation.(*args)

data/lib/dry/transaction/step_adapters.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require 'dry-container'
-
 module Dry
   module Transaction
     class StepAdapters
-      extend Dry::Container::Mixin
+      extend Dry::Core::Container::Mixin
     end
   end
 end
 
-require 'dry/transaction/step_adapters/check'
-require 'dry/transaction/step_adapters/map'
-require 'dry/transaction/step_adapters/raw'
-require 'dry/transaction/step_adapters/tee'
-require 'dry/transaction/step_adapters/try'
-require 'dry/transaction/step_adapters/around'
+require "dry/transaction/step_adapters/check"
+require "dry/transaction/step_adapters/map"
+require "dry/transaction/step_adapters/raw"
+require "dry/transaction/step_adapters/tee"
+require "dry/transaction/step_adapters/try"
+require "dry/transaction/step_adapters/around"

data/lib/dry/transaction/step_failure.rb

@@ -10,12 +10,14 @@ module Dry
 
       # @api private
       def self.call(step, value)
+        # rubocop:disable Style/CaseEquality
         if self === value
           value
         else
           yield
           new(step, value)
         end
+        # rubocop:enable Style/CaseEquality
       end
 
       def initialize(step, value)

data/lib/dry/transaction/version.rb

@@ -3,6 +3,6 @@
 module Dry
   # Business transaction DSL.
   module Transaction
-    VERSION = '0.14.0'.freeze
+    VERSION = "0.15.0"
   end
 end

data/lib/dry/transaction.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require "dry/core"
+require "dry/events"
 require "dry/monads"
+require "dry/matcher"
 require "dry/transaction/version"
 require "dry/transaction/step_adapters"
 require "dry/transaction/builder"

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: dry-transaction
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Tim Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-matcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.6'
 description: Business Transaction Flow DSL
 email:
 - tim@icelab.com.au
@@ -104,7 +104,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-transaction/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-transaction/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-transaction
   bug_tracker_uri: https://github.com/dry-rb/dry-transaction/issues
 post_install_message: