eqq 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bca6982f43fb57004acdca8facb594d0d178999bdcb323a41663138d9f00325
-  data.tar.gz: 31f2e909e814925d47cf64824ac1267597fc2b85d3a4704ed9612704f6b41071
+  metadata.gz: fd093a7aa8c034327d463c56bfe120a8ecc48b52649ba7900491f05cc130cc38
+  data.tar.gz: 13f7ca2f2f40d9be41abd4408f5486b892f345347eb07eeb3f4d936c47cc92ab
 SHA512:
-  metadata.gz: e30c7e8c661ffb9764e9c604503454e3bd29de40075f6e8296540d0b3a41a482c1221178d155e2c090b1b075ea4ec4d6f63306d5eaeba3b69e505e981abd0712
-  data.tar.gz: '0885388e12a098f0c26415b252f0bc552c39e526df9ffbed2beffcc046ffe778eee99a71120e23e6ea80c61c1aee67b5769208196fee9d422646a6d90e4e92d4'
+  metadata.gz: 2e510f5313e0f890bf3c8277a413f937b0a26e2ba58e501591288556783bc5fffc944c23a1216ddf95308a111b06c6ac82557526d9f7de49ef9dbe7806f93bb6
+  data.tar.gz: 719905cbd2f71a388e13ca0427b7db49115513ce11395a436d8ef9fc43397c9c77cc408135862147bbfc3bac3fb36615332752f56ab28e4136bc74b8db3f97dd

data/MIT-LICENSE.txt

@@ -7,7 +7,7 @@ of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+furnished to do so, subject to the following patterns:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.

data/README.md

@@ -9,12 +9,12 @@ Pattern objects builder.
 
 ## Usage
 
-Require Ruby 2.5 or later
+Require Ruby 2.6 or later
 
 Add below code into your Gemfile
 
 ```ruby
-gem 'eqq', '>= 0.0.1', '< 0.1.0'
+gem 'eqq', '0.0.2'
 ```
 
 ### Overview

data/lib/eqq.rb

@@ -2,238 +2,40 @@
 # frozen_string_literal: true
 
 # Copyright (c) 2011 Kenichi Kamiya
-# Forked from https://github.com/kachick/eqq at 2021
+# Forked from https://github.com/kachick/validation at 2021
 
-module Eqq
-  def self.conditionable?(object)
-    case object
-    when Proc, Method
-      object.arity == 1
-    else
-      begin
-        object.respond_to?(:===)
-      rescue NoMethodError
-        false
-      end
-    end
-  end
-
-  def self.define(&block)
-    module_exec(&block)
-  end
-
-  module_function
-
-  # A condition builder.
-  # @param condition1 [Proc, Method, #===]
-  # @param condition2 [Proc, Method, #===]
-  # @param conditions [Array<Proc, Method, #===>]
-  # @return [Proc]
-  #   this lambda return true if match all conditions
-  def AND(condition1, condition2, *conditions)
-    ->v {
-      [condition1, condition2, *conditions].all? { |condition| condition === v }
-    }
-  end
-
-  # A condition builder.
-  # @param condition1 [Proc, Method, #===]
-  # @param condition2 [Proc, Method, #===]
-  # @param conditions [Array<Proc, Method, #===>]
-  # @return [Proc]
-  def NAND(condition1, condition2, *conditions)
-    NOT(AND(condition1, condition2, *conditions))
-  end
-
-  # A condition builder.
-  # @param condition1 [Proc, Method, #===]
-  # @param condition2 [Proc, Method, #===]
-  # @param conditions [Array<Proc, Method, #===>]
-  # @return [Proc]
-  #   this lambda return true if match a any condition
-  def OR(condition1, condition2, *conditions)
-    ->v {
-      [condition1, condition2, *conditions].any? { |condition| condition === v }
-    }
-  end
-
-  # A condition builder.
-  # @param condition1 [Proc, Method, #===]
-  # @param condition2 [Proc, Method, #===]
-  # @param conditions [Array<Proc, Method, #===>]
-  # @return [Proc]
-  def NOR(condition1, condition2, *conditions)
-    NOT(OR(condition1, condition2, *conditions))
-  end
-
-  # A condition builder.
-  # @param condition1 [Proc, Method, #===]
-  # @param condition2 [Proc, Method, #===]
-  # @param conditions [Array<Proc, Method, #===>]
-  # @return [Proc]
-  def XOR(condition1, condition2, *conditions)
-    ->v {
-      [condition1, condition2, *conditions].one? { |condition| condition === v }
-    }
-  end
-
-  # A condition builder.
-  # @param condition1 [Proc, Method, #===]
-  # @param condition2 [Proc, Method, #===]
-  # @param conditions [Array<Proc, Method, #===>]
-  # @return [Proc]
-  def XNOR(condition1, condition2, *conditions)
-    NOT(XOR(condition1, condition2, *conditions))
-  end
-
-  # A condition builder.
-  # @param condition [Proc, Method, #===]
-  # @return [Proc] A condition invert the original condition.
-  def NOT(condition)
-    unless Eqq.conditionable?(condition)
-      raise TypeError, 'wrong object for condition'
-    end
-
-    ->v { !(condition === v) }
-  end
-
-  # A condition builder.
-  # @param obj [#==]
-  # @return [Proc]
-  #   this lambda return true if a argument match under #== method
-  def EQ(obj)
-    ->v { obj == v }
-  end
+require_relative 'eqq/buildable'
+require_relative 'eqq/version'
 
