sinclair 2.1.1 → 3.0.0

data/lib/sinclair/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Sinclair
-  VERSION = '2.1.1'
+  VERSION = '3.0.0'
 end

data/lib/sinclair.rb

@@ -294,8 +294,8 @@ class Sinclair
   #     person.bond_name # returns 'Bond, James Bond'
   #
   # @return [Array<MethodDefinition>] the list of all currently defined instance methods
-  def add_method(*args, type: nil, **options, &block)
-    definitions.add(*args, type: type, **options, &block)
+  def add_method(*, type: nil, **, &)
+    definitions.add(*, type:, **, &)
   end
 
   # Add a method to the method list to be created on klass
@@ -379,8 +379,8 @@ class Sinclair
   #     env_fetcher.timeout # returns '10'
   #
   # @return [Array<MethodDefinition>] the list of all currently defined class methods
-  def add_class_method(*args, type: nil, **options, &block)
-    class_definitions.add(*args, type: type, **options, &block)
+  def add_class_method(*, type: nil, **, &)
+    class_definitions.add(*, type:, **, &)
   end
 
   # Evaluetes a block which will result in a String, the method code
@@ -453,8 +453,8 @@ class Sinclair
   #
   #   Purchase.new(2.3, 5).total_price # returns 11.5
   # @return [Array<MethodDefinition>] the list of all currently defined instance methods
-  def eval_and_add_method(name, &block)
-    add_method(name, instance_eval(&block))
+  def eval_and_add_method(name, &)
+    add_method(name, instance_eval(&))
   end
 
   private

data/sinclair.gemspec

@@ -12,29 +12,12 @@ Gem::Specification.new do |gem|
   gem.homepage              = 'https://github.com/darthjee/sinclair'
   gem.description           = 'Gem for easy concern creation'
   gem.summary               = gem.description
-  gem.required_ruby_version = '>= 2.5.0'
+  gem.required_ruby_version = '>= 3.3.1'
 
   gem.files                 = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables           = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  gem.test_files            = gem.files.grep(%r{^(test|gem|features)/})
   gem.require_paths         = ['lib']
+  gem.metadata['rubygems_mfa_required'] = 'false'
 
-  gem.add_runtime_dependency 'activesupport', '~> 7.0.4'
-
-  gem.add_development_dependency 'bundler',            '>= 2.3.25'
-  gem.add_development_dependency 'pry',                '0.14.1'
-  gem.add_development_dependency 'pry-nav',            '1.0.0'
-  gem.add_development_dependency 'rake',               '13.0.1'
-  gem.add_development_dependency 'reek',               '6.0.3'
-  gem.add_development_dependency 'rspec',              '3.11.0'
-  gem.add_development_dependency 'rspec-core',         '3.11.0'
-  gem.add_development_dependency 'rspec-expectations', '3.11.0'
-  gem.add_development_dependency 'rspec-mocks',        '3.11.1'
-  gem.add_development_dependency 'rspec-support',      '3.11.0'
-  gem.add_development_dependency 'rubocop',            '0.80.1'
-  gem.add_development_dependency 'rubocop-rspec',      '1.38.1'
-  gem.add_development_dependency 'rubycritic',         '4.7.0'
-  gem.add_development_dependency 'simplecov',          '0.21.2'
-  gem.add_development_dependency 'yard',               '0.9.27'
-  gem.add_development_dependency 'yardstick',          '0.9.9'
+  gem.add_dependency 'activesupport', '~> 7.2.x'
 end

data/spec/integration/readme/my_class_spec.rb

@@ -10,9 +10,9 @@ describe MyClass do
   let(:age)   { 20 }
   let(:attributes) do
     {
-      name: name,
+      name:,
       surname: 'surname',
-      age: age,
+      age:,
       legs: 2
     }
   end

data/spec/integration/readme/sinclair/model_spec.rb

@@ -11,14 +11,14 @@ describe Sinclair::Model do
       expect(human1.name).to eq('John Doe')
       expect(human1.age).to eq(22)
       expect(human1.gender).to eq(:undefined)
-      expect(human1 == human2).to eq(true)
+      expect(human1 == human2).to be(true)
     end
 
     it 'Without comparable' do
       tv1 = Tv.new(model: 'Sans Sunga Xt')
       tv2 = Tv.new(model: 'Sans Sunga Xt')
 
-      expect(tv1 == tv2).to eq(false)
+      expect(tv1 == tv2).to be(false)
     end
   end
 end

data/spec/integration/readme/sinclair/options_spec.rb

