attr_extras 5.2.0 → 6.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 31be8de6a1c2dbbb19e44ea4255d099e656728b3
-  data.tar.gz: f5a8e9dbfdef34e1f1d368c889ae7a0f825e07e2
+SHA256:
+  metadata.gz: e4f8e12f94bbc166632e1a65a52f83ddc14e4982ad57f87043fa285e7e7a8cf2
+  data.tar.gz: 1d621e46616f5df763909d9481f983d60fe4e014a8a9a3b0dbfc2635d8867d71
 SHA512:
-  metadata.gz: 30d562066800bdcc69011c4eb7ed26966d61aae06e4ebd1050ba7346bb15ef1b131edaa547f2aec9504f61ef103c9022126c40a2ebdd12bf4838d3b8722f387d
-  data.tar.gz: 4ba342974d86d1c4d0d3eeb30d41caa1fa97720b4626e7bbbafe7245fbf5dd48c4a10ef52c7ce8a43d3f2557a9c7ccb19218c2c21fc94e711fe31a7918958f32
+  metadata.gz: 44cade5ed299c18a1e8c01706e04767f1b49f3a934a53759542702fd6435c8ba225b360250dd276a78174fdea32e112ca1155cf20e172db765940ea05ecb3b03
+  data.tar.gz: 7fe165a6de71503666cb3344478c769385d50a31ca11de78cce7f934d87393867a5e2c3bc05703c7a3fdc86dd81da729703452c35d0999600f70b42a35851629

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.1
-  - 2.0.0
-  - jruby-19mode
+  - 2.7.1
+  - 2.6.6
+  - 2.5.8
+  - jruby-head

data/CHANGELOG.md