-  # A condition builder.
-  # @param obj [#equal?]
-  # @return [Proc]
-  #   this lambda return true if a argument match under #equal? method
-  def SAME(obj)
-    ->v { obj.equal?(v) }
-  end
+module Eqq
+  extend Buildable
 
-  # A condition builder.
-  # @param message1 [Symbol, String]
-  # @param messages [Array<Symbol, String>]
-  # @return [Proc]
-  #   this lambda return true if a argument respond to all messages
-  def CAN(message1, *messages)
-    messages = [message1, *messages].map(&:to_sym)
+  class Error < StandardError; end
+  class InvalidProductError < Error; end
 
-    ->v {
-      messages.all? { |message| v.respond_to?(message) }
-    }
+  class DSLScope
+    include Buildable
   end
 
-  # A condition builder.
-  # @param condition1 [Proc, Method, #===]
-  # @param conditions [Array<Proc, Method, #===>]
-  # @return [Proc]
-  #   this lambda return true
-  #   if face no exception when a argument checking under all conditions
-  def QUIET(condition1, *conditions)
-    conditions = [condition1, *conditions]
-    unless conditions.all? { |c| Eqq.conditionable?(c) }
-      raise TypeError, 'wrong object for condition'
-    end
-
-    ->v {
-      conditions.all? { |condition|
+  class << self
+    def valid?(object)
+      case object
+      when Proc, Method
+        object.arity == 1
+      else
         begin
-          condition === v
-        rescue Exception
+          object.respond_to?(:===)
+        rescue NoMethodError
           false
-        else
-          true
         end
-      }
-    }
-  end
-
-  # A condition builder.
-  # @param exception [Exception]
-  # @param exceptions [Array<Exception>]
-  # @return [Proc]
-  #   this lambda return true
-  #   if catch any kindly exceptions when a argument checking in a block parameter
-  def RESCUE(exception, *exceptions, &condition)
-    exceptions = [exception, *exceptions]
-    raise ArgumentError unless Eqq.conditionable?(condition)
-    raise ArgumentError unless exceptions.all?(Exception)
-
-    ->v {
-      begin
-        condition.call(v)
-        false
-      rescue *exceptions
-        true
-      rescue Exception
-        false
-      end
-    }
-  end
-
-  # A condition builder.
-  # @param exception [Exception]
-  # @return [Proc]
-  #   this lambda return true
-  #   if catch a specific exception when a argument checking in a block parameter
-  def CATCH(exception, &condition)
-    raise ArgumentError unless Eqq.conditionable?(condition)
-    raise ArgumentError unless exceptions.all?(Exception)
-
-    ->v {
-      begin
-        condition.call(v)
-      rescue Exception => err
-        err.instance_of?(exception)
-      else
-        false
       end
-    }
-  end
-
-  # A condition builder.
-  # @param condition1 [Proc, Method, #===]
-  # @param condition2 [Proc, Method, #===]
-  # @param conditions [Array<Proc, Method, #===>]
-  # @return [Proc]
-  #   this lambda return true
-  #   if all included objects match all conditions
-  def ALL(condition1, condition2, *conditions)
-    condition = Eqq.AND(condition1, condition2, *conditions)
-
-    ->list {
-      enum = (
-        case
-        when list.respond_to?(:each_value)
-          list.each_value
-        when list.respond_to?(:all?)
-          list
-        when list.respond_to?(:each)
-          list.each
-        else
-          return false
-        end
-      )
-
-      enum.all?(condition)
-    }
-  end
-
-  def ANYTHING
-    # BasicObject.=== always passing
-    BasicObject
-  end
+    end
 
