attr_extras 6.1.0 → 6.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d927809a2d8cd1a5da0e4e910942027d230dfb45
-  data.tar.gz: 80988c71e715df538d82b902846ca660e5f5a4fb
+SHA256:
+  metadata.gz: e4f8e12f94bbc166632e1a65a52f83ddc14e4982ad57f87043fa285e7e7a8cf2
+  data.tar.gz: 1d621e46616f5df763909d9481f983d60fe4e014a8a9a3b0dbfc2635d8867d71
 SHA512:
-  metadata.gz: 8d9bd920c1a3227cd592dab70c0035124322bc0a358ed535b8aa5e42c6a8fb26bdcde0c85c8ef92a81131179e0b9fafbb928ccff2ab454164bc549cec36bd745
-  data.tar.gz: 96ff27fb9e371d898f3056159a644cb3828ad2e10bc3c83273fb38ab8441661e78f46bf4f2960b59f0af09affaa39cb8033f5a75b64efbc74476705268a73735
+  metadata.gz: 44cade5ed299c18a1e8c01706e04767f1b49f3a934a53759542702fd6435c8ba225b360250dd276a78174fdea32e112ca1155cf20e172db765940ea05ecb3b03
+  data.tar.gz: 7fe165a6de71503666cb3344478c769385d50a31ca11de78cce7f934d87393867a5e2c3bc05703c7a3fdc86dd81da729703452c35d0999600f70b42a35851629

data/.travis.yml

@@ -1,10 +1,6 @@
 language: ruby
 rvm:
-  - 2.6.1
-  - 2.5.3
-  - 2.4.1
-  - 2.3.3
+  - 2.7.1
+  - 2.6.6
+  - 2.5.8
   - jruby-head
-before_install:  # For jruby-head to work.
-  - gem install bundler
-  - gem update bundler

data/CHANGELOG.md

@@ -1,13 +1,34 @@
 # Changelog
 
