dry-logic 0.5.0 → 1.5.0

data/lib/dry/logic.rb

@@ -1,9 +1,25 @@
-# A collection of micro-libraries, each intended to encapsulate
-# a common task in Ruby
+# frozen_string_literal: true
+
+require "zeitwerk"
+require "dry/core"
+
 module Dry
   module Logic
+    include Dry::Core::Constants
+
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dry-logic"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-logic.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-logic.rb",
+          "#{root}/dry/logic/version.rb"
+        )
+      end
+    end
+
+    loader.setup
   end
 end
-
-require 'dry/logic/rule/predicate'
-require 'dry/logic/operations'

data/lib/dry-logic.rb

@@ -1 +1,3 @@
-require 'dry/logic'
+# frozen_string_literal: true
+
+require "dry/logic"

metadata

@@ -1,63 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2022-11-24 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: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,33 +100,22 @@ 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
-- bin/console
 - dry-logic.gemspec
-- examples/basic.rb
 - lib/dry-logic.rb
 - lib/dry/logic.rb
 - lib/dry/logic/appliable.rb
+- lib/dry/logic/builder.rb
 - lib/dry/logic/evaluator.rb
-- lib/dry/logic/operations.rb
 - lib/dry/logic/operations/abstract.rb
 - lib/dry/logic/operations/and.rb
 - lib/dry/logic/operations/attr.rb
@@ -144,68 +133,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/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: 
 rdoc_options: []
 require_paths:
@@ -214,70 +153,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.6
 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: []

data/.codeclimate.yml

@@ -1,23 +0,0 @@
-engines:
-  rubocop:
-    enabled: true
-    checks:
-      Rubocop/Metrics/LineLength:
-        enabled: true
-        max: 100
-      Rubocop/Style/Documentation:
-        enabled: false
-      Rubocop/Lint/HandleExceptions:
-        enabled: true
-        exclude:
-          - rakelib/*.rake
-      Rubocop/Style/FileName:
-        enabled: true
-        exclude:
-          - 'lib/dry-logic.rb'
-ratings:
-  paths:
-    - lib/**/*.rb
-  exclude_paths:
-    - spec/**/*
-    - examples/**/*

data/.gitignore

@@ -1,7 +0,0 @@
-.DS_Store
-coverage
-/.bundle
-vendor/bundle
-tmp/
-.idea/
-Gemfile.lock

data/.rspec

@@ -1,3 +0,0 @@
---color
---require spec_helper
---order random

data/.rubocop.yml