-  BOOLEAN = OR(SAME(true), SAME(false))
+    def define(&block)
+      pattern = DSLScope.new.instance_exec(&block)
+      raise InvalidProductError unless valid?(pattern)
 
-  # A getter for a useful condition.
-  # @return [BOOLEAN] "true or false"
-  def BOOLEAN
-    BOOLEAN
+      pattern
+    end
   end
 end
-
-require_relative 'eqq/version'

data/lib/eqq/buildable.rb

@@ -0,0 +1,172 @@
+# coding: us-ascii
+# frozen_string_literal: true
+
+module Eqq
+  module Buildable
+    extend self
+
+    # @param pattern1 [Proc, Method, #===]
+    # @param pattern2 [Proc, Method, #===]
+    # @param patterns [Array<Proc, Method, #===>]
+    # @return [Proc]
+    #   this lambda return true if match all patterns
+    def AND(pattern1, pattern2, *patterns)
+      ->v {
+        [pattern1, pattern2, *patterns].all? { |pattern| pattern === v }
+      }
+    end
+
+    # @param pattern1 [Proc, Method, #===]
+    # @param pattern2 [Proc, Method, #===]
+    # @param patterns [Array<Proc, Method, #===>]
+    # @return [Proc]
+    def NAND(pattern1, pattern2, *patterns)
+      NOT(AND(pattern1, pattern2, *patterns))
+    end
+
+    # @param pattern1 [Proc, Method, #===]
+    # @param pattern2 [Proc, Method, #===]
+    # @param patterns [Array<Proc, Method, #===>]
+    # @return [Proc]
+    #   this lambda return true if match a any pattern
+    def OR(pattern1, pattern2, *patterns)
+      ->v {
+        [pattern1, pattern2, *patterns].any? { |pattern| pattern === v }
+      }
+    end
+
+    # @param pattern1 [Proc, Method, #===]
+    # @param pattern2 [Proc, Method, #===]
+    # @param patterns [Array<Proc, Method, #===>]
+    # @return [Proc]
+    def NOR(pattern1, pattern2, *patterns)
+      NOT(OR(pattern1, pattern2, *patterns))
+    end
+
+    # @param pattern1 [Proc, Method, #===]
+    # @param pattern2 [Proc, Method, #===]
+    # @param patterns [Array<Proc, Method, #===>]
+    # @return [Proc]
+    def XOR(pattern1, pattern2, *patterns)
+      ->v {
+        [pattern1, pattern2, *patterns].one? { |pattern| pattern === v }
+      }
+    end
+
+    # @param pattern1 [Proc, Method, #===]
+    # @param pattern2 [Proc, Method, #===]
+    # @param patterns [Array<Proc, Method, #===>]
+    # @return [Proc]
+    def XNOR(pattern1, pattern2, *patterns)
+      NOT(XOR(pattern1, pattern2, *patterns))
+    end
+
+    # @param pattern [Proc, Method, #===]
+    # @return [Proc]
+    def NOT(pattern)
+      raise ArgumentError, 'wrong object for pattern' unless Eqq.valid?(pattern)
+
+      ->v { !(pattern === v) }
+    end
+
+    # A pattern builder.
+    # @param obj [#==]
+    # @return [Proc]
+    def EQ(obj)
+      ->v { obj == v }
+    end
+
+    # @param obj [#equal?]
+    # @return [Proc]
+    def SAME(obj)
+      ->v { obj.equal?(v) }
+    end
+
+    # @param message1 [Symbol, String]
+    # @param messages [Array<Symbol, String>]
+    # @return [Proc]
+    def CAN(message1, *messages)
+      messages = begin
+        [message1, *messages].map(&:to_sym)
+      rescue NoMethodError
+        raise ArgumentError
+      end
+
+      ->v {
+        messages.all? { |message|
+          begin
+            v.respond_to?(message)
+          rescue NoMethodError
+            false
+          end
+        }
+      }
+    end
+
+    # @param pattern1 [Proc, Method, #===]
+    # @param patterns [Array<Proc, Method, #===>]
+    # @return [Proc]
+    def QUIET(pattern1, *patterns)
+      patterns = [pattern1, *patterns]
+      unless patterns.all? { |pattern| Eqq.valid?(pattern) }
+        raise ArgumentError, 'wrong object for pattern'
+      end
+
+      ->v {
+        patterns.all? { |pattern|
+          begin
+            pattern === v
+          rescue Exception
+            false
+          else
+            true
+          end
+        }
+      }
+    end
+
+    # @param mod [Module]
+    # @param pattern [Proc, Method, #===]
+    # @return [Proc]
+    def RESCUE(mod, pattern)
+      raise ArgumentError unless Eqq.valid?(pattern)
+      raise ArgumentError unless Module === mod
+
+      ->v {
+        begin
+          pattern === v
+          false
+        rescue mod
+          true
+        rescue Exception
+          false
+        end
+      }
+    end
+
+    # @param name [Symbol, #to_sym]
+    # @param pattern [Proc, Method, #===]
+    # @return [Proc]
+    def SEND(name, pattern)
+      raise InvalidProductError unless Eqq.valid?(pattern)
+
+      ->v {
+        v.__send__(name, pattern)
+      }
+    end
+
+    # @return [BasicObject]
+    def ANYTHING
+      # BasicObject.=== always passing
+      BasicObject
+    end
+
+    BOOLEAN = OR(SAME(true), SAME(false))
+    private_constant :BOOLEAN
+
+    # @return [BOOLEAN]
+    def BOOLEAN
+      BOOLEAN
+    end
+  end
+end