@@ -11,7 +11,7 @@ describe Sinclair::Options do
       )
 
       expect(options.timeout).to eq(10)
-      expect(options.retries).to eq(nil)
+      expect(options.retries).to be_nil
       expect(options.protocol).to eq('http')
       expect(options.port).to eq(443)
     end

data/spec/integration/yard/sinclair/add_class_method_spec.rb

@@ -19,7 +19,7 @@ describe 'yard Sinclair#add_class_method' do
   describe 'Adding a method by Block' do
     it 'returns the timeout' do
       builder = Sinclair.new(klass)
-      builder.add_class_method(:timeout) { ENV['TIMEOUT'] }
+      builder.add_class_method(:timeout) { ENV.fetch('TIMEOUT', nil) }
       builder.build
       ENV['TIMEOUT'] = '300'
 
@@ -30,7 +30,7 @@ describe 'yard Sinclair#add_class_method' do
   describe 'Passing type block' do
     it 'creates new method' do
       builder = Sinclair.new(klass)
-      builder.add_class_method(:timeout, type: :block) { ENV['TIMEOUT'] }
+      builder.add_class_method(:timeout, type: :block) { ENV.fetch('TIMEOUT', nil) }
       builder.build
       ENV['TIMEOUT'] = '300'
 

data/spec/integration/yard/sinclair/caster/cast_spec.rb

@@ -15,8 +15,8 @@ describe 'yard Sinclair::Caster' do
     it 'Casts passing parameter' do
       base = Random.rand(3..6)
       initial = Random.rand(10..20)
-      log = MathCaster.cast(initial, :log, base: base)
-      exp = MathCaster.cast(log, :exp, base: base)
+      log = MathCaster.cast(initial, :log, base:)
+      exp = MathCaster.cast(log, :exp, base:)
 
       expect(exp).to be_between(initial - 0.0001, initial + 0.0001)
     end

data/spec/integration/yard/sinclair/caster/cast_with_spec.rb

@@ -45,7 +45,7 @@ describe 'yard Sinclair::Caster.cast_with' do
     values.map! do |config|
       value = config[:value]
       klass = config[:klass]
-      my_caster.cast(value, klass, klass: klass)
+      my_caster.cast(value, klass, klass:)
     end
 
     expect(values[0]).to eq('{"name":"john","age":20,"country":"BR"}')

data/spec/integration/yard/sinclair/config_factory_spec.rb

@@ -6,8 +6,8 @@ describe Sinclair::ConfigFactory do
   describe '#yard' do
     subject(:factory) do
       described_class.new(
-        config_class: config_class,
-        config_attributes: config_attributes
+        config_class:,
+        config_attributes:
       )
     end
 
@@ -74,13 +74,13 @@ describe Sinclair::ConfigFactory do
 
       describe 'Setting name with hash and block' do
         it 'sets name on config' do
-          expect { factory.configure(email: email) { name 'John' } }
+          expect { factory.configure(email:) { name 'John' } }
             .to change(config, :name)
             .from(nil).to('John')
         end
 
         it 'sets email on config' do
-          expect { factory.configure(email: email) { name 'John' } }
+          expect { factory.configure(email:) { name 'John' } }
             .to change(config, :email)
             .from(nil).to(email)
         end

data/spec/integration/yard/sinclair/core_ext/object_spec.rb

@@ -7,8 +7,8 @@ describe Object do
         it do
           object = [1, 2, 3]
 
-          expect(object.is_any?(Hash, Class)).to eq(false)
-          expect(object.is_any?(Hash, Array)).to eq(true)
+          expect(object.is_any?(Hash, Class)).to be(false)
+          expect(object.is_any?(Hash, Array)).to be(true)
         end
       end
     end

data/spec/lib/sinclair/chain_settable_spec.rb

@@ -69,7 +69,7 @@ describe Sinclair::ChainSettable do
 
   context 'when none has value' do
     let(:default)      { 'some_default_username' }
-    let(:options_hash) { { default: default } }
+    let(:options_hash) { { default: } }
 
     it 'returns the first value' do
       expect(settable.username).to eq(default)

data/spec/lib/sinclair/config_factory_spec.rb

@@ -153,7 +153,7 @@ describe Sinclair::ConfigFactory do
     end
 
     context 'when config class was set from common class' do
-      subject(:factory) { described_class.new(config_class: config_class) }
+      subject(:factory) { described_class.new(config_class:) }
 
       let(:config_class) { Class.new }
 

