dry-logic 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58ce7aca14ea687be3852f8f6359ea33de4da0f057091127f828dbb2e6db8856
-  data.tar.gz: 283cf7ff61520f4ca1822bea434bd9b98ccb07c10e17f628e0f440029ca76092
+  metadata.gz: c1ad8dbf80a90343c1b903d8c56682b3b83ec02fbd40b96175598d011ca6e5fb
+  data.tar.gz: 1bdd6f06073b61dfaa843844c72a96408dcb8745b69ecfae99758da1b7876abc
 SHA512:
-  metadata.gz: 8d16672e062a05eb7c79a5ce34f47307b8eb7cba7cefce4c39d513f835b59fd711968e5bccb8a5f6e7c125aeec6485a4ff9193cc046390c44e2f4f4090f3ad44
-  data.tar.gz: 4fbe122584b52eda9d699726023c09fcc9e636f8f67d3670de584b0a7d6345ebdac17ea7173bfa753aab35500eeb8f95d9941b851c980cd6fcac5c3cac8d879d
+  metadata.gz: b8f95362da176825e3dc22dac020ab008222980788abc472b7008b6fd9c98aae7f48a18c523b5f8194399e08fc271a457b8167438ad103faad8f6ebc7ae7a0c6
+  data.tar.gz: 06644cc140ae06bf5f9df176560a21aca0aa3f96ff250cabfe299c7864b7ed31c673576b68e035809645c4a24ccce6867c9232c50874da669dbe7c6c75189dbe

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.6.0 2025-01-04
+
+
+### Fixed
+
+- Fix NoMethodError when trying to get AST of a Builder's result. (via #107) (@estum)
+
+### Changed
+
+- Set 3.1 as minimum ruby version (@flash-gordon)
+
+[Compare v1.5.0...v1.6.0](https://github.com/dry-rb/dry-logic/compare/v1.5.0...v1.6.0)
+
 ## 1.5.0 2022-11-24
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022 dry-rb team
+Copyright (c) 2015-2023 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/README.md

@@ -2,7 +2,7 @@
 [gem]: https://rubygems.org/gems/dry-logic
 [actions]: https://github.com/dry-rb/dry-logic/actions
 
-# dry-logic [![Gem Version](https://badge.fury.io/rb/dry-logic.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-logic/workflows/ci/badge.svg)][actions]
+# dry-logic [![Gem Version](https://badge.fury.io/rb/dry-logic.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-logic/workflows/CI/badge.svg)][actions]
 
 ## Links
 
@@ -14,8 +14,8 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.7.0`
-* jruby `>= 9.3` (postponed until 2.7 is supported)
+* MRI `>= 3.1`
+* jruby `>= 9.4` (not tested on CI)
 
 ## License
 

data/dry-logic.gemspec

@@ -25,15 +25,13 @@ Gem::Specification.new do |spec|
   spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-logic/blob/main/CHANGELOG.md"
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-logic"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-logic/issues"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-core", "~> 1.0", "< 2"
-  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_dependency "bigdecimal"
+  spec.add_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_dependency "dry-core", "~> 1.1"
+  spec.add_dependency "zeitwerk", "~> 2.6"
 end

data/lib/dry/logic/builder.rb

@@ -28,8 +28,8 @@ module Dry
       #   p is_zero.call(1) # => false
       #   p is_zero.call(0) # => true
       #   p is_zero.call(-1) # => false
-      def call(&context)
-        Context.instance.call(&context)
+      def call(&)
+        Context.instance.call(&)
       end
       module_function :call
       alias_method :build, :call
@@ -44,23 +44,23 @@ module Dry
         end
 
         # @see Builder#call
-        def call(&context)
-          instance_eval(&context)
+        def call(&)
+          instance_eval(&)
         end
 
         # Defines custom predicate
         #
         # @name [Symbol] Name of predicate
         # @Context [Proc]
-        def predicate(name, &context)
+        def predicate(name, context = nil, &block)
           if singleton_class.method_defined?(name)
             singleton_class.undef_method(name)
           end
 
-          prerdicate = Rule::Predicate.new(context)
+          predicate = Rule::Predicate.new(context || block)
 
           define_singleton_method(name) do |*args|
-            prerdicate.curry(*args)
+            predicate.curry(*args)
           end
         end
 
@@ -78,7 +78,7 @@ module Dry
 
           Predicates::Methods.instance_methods(false).each do |name|
             unless IGNORED_PREDICATES.include?(name)
-              predicate(name, &Predicates[name])
+              predicate(name, Predicates[name])
             end
           end
         end

data/lib/dry/logic/operations/abstract.rb

@@ -5,7 +5,7 @@ module Dry
     module Operations
       class Abstract
         include Core::Constants
-        include Dry::Equalizer(:rules, :options)
+        include ::Dry::Equalizer(:rules, :options)
         include Operators
 
         attr_reader :rules

data/lib/dry/logic/operations/check.rb

@@ -8,7 +8,7 @@ module Dry
 
         def self.new(rule, **options)
           if options[:evaluator]
-            super(rule, **options)
+            super
           else
             keys = options.fetch(:keys)
             evaluator = Evaluator::Set.new(keys)

data/lib/dry/logic/operations/each.rb

@@ -23,7 +23,7 @@ module Dry
         end
 
         def [](arr)
-          arr.map { |input| rule[input] }.all?
+          arr.all? { |input| rule[input] }
         end
       end
     end

data/lib/dry/logic/predicates.rb

@@ -5,11 +5,12 @@ require "dry/core/constants"
 require "bigdecimal"
 require "bigdecimal/util"
 require "date"
+require "uri"
 
 module Dry
   module Logic
     module Predicates
-      include Dry::Core::Constants
+      include ::Dry::Core::Constants
 
       # rubocop:disable Metrics/ModuleLength
       module Methods
@@ -29,143 +30,99 @@ module Dry
 
         UUIDv5 = uuid_format(5)
 
+        UUIDv6 = uuid_format(6)
+
+        UUIDv7 = uuid_format(7)
+
+        UUIDv8 = uuid_format(8)
+
         def [](name)
           method(name)
         end
 
-        def type?(type, input)
-          input.is_a?(type)
-        end
+        def type?(type, input) = input.is_a?(type)
 
-        def nil?(input)
-          input.nil?
-        end
+        def nil?(input) = input.nil?
         alias_method :none?, :nil?
 
-        def key?(name, input)
-          input.key?(name)
-        end
+        def key?(name, input) = input.key?(name)
 
-        def attr?(name, input)
-          input.respond_to?(name)
-        end
+        def attr?(name, input) = input.respond_to?(name)
 
         def empty?(input)
           case input
-          when String, Array, Hash then input.empty?
+          when ::String, ::Array, ::Hash then input.empty?
           when nil then true
           else
             false
           end
         end
 
-        def filled?(input)
-          !empty?(input)
-        end
+        def filled?(input) = !empty?(input)
 
-        def bool?(input)
-          input.is_a?(TrueClass) || input.is_a?(FalseClass)
-        end
+        def bool?(input) = input.equal?(true) || input.equal?(false)
 
-        def date?(input)
-          input.is_a?(Date)
-        end
+        def date?(input) = input.is_a?(::Date)
 
-        def date_time?(input)
-          input.is_a?(DateTime)
-        end
+        def date_time?(input) = input.is_a?(::DateTime)
 
-        def time?(input)
-          input.is_a?(Time)
-        end
+        def time?(input) = input.is_a?(::Time)
 
         def number?(input)
           true if Float(input)
-        rescue ArgumentError, TypeError
+        rescue ::ArgumentError, ::TypeError
           false
         end
 
-        def int?(input)
-          input.is_a?(Integer)
-        end
+        def int?(input) = input.is_a?(::Integer)
 
-        def float?(input)
-          input.is_a?(Float)
-        end
+        def float?(input) = input.is_a?(::Float)
 
-        def decimal?(input)
-          input.is_a?(BigDecimal)
-        end
+        def decimal?(input) = input.is_a?(::BigDecimal)
 
-        def str?(input)
-          input.is_a?(String)
-        end
+        def str?(input) = input.is_a?(::String)
 
-        def hash?(input)
-          input.is_a?(Hash)
-        end
+        def hash?(input) = input.is_a?(::Hash)
 
-        def array?(input)
-          input.is_a?(Array)
-        end
+        def array?(input) = input.is_a?(::Array)
 
-        def odd?(input)
-          input.odd?
-        end
+        def odd?(input) = input.odd?
 
-        def even?(input)
-          input.even?
-        end
+        def even?(input) = input.even?
 
-        def lt?(num, input)
-          input < num
-        end
+        def lt?(num, input) = input < num
 
-        def gt?(num, input)
-          input > num
-        end
+        def gt?(num, input) = input > num
 
-        def lteq?(num, input)
-          !gt?(num, input)
-        end
+        def lteq?(num, input) = !gt?(num, input)
 
-        def gteq?(num, input)
-          !lt?(num, input)
-        end
+        def gteq?(num, input) = !lt?(num, input)
 
         def size?(size, input)
           case size
-          when Integer then size.equal?(input.size)
-          when Range, Array then size.include?(input.size)
+          when ::Integer then size.equal?(input.size)
+          when ::Range, ::Array then size.include?(input.size)
           else
-            raise ArgumentError, "+#{size}+ is not supported type for size? predicate."
+            raise ::ArgumentError, "+#{size}+ is not supported type for size? predicate."
           end
         end
 
-        def min_size?(num, input)
-          input.size >= num
-        end
+        def min_size?(num, input) = input.size >= num
 
-        def max_size?(num, input)
-          input.size <= num
-        end
+        def max_size?(num, input) = input.size <= num
 
         def bytesize?(size, input)
           case size
-          when Integer then size.equal?(input.bytesize)
-          when Range, Array then size.include?(input.bytesize)
+          when ::Integer then size.equal?(input.bytesize)
+          when ::Range, ::Array then size.include?(input.bytesize)
           else
-            raise ArgumentError, "+#{size}+ is not supported type for bytesize? predicate."
+            raise ::ArgumentError, "+#{size}+ is not supported type for bytesize? predicate."
           end
         end
 
-        def min_bytesize?(num, input)
-          input.bytesize >= num
-        end
+        def min_bytesize?(num, input) = input.bytesize >= num
 
-        def max_bytesize?(num, input)
-          input.bytesize <= num
-        end
+        def max_bytesize?(num, input) = input.bytesize <= num
 
         def inclusion?(list, input)
           deprecated(:inclusion?, :included_in?)
@@ -177,13 +134,9 @@ module Dry
           excluded_from?(list, input)
         end
 
-        def included_in?(list, input)
-          list.include?(input)
-        end
+        def included_in?(list, input) = list.include?(input)
 
-        def excluded_from?(list, input)
-          !list.include?(input)
-        end
+        def excluded_from?(list, input) = !list.include?(input)
 
         def includes?(value, input)
           if input.respond_to?(:include?)
@@ -191,13 +144,11 @@ module Dry
           else
             false
           end
-        rescue TypeError
+        rescue ::TypeError
           false
         end
 
-        def excludes?(value, input)
-          !includes?(value, input)
-        end
+        def excludes?(value, input) = !includes?(value, input)
 
         # This overrides Object#eql? so we need to make it compatible
         def eql?(left, right = Undefined)
@@ -206,61 +157,48 @@ module Dry
           left.eql?(right)
         end
 
-        def is?(left, right)
-          left.equal?(right)
-        end
+        def is?(left, right) = left.equal?(right)
 
-        def not_eql?(left, right)
-          !left.eql?(right)
-        end
+        def not_eql?(left, right) = !left.eql?(right)
 
-        def true?(value)
-          value.equal?(true)
-        end
+        def true?(value) = value.equal?(true)
 
-        def false?(value)
-          value.equal?(false)
-        end
+        def false?(value) = value.equal?(false)
 
-        def format?(regex, input)
-          !input.nil? && regex.match?(input)
-        end
+        def format?(regex, input) = !input.nil? && regex.match?(input)
 
-        def case?(pattern, input)
-          # rubocop:disable Style/CaseEquality
-          pattern === input
-          # rubocop:enable Style/CaseEquality
-        end
+        def case?(pattern, input) = pattern === input # rubocop:disable Style/CaseEquality
 
-        def uuid_v1?(input)
-          format?(UUIDv1, input)
-        end
+        def uuid_v1?(input) = format?(UUIDv1, input)
 
-        def uuid_v2?(input)
-          format?(UUIDv2, input)
-        end
+        def uuid_v2?(input) = format?(UUIDv2, input)
 
-        def uuid_v3?(input)
-          format?(UUIDv3, input)
-        end
+        def uuid_v3?(input) = format?(UUIDv3, input)
 
-        def uuid_v4?(input)
-          format?(UUIDv4, input)
-        end
+        def uuid_v4?(input) = format?(UUIDv4, input)
 
-        def uuid_v5?(input)
-          format?(UUIDv5, input)
-        end
+        def uuid_v5?(input) = format?(UUIDv5, input)
 
-        def uri?(schemes, input)
-          uri_format = URI::DEFAULT_PARSER.make_regexp(schemes)
-          format?(uri_format, input)
-        end
+        def uuid_v6?(input) = format?(UUIDv6, input)
+
+        def uuid_v7?(input) = format?(UUIDv7, input)
+
+        def uuid_v8?(input) = format?(UUIDv8, input)
 
-        def uri_rfc3986?(input)
-          format?(URI::RFC3986_Parser::RFC3986_URI, input)
+        if defined?(::URI::RFC2396_PARSER)
+          def uri?(schemes, input)
+            uri_format = ::URI::RFC2396_PARSER.make_regexp(schemes)
+            format?(uri_format, input)
+          end
+        else
+          def uri?(schemes, input)
+            uri_format = ::URI::DEFAULT_PARSER.make_regexp(schemes)
+            format?(uri_format, input)
+          end
         end
 
+        def uri_rfc3986?(input) = format?(::URI::RFC3986_Parser::RFC3986_URI, input)
+
         # This overrides Object#respond_to? so we need to make it compatible
         def respond_to?(method, input = Undefined)
           return super if input.equal?(Undefined)
@@ -268,8 +206,8 @@ module Dry
           input.respond_to?(method)
         end
 
-        def predicate(name, &block)
-          define_singleton_method(name, &block)
+        def predicate(name, &)
+          define_singleton_method(name, &)
         end
 
         def deprecated(name, in_favor_of)

data/lib/dry/logic/result.rb

@@ -3,7 +3,7 @@
 module Dry
   module Logic
     class Result
-      SUCCESS = Class.new {
+      SUCCESS = ::Class.new {
         def success?
           true
         end

data/lib/dry/logic/rule/interface.rb

@@ -29,17 +29,11 @@ module Dry
           end
         end
 
-        def constant?
-          arity.zero?
-        end
+        def constant? = arity.zero?
 
-        def variable_arity?
-          arity.negative?
-        end
+        def variable_arity? = arity.negative?
 
-        def curried?
-          !curried.zero?
-        end
+        def curried? = !curried.zero?
 
         def unapplied
           if variable_arity?
@@ -116,26 +110,26 @@ module Dry
           application = "@predicate[#{(curried_args + unapplied_args + splat).join(", ")}]"
 
           module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-            def call(#{parameters})                                         # def call(input0, input1, *rest)
-              if #{application}                                             #   if @predicate[@arg0, @arg1, input0, input1, *rest]
-                Result::SUCCESS                               #     ::Dry::Logic::Result::Success
-              else                                                          #   else
-                Result.new(false, id) { ast(#{parameters}) }  #     ::Dry::Logic::Result.new(false, id) { ast(input0, input1, *rest) }
-              end                                                           #   end
-            end                                                             # end
-                                                                            #
-            def [](#{parameters})                                           # def [](@arg0, @arg1, input0, input1, *rest)
-              #{application}                                                #   @predicate[@arg0, @arg1, input0, input1, *rest]
-            end                                                             # end
+            def call(#{parameters})                          # def call(input0, input1, *rest)
+              if #{application}                              #   if @predicate[@arg0, @arg1, input0, input1, *rest]
+                Result::SUCCESS                              #     ::Dry::Logic::Result::Success
+              else                                           #   else
+                Result.new(false, id) { ast(#{parameters}) } #     ::Dry::Logic::Result.new(false, id) { ast(input0, input1, *rest) }
+              end                                            #   end
+            end                                              # end
+                                                             #
+            def [](#{parameters})                            # def [](@arg0, @arg1, input0, input1, *rest)
+              #{application}                                 #   @predicate[@arg0, @arg1, input0, input1, *rest]
+            end                                              # end
           RUBY
         end
 
         def curried_args
-          @curried_args ||= ::Array.new(curried) { |i| "@arg#{i}" }
+          @curried_args ||= ::Array.new(curried) { "@arg#{_1}" }
         end
 
         def unapplied_args
-          @unapplied_args ||= ::Array.new(unapplied) { |i| "input#{i}" }
+          @unapplied_args ||= ::Array.new(unapplied) { "input#{_1}" }
         end
       end
     end

data/lib/dry/logic/rule.rb

@@ -14,7 +14,7 @@ module Dry
 
     class Rule
       include Core::Constants
-      include Dry::Equalizer(:predicate, :options)
+      include ::Dry::Equalizer(:predicate, :options)
       include Operators
 
       attr_reader :predicate
@@ -32,7 +32,7 @@ module Dry
       def self.specialize(arity, curried, base = Rule)
         base.interfaces.fetch_or_store([arity, curried]) do
           interface = Interface.new(arity, curried)
-          klass = Class.new(base) { include interface }
+          klass = ::Class.new(base) { include interface }
           base.const_set("#{base.name.split("::").last}#{interface.name}", klass)
           klass
         end

data/lib/dry/logic/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Logic
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,39 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,65 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 description: Predicate logic with rule composition
 email:
 - piotr.solnica@gmail.com
@@ -145,7 +111,8 @@ metadata:
   changelog_uri: https://github.com/dry-rb/dry-logic/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-logic
   bug_tracker_uri: https://github.com/dry-rb/dry-logic/issues
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,15 +120,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Predicate logic with rule composition
 test_files: []