data/lib/eqq/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Eqq
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/sig/eqq.rbs

@@ -0,0 +1,49 @@
+module Eqq
+  interface _Patternable
+    def ===: (untyped object) -> bool
+  end
+
+  interface _ToSym
+    def to_sym: -> Symbol
+  end
+
+  module Buildable
+    # A pribate constant. Should not be used in your code.
+    BOOLEAN: ^(untyped object) -> bool
+
+    extend Buildable
+    def OR: (_Patternable, _Patternable, *_Patternable) -> ^(untyped object) -> bool
+    def AND: (_Patternable, _Patternable, *_Patternable) -> ^(untyped object) -> bool
+    def NAND: (_Patternable, _Patternable, *_Patternable) -> ^(untyped object) -> bool
+    def NOR: (_Patternable, _Patternable, *_Patternable) -> ^(untyped object) -> bool
+    def XOR: (_Patternable, _Patternable, *_Patternable) -> ^(untyped object) -> bool
+    def XNOR: (_Patternable, _Patternable, *_Patternable) -> ^(untyped object) -> bool
+    def NOT: (_Patternable) -> ^(untyped object) -> bool
+    def EQ: (untyped object) -> ^(untyped object) -> bool
+    def SAME: (untyped object) -> ^(untyped object) -> bool
+    def CAN: (_ToSym, *_ToSym) -> ^(untyped object) -> bool
+    def RESCUE: (Module, _Patternable) -> ^(untyped object) -> bool
+    def QUIET: (_Patternable, *_Patternable) -> ^(untyped object) -> bool
+    def SEND: (Symbol | String name, _Patternable) -> ^(untyped object) -> bool
+    def ANYTHING: () -> BasicObject
+    def BOOLEAN: () -> ^(untyped object) -> bool
+  end
+
+  extend Buildable
+
+  class Error < StandardError
+  end
+
+  class InvalidProductError < Error
+  end
+
+  # A pribate API. Should not be used in your code.
+  class DSLScope
+    include Buildable
+  end
+
+  VERSION: String
+
+  def self.valid?: (untyped object) -> bool
+  def self.define:  { () -> _Patternable } -> _Patternable
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eqq
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kenichi Kamiya
@@ -9,221 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2021-06-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: irb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: irb-power_assert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: warning
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '20.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '20.0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.26
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.26
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.16.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.16.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rubycw
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-md
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+dependencies: []
 description: "    [4.2, 42, 42.0, 420].grep(Eqq.AND(Integer, 20..50)) #=> [42]\n"
 email:
 - kachick1+ruby@gmail.com
@@ -234,7 +20,9 @@ files:
 - MIT-LICENSE.txt
 - README.md
 - lib/eqq.rb
+- lib/eqq/buildable.rb
 - lib/eqq/version.rb
+- sig/eqq.rbs
 homepage: https://github.com/kachick/eqq
 licenses:
 - MIT
@@ -251,7 +39,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="