data/spec/lib/sinclair/equals_checker/reader_spec.rb

@@ -6,7 +6,7 @@ describe Sinclair::EqualsChecker::Reader do
   subject(:reader) { described_class.new(attribute) }
 
   let(:attribute) { :information }
-  let(:model)     { SampleModel.new(name: name, age: age) }
+  let(:model)     { SampleModel.new(name:, age:) }
   let(:name)      { 'The Name' }
   let(:age)       { 25 }
 

data/spec/lib/sinclair/matchers/add_class_method_spec.rb

@@ -23,7 +23,7 @@ describe Sinclair::Matchers::AddClassMethod do
       expect { matcher.matches?(proc {}) }
         .to raise_error(
           SyntaxError, 'You should specify which class the method is being added to' \
-          "add_class_method(:#{method}).to(klass)"
+                       "add_class_method(:#{method}).to(klass)"
         )
     end
   end

data/spec/lib/sinclair/matchers/add_class_method_to_spec.rb

@@ -60,7 +60,7 @@ describe Sinclair::Matchers::AddClassMethodTo do
         expect { matcher.matches?(event_proc) { 1 } }
           .to raise_error(
             SyntaxError, 'Block not received by the `add_class_method_to` matcher. ' \
-            'Perhaps you want to use `{ ... }` instead of do/end?'
+                         'Perhaps you want to use `{ ... }` instead of do/end?'
           )
       end
     end

data/spec/lib/sinclair/matchers/add_instance_method_spec.rb

@@ -25,7 +25,7 @@ describe Sinclair::Matchers::AddInstanceMethod do
       expect { matcher.matches?(proc {}) }
         .to raise_error(
           SyntaxError, 'You should specify which instance the method is being added to' \
-          "add_method(:#{method}).to(instance)"
+                       "add_method(:#{method}).to(instance)"
         )
     end
   end

data/spec/lib/sinclair/matchers/add_instance_method_to_spec.rb

@@ -69,7 +69,7 @@ describe Sinclair::Matchers::AddInstanceMethodTo do
         expect { matcher.matches?(event_proc) { 1 } }
           .to raise_error(
             SyntaxError, 'Block not received by the `add_instance_method_to` matcher. ' \
-            'Perhaps you want to use `{ ... }` instead of do/end?'
+                         'Perhaps you want to use `{ ... }` instead of do/end?'
           )
       end
     end

data/spec/lib/sinclair/matchers/change_class_method_on_spec.rb

@@ -54,7 +54,7 @@ describe Sinclair::Matchers::ChangeClassMethodOn do
         expect { matcher.matches?(event_proc) { 1 } }
           .to raise_error(
             SyntaxError, 'Block not received by the `change_class_method_on` matcher. ' \
-            'Perhaps you want to use `{ ... }` instead of do/end?'
+                         'Perhaps you want to use `{ ... }` instead of do/end?'
           )
       end
     end

data/spec/lib/sinclair/matchers/change_class_method_spec.rb

@@ -25,7 +25,7 @@ describe Sinclair::Matchers::ChangeClassMethod do
       expect { matcher.matches?(proc {}) }
         .to raise_error(
           SyntaxError, 'You should specify which class the method is being changed on' \
-          "change_class_method(:#{method}).on(klass)"
+                       "change_class_method(:#{method}).on(klass)"
         )
     end
   end

data/spec/lib/sinclair/matchers/change_instance_method_on_spec.rb

@@ -65,7 +65,7 @@ describe Sinclair::Matchers::ChangeInstanceMethodOn do
         expect { matcher.matches?(event_proc) { 1 } }
           .to raise_error(
             SyntaxError, 'Block not received by the `change_instance_method_on` matcher. ' \
-            'Perhaps you want to use `{ ... }` instead of do/end?'
+                         'Perhaps you want to use `{ ... }` instead of do/end?'
           )
       end
     end

data/spec/lib/sinclair/matchers/change_instance_method_spec.rb

@@ -25,7 +25,7 @@ describe Sinclair::Matchers::ChangeInstanceMethod do
       expect { matcher.matches?(proc {}) }
         .to raise_error(
           SyntaxError, 'You should specify which instance the method is being changed on' \
-          "change_method(:#{method}).on(instance)"
+                       "change_method(:#{method}).on(instance)"
         )
     end
   end

data/spec/lib/sinclair/method_builder/base_spec.rb

@@ -8,7 +8,7 @@ describe Sinclair::MethodBuilder::Base do
     let(:type)  { Sinclair::MethodBuilder::CLASS_METHOD }
 
     it do
