attribool 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cee1c79ed2d93c1f4d77b14f42d59dfd7c805afe569d9e43c999484d552c64ff
-  data.tar.gz: becb227aebe9b9878f40b3a3de4a9737623a10f364d2788830f3b440524ce0fb
+  metadata.gz: d928a7ac0b90deb248cfcbb3a9b638baa6a38a8c62691c884df1e2db2f7c6d04
+  data.tar.gz: 525256019fd56a8bc53695c1772e6367fcb6dac0ac05da4a4f457431029d21d9
 SHA512:
-  metadata.gz: 4904af389ad68348764f519eb058aaff66cb022dcc3de3d9f1ee3ce07b620eb08552bb9f03c9316943693370ed79131d11b91950433a4950bbdc4ce7619d34a4
-  data.tar.gz: 0f0d3622f6214668c8fa150d7e1b89ab828a803803aaa4707c25fd53b72a734d5e07f3ecc9d6d6a600c6e47522729ad0097da600065f76ad43fd6a2675efa203
+  metadata.gz: 3719316d9feaa069f64748a23ef1ba9531dbecb6b7cb3188e8292f9f70a7cdd3a262522b63a8a6c7b9673a232a3c6e2dc86953cba6527ea6c9727d5e32360c0f
+  data.tar.gz: 792822e7f8e5ee0242d8a60cd5ab0870613794a26652bcb7025dbdda5dd3500bee8004c66fdd297c8e0a26c0e6ec1a458967e69186a91a1795bb5ee92e65a4d6

data/.github/workflows/ruby.yml

@@ -1,11 +1,4 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
+name: Ruby CI
 
 on:
   push:
@@ -17,19 +10,18 @@ jobs:
   test:
 
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['3.2', '3.1', '3.0', '2.7', '2.6']
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rake
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/Gemfile.lock

@@ -1,19 +1,24 @@
 PATH
   remote: .
   specs:
