dry-logic 0.4.2 → 1.1.0

data/lib/dry/logic/result.rb

@@ -1,4 +1,6 @@
-require 'dry/core/constants'
+# frozen_string_literal: true
+
+require "dry/core/constants"
 
 module Dry
   module Logic
@@ -67,7 +69,7 @@ module Dry
         if args.empty?
           name.to_s
         else
-          "#{name}(#{args.map(&:last).map(&:inspect).join(', ')})"
+          "#{name}(#{args.map(&:last).map(&:inspect).join(", ")})"
         end
       end
 

data/lib/dry/logic/rule.rb

@@ -1,15 +1,19 @@
-require 'dry/core/constants'
-require 'dry/equalizer'
-require 'dry/logic/operations'
-require 'dry/logic/result'
+# frozen_string_literal: true
+
+require "concurrent/map"
+require "dry/core/constants"
+require "dry/core/equalizer"
+require "dry/logic/operations"
+require "dry/logic/result"
+require "dry/logic/rule/interface"
 
 module Dry
   module Logic
     def self.Rule(*args, **options, &block)
       if args.any?
-        Rule.new(*args, Rule::DEFAULT_OPTIONS.merge(options))
+        Rule.build(*args, **options)
       elsif block
-        Rule.new(block, Rule::DEFAULT_OPTIONS.merge(options))
+        Rule.build(block, **options)
       end
     end
 
@@ -18,8 +22,6 @@ module Dry
       include Dry::Equalizer(:predicate, :options)
       include Operators
 
-      DEFAULT_OPTIONS = { args: [].freeze }.freeze
-
       attr_reader :predicate
 
       attr_reader :options
@@ -28,10 +30,27 @@ module Dry
 
       attr_reader :arity
 
-      def initialize(predicate, options = DEFAULT_OPTIONS)
+      def self.interfaces
+        @interfaces ||= ::Concurrent::Map.new
+      end
+
+      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 }
+          base.const_set("#{base.name.split("::").last}#{interface.name}", klass)
+          klass
+        end
+      end
+
+      def self.build(predicate, args: EMPTY_ARRAY, arity: predicate.arity, **options)
+        specialize(arity, args.size).new(predicate, {args: args, arity: arity, **options})
+      end
+
+      def initialize(predicate, options = EMPTY_HASH)
         @predicate = predicate
         @options = options
-        @args = options[:args]
+        @args = options[:args] || EMPTY_ARRAY
         @arity = options[:arity] || predicate.arity
       end
 
@@ -43,31 +62,17 @@ module Dry
         options[:id]
       end
 
-      def call(*input)
-        Result.new(self[*input], id) { ast(*input) }
-      end
-
-      def [](*input)
-        arity == 0 ? predicate.() : predicate[*args, *input]
-      end
-
       def curry(*new_args)
-        all_args = args + new_args
-
-        if all_args.size > arity
-          raise ArgumentError, "wrong number of arguments (#{all_args.size} for #{arity})"
-        else
-          with(args: all_args)
-        end
+        with(args: args + new_args)
       end
 
       def bind(object)
-        if UnboundMethod === predicate
-          self.class.new(predicate.bind(object), options)
+        if predicate.respond_to?(:bind)
+          self.class.build(predicate.bind(object), **options)
         else