-      expect { described_class.build(klass, instance_of(described_class), type: type) }
+      expect { described_class.build(klass, instance_of(described_class), type:) }
         .to raise_error(NotImplementedError)
     end
   end

data/spec/lib/sinclair/method_builder/block_method_builder_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Sinclair::MethodBuilder::BlockMethodBuilder do
   describe '#build' do
     subject(:builder) do
-      described_class.new(klass, definition, type: type)
+      described_class.new(klass, definition, type:)
     end
 
     let(:klass)       { Class.new }

data/spec/lib/sinclair/method_builder/call_method_builder_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Sinclair::MethodBuilder::CallMethodBuilder do
   describe '#build' do
     subject(:builder) do
-      described_class.new(klass, definition, type: type)
+      described_class.new(klass, definition, type:)
     end
 
     let(:call_name) { "attr_#{accessor_type}" }

data/spec/lib/sinclair/method_builder/string_method_builder_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Sinclair::MethodBuilder::StringMethodBuilder do
   describe '#build' do
     subject(:builder) do
-      described_class.new(klass, definition, type: type)
+      described_class.new(klass, definition, type:)
     end
 
     let(:klass)       { Class.new }

data/spec/lib/sinclair/method_definition_spec.rb

@@ -28,6 +28,7 @@ describe Sinclair::MethodDefinition do
           attr_reader :name
 
           def initialize(name)
+            super
             @name = name
           end
 

data/spec/lib/sinclair/method_definitions_spec.rb

@@ -48,22 +48,22 @@ describe Sinclair::MethodDefinitions do
       let(:arguments) { %i[attr_reader some_attribute other_attribute] }
 
       it do
-        expect(definitions.add(*arguments, type: type))
+        expect(definitions.add(*arguments, type:))
           .to be_a(Array)
       end
 
       it 'creates a new definition' do
-        expect(definitions.add(*arguments, type: type).last)
+        expect(definitions.add(*arguments, type:).last)
           .to be_a(Sinclair::MethodDefinition)
       end
 
       it 'creates a new definition of the chosen type' do
-        expect(definitions.add(*arguments, type: type).last)
+        expect(definitions.add(*arguments, type:).last)
           .to be_a(Sinclair::MethodDefinition::CallDefinition)
       end
 
       it 'initializes it correctly' do
-        expect { klass.module_eval(&definitions.add(*arguments, type: type).last.code_block) }
+        expect { klass.module_eval(&definitions.add(*arguments, type:).last.code_block) }
           .to add_method(:some_attribute).to(klass)
       end
     end
@@ -89,7 +89,7 @@ describe Sinclair::MethodDefinitions do
       end
 
       it 'initializes it correctly' do
-        expect(definitions.add(method_name, type: type, &block).last.name)
+        expect(definitions.add(method_name, type:, &block).last.name)
           .to eq(method_name)
       end
     end
@@ -100,22 +100,22 @@ describe Sinclair::MethodDefinitions do
       let(:code)        { '10' }
 
       it do
-        expect(definitions.add(method_name, code, type: type))
+        expect(definitions.add(method_name, code, type:))
           .to be_a(Array)
       end
 
       it 'creates a new definition' do
-        expect(definitions.add(method_name, code, type: type).last)
+        expect(definitions.add(method_name, code, type:).last)
           .to be_a(Sinclair::MethodDefinition)
       end
 
       it 'creates a new definition of the chosen type' do
-        expect(definitions.add(method_name, code, type: type).last)
+        expect(definitions.add(method_name, code, type:).last)
           .to be_a(Sinclair::MethodDefinition::StringDefinition)
       end
 
       it 'initializes it correctly' do
-        expect(definitions.add(method_name, code, type: type).last.name)
+        expect(definitions.add(method_name, code, type:).last.name)
           .to eq(method_name)
       end
     end

data/spec/lib/sinclair/model_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Sinclair::Model do
-  subject(:model) { klass.new(name: name) }
+  subject(:model) { klass.new(name:) }
 
   let(:name)       { SecureRandom.hex(10) }
   let(:attributes) { %i[name] }
@@ -55,7 +55,7 @@ describe Sinclair::Model do
     end
 
     context 'when class is subclass of another model' do
-      subject(:model) { klass.new(name: name, age: age) }
+      subject(:model) { klass.new(name:, age:) }
 
       let(:age) { Random.rand(10..20) }
 
@@ -72,7 +72,7 @@ describe Sinclair::Model do
       end
 
       it 'is initialized with both attributes' do
