attr_extras 6.2.5 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01c4bfc2a6ce3f1ae8735fe122b7abbd65c99be5a17330087e09e028e59b3cb
-  data.tar.gz: c83abb5d1467b7c91b2ff0c54220fa72ebdc2d6ee0deba2c7ca8edc3629f744c
+  metadata.gz: 466f80d1e0d81139ee5eeb996a584fb26b7ae69062e5bce75a901095e1b3ff82
+  data.tar.gz: a8e7b0a9ef95e1375d5a928d65f0c76371c8796c1cca813a4c27a897e32cadbb
 SHA512:
-  metadata.gz: 48893855229adec5435cd0b709c50cf1e631e321197dd23baeaaa54e11c513f1d4f47ac3e9b3ab2268fc6d86c26c519e57c8e12d9c7aa2a7e819e9c5a53d9cfd
-  data.tar.gz: dc63a635eedac54ce49b25eece473e5264b655d2c87852725bc28baeaf4f9c7d516febad45978ba71816c3dec0afc1e5e114c9587c16ad890999a408efe588cd
+  metadata.gz: 68c0d15374bd6a9a3eeaecd3d7b7458ed874e99f05927ac3a07b2c9d6d11c63d7c230347191eb1c06d2501fca387cb032c5d67e580422833afb4967bdc09fb74
+  data.tar.gz: c1012ecd9b537608b382eec96a8a449fc85d8f32dd2ad6380ae6a246cf5d44d3b61c00a7c8be21b32a7a0f4d22afcf7c7a0ca0870877a84dbb587c433b6355e6

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -13,10 +13,10 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["3.0", "2.7", "2.6", "2.5", "jruby-head"]
+        ruby-version: [3.1, "3.0", 2.7, jruby-head]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:

data/.rubocop.yml