-# 6.1.0
+## [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)!
+
+## [6.2.3](https://github.com/barsoom/attr_extras/releases/tag/v6.2.3)
+
+- `attr_implement` error says "an 'ear()' method" instead of "a 'ear()' method", when the method starts with a likely vowel.
+
+## [6.2.2](https://github.com/barsoom/attr_extras/releases/tag/v6.2.2)
+
+- Fix warnings with Ruby 2.7. Thanks to [Juanito Fatas](https://github.com/barsoom/attr_extras/pull/31)!
+- Fix deprecation warnings for Minitest 6. Thanks again to [Juanito Fatas](https://github.com/barsoom/attr_extras/pull/30)!
+
+## [6.2.1](https://github.com/barsoom/attr_extras/releases/tag/v6.2.1)
+
+* Bugfix with keyword argument defaults. Thanks to [Roman Dubrovsky](https://github.com/barsoom/attr_extras/pull/29)!
+
+## [6.2.0](https://github.com/barsoom/attr_extras/releases/tag/v6.2.0)
+
+* Another bugfix when passing hash values to positional arguments.
+
+## [6.1.0](https://github.com/barsoom/attr_extras/releases/tag/v6.1.0)
 
 * Bugfix when passing hash values to positional arguments.
 
-# 6.0.0 (yanked)
+## 6.0.0 (yanked)
 
 * Default arguments! Thanks to [Ola K](https://github.com/lesin). For example: `pattr_initialize [:foo, bar: "default value"]`
 
-# 5.2.0 and earlier
+## [5.2.0](https://github.com/barsoom/attr_extras/releases/tag/v5.2.0) and earlier
 
 Please [see Git history](https://github.com/barsoom/attr_extras/releases).

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/attr_extras.svg)](https://badge.fury.io/rb/attr_extras)
 [![Build status](https://secure.travis-ci.org/barsoom/attr_extras.svg)](https://travis-ci.org/#!/barsoom/attr_extras/builds)
 [![Code Climate](https://codeclimate.com/github/barsoom/attr_extras/badges/gpa.svg)](https://codeclimate.com/github/barsoom/attr_extras)
 
@@ -59,14 +60,35 @@ Also provides conveniences for creating value objects, method objects, query met
 
 `attr_initialize [:bar, :baz!]` defines an initializer that takes two keyword arguments, assigning `@bar` (optional) and `@baz` (required).
 
-Keyword arguments can have default values:
-`attr_initialize [:bar, baz: "default value"]` defines an initializer that takes two keyword arguments, assigning `@bar` (optional) and `@baz` (optional with default value `"default value"`).
-
 If you pass unknown keyword arguments, you will get an `ArgumentError`.
 If you don't pass required arguments and don't define default value for them, you will get a `KeyError`.
 
 `attr_initialize` can also accept a block which will be invoked after initialization. This is useful for e.g. initializing private data as necessary.
 
+#### Default values
+
+Keyword arguments can have default values:
+
+`attr_initialize [:bar, baz: "default value"]` defines an initializer that takes two keyword arguments, assigning `@bar` (optional) and `@baz` (optional with default value `"default value"`).
+
+Note that default values are evaluated *when the class is loaded* and not on every instantition. So `attr_initialize [time: Time.now]` might not do what you expect.
+
+You can always use regular Ruby methods to achieve this:
+
+```
+class Foo
+  attr_initialize [:time]
+
+  private
+
+  def time
+    @time || Time.now
+  end
+end
+```
+
+Or just use a regular initializer with default values.
+
 
 ### `attr_private`
 

data/attr_extras.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/attr_extras/version', __FILE__)
+require File.expand_path("../lib/attr_extras/version", __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Henrik Nyh", "Joakim Kolsjö", "Victor Arias", "Ola K"]
+  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"
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = AttrExtras::VERSION
 
   gem.add_development_dependency "minitest", ">= 5"
-  gem.add_development_dependency "m", "~> 1.5.0"  # Running individual tests.
+  gem.add_development_dependency "m", "~> 1.5.1"  # Running individual tests.
 
   # For Travis CI.
   gem.add_development_dependency "rake"

data/lib/attr_extras/attr_implement.rb

@@ -19,7 +19,7 @@ class AttrExtras::AttrImplement
             raise ArgumentError, "wrong number of arguments (#{provided_arity} for #{expected_arity})"
           end
 
-          raise AttrExtras::MethodNotImplementedError, "Implement a '#{name}(#{arg_names.join(", ")})' method"
+          raise AttrExtras::MethodNotImplementedError, "Implement a#{"n" if name[0].match?(/\A[aeiou]/i)} '#{name}(#{arg_names.join(", ")})' method"
         else
           super(name, *args)
         end

data/lib/attr_extras/attr_initialize.rb

@@ -19,7 +19,7 @@ class AttrExtras::AttrInitialize
     validate_args = method(:validate_args)
 
     klass.send(:define_method, :initialize) do |*values|
-      hash_values = values.select { |name| name.is_a?(Hash) }.inject(:merge) || {}
+      hash_values = (values[(klass_params.positional_args.length)..-1] || []).inject(:merge) || {}
 
       validate_arity.call(values.length, self.class)
       validate_args.call(values, klass_params)

data/lib/attr_extras/explicit.rb

@@ -21,9 +21,8 @@ module AttrExtras
     end
 
     def attr_private(*names)
-      # Need this to avoid "private attribute?" warnings when running
-      # the full test suite; not sure why exactly.
-      public
+      # Avoid warnings: https://github.com/barsoom/attr_extras/pull/31
+      return unless names && names.any?
 
       attr_reader(*names)
       private(*names)
@@ -62,9 +61,17 @@ module AttrExtras
     alias_method :attr_accessor_initialize, :aattr_initialize
 
     def static_facade(method_name_or_names, *names)
-      Array(method_name_or_names).each do |method_name|
-        define_singleton_method(method_name) do |*values, &block|
-          new(*values).public_send(method_name, &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|
+            new(*args, **opts).public_send(method_name, &block)
+          end
+        end
+      else
+        Array(method_name_or_names).each do |method_name|
+          define_singleton_method(method_name) do |*args, &block|
+            new(*args).public_send(method_name, &block)
+          end
         end
       end
 

data/lib/attr_extras/utils.rb

@@ -1,5 +1,7 @@
 module AttrExtras::Utils
   def self.flat_names(names)
-    names.flatten.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.1.0"
+  VERSION = "6.2.4"
 end

data/spec/attr_extras/aattr_initialize_spec.rb

@@ -8,7 +8,7 @@ describe Object, ".aattr_initialize" do
 
     example = klass.new("Foo", "Bar")
 
-    example.foo.must_equal "Foo"
+    _(example.foo).must_equal "Foo"
   end
 
   it "creates public writers" do
@@ -19,17 +19,27 @@ describe Object, ".aattr_initialize" do
     example = klass.new("Foo", "Bar")
     example.foo = "Baz"
 
-    example.foo.must_equal "Baz"
+    _(example.foo).must_equal "Baz"
   end
 
   it "works with hash ivars" do
     klass = Class.new do
-      aattr_initialize :foo, [:bar, :baz!]
+      aattr_initialize :foo, [ :bar, :baz! ]
     end
 
     example = klass.new("Foo", bar: "Bar", baz: "Baz")
 
-    example.baz.must_equal "Baz"
+    _(example.baz).must_equal "Baz"
+  end
+
+  it "works with hash ivars and default values" do
+    klass = Class.new do
+      aattr_initialize :foo, [ bar: "Bar", baz!: "Baz" ]
+    end
+
+    example = klass.new("Foo")
+
+    _(example.baz).must_equal "Baz"
   end
 
   it "accepts a block for initialization" do
@@ -43,7 +53,7 @@ describe Object, ".aattr_initialize" do
 
     example = klass.new("expected")
 
-    example.copy.must_equal "expected"
+    _(example.copy).must_equal "expected"
   end
 
   it "accepts the alias attr_accessor_initialize" do
@@ -53,6 +63,6 @@ describe Object, ".aattr_initialize" do
 
     example = klass.new("Foo", "Bar")
 
-    example.foo.must_equal "Foo"
+    _(example.foo).must_equal "Foo"
   end
 end

data/spec/attr_extras/attr_id_query_spec.rb

@@ -15,6 +15,6 @@ describe Object, ".attr_id_query" do
   end
 
   it "requires a trailing questionmark" do
-    lambda { Object.attr_id_query(:foo) }.must_raise ArgumentError
+    _(lambda { Object.attr_id_query(:foo) }).must_raise ArgumentError
   end
 end

data/spec/attr_extras/attr_implement_spec.rb

@@ -7,8 +7,8 @@ describe Object, ".attr_implement" do
     end
 
     example = klass.new
-    exception = lambda { example.foo }.must_raise AttrExtras::MethodNotImplementedError
-    exception.message.must_equal "Implement a 'foo()' method"
+    exception = _(lambda { example.foo }).must_raise AttrExtras::MethodNotImplementedError
+    _(exception.message).must_equal "Implement a 'foo()' method"
   end
 
   it "allows specifying arity and argument names" do
@@ -18,10 +18,10 @@ describe Object, ".attr_implement" do
 
     example = klass.new
 
-    exception = lambda { example.foo(1, 2) }.must_raise AttrExtras::MethodNotImplementedError
-    exception.message.must_equal "Implement a 'foo(name, age)' method"
+    exception = _(lambda { example.foo(1, 2) }).must_raise AttrExtras::MethodNotImplementedError
+    _(exception.message).must_equal "Implement a 'foo(name, age)' method"
 
-    lambda { example.foo }.must_raise ArgumentError
+    _(lambda { example.foo }).must_raise ArgumentError
   end
 
   it "does not raise if method is implemented in a subclass" do
@@ -35,7 +35,7 @@ describe Object, ".attr_implement" do
       end
     end
 
-    subklass.new.foo.must_equal "bar"
+    _(subklass.new.foo).must_equal "bar"
   end
 
   # E.g. when Active Record defines column query methods like "admin?"
@@ -55,7 +55,7 @@ describe Object, ".attr_implement" do
       include foo_interface
     end
 
-    klass.new.foo.must_equal "bar"
+    _(klass.new.foo).must_equal "bar"
   end
 
   it "does not mess up missing-method handling" do
@@ -63,7 +63,17 @@ describe Object, ".attr_implement" do
       attr_implement :foo
     end
 
-    lambda { klass.new.some_other_method }.must_raise NoMethodError
+    _(lambda { klass.new.some_other_method }).must_raise NoMethodError
+  end
+
+  it "says 'an' if followed by a vowel" do
+    klass = Class.new do
+      attr_implement :ear
+    end
+
+    example = klass.new
+    exception = _(lambda { example.ear }).must_raise AttrExtras::MethodNotImplementedError
+    _(exception.message).must_equal "Implement an 'ear()' method"
   end
 end
 
@@ -73,9 +83,9 @@ describe Object, ".cattr_implement" do
       cattr_implement :foo, [:name, :age]
     end
 
-    exception = lambda { klass.foo(1, 2) }.must_raise AttrExtras::MethodNotImplementedError
-    exception.message.must_equal "Implement a 'foo(name, age)' method"
+    exception = _(lambda { klass.foo(1, 2) }).must_raise AttrExtras::MethodNotImplementedError
+    _(exception.message).must_equal "Implement a 'foo(name, age)' method"
 
-    lambda { klass.foo }.must_raise ArgumentError
+    _(lambda { klass.foo }).must_raise ArgumentError
   end
 end

data/spec/attr_extras/attr_initialize_spec.rb

@@ -13,13 +13,13 @@ describe Object, ".attr_initialize" do
 
   it "creates an initializer setting those instance variables" do
     example = klass.new("Foo", "Bar")
-    example.instance_variable_get("@foo").must_equal "Foo"
-    example.instance_variable_get("@bar").must_equal "Bar"
+    _(example.instance_variable_get("@foo")).must_equal "Foo"
+    _(example.instance_variable_get("@bar")).must_equal "Bar"
   end
 
   it "requires all arguments" do
-    exception = lambda { klass.new("Foo") }.must_raise ArgumentError
-    exception.message.must_equal "wrong number of arguments (1 for 2) for ExampleClass initializer"
+    exception = _(lambda { klass.new("Foo") }).must_raise ArgumentError
+    _(exception.message).must_equal "wrong number of arguments (1 for 2) for ExampleClass initializer"
   end
 
   it "can set ivars from a hash" do
@@ -28,9 +28,9 @@ describe Object, ".attr_initialize" do
     end
 
     example = klass.new("Foo", bar: "Bar", baz: "Baz")
-    example.instance_variable_get("@foo").must_equal "Foo"
-    example.instance_variable_get("@bar").must_equal "Bar"
-    example.instance_variable_get("@baz").must_equal "Baz"
+    _(example.instance_variable_get("@foo")).must_equal "Foo"
+    _(example.instance_variable_get("@bar")).must_equal "Bar"
+    _(example.instance_variable_get("@baz")).must_equal "Baz"
   end
 
   it "can set default values for keyword arguments" do
@@ -39,12 +39,12 @@ describe Object, ".attr_initialize" do
     end
 
     example = klass.new("Foo", bar: "Bar")
-    example.instance_variable_get("@foo").must_equal "Foo"
-    example.instance_variable_get("@bar").must_equal "Bar"
-    example.instance_variable_get("@baz").must_equal "default baz"
+    _(example.instance_variable_get("@foo")).must_equal "Foo"
+    _(example.instance_variable_get("@bar")).must_equal "Bar"
+    _(example.instance_variable_get("@baz")).must_equal "default baz"
 
     example = klass.new("Foo", bar: "Bar", baz: "Baz")
-    example.instance_variable_get("@baz").must_equal "Baz"
+    _(example.instance_variable_get("@baz")).must_equal "Baz"
   end
 
   it "treats hash values as optional" do
@@ -53,10 +53,10 @@ describe Object, ".attr_initialize" do
     end
 
     example = klass.new("Foo", bar: "Bar")
-    example.instance_variable_defined?("@baz").must_equal false
+    _(example.instance_variable_defined?("@baz")).must_equal false
 
     example = klass.new("Foo")
-    example.instance_variable_defined?("@bar").must_equal false
+    _(example.instance_variable_defined?("@bar")).must_equal false
   end
 
   it "can require hash values" do
@@ -65,9 +65,9 @@ describe Object, ".attr_initialize" do
     end
 
     example = klass.new(required: "X")
-    example.instance_variable_get("@required").must_equal "X"
+    _(example.instance_variable_get("@required")).must_equal "X"
 
-    lambda { klass.new(optional: "X") }.must_raise KeyError
+    _(lambda { klass.new(optional: "X") }).must_raise KeyError
   end
 
   it "complains about unknown hash values" do
@@ -78,8 +78,8 @@ describe Object, ".attr_initialize" do
     # Should not raise.
     klass.new("Foo", bar: "Bar", baz: "Baz")
 
-    exception = lambda { klass.new("Foo", bar: "Bar", baz: "Baz", hello: "Hello") }.must_raise ArgumentError
-    exception.message.must_include "[:hello]"
+    exception = _(lambda { klass.new("Foo", bar: "Bar", baz: "Baz", hello: "Hello") }).must_raise ArgumentError
+    _(exception.message).must_include "[:hello]"
   end
 
   # Regression.
@@ -99,8 +99,21 @@ describe Object, ".attr_initialize" do
     end
 
     # Provides a hash to "foo" but does not provide "bar".
-    exception = lambda { klass.new({ bar: 123 }) }.must_raise KeyError
-    exception.message.must_include "[:bar]"
+    exception = _(lambda { klass.new({ bar: 123 }) }).must_raise KeyError
+    _(exception.message).must_include "[:bar]"
+  end
+
+  # Regression.
+  it "doesn't store hash values to positional arguments as ivars" do
+    klass = Class.new do
+      attr_initialize :foo
+      attr_reader :foo
+    end
+
+    # Should not raise.
+    example = klass.new({ "invalid.ivar.name" => 123 })
+
+    _(example.foo).must_equal({ "invalid.ivar.name" => 123 })
   end
 
   it "accepts a block for initialization" do
@@ -114,6 +127,6 @@ describe Object, ".attr_initialize" do
 
     example = klass.new("expected")
 
-    example.copy.must_equal "expected"
+    _(example.copy).must_equal "expected"
   end
 end

data/spec/attr_extras/attr_private_spec.rb

@@ -11,8 +11,8 @@ describe Object, ".attr_private" do
     example = klass.new
     example.instance_variable_set("@foo", "Foo")
     example.instance_variable_set("@bar", "Bar")
-    example.send(:foo).must_equal "Foo"
-    example.send(:bar).must_equal "Bar"
-    lambda { example.foo }.must_raise NoMethodError
+    _(example.send(:foo)).must_equal "Foo"
+    _(example.send(:bar)).must_equal "Bar"
+    _(lambda { example.foo }).must_raise NoMethodError
   end
 end

data/spec/attr_extras/attr_query_spec.rb

@@ -14,6 +14,6 @@ describe Object, ".attr_query" do
   end
 
   it "requires a trailing questionmark" do
-    lambda { Object.attr_query(:foo) }.must_raise ArgumentError
+    _(lambda { Object.attr_query(:foo) }).must_raise ArgumentError
   end
 end

data/spec/attr_extras/attr_value_spec.rb

@@ -9,7 +9,7 @@ describe Object, ".attr_value" do
 
     example = klass.new
     example.instance_variable_set("@foo", "Foo")
-    example.foo.must_equal "Foo"
+    _(example.foo).must_equal "Foo"
   end
 
   it "does not create writers" do
@@ -17,7 +17,7 @@ describe Object, ".attr_value" do
       attr_value :foo
     end
 
-    lambda { klass.new.foo = "new value" }.must_raise NoMethodError
+    _(lambda { klass.new.foo = "new value" }).must_raise NoMethodError
   end
 
   describe "object equality" do
@@ -92,21 +92,21 @@ describe Object, ".attr_value" do
       klass1_bar = klass1.new("Bar")
       klass2_foo = klass2.new("Foo")
 
-      klass1_foo.hash.must_equal klass1_foo2.hash
-      klass1_foo.hash.wont_equal klass1_bar.hash
-      klass1_foo.hash.wont_equal klass2_foo.hash
+      _(klass1_foo.hash).must_equal klass1_foo2.hash
+      _(klass1_foo.hash).wont_equal klass1_bar.hash
+      _(klass1_foo.hash).wont_equal klass2_foo.hash
 
       assert klass1_foo.eql?(klass1_foo2), "Examples should be 'eql?'"
       refute klass1_foo.eql?(klass1_bar), "Examples should not be 'eql?'"
       refute klass1_foo.eql?(klass2_foo), "Examples should not be 'eql?'"
 
-      Set[klass1_foo, klass1_foo2, klass1_bar, klass2_foo].length.must_equal 3
+      _(Set[klass1_foo, klass1_foo2, klass1_bar, klass2_foo].length).must_equal 3
 
       hash = {}
       hash[klass1_foo] = :awyeah
       hash[klass1_bar] = :wat
       hash[klass2_foo] = :nooooo
-      hash[klass1_foo2].must_equal :awyeah
+      _(hash[klass1_foo2]).must_equal :awyeah
     end
   end
 end

data/spec/attr_extras/params_builder_spec.rb

@@ -7,11 +7,11 @@ describe AttrExtras::AttrInitialize::ParamsBuilder do
     let(:names) { [ :foo, :bar, [ :baz, :qux!, quux: "Quux" ]] }
 
     it "properly devides params by the type" do
-      subject.positional_args.must_equal [ :foo, :bar ]
-      subject.hash_args.must_equal [ :baz, :qux!, :quux ]
-      subject.hash_args_names.must_equal [ :baz, :qux, :quux ]
-      subject.hash_args_required.must_equal [ :qux ]
-      subject.default_values.must_equal({ quux: "Quux" })
+      _(subject.positional_args).must_equal [ :foo, :bar ]
+      _(subject.hash_args).must_equal [ :baz, :qux!, :quux ]
+      _(subject.hash_args_names).must_equal [ :baz, :qux, :quux ]
+      _(subject.hash_args_required).must_equal [ :qux ]
+      _(subject.default_values).must_equal({ quux: "Quux" })
     end
   end
 
@@ -19,11 +19,11 @@ describe AttrExtras::AttrInitialize::ParamsBuilder do
     let(:names) { [ :foo, :bar] }
 
     it "properly devides params by the type" do
-      subject.positional_args.must_equal [ :foo, :bar ]
-      subject.hash_args.must_be_empty
-      subject.hash_args_names.must_be_empty
-      subject.hash_args_required.must_be_empty
-      subject.default_values.must_be_empty
+      _(subject.positional_args).must_equal [ :foo, :bar ]
+      _(subject.hash_args).must_be_empty
+      _(subject.hash_args_names).must_be_empty
+      _(subject.hash_args_required).must_be_empty
+      _(subject.default_values).must_be_empty
     end
   end
 
@@ -31,11 +31,11 @@ describe AttrExtras::AttrInitialize::ParamsBuilder do
     let(:names) { [[ { baz: "Baz" }, :qux!, { quux: "Quux" } ]] }
 
     it "properly devides params by the type" do
-      subject.positional_args.must_be_empty
-      subject.hash_args.must_equal [ :baz, :qux!, :quux ]
-      subject.hash_args_names.must_equal [ :baz, :qux, :quux ]
-      subject.hash_args_required.must_equal [ :qux ]
-      subject.default_values.must_equal({ quux: "Quux", baz: "Baz" })
+      _(subject.positional_args).must_be_empty
+      _(subject.hash_args).must_equal [ :baz, :qux!, :quux ]
+      _(subject.hash_args_names).must_equal [ :baz, :qux, :quux ]
+      _(subject.hash_args_required).must_equal [ :qux ]
+      _(subject.default_values).must_equal({ quux: "Quux", baz: "Baz" })
     end
   end
 
@@ -43,11 +43,11 @@ describe AttrExtras::AttrInitialize::ParamsBuilder do
     let(:names) { [] }
 
     it "properly devides params by the type" do
-      subject.positional_args.must_be_empty
-      subject.hash_args.must_be_empty
-      subject.hash_args_names.must_be_empty
-      subject.hash_args_required.must_be_empty
-      subject.default_values.must_be_empty
+      _(subject.positional_args).must_be_empty
+      _(subject.hash_args).must_be_empty
+      _(subject.hash_args_names).must_be_empty
+      _(subject.hash_args_required).must_be_empty
+      _(subject.default_values).must_be_empty
     end
   end
 end

data/spec/attr_extras/pattr_initialize_spec.rb

@@ -7,7 +7,7 @@ describe Object, ".pattr_initialize" do
     end
 
     example = klass.new("Foo", "Bar")
-    example.send(:foo).must_equal "Foo"
+    _(example.send(:foo)).must_equal "Foo"
   end
 
   it "works with hash ivars" do
@@ -16,7 +16,16 @@ describe Object, ".pattr_initialize" do
     end
 
     example = klass.new("Foo", bar: "Bar", baz: "Baz")
-    example.send(:baz).must_equal "Baz"
+    _(example.send(:baz)).must_equal "Baz"
+  end
+
+  it "works with hash ivars and default values" do
+    klass = Class.new do
+      pattr_initialize :foo, [ bar: "Bar", baz!: "Baz" ]
+    end
+
+    example = klass.new("Foo")
+    _(example.send(:baz)).must_equal "Baz"
   end
 
   it "can reference private initializer methods in an initializer block" do
@@ -30,7 +39,7 @@ describe Object, ".pattr_initialize" do
 
     example = klass.new("expected")
 
-    example.copy.must_equal "expected"
+    _(example.copy).must_equal "expected"
   end
 
   it "accepts the alias attr_private_initialize" do
@@ -39,6 +48,6 @@ describe Object, ".pattr_initialize" do
     end
 
     example = klass.new("Foo", "Bar")
-    example.send(:foo).must_equal "Foo"
+    _(example.send(:foo)).must_equal "Foo"
   end
 end

data/spec/attr_extras/rattr_initialize_spec.rb

@@ -7,16 +7,25 @@ describe Object, ".rattr_initialize" do
     end
 
     example = klass.new("Foo", "Bar")
-    example.public_send(:foo).must_equal "Foo"
+    _(example.public_send(:foo)).must_equal "Foo"
   end
 
   it "works with hash ivars" do
     klass = Class.new do
-      rattr_initialize :foo, [:bar, :baz!]
+      rattr_initialize :foo, [ :bar, :baz! ]
     end
 
     example = klass.new("Foo", bar: "Bar", baz: "Baz")
-    example.public_send(:baz).must_equal "Baz"
+    _(example.public_send(:baz)).must_equal "Baz"
+  end
+
+  it "works with hash ivars and default values" do
+    klass = Class.new do
+      rattr_initialize :foo, [ bar: "Bar", baz!: "Baz" ]
+    end
+
+    example = klass.new("Foo")
+    _(example.send(:baz)).must_equal "Baz"
   end
 
   it "accepts the alias attr_reader_initialize" do
@@ -25,6 +34,6 @@ describe Object, ".rattr_initialize" do
     end
 
     example = klass.new("Foo", "Bar")
-    example.public_send(:foo).must_equal "Foo"
+    _(example.public_send(:foo)).must_equal "Foo"
   end
 end

data/spec/attr_extras/static_facade_spec.rb

@@ -56,4 +56,34 @@ describe Object, ".static_facade" do
 
     assert klass.foo { :bar } == :bar
   end
+
+  it "does not blow up when the class method is called with an empty hash" do
+    klass = Class.new do
+      static_facade :foo,
+        :value
+
+      def foo
+      end
+    end
+
+    refute_raises_anything { klass.foo({}) }
+  end
+
+  it "does not emit warnings when the initializer is overridden with more keyword arguments" do
+    superklass = Class.new do
+      static_facade :something, [ :foo!, :bar! ]
+
+      def something
+      end
+    end
+
+    klass = Class.new(superklass) do
+      def initialize(extra:, **rest)
+        super(**rest)
+        @extra = extra
+      end
+    end
+
+    refute_warnings_emitted { klass.something(foo: 1, bar: 2, extra: "yay") }
+  end
 end

data/spec/attr_extras/utils_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe AttrExtras::Utils do
+  describe ".flat_names" do
+    subject { AttrExtras::Utils.flat_names(names) }
+
+    it "strips any bangs from a flat list of arguments" do
+      _(AttrExtras::Utils.flat_names([ :foo, :bar! ])).must_equal [ "foo", "bar" ]
+    end
+
+    it "flattens hash arguments and strips any bangs" do
+      _(AttrExtras::Utils.flat_names([ :foo, [ :bar, :baz! ] ])).must_equal [ "foo", "bar", "baz" ]
+    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" ]
+    end
+  end
+end

data/spec/attr_extras/vattr_initialize_spec.rb

@@ -9,8 +9,8 @@ describe Object, ".vattr_initialize" do
     example1 = klass.new("Foo", "Bar")
     example2 = klass.new("Foo", "Bar")
 
-    example1.foo.must_equal "Foo"
-    example1.must_equal example2
+    _(example1.foo).must_equal "Foo"
+    _(example1).must_equal example2
   end
 
   it "works with hash ivars" do
@@ -20,8 +20,19 @@ describe Object, ".vattr_initialize" do
 
     example1 = klass.new("Foo", bar: "Bar", baz: "Baz")
     example2 = klass.new("Foo", bar: "Bar", baz: "Baz")
-    example1.baz.must_equal "Baz"
-    example1.must_equal example2
+    _(example1.baz).must_equal "Baz"
+    _(example1).must_equal example2
+  end
+
+  it "works with hash ivars and default values" do
+    klass = Class.new do
+      vattr_initialize :foo, [ bar: "Bar", baz!: "Baz" ]
+    end
+
+    example1 = klass.new("Foo")
+    example2 = klass.new("Foo")
+    _(example1.baz).must_equal "Baz"
+    _(example1).must_equal example2
   end
 
   it "can accept an initializer block" do
@@ -34,7 +45,7 @@ describe Object, ".vattr_initialize" do
 
     klass.new("expected")
 
-    called.must_equal true
+    _(called).must_equal true
   end
 
   it "accepts the alias attr_value_initialize" do
@@ -45,7 +56,7 @@ describe Object, ".vattr_initialize" do
     example1 = klass.new("Foo", "Bar")
     example2 = klass.new("Foo", "Bar")
 
-    example1.foo.must_equal "Foo"
-    example1.must_equal example2
+    _(example1.foo).must_equal "Foo"
+    _(example1).must_equal example2
   end
 end

data/spec/attr_extras_spec.rb

@@ -10,6 +10,6 @@ describe AttrExtras do
       include mod
     end
 
-    klass.new("Hello").send(:name).must_equal "Hello"
+    _(klass.new("Hello").send(:name)).must_equal "Hello"
   end
 end

data/spec/spec_helper_without_loading_attr_extras.rb

@@ -2,3 +2,20 @@ require "minitest/autorun"
 require "minitest/pride"
 
 $: << File.dirname(__FILE__) + "/../lib"
+
+Minitest::Test.class_eval do
+  def refute_warnings_emitted(&block)
+    _, stderr = capture_io(&block)
+
+    assert stderr.empty?, -> do
+      warnings = stderr.strip.split("\n").map { |line| "  #{line}" }.join("\n")
+      "Expected no warnings to be emitted, but these ones were:\n\n#{warnings}"
+    end
+  end
+
+  def refute_raises_anything
+    yield
+  rescue => error
+    flunk "Expected no error to be raised, but got #{error.class} (#{error.message})."
+  end
+end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: attr_extras
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.4
 platform: ruby
 authors:
 - Henrik Nyh
 - Joakim Kolsjö
+- Tomas Skogberg
 - Victor Arias
 - Ola K
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -33,14 +34,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +94,7 @@ files:
 - spec/attr_extras/pattr_initialize_spec.rb
 - spec/attr_extras/rattr_initialize_spec.rb
 - spec/attr_extras/static_facade_spec.rb
+- spec/attr_extras/utils_spec.rb
 - spec/attr_extras/vattr_initialize_spec.rb
 - spec/attr_extras_spec.rb
 - spec/spec_helper.rb
@@ -116,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Takes some boilerplate out of Ruby with methods like attr_initialize.
@@ -135,6 +136,7 @@ test_files:
 - spec/attr_extras/pattr_initialize_spec.rb
 - spec/attr_extras/rattr_initialize_spec.rb
 - spec/attr_extras/static_facade_spec.rb
+- spec/attr_extras/utils_spec.rb
 - spec/attr_extras/vattr_initialize_spec.rb
 - spec/attr_extras_spec.rb
 - spec/spec_helper.rb