@@ -0,0 +1,34 @@
+# Changelog
+
+## [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)
+
+* Default arguments! Thanks to [Ola K](https://github.com/lesin). For example: `pattr_initialize [:foo, bar: "default value"]`
+
+## [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,4 +1,5 @@
-[![Build status](https://secure.travis-ci.org/barsoom/attr_extras.png)](https://travis-ci.org/#!/barsoom/attr_extras/builds)
+[![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)
 
 # attr\_extras
@@ -29,7 +30,7 @@ end
 
 This nicely complements Ruby's built-in `attr_accessor`, `attr_reader` and `attr_writer`.
 
-Supports positional arguments as well as optional and required hash arguments.
+Supports positional arguments as well as optional and required keyword arguments.
 
 Also provides conveniences for creating value objects, method objects, query methods and abstract methods.
 
@@ -55,14 +56,39 @@ Also provides conveniences for creating value objects, method objects, query met
 
 `attr_initialize :foo, :bar` defines an initializer that takes two arguments and assigns `@foo` and `@bar`.
 
-`attr_initialize :foo, [:bar, :baz!]` defines an initializer that takes one regular argument, assigning `@foo`, and one hash argument, assigning `@bar` (optional) and `@baz` (required).
+`attr_initialize :foo, [:bar, :baz!]` defines an initializer that takes one regular argument, assigning `@foo`, and two keyword arguments, assigning `@bar` (optional) and `@baz` (required).
 
-`attr_initialize [:bar, :baz!]` defines an initializer that takes one hash argument, assigning `@bar` (optional) and `@baz` (required).
+`attr_initialize [:bar, :baz!]` defines an initializer that takes two keyword arguments, assigning `@bar` (optional) and `@baz` (required).
 
-If you pass unknown hash arguments, you will get an `ArgumentError`.
+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`
 
@@ -102,7 +128,7 @@ end
 Item.new("Pug", 100).price_with_vat  # => 125.0
 ```
 
-[The `attr_initialize` notation](#attr_initialize) for hash arguments is also supported: `pattr_initialize :foo, [:bar, :baz!]`
+[The `attr_initialize` notation](#attr_initialize) for keyword arguments is also supported: `pattr_initialize :foo, [:bar, :baz!]`
 
 ### `vattr_initialize`
 ### `attr_value_initialize`
@@ -127,7 +153,7 @@ Country.new("SE") == Country.new("SE")  # => true
 Country.new("SE").code  # => "SE"
 ```
 
-[The `attr_initialize` notation](#attr_initialize) for hash arguments is also supported: `vattr_initialize :foo, [:bar, :baz!]`
+[The `attr_initialize` notation](#attr_initialize) for keyword arguments is also supported: `vattr_initialize :foo, [:bar, :baz!]`
 
 
 ### `rattr_initialize`
@@ -157,7 +183,7 @@ service = PublishBook.new("A Novel", publisher)
 service.book_name  # => "A Novel"
 ```
 
-[The `attr_initialize` notation](#attr_initialize) for hash arguments is also supported: `rattr_initialize :foo, [:bar, :baz!]`
+[The `attr_initialize` notation](#attr_initialize) for keyword arguments is also supported: `rattr_initialize :foo, [:bar, :baz!]`
 
 ### `aattr_initialize`
 ### `attr_accessor_initialize`
@@ -185,7 +211,7 @@ client.access_token = "NEW_SECRET"
 client.access_token # => "NEW_SECRET"
 ```
 
-[The `attr_initialize` notation](#attr_initialize) for hash arguments and blocks is also supported.
+[The `attr_initialize` notation](#attr_initialize) for keyword arguments and blocks is also supported.
 
 ### `static_facade`
 
@@ -223,7 +249,7 @@ def self.allow?(user)
 end
 ```
 
-[The `attr_initialize` notation](#attr_initialize) for hash arguments is also supported: `static_facade :allow?, :user, [:user_agent, :ip!]`
+[The `attr_initialize` notation](#attr_initialize) for keyword arguments is also supported: `static_facade :allow?, :user, [:user_agent, :ip!]`
 
 You don't have to specify arguments/readers if you don't want them: just `static_facade :tuesday?` is also valid.
 
@@ -288,7 +314,7 @@ def self.call(foo)
 end
 ```
 
-[The `attr_initialize` notation](#attr_initialize) for hash arguments is also supported: `method_object :foo, [:bar, :baz!]`
+[The `attr_initialize` notation](#attr_initialize) for keyword arguments is also supported: `method_object :foo, [:bar, :baz!]`
 
 You don't have to specify arguments/readers if you don't want them: just `method_object` is also valid.
 

data/Rakefile

@@ -19,5 +19,5 @@ Rake::TestTask.new(:test_explicit) do |t|
   t.test_files = explicit_tests
 end
 
-task :test => [ :test_implicit, :test_explicit ]
-task :default => :test
+task test: [ :test_implicit, :test_explicit ]
+task default: :test

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"]
+  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.3.1"  # 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

@@ -1,3 +1,5 @@
+require "attr_extras/params_builder"
+
 class AttrExtras::AttrInitialize
   def initialize(klass, names, block)
     @klass, @names, @block = klass, names, block
@@ -9,31 +11,29 @@ class AttrExtras::AttrInitialize
   def apply
     # The define_method block can't call our methods, so we need to make
     # things available via local variables.
-    names = @names
     block = @block
+
+    klass_params = AttrExtras::AttrInitialize::ParamsBuilder.new(names)
+
     validate_arity = method(:validate_arity)
-    set_ivar_from_hash = method(:set_ivar_from_hash)
+    validate_args = method(:validate_args)
 
     klass.send(:define_method, :initialize) do |*values|
+      hash_values = (values[(klass_params.positional_args.length)..-1] || []).inject(: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)
+      end
+
+      klass_params.positional_args.zip(values).each do |name, value|
+        instance_variable_set("@#{name}", value)
+      end
 
-      names.zip(values).each do |name_or_names, value|
-        if name_or_names.is_a?(Array)
-          hash = value || {}
-
-          known_keys = name_or_names.map { |name| name.to_s.sub(/!\z/, "").to_sym }
-          unknown_keys = hash.keys - known_keys
-          if unknown_keys.any?
-            raise ArgumentError, "Got unknown keys: #{unknown_keys.inspect}; allowed keys: #{known_keys.inspect}"
-          end
-
-          name_or_names.each do |name|
-            set_ivar_from_hash.call(self, name, hash)
-          end
-        else
-          name = name_or_names
-          instance_variable_set("@#{name}", value)
-        end
+      hash_values.each do |name, value|
+        instance_variable_set("@#{name}", value)
       end
 
       if block
@@ -54,15 +54,17 @@ class AttrExtras::AttrInitialize
     end
   end
 
-  def set_ivar_from_hash(instance, name, hash)
-    if name.to_s.end_with?("!")
-      actual_name = name.to_s.chop.to_sym
-      value = hash.fetch(actual_name)
-    else
-      actual_name = name
-      value = hash[actual_name]
+  def validate_args(values, klass_params)
+    hash_values = values[(klass_params.positional_args.length)..-1].inject(:merge) || {}
+    unknown_keys = hash_values.keys - klass_params.hash_args_names
+
+    if unknown_keys.any?
+      raise ArgumentError, "Got unknown keys: #{unknown_keys.inspect}; allowed keys: #{klass_params.hash_args_names.inspect}"
     end
 
-    instance.instance_variable_set("@#{actual_name}", value)
+    missing_args = klass_params.hash_args_required - klass_params.default_values.keys - hash_values.keys
+    if missing_args.any?
+      raise KeyError, "Missing required keys: #{missing_args.inspect}"
+    end
   end
 end

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/params_builder.rb

@@ -0,0 +1,49 @@
+module AttrExtras
+  class AttrInitialize
+    class ParamsBuilder
+      REQUIRED_SIGN = "!".freeze
+
+      def initialize(names)
+        @names = names
+      end
+
+      attr_reader :names
+      private :names
+
+      def positional_args
+        @positional_args ||= names.take_while { |name| !name.is_a?(Array) }
+      end
+
+      def hash_args
+        @hash_args ||= (names - positional_args).flatten.flat_map { |name|
+          name.is_a?(Hash) ? name.keys : name
+        }
+      end
+
+      def hash_args_names
+        @hash_args_names ||= hash_args.map { |name| remove_required_sign(name) }
+      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) }
+      end
+
+      def default_values
+        @default_values ||= begin
+          default_values_hash = names.flatten.select { |name| name.is_a?(Hash) }.inject(:merge) || {}
+
+          default_values_hash.map { |name, value|
+            [ remove_required_sign(name), value ]
+          }.to_h
+        end
+      end
+
+      private
+
+      def remove_required_sign(name)
+        name.to_s.sub(/#{REQUIRED_SIGN}\z/, "").to_sym
+      end
+    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 = "5.2.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 = 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
@@ -27,10 +27,24 @@ describe Object, ".attr_initialize" do
       attr_initialize :foo, [:bar, :baz]
     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 = 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"
+  end
+
+  it "can set default values for keyword arguments" do
+    klass = Class.new do
+      attr_initialize :foo, [:bar, baz: "default baz"]
+    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 = klass.new("Foo", bar: "Bar", baz: "Baz")
+    _(example.instance_variable_get("@baz")).must_equal "Baz"
   end
 
   it "treats hash values as optional" do
@@ -38,11 +52,11 @@ describe Object, ".attr_initialize" do
       attr_initialize :foo, [:bar, :baz]
     end
 
-    example = klass.new("Foo", :bar => "Bar")
-    example.instance_variable_get("@baz").must_equal nil
+    example = klass.new("Foo", bar: "Bar")
+    _(example.instance_variable_defined?("@baz")).must_equal false
 
     example = klass.new("Foo")
-    example.instance_variable_get("@bar").must_equal nil
+    _(example.instance_variable_defined?("@bar")).must_equal false
   end
 
   it "can require hash values" do
@@ -50,10 +64,10 @@ describe Object, ".attr_initialize" do
       attr_initialize [:optional, :required!]
     end
 
-    example = klass.new(:required => "X")
-    example.instance_variable_get("@required").must_equal "X"
+    example = klass.new(required: "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
@@ -62,10 +76,44 @@ describe Object, ".attr_initialize" do
     end
 
     # Should not raise.
-    klass.new("Foo", :bar => "Bar", :baz => "Baz")
+    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]"
+  end
+
+  # Regression.
+  it "assigns hash values to positional arguments even when there's also hash arguments" do
+    klass = Class.new do
+      attr_initialize :foo, [:bar]
+    end
+
+    # Should not raise.
+    klass.new({ inside_foo: 123 }, bar: 456)
+  end
+
+  # Regression.
+  it "only looks at hash arguments when determining missing required keys" do
+    klass = Class.new do
+      attr_initialize :foo, [:bar!]
+    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]"
+  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 })
 
-    exception = lambda { klass.new("Foo", :bar => "Bar", :baz => "Baz", :hello => "Hello") }.must_raise ArgumentError
-    exception.message.must_include "[:hello]"
+    _(example.foo).must_equal({ "invalid.ivar.name" => 123 })
   end
 
   it "accepts a block for initialization" do
@@ -79,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

@@ -0,0 +1,53 @@
+require "spec_helper"
+
+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" ]] }
+
+    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" })
+    end
+  end
+
+  describe "when only positional params are present" 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
+    end
+  end
+
+  describe "when only hash params are present" 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" })
+    end
+  end
+
+  describe "when params are empty" 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
+    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
@@ -15,8 +15,17 @@ describe Object, ".pattr_initialize" do
       pattr_initialize :foo, [:bar, :baz!]
     end
 
-    example = klass.new("Foo", :bar => "Bar", :baz => "Baz")
-    example.send(:baz).must_equal "Baz"
+    example = klass.new("Foo", bar: "Bar", baz: "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 = klass.new("Foo", bar: "Bar", baz: "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
@@ -18,10 +18,21 @@ describe Object, ".vattr_initialize" do
       vattr_initialize :foo, [:bar, :baz!]
     end
 
-    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 = klass.new("Foo", bar: "Bar", baz: "Baz")
+    example2 = klass.new("Foo", bar: "Bar", baz: "Baz")
+    _(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,16 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: attr_extras
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.2.4
 platform: ruby
 authors:
 - Henrik Nyh
 - Joakim Kolsjö
+- Tomas Skogberg
 - Victor Arias
+- Ola K
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -32,14 +34,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +65,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -74,6 +77,7 @@ files:
 - lib/attr_extras/attr_query.rb
 - lib/attr_extras/attr_value.rb
 - lib/attr_extras/explicit.rb
+- lib/attr_extras/params_builder.rb
 - lib/attr_extras/utils.rb
 - lib/attr_extras/version.rb
 - script/test
@@ -86,9 +90,11 @@ files:
 - spec/attr_extras/attr_value_spec.rb
 - spec/attr_extras/explicit_spec.rb
 - spec/attr_extras/method_object_spec.rb
+- spec/attr_extras/params_builder_spec.rb
 - 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
@@ -112,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Takes some boilerplate out of Ruby with methods like attr_initialize.
@@ -127,9 +132,11 @@ test_files:
 - spec/attr_extras/attr_value_spec.rb
 - spec/attr_extras/explicit_spec.rb
 - spec/attr_extras/method_object_spec.rb
+- spec/attr_extras/params_builder_spec.rb
 - 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