@@ -0,0 +1,5 @@
+AllCops:
+  Exclude:
+    - "tmp/**/*"
+inherit_gem:
+  barsoom_utils: shared_rubocop.yml

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [7.1.0](https://github.com/barsoom/attr_extras/releases/tag/v7.1.0)
+
+- Make `static_facade` and `method_object` take a block for initalization.
+
+## [7.0.0](https://github.com/barsoom/attr_extras/releases/tag/v7.0.0)
+
+- Drop end-of-lifed Ruby 2.5 and 2.6.
+- Don't share default value object instances. (We now do a shallow `dup`.) Thanks to [sammo1235](https://github.com/barsoom/attr_extras/pull/46)!
+
 ## [6.2.4](https://github.com/barsoom/attr_extras/releases/tag/v6.2.4)
 
 - Fix keyword argument warnings with Ruby 2.7. Thanks to [Elliot Winkler](https://github.com/barsoom/attr_extras/pull/34)!

data/Gemfile

@@ -1,4 +1,12 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in attr_extras.gemspec
 gemspec
+
+group :development, :test do
+  gem "barsoom_utils"
+  gem "m" # Running individual tests.
+  gem "minitest"
+  gem "rake"
+  gem "rubocop"
+end

data/README.md

@@ -517,17 +517,6 @@ You can run an individual test using the [m](https://github.com/qrush/m) gem:
 The tests are intentionally split into two test suites for reasons described in `Rakefile`.
 
 
-## Contributors
-
-* [Henrik Nyh](https://github.com/henrik)
-* [Joakim Kolsjö](https://github.com/joakimk)
-* [Victor Arias](https://github.com/victorarias)
-* [Teo Ljungberg](https://github.com/teoljungberg)
-* [Kim Persson](https://github.com/lavinia)
-* [Joe Ferris](https://github.com/jferris)
-* [Julien Vanier](https://github.com/monkbroc)
-
-
 ## License
 
 [MIT](LICENSE.txt)

data/attr_extras.gemspec

@@ -2,23 +2,17 @@
 require File.expand_path("../lib/attr_extras/version", __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Henrik Nyh", "Joakim Kolsjö", "Tomas Skogberg", "Victor Arias", "Ola K"]
-  gem.email         = ["henrik@nyh.se"]
+  gem.authors       = [ "Henrik Nyh", "Joakim Kolsjö", "Tomas Skogberg", "Victor Arias", "Ola K" ]
+  gem.email         = [ "henrik@nyh.se" ]
   gem.summary       = %q{Takes some boilerplate out of Ruby with methods like attr_initialize.}
   gem.homepage      = "https://github.com/barsoom/attr_extras"
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "attr_extras"
-  gem.require_paths = ["lib"]
+  gem.require_paths = [ "lib" ]
   gem.license       = "MIT"
   gem.version       = AttrExtras::VERSION
-  gem.metadata       = { "rubygems_mfa_required" => "true" }
-
-  gem.add_development_dependency "minitest", ">= 5"
-  gem.add_development_dependency "m", "~> 1.5.1"  # Running individual tests.
-
-  # For Travis CI.
-  gem.add_development_dependency "rake"
+  gem.metadata      = { "rubygems_mfa_required" => "true" }
 end

data/lib/attr_extras/attr_implement.rb

@@ -1,6 +1,7 @@
 class AttrExtras::AttrImplement
   def initialize(klass, names)
-    @klass, @names = klass, names.dup
+    @klass = klass
+    @names = names.dup
   end
 
   def apply

data/lib/attr_extras/attr_initialize.rb

@@ -2,7 +2,9 @@ require "attr_extras/params_builder"
 
 class AttrExtras::AttrInitialize
   def initialize(klass, names, block)
-    @klass, @names, @block = klass, names, block
+    @klass = klass
+    @names = names
+    @block = block
   end
 
   attr_reader :klass, :names
@@ -19,13 +21,13 @@ class AttrExtras::AttrInitialize
     validate_args = method(:validate_args)
 
     klass.send(:define_method, :initialize) do |*values|
-      hash_values = (values[(klass_params.positional_args.length)..-1] || []).inject(:merge) || {}
+      hash_values = (values[(klass_params.positional_args.length)..-1] || []).reduce(:merge) || {}
 
       validate_arity.call(values.length, self.class)
       validate_args.call(values, klass_params)
 
       klass_params.default_values.each do |name, default_value|
-        instance_variable_set("@#{name}", default_value)
+        instance_variable_set("@#{name}", default_value.dup)
       end
 
       klass_params.positional_args.zip(values).each do |name, value|
@@ -55,7 +57,7 @@ class AttrExtras::AttrInitialize
   end
 
   def validate_args(values, klass_params)
-    hash_values = values[(klass_params.positional_args.length)..-1].inject(:merge) || {}
+    hash_values = values[(klass_params.positional_args.length)..-1].reduce(:merge) || {}
     unknown_keys = hash_values.keys - klass_params.hash_args_names
 
     if unknown_keys.any?

data/lib/attr_extras/attr_value.rb

@@ -1,6 +1,7 @@
 class AttrExtras::AttrValue
   def initialize(klass, *names)
-    @klass, @names = klass, names
+    @klass = klass
+    @names = names
   end
 
   attr_reader :klass, :names

data/lib/attr_extras/explicit.rb

@@ -60,7 +60,7 @@ module AttrExtras
 
     alias_method :attr_accessor_initialize, :aattr_initialize
 
-    def static_facade(method_name_or_names, *names)
+    def static_facade(method_name_or_names, *names, &block)
       if names.any? { |name| name.is_a?(Array) }
         Array(method_name_or_names).each do |method_name|
           define_singleton_method(method_name) do |*args, **opts, &block|
@@ -75,11 +75,11 @@ module AttrExtras
         end
       end
 
-      pattr_initialize(*names)
+      pattr_initialize(*names, &block)
     end
 
-    def method_object(*names)
-      static_facade :call, *names
+    def method_object(*names, &block)
+      static_facade :call, *names, &block
     end
 
     def attr_query(*names)

data/lib/attr_extras/params_builder.rb

@@ -25,13 +25,13 @@ module AttrExtras
       end
 
       def hash_args_required
-        @hash_args_required ||= hash_args.select { |name| name.to_s.end_with?(REQUIRED_SIGN) }.
-          map { |name| remove_required_sign(name) }
+        @hash_args_required ||= hash_args.select { |name| name.to_s.end_with?(REQUIRED_SIGN) }
+          .map { |name| remove_required_sign(name) }
       end
 
       def default_values
         @default_values ||= begin
-          default_values_hash = names.flatten.select { |name| name.is_a?(Hash) }.inject(:merge) || {}
+          default_values_hash = names.flatten.select { |name| name.is_a?(Hash) }.reduce(:merge) || {}
 
           default_values_hash.map { |name, value|
             [ remove_required_sign(name), value ]

data/lib/attr_extras/utils.rb

@@ -1,7 +1,8 @@
 module AttrExtras::Utils
   def self.flat_names(names)
-    names.flatten.
-      flat_map { |x| x.is_a?(Hash) ? x.keys : x }.
-      map { |x| x.to_s.sub(/!\z/, "") }
+    names
+      .flatten
+      .flat_map { |x| x.is_a?(Hash) ? x.keys : x }
+      .map { |x| x.to_s.sub(/!\z/, "") }
   end
 end

data/lib/attr_extras/version.rb

@@ -1,3 +1,3 @@
 module AttrExtras
-  VERSION = "6.2.5"
+  VERSION = "7.1.0"
 end

data/spec/attr_extras/aattr_initialize_spec.rb

@@ -65,4 +65,29 @@ describe Object, ".aattr_initialize" do
 
     _(example.foo).must_equal "Foo"
   end
+
+  it "does not use the same default value object across class instances" do
+    klass = Class.new do
+      aattr_initialize [:name, items: []]
+    end
+
+    data = [
+      { name: "One", items: [1, 2, 3] },
+      { name: "Two", items: [4, 5, 6] },
+    ]
+
+    results = data.each_with_object([]) do |datum, results|
+      name, items = datum.values_at(:name, :items)
+      foo = klass.new(name: name)
+
+      items.each do |n|
+        foo.items << n
+      end
+
+      results << foo
+    end
+
+    _(results.first.items).must_equal [1, 2, 3]
+    _(results.last.items).must_equal [4, 5, 6]
+  end
 end

data/spec/attr_extras/attr_implement_spec.rb

@@ -13,7 +13,7 @@ describe Object, ".attr_implement" do
 
   it "allows specifying arity and argument names" do
     klass = Class.new do
-      attr_implement :foo, [:name, :age]
+      attr_implement :foo, [ :name, :age ]
     end
 
     example = klass.new
@@ -80,7 +80,7 @@ end
 describe Object, ".cattr_implement" do
   it "applies to class methods" do
     klass = Class.new do
-      cattr_implement :foo, [:name, :age]
+      cattr_implement :foo, [ :name, :age ]
     end
 
     exception = _(lambda { klass.foo(1, 2) }).must_raise AttrExtras::MethodNotImplementedError

data/spec/attr_extras/attr_initialize_spec.rb

@@ -24,7 +24,7 @@ describe Object, ".attr_initialize" do
 
   it "can set ivars from a hash" do
     klass = Class.new do
-      attr_initialize :foo, [:bar, :baz]
+      attr_initialize :foo, [ :bar, :baz ]
     end
 
     example = klass.new("Foo", bar: "Bar", baz: "Baz")
@@ -35,7 +35,7 @@ describe Object, ".attr_initialize" do
 
   it "can set default values for keyword arguments" do
     klass = Class.new do
-      attr_initialize :foo, [:bar, baz: "default baz"]
+      attr_initialize :foo, [ :bar, baz: "default baz" ]
     end
 
     example = klass.new("Foo", bar: "Bar")
@@ -49,7 +49,7 @@ describe Object, ".attr_initialize" do
 
   it "treats hash values as optional" do
     klass = Class.new do
-      attr_initialize :foo, [:bar, :baz]
+      attr_initialize :foo, [ :bar, :baz ]
     end
 
     example = klass.new("Foo", bar: "Bar")
@@ -61,7 +61,7 @@ describe Object, ".attr_initialize" do
 
   it "can require hash values" do
     klass = Class.new do
-      attr_initialize [:optional, :required!]
+      attr_initialize [ :optional, :required! ]
     end
 
     example = klass.new(required: "X")
@@ -72,7 +72,7 @@ describe Object, ".attr_initialize" do
 
   it "complains about unknown hash values" do
     klass = Class.new do
-      attr_initialize :foo, [:bar, :baz!]
+      attr_initialize :foo, [ :bar, :baz! ]
     end
 
     # Should not raise.
@@ -85,7 +85,7 @@ describe Object, ".attr_initialize" do
   # Regression.
   it "assigns hash values to positional arguments even when there's also hash arguments" do
     klass = Class.new do
-      attr_initialize :foo, [:bar]
+      attr_initialize :foo, [ :bar ]
     end
 
     # Should not raise.
@@ -95,7 +95,7 @@ describe Object, ".attr_initialize" do
   # Regression.
   it "only looks at hash arguments when determining missing required keys" do
     klass = Class.new do
-      attr_initialize :foo, [:bar!]
+      attr_initialize :foo, [ :bar! ]
     end
 
     # Provides a hash to "foo" but does not provide "bar".

data/spec/attr_extras/method_object_spec.rb

@@ -26,6 +26,20 @@ describe Object, ".method_object" do
     assert klass.call
   end
 
+  it "accepts a block for initialization" do
+    klass = Class.new do
+      method_object :value do
+        @copy = @value
+      end
+
+      attr_reader :copy
+    end
+
+    example = klass.new("expected")
+
+    _(example.copy).must_equal "expected"
+  end
+
   it "passes along any block" do
     klass = Class.new do
       method_object

data/spec/attr_extras/params_builder_spec.rb

@@ -4,7 +4,7 @@ describe AttrExtras::AttrInitialize::ParamsBuilder do
   subject { AttrExtras::AttrInitialize::ParamsBuilder.new(names) }
 
   describe "when positional and hash params are present" do
-    let(:names) { [ :foo, :bar, [ :baz, :qux!, quux: "Quux" ]] }
+    let(:names) { [ :foo, :bar, [ :baz, :qux!, quux: "Quux" ] ] }
 
     it "properly devides params by the type" do
       _(subject.positional_args).must_equal [ :foo, :bar ]
@@ -16,7 +16,7 @@ describe AttrExtras::AttrInitialize::ParamsBuilder do
   end
 
   describe "when only positional params are present" do
-    let(:names) { [ :foo, :bar] }
+    let(:names) { [ :foo, :bar ] }
 
     it "properly devides params by the type" do
       _(subject.positional_args).must_equal [ :foo, :bar ]
@@ -28,7 +28,7 @@ describe AttrExtras::AttrInitialize::ParamsBuilder do
   end
 
   describe "when only hash params are present" do
-    let(:names) { [[ { baz: "Baz" }, :qux!, { quux: "Quux" } ]] }
+    let(:names) { [ [ { baz: "Baz" }, :qux!, { quux: "Quux" } ] ] }
 
     it "properly devides params by the type" do
       _(subject.positional_args).must_be_empty

data/spec/attr_extras/pattr_initialize_spec.rb

@@ -12,7 +12,7 @@ describe Object, ".pattr_initialize" do
 
   it "works with hash ivars" do
     klass = Class.new do
-      pattr_initialize :foo, [:bar, :baz!]
+      pattr_initialize :foo, [ :bar, :baz! ]
     end
 
     example = klass.new("Foo", bar: "Bar", baz: "Baz")

data/spec/attr_extras/static_facade_spec.rb

@@ -45,6 +45,20 @@ describe Object, ".static_facade" do
     assert klass.barable?(false)
   end
 
+  it "accepts a block for initialization" do
+    klass = Class.new do
+      static_facade :foo, :value do
+        @copy = @value
+      end
+
+      attr_reader :copy
+    end
+
+    example = klass.new("expected")
+
+    _(example.copy).must_equal "expected"
+  end
+
   it "passes along any block to the instance method" do
     klass = Class.new do
       static_facade :foo

data/spec/attr_extras/utils_spec.rb

@@ -13,7 +13,7 @@ describe AttrExtras::Utils do
     end
 
     it "flattens hash arguments with defaults and strips any bangs" do
-      _(AttrExtras::Utils.flat_names([ :foo, [ bar: "Bar", baz!: "Baz"] ])).must_equal [ "foo", "bar", "baz" ]
+      _(AttrExtras::Utils.flat_names([ :foo, [ bar: "Bar", baz!: "Baz" ] ])).must_equal [ "foo", "bar", "baz" ]
     end
   end
 end

data/spec/attr_extras/vattr_initialize_spec.rb

@@ -15,7 +15,7 @@ describe Object, ".vattr_initialize" do
 
   it "works with hash ivars" do
     klass = Class.new do
-      vattr_initialize :foo, [:bar, :baz!]
+      vattr_initialize :foo, [ :bar, :baz! ]
     end
 
     example1 = klass.new("Foo", bar: "Bar", baz: "Baz")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attr_extras
 version: !ruby/object:Gem::Version
-  version: 6.2.5
+  version: 7.1.0
 platform: ruby
 authors:
 - Henrik Nyh
@@ -12,50 +12,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
+date: 2023-02-09 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - henrik@nyh.se
@@ -63,8 +21,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -119,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.4.3
 signing_key: 
 specification_version: 4
 summary: Takes some boilerplate out of Ruby with methods like attr_initialize.