@@ -1,16 +0,0 @@
-# Generated by `rubocop --auto-gen-config`
-inherit_from: .rubocop_todo.yml
-
-Metrics/LineLength:
-  Max: 100
-
-Style/Documentation:
-  Enabled: false
-
-Lint/HandleExceptions:
-  Exclude:
-    - rakelib/*.rake
-
-Style/FileName:
-  Exclude:
-    - lib/dry-logic.rb

data/.rubocop_todo.yml

@@ -1,7 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-10-30 01:32:46 +0000 using RuboCop version 0.34.2.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,30 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-bundler_args: --without benchmarks tools
-before_install: gem update --system
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-after_script:
-  - "[ -d coverage ] && ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
-script:
-  - bundle exec rake
-rvm:
-  - 2.6.0
-  - 2.5.3
-  - 2.4.5
-  - 2.3.8
-  - jruby-9.2.5.0
-env:
-  global:
-    - COVERAGE=true
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/19098b4253a72c9796db
-    on_success: change # options: [always|never|change] default: always
-    on_failure: always # options: [always|never|change] default: always
-    on_start: false # default: false

data/CONTRIBUTING.md

@@ -1,29 +0,0 @@
-# Issue Guidelines
-
-## Reporting bugs
-
-If you found a bug, report an issue and describe what's the expected behavior versus what actually happens. If the bug causes a crash, attach a full backtrace. If possible, a reproduction script showing the problem is highly appreciated.
-
-## Reporting feature requests
-
-Report a feature request **only after discussing it first on [discuss.dry-rb.org](https://discuss.dry-rb.org)** where it was accepted. Please provide a concise description of the feature, don't link to a discussion thread, and instead summarize what was discussed.
-
-## Reporting questions, support requests, ideas, concerns etc.
-
-**PLEASE DON'T** - use [discuss.dry-rb.org](http://discuss.dry-rb.org) instead.
-
-# Pull Request Guidelines
-
-A Pull Request will only be accepted if it addresses a specific issue that was reported previously, or fixes typos, mistakes in documentation etc.
-
-Other requirements:
-
-1) Do not open a pull request if you can't provide tests along with it. If you have problems writing tests, ask for help in the related issue.
-2) Follow the style conventions of the surrounding code. In most cases, this is standard ruby style.
-3) Add API documentation if it's a new feature
-4) Update API documentation if it changes an existing feature
-5) Bonus points for sending a PR to [github.com/dry-rb/dry-rb.org](github.com/dry-rb/dry-rb.org) which updates user documentation and guides
-
-# Asking for help
-
-If these guidelines aren't helpful, and you're stuck, please post a message on [discuss.dry-rb.org](https://discuss.dry-rb.org).

data/Gemfile

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-group :test do
-  gem 'simplecov', require: false, platform: :mri
-end
-
-group :tools do
-  gem 'rubocop'
-  gem 'byebug', platform: :mri
-
-  unless ENV['TRAVIS']
-    gem 'mutant', github: 'mbj/mutant'
-    gem 'mutant-rspec', github: 'mbj/mutant'
-  end
-end

data/Rakefile

@@ -1,12 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-task default: :spec
-
-desc 'Run all specs in spec directory'
-RSpec::Core::RakeTask.new(:spec)

data/bin/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require 'dry/logic'
-require 'dry/logic/predicates'
-
-include Dry::Logic
-
-require "irb"
-IRB.start

data/examples/basic.rb

@@ -1,14 +0,0 @@
-require 'dry/logic'
-require 'dry/logic/predicates'
-
-include Dry::Logic
-
-user_present = Rule::Predicate.new(Predicates[:key?]).curry(:user)
-
-has_min_age = Operations::Key.new(Rule::Predicate.new(Predicates[:gt?]).curry(18), name: [:user, :age])
-
-user_rule = user_present & has_min_age
-
-puts user_rule.(user: { age: 19 }).success?
-
-puts user_rule.(user: { age: 18 }).success?

data/lib/dry/logic/operations.rb

@@ -1,13 +0,0 @@
-require 'dry/logic/operations/and'
-require 'dry/logic/operations/or'
-require 'dry/logic/operations/xor'
-require 'dry/logic/operations/implication'
-require 'dry/logic/operations/negation'
-
-require 'dry/logic/operations/key'
-require 'dry/logic/operations/attr'
-require 'dry/logic/operations/each'
-require 'dry/logic/operations/set'
-require 'dry/logic/operations/check'
-
-require 'dry/logic/operators'

data/spec/integration/result_spec.rb

@@ -1,59 +0,0 @@
-RSpec.describe Result do
-  include_context 'predicates'
-
-  describe '#to_s' do
-    shared_examples_for 'string representation' do
-      it 'returns string representation' do
-        expect(rule.(input).to_s).to eql(output)
-      end
-    end
-
-    context 'with a predicate' do
-      let(:rule) { Rule::Predicate.new(gt?, args: [18]) }
-      let(:input) { 17 }
-      let(:output) { 'gt?(18, 17)' }
-
-      it_behaves_like 'string representation'
-    end
-
-    context 'with AND operation' do
-      let(:rule) { Rule::Predicate.new(array?).and(Rule::Predicate.new(empty?)) }
-      let(:input) { '' }
-      let(:output) { 'array?("") AND empty?("")' }
-
-      it_behaves_like 'string representation'
-    end
-
-    context 'with OR operation' do
-      let(:rule) { Rule::Predicate.new(array?).or(Rule::Predicate.new(empty?)) }
-      let(:input) { 123 }
-      let(:output) { 'array?(123) OR empty?(123)' }
-
-      it_behaves_like 'string representation'
-    end
-
-    context 'with XOR operation' do
-      let(:rule) { Rule::Predicate.new(array?).xor(Rule::Predicate.new(empty?)) }
-      let(:input) { [] }
-      let(:output) { 'array?([]) XOR empty?([])' }
-
-      it_behaves_like 'string representation'
-    end
-
-    context 'with THEN operation' do
-      let(:rule) { Rule::Predicate.new(array?).then(Rule::Predicate.new(empty?)) }
-      let(:input) { [1, 2, 3] }
-      let(:output) { 'empty?([1, 2, 3])' }
-
-      it_behaves_like 'string representation'
-    end
-
-    context 'with NOT operation' do
-      let(:rule) { Operations::Negation.new(Rule::Predicate.new(array?)) }
-      let(:input) { 'foo' }
-      let(:output) { 'not(array?("foo"))' }
-
-      it_behaves_like 'string representation'
-    end
-  end
-end

data/spec/integration/rule_spec.rb

@@ -1,53 +0,0 @@
-require 'dry-logic'
-
-RSpec.describe 'Rules' do
-  specify 'defining an anonymous rule with an arbitrary predicate' do
-    rule = Dry::Logic.Rule { |value| value.is_a?(Integer) }
-
-    expect(rule.(1)).to be_success
-    expect(rule[1]).to be(true)
-  end
-
-  specify 'defining a conjunction' do
-    rule = Dry::Logic.Rule(&:even?) & Dry::Logic.Rule { |v| v > 4 }
-
-    expect(rule.(3)).to be_failure
-    expect(rule.(4)).to be_failure
-    expect(rule.(5)).to be_failure
-    expect(rule.(6)).to be_success
-  end
-
-  specify 'defining a disjunction' do
-    rule = Dry::Logic.Rule { |v| v < 4 } | Dry::Logic.Rule { |v| v > 6 }
-
-    expect(rule.(5)).to be_failure
-    expect(rule.(3)).to be_success
-    expect(rule.(7)).to be_success
-  end
-
-  specify 'defining an implication' do
-    rule = Dry::Logic.Rule(&:empty?) > Dry::Logic.Rule { |v| v.is_a?(Array) }
-
-    expect(rule.('foo')).to be_success
-    expect(rule.([1, 2])).to be_success
-    expect(rule.([])).to be_success
-    expect(rule.('')).to be_failure
-  end
-
-  specify 'defining an exclusive disjunction' do
-    rule = Dry::Logic.Rule(&:empty?) ^ Dry::Logic.Rule { |v| v.is_a?(Array) }
-
-    expect(rule.('foo')).to be_failure
-    expect(rule.([])).to be_failure
-    expect(rule.([1, 2])).to be_success
-    expect(rule.('')).to be_success
-  end
-
-  specify 'defining a rule with options' do
-    rule = Dry::Logic::Rule(id: :empty?) { |value| value.empty? }
-
-    expect(rule.('foo')).to be_failure
-    expect(rule.('')).to be_success
-    expect(rule.ast('foo')).to eql([:predicate, [:empty?, [[:value, 'foo']]]])
-  end
-end

data/spec/shared/predicates.rb

@@ -1,57 +0,0 @@
-require 'dry/logic/predicates'
-
-RSpec.shared_examples 'predicates' do
-  let(:nil?) { Dry::Logic::Predicates[:nil?] }
-
-  let(:array?) { Dry::Logic::Predicates[:array?] }
-
-  let(:empty?) { Dry::Logic::Predicates[:empty?] }
-
-  let(:str?) { Dry::Logic::Predicates[:str?] }
-
-  let(:true?) { Dry::Logic::Predicates[:true?] }
-
-  let(:hash?) { Dry::Logic::Predicates[:hash?] }
-
-  let(:int?) { Dry::Logic::Predicates[:int?] }
-
-  let(:filled?) { Dry::Logic::Predicates[:filled?] }
-
-  let(:min_size?) { Dry::Logic::Predicates[:min_size?] }
-
-  let(:lt?) { Dry::Logic::Predicates[:lt?] }
-
-  let(:gt?) { Dry::Logic::Predicates[:gt?] }
-
-  let(:key?) { Dry::Logic::Predicates[:key?] }
-
-  let(:attr?) { Dry::Logic::Predicates[:attr?] }
-
-  let(:eql?) { Dry::Logic::Predicates[:eql?] }
-
-  let(:size?) { Dry::Logic::Predicates[:size?] }
-
-  let(:case?) { Dry::Logic::Predicates[:case?] }
-
-  let(:equal?) { Dry::Logic::Predicates[:equal?] }
-end
-
-RSpec.shared_examples 'a passing predicate' do
-  let(:predicate) { Dry::Logic::Predicates[predicate_name] }
-
-  it do
-    arguments_list.each do |args|
-      expect(predicate.call(*args)).to be(true)
-    end
-  end
-end
-
-RSpec.shared_examples 'a failing predicate' do
-  let(:predicate) { Dry::Logic::Predicates[predicate_name] }
-
-  it do
-    arguments_list.each do |args|
-      expect(predicate.call(*args)).to be(false)
-    end
-  end
-end