-        expect { klass.new(name: name, age: age) }
+        expect { klass.new(name:, age:) }
           .not_to raise_error
       end
 

data/spec/lib/sinclair/options/class_methods_spec.rb

@@ -107,7 +107,7 @@ describe Sinclair::Options::ClassMethods do
           .to change {
             klass.invalid_options_in(test_keys)
           }.from(%i[protocol port invalid])
-          .to([:invalid])
+           .to([:invalid])
       end
 
       it do

data/spec/lib/sinclair/options_spec.rb

@@ -20,7 +20,7 @@ describe Sinclair::Options do
 
     context 'when initializing with valid args' do
       subject(:options) do
-        klass.new(timeout: timeout, protocol: 'http')
+        klass.new(timeout:, protocol: 'http')
       end
 
       let(:timeout) { Random.rand(10..19) }
@@ -44,7 +44,7 @@ describe Sinclair::Options do
 
     context 'when initializing subclass with valid args' do
       subject(:options) do
-        klass.new(timeout: timeout, protocol: 'http')
+        klass.new(timeout:, protocol: 'http')
       end
 
       let(:klass)   { Class.new(ConnectionOptions) }
@@ -142,7 +142,7 @@ describe Sinclair::Options do
     context 'when overriding values with false' do
       let(:options) { klass.new(protocol: false) }
 
-      it { expect(options.protocol).to eq(false) }
+      it { expect(options.protocol).to be(false) }
     end
   end
 

data/spec/lib/sinclair/settable/builder_spec.rb

@@ -16,7 +16,7 @@ describe Sinclair::Settable::Builder do
   let(:username)   { 'my_login' }
   let(:password)   { Random.rand(10_000).to_s }
   let(:settings)   { %i[username password] }
-  let(:options)    { { prefix: prefix } }
+  let(:options)    { { prefix: } }
 
   let(:builder) do
     described_class.new(settable, *settings, **options)

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ require 'pry-nav'
 
 support_files = File.expand_path('spec/support/**/*.rb')
 
-Dir[support_files].sort.each { |file| require file }
+Dir[support_files].each { |file| require file }
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

data/spec/support/models/default_valueable.rb

@@ -5,7 +5,7 @@ require './spec/support/models/default_value_builder'
 module DefaultValueable
   def default_reader(*methods, value:, accept_nil: false)
     DefaultValueBuilder.new(
-      self, value: value, accept_nil: accept_nil
+      self, value:, accept_nil:
     ).add_default_values(*methods)
   end
 end

data/spec/support/models/env_settings.rb

@@ -13,7 +13,7 @@ module EnvSettings
       env_key = [env_prefix, method_name].compact.join('_').upcase
 
       builder.add_class_method(method_name, cached: true) do
-        ENV[env_key]
+        ENV.fetch(env_key, nil)
       end
 
       builder.build

data/spec/support/models/random_generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RandomGenerator
-  KAPA = 3.9 + Random.rand / 10.0
+  KAPA = 3.9 + (Random.rand / 10.0)
 
   class << self
     def rand

data/spec/support/shared_examples/model.rb

@@ -18,7 +18,7 @@ shared_examples 'sinclair model building' do
     end
 
     it 'returns a new class with a comparable that finds matches' do
-      expect(model).to eq(klass.new(name: name))
+      expect(model).to eq(klass.new(name:))
     end
 
     it 'returns a new class with a comparable that find misses' do
@@ -48,7 +48,7 @@ shared_examples 'sinclair model building' do
     let(:options) { { comparable: false } }
 
     it 'returns a new class without comparable' do
-      expect(model).not_to eq(klass.new(name: name))
+      expect(model).not_to eq(klass.new(name:))
     end
   end
 

data/spec/support/shared_examples/settable.rb

@@ -35,7 +35,7 @@ shared_examples 'settings reading' do
 
   context 'when defining defaults' do
     let(:settings)   { %i[host] }
-    let(:options)    { { prefix: prefix, default: 'my-host.com' } }
+    let(:options)    { { prefix:, default: 'my-host.com' } }
 
     it 'returns default value' do
       expect(settable.host).to eq('my-host.com')
@@ -60,7 +60,7 @@ shared_examples 'settings reading' do
 
   context 'when defining a type' do
     let(:settings) { %i[port] }
-    let(:options)  { { prefix: prefix, type: :integer } }
+    let(:options)  { { prefix:, type: :integer } }
     let(:port)     { Random.rand(10..100) }
 
     context 'when the key is not set' do