-          self.class.new(
+          self.class.build(
             -> *args { object.instance_exec(*args, &predicate) },
-            options.merge(arity: arity, parameters: parameters)
+            **options, arity: arity, parameters: parameters
           )
         end
       end
@@ -77,7 +82,7 @@ module Dry
       end
 
       def with(new_opts)
-        self.class.new(predicate, options.merge(new_opts))
+        self.class.build(predicate, **options, **new_opts)
       end
 
       def parameters

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

@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+module Dry
+  module Logic
+    class Rule
+      class Interface < ::Module
+        SPLAT = ["*rest"].freeze
+
+        attr_reader :arity
+
+        attr_reader :curried
+
+        def initialize(arity, curried)
+          @arity = arity
+          @curried = curried
+
+          if !variable_arity? && curried > arity
+            raise ArgumentError, "wrong number of arguments (#{curried} for #{arity})"
+          end
+
+          define_constructor if curried?
+
+          if constant?
+            define_constant_application
+          else
+            define_application
+          end
+        end
+
+        def constant?
+          arity.zero?
+        end
+
+        def variable_arity?
+          arity.negative?
+        end
+
+        def curried?
+          !curried.zero?
+        end
+
+        def unapplied
+          if variable_arity?
+            unapplied = arity.abs - 1 - curried
+
+            if unapplied.negative?
+              0
+            else
+              unapplied
+            end
+          else
+            arity - curried
+          end
+        end
+
+        def name
+          if constant?
+            "Constant"
+          else
+            arity_str =
+              if variable_arity?
+                "Variable#{arity.abs - 1}Arity"
+              else
+                "#{arity}Arity"
+              end
+
+            curried_str =
+              if curried?
+                "#{curried}Curried"
+              else
+                EMPTY_STRING
+              end
+
+            "#{arity_str}#{curried_str}"
+          end
+        end
+
+        def define_constructor
+          assignment =
+            if curried.equal?(1)
+              "@arg0 = @args[0]"
+            else
+              "#{curried_args.join(", ")} = @args"
+            end
+
+          module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+            def initialize(*)
+              super
+
+              #{assignment}
+            end
+          RUBY
+        end
+
+        def define_constant_application
+          module_exec do
+            def call(*)
+              if @predicate[]
+                Result::SUCCESS
+              else
+                Result.new(false, id) { ast }
+              end
+            end
+
+            def [](*)
+              @predicate[]
+            end
+          end
+        end
+
+        def define_application
+          splat = variable_arity? ? SPLAT : EMPTY_ARRAY
+          parameters = (unapplied_args + splat).join(", ")
+          application = "@predicate[#{(curried_args + unapplied_args + splat).join(", ")}]"
+
+          module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+            def call(#{parameters})
+              if #{application}
+                Result::SUCCESS
+              else
+                Result.new(false, id) { ast(#{parameters}) }
+              end
+            end
+
+            def [](#{parameters})
+              #{application}
+            end
+          RUBY
+        end
+
+        def curried_args
+          @curried_args ||= ::Array.new(curried) { |i| "@arg#{i}" }
+        end
+
+        def unapplied_args
+          @unapplied_args ||= ::Array.new(unapplied) { |i| "input#{i}" }
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,14 @@
-require 'dry/logic/rule'
+# frozen_string_literal: true
+
+require "dry/logic/rule"
 
 module Dry
   module Logic
     class Rule::Predicate < Rule
+      def self.specialize(arity, curried, base = Predicate)
+        super
+      end
+
       def type
         :predicate
       end
@@ -13,9 +19,9 @@ module Dry
 
       def to_s
         if args.size > 0
-          "#{name}(#{args.map(&:inspect).join(', ')})"
+          "#{name}(#{args.map(&:inspect).join(", ")})"
         else
-          "#{name}"
+          name.to_s
         end
       end
 

data/lib/dry/logic/rule_compiler.rb

@@ -1,5 +1,9 @@
-require 'dry/core/constants'
-require 'dry/logic/rule'
+# frozen_string_literal: true
+
+require "dry/core/constants"
+
+require "dry/logic/rule"
+require "dry/logic/rule/predicate"
 
 module Dry
   module Logic
@@ -50,7 +54,7 @@ module Dry
 
       def visit_predicate(node)
         name, params = node
-        predicate = Rule::Predicate.new(predicates[name])
+        predicate = Rule::Predicate.build(predicates[name])
 
         if params.size > 1
           args = params.map(&:last).reject { |val| val == Undefined }

data/lib/dry/logic/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Dry
   module Logic
-    VERSION = '0.4.2'.freeze
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,63 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2020-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
-- !ruby/object:Gem::Dependency
-  name: dry-equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,27 +86,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Predicate logic with rule composition
 email:
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - dry-logic.gemspec
-- examples/basic.rb
 - lib/dry-logic.rb
 - lib/dry/logic.rb
 - lib/dry/logic/appliable.rb
@@ -143,68 +119,18 @@ files:
 - lib/dry/logic/predicates.rb
 - lib/dry/logic/result.rb
 - lib/dry/logic/rule.rb
+- lib/dry/logic/rule/interface.rb
 - lib/dry/logic/rule/predicate.rb
 - lib/dry/logic/rule_compiler.rb
 - lib/dry/logic/version.rb
-- spec/integration/result_spec.rb
-- spec/integration/rule_spec.rb
-- spec/shared/predicates.rb
-- spec/shared/rule.rb
-- spec/spec_helper.rb
-- spec/support/mutant.rb
-- spec/unit/operations/and_spec.rb
-- spec/unit/operations/attr_spec.rb
-- spec/unit/operations/check_spec.rb
-- spec/unit/operations/each_spec.rb
-- spec/unit/operations/implication_spec.rb
-- spec/unit/operations/key_spec.rb
-- spec/unit/operations/negation_spec.rb
-- spec/unit/operations/or_spec.rb
-- spec/unit/operations/set_spec.rb
-- spec/unit/operations/xor_spec.rb
-- spec/unit/predicates/array_spec.rb
-- spec/unit/predicates/attr_spec.rb
-- spec/unit/predicates/bool_spec.rb
-- spec/unit/predicates/case_spec.rb
-- spec/unit/predicates/date_spec.rb
-- spec/unit/predicates/date_time_spec.rb
-- spec/unit/predicates/decimal_spec.rb
-- spec/unit/predicates/empty_spec.rb
-- spec/unit/predicates/eql_spec.rb
-- spec/unit/predicates/even_spec.rb
-- spec/unit/predicates/excluded_from_spec.rb
-- spec/unit/predicates/excludes_spec.rb
-- spec/unit/predicates/false_spec.rb
-- spec/unit/predicates/filled_spec.rb
-- spec/unit/predicates/float_spec.rb
-- spec/unit/predicates/format_spec.rb
-- spec/unit/predicates/gt_spec.rb
-- spec/unit/predicates/gteq_spec.rb
-- spec/unit/predicates/included_in_spec.rb
-- spec/unit/predicates/includes_spec.rb
-- spec/unit/predicates/int_spec.rb
-- spec/unit/predicates/key_spec.rb
-- spec/unit/predicates/lt_spec.rb
-- spec/unit/predicates/lteq_spec.rb
-- spec/unit/predicates/max_size_spec.rb
-- spec/unit/predicates/min_size_spec.rb
-- spec/unit/predicates/none_spec.rb
-- spec/unit/predicates/not_eql_spec.rb
-- spec/unit/predicates/number_spec.rb
-- spec/unit/predicates/odd_spec.rb
-- spec/unit/predicates/size_spec.rb
-- spec/unit/predicates/str_spec.rb
-- spec/unit/predicates/time_spec.rb
-- spec/unit/predicates/true_spec.rb
-- spec/unit/predicates/type_spec.rb
-- spec/unit/predicates_spec.rb
-- spec/unit/rule/predicate_spec.rb
-- spec/unit/rule_compiler_spec.rb
-- spec/unit/rule_spec.rb
-homepage: https://github.com/dry-rb/dry-logic
+homepage: https://dry-rb.org/gems/dry-logic
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-logic/blob/master/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: 
 rdoc_options: []
 require_paths:
@@ -213,71 +139,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Predicate logic with rule composition
-test_files:
-- spec/integration/result_spec.rb
-- spec/integration/rule_spec.rb
-- spec/shared/predicates.rb
-- spec/shared/rule.rb
-- spec/spec_helper.rb
-- spec/support/mutant.rb
-- spec/unit/operations/and_spec.rb
-- spec/unit/operations/attr_spec.rb
-- spec/unit/operations/check_spec.rb
-- spec/unit/operations/each_spec.rb
-- spec/unit/operations/implication_spec.rb
-- spec/unit/operations/key_spec.rb
-- spec/unit/operations/negation_spec.rb
-- spec/unit/operations/or_spec.rb
-- spec/unit/operations/set_spec.rb
-- spec/unit/operations/xor_spec.rb
-- spec/unit/predicates/array_spec.rb
-- spec/unit/predicates/attr_spec.rb
-- spec/unit/predicates/bool_spec.rb
-- spec/unit/predicates/case_spec.rb
-- spec/unit/predicates/date_spec.rb
-- spec/unit/predicates/date_time_spec.rb
-- spec/unit/predicates/decimal_spec.rb
-- spec/unit/predicates/empty_spec.rb
-- spec/unit/predicates/eql_spec.rb
-- spec/unit/predicates/even_spec.rb
-- spec/unit/predicates/excluded_from_spec.rb
-- spec/unit/predicates/excludes_spec.rb
-- spec/unit/predicates/false_spec.rb
-- spec/unit/predicates/filled_spec.rb
-- spec/unit/predicates/float_spec.rb
-- spec/unit/predicates/format_spec.rb
-- spec/unit/predicates/gt_spec.rb
-- spec/unit/predicates/gteq_spec.rb
-- spec/unit/predicates/included_in_spec.rb
-- spec/unit/predicates/includes_spec.rb
-- spec/unit/predicates/int_spec.rb
-- spec/unit/predicates/key_spec.rb
-- spec/unit/predicates/lt_spec.rb
-- spec/unit/predicates/lteq_spec.rb
-- spec/unit/predicates/max_size_spec.rb
-- spec/unit/predicates/min_size_spec.rb
-- spec/unit/predicates/none_spec.rb
-- spec/unit/predicates/not_eql_spec.rb
-- spec/unit/predicates/number_spec.rb
-- spec/unit/predicates/odd_spec.rb
-- spec/unit/predicates/size_spec.rb
-- spec/unit/predicates/str_spec.rb
-- spec/unit/predicates/time_spec.rb
-- spec/unit/predicates/true_spec.rb
-- spec/unit/predicates/type_spec.rb
-- spec/unit/predicates_spec.rb
-- spec/unit/rule/predicate_spec.rb
-- spec/unit/rule_compiler_spec.rb
-- spec/unit/rule_spec.rb
+test_files: []