-    attribool (2.0.0)
+    attribool (2.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    coderay (1.1.3)
     docile (1.3.5)
     json (2.6.3)
     language_server-protocol (3.17.0.2)
+    method_source (1.0.0)
     parallel (1.22.1)
     parser (3.1.3.0)
       ast (~> 2.4.1)
     power_assert (2.0.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.3)
     regexp_parser (2.6.1)
@@ -53,6 +58,7 @@ PLATFORMS
 
 DEPENDENCIES
   attribool!
+  pry
   rake (~> 13.0, >= 13.0.1)
   simplecov
   standard

data/attribool.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.bindir = "bin"
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 13.0", ">= 13.0.1"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "standard"

data/lib/attribool/attribute_list.rb

@@ -8,13 +8,24 @@ module Attribool
     include Enumerable
 
     ##
-    # Generate the list.
+    # Create an +AttributeList+ from a list of attribute names.
     #
-    # @param [String, Symbol] *attributes
+    # @param [String, Symbol] *attribute_names
     #
     # @kwarg [nil, String, Symbol, Proc] method_name
-    def initialize(*attributes, method_name: nil)
-      @entries = attributes.map { |a| Attribool::Attribute.new(a, method_name) }
+    #
+    # @return [AttributeList]
+    def self.build(*attribute_names, method_name: nil)
+      new(*attribute_names.map { |a| Attribool::Attribute.new(a, method_name) })
+    end
+
+    ##
+    # Construct the list.
+    #
+    # @param [String, Symbol] *attributes
+    def initialize(*attributes)
+      ValidatorService.call(:attribute_list, *attributes)
+      @entries = attributes
     end
 
     ##

data/lib/attribool/validator_service.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Attribool
+  class ValidatorService
+    def self.call(validator, *args)
+      new(validator, *args).validate
+    end
+
+    def initialize(validator, *args)
+      @validator = ::Attribool::Validators.const_get(
+        "#{validator.to_s.split("_").map(&:capitalize).join}Validator"
+      ).new(*args)
+    end
+
+    def validate
+      @validator.valid? || raise(@validator.error)
+    end
+  end
+end

data/lib/attribool/validators/attribute_list_validator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Attribool::Validators
+  class AttributeListValidator
+    def initialize(*items)
+      @items = items
+    end
+
+    def valid?
+      @items.all?(Attribool::Attribute)
+    end
+
+    def error
+      TypeError.new("All items must be an instance of Attribool::Attribute")
+    end
+  end
+end

data/lib/attribool/validators/condition_validator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Attribool::Validators
+  class ConditionValidator
+    def initialize(condition)
+      @condition = condition
+    end
+
+    def valid?
+      @condition.nil? || @condition.is_a?(Proc)
+    end
+
+    def error
+      ArgumentError.new("Condition is not a proc")
+    end
+  end
+end

data/lib/attribool/validators/method_name_validator.rb

@@ -4,11 +4,10 @@ module Attribool::Validators
   ##
   # Ensures that if multiple attributes are being defined, and +method_name+
   # is provided, that +method_name+ is a +Proc+.
-  class MethodNameValidator < Attribool::Validators::Validator
+  class MethodNameValidator
     def initialize(method_name, number_of_attributes)
       @method_name = method_name
       @number_of_attributes = number_of_attributes
-      super
     end
 
     def valid?

data/lib/attribool/validators/nil_attribute_validator.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 module Attribool::Validators
-  class NilAttributeValidator < Attribool::Validators::Validator
+  class NilAttributeValidator
     def initialize(ivar, value, allow_nil)
       @ivar = ivar
       @value = value
       @allow_nil = allow_nil
-      super
     end
 
     def valid?

data/lib/attribool/validators/strict_boolean_validator.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 module Attribool::Validators
-  class StrictBooleanValidator < Attribool::Validators::Validator
+  class StrictBooleanValidator
     def initialize(value, strict)
       @value = value
       @strict = strict
-      super
     end
 
     def valid?

data/lib/attribool/value.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Attribool
+  class Value
+    def initialize(value, condition = nil)
+      ValidatorService.call(:condition, condition)
+      @value = value
+      @condition = condition
+    end
+
+    def to_boolean
+      !!(@condition ? @condition.call(@value) : @value)
+    end
+  end
+end

data/lib/attribool/version.rb

@@ -21,7 +21,7 @@ module Attribool
     # Patch version.
     #
     # @return [Integer]
-    PATCH = 0
+    PATCH = 2
 
     module_function
 

data/lib/attribool.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
 require_relative "attribool/version"
+require_relative "attribool/value"
 require_relative "attribool/attribute"
 require_relative "attribool/reader_name"
 require_relative "attribool/attribute_list"
-require_relative "attribool/validators/validator"
+require_relative "attribool/validator_service"
+require_relative "attribool/validators/condition_validator"
 require_relative "attribool/validators/method_name_validator"
 require_relative "attribool/validators/nil_attribute_validator"
 require_relative "attribool/validators/strict_boolean_validator"
+require_relative "attribool/validators/attribute_list_validator"
 
 ##
 # Adds macros for dealing with boolean attributes.
@@ -40,14 +43,14 @@ module Attribool
   #
   # @kwarg [Symbol, String, Proc] method_name
   def bool_reader(*attributes, allow_nil: true, method_name: nil, condition: nil)
-    Validators::MethodNameValidator.validate(method_name, attributes.size)
+    ValidatorService.call(:method_name, method_name, attributes.size)
 
-    AttributeList.new(*attributes, method_name: method_name).each do |attribute|
+    AttributeList.build(*attributes, method_name: method_name).each do |attribute|
       define_method(attribute.reader) do
         instance_variable_get(attribute.ivar).then do |value|
-          Validators::NilAttributeValidator.validate(attribute.ivar, value, allow_nil)
+          ValidatorService.call(:nil_attribute, attribute.ivar, value, allow_nil)
 
-          !!(condition ? condition.call(value) : value)
+          Value.new(value, condition).to_boolean
         end
       end
     end
@@ -61,11 +64,11 @@ module Attribool
   #
   # @kwarg [Boolean] strict
   def bool_writer(*attributes, strict: false)
-    AttributeList.new(*attributes).each do |attribute|
+    AttributeList.build(*attributes).each do |attribute|
       define_method(attribute.writer) do |value|
-        Validators::StrictBooleanValidator.validate(value, strict)
+        ValidatorService.call(:strict_boolean, value, strict)
 
-        instance_variable_set(attribute.ivar, !!value)
+        instance_variable_set(attribute.ivar, Value.new(value).to_boolean)
       end
     end
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: attribool
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Evan Gray
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -96,10 +110,13 @@ files:
 - lib/attribool/attribute.rb
 - lib/attribool/attribute_list.rb
 - lib/attribool/reader_name.rb
+- lib/attribool/validator_service.rb
+- lib/attribool/validators/attribute_list_validator.rb
+- lib/attribool/validators/condition_validator.rb
 - lib/attribool/validators/method_name_validator.rb
 - lib/attribool/validators/nil_attribute_validator.rb
 - lib/attribool/validators/strict_boolean_validator.rb
-- lib/attribool/validators/validator.rb
+- lib/attribool/value.rb
 - lib/attribool/version.rb
 homepage: https://github.com/evanthegrayt/attribool
 licenses:

data/lib/attribool/validators/validator.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Attribool::Validators
-  class Validator
-    def self.validate(*args)
-      new(*args).validate
-    end
-
-    def initialize(*)
-      raise "#{self.class} is an abstract class" if base_class?
-    end
-
-    def validate
-      valid? || raise(error)
-    end
-
-    def valid?
-      raise NoMethodError, "Validator must implement `valid?'"
-    end
-
-    def error
-      raise NoMethodError, "Validator must implement `error'"
-    end
-
-    private
-
-    def base_class?
-      instance_of?(Attribool::Validators::Validator)
-    end
-  end
-end