attr_extras 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd8abe1675a431f0b748464aae94e5e45ff1305
-  data.tar.gz: eb248dbd2a6e75dec4e9fe44c9a999087bc9fcb9
+  metadata.gz: 0749835eb5235d2f2171a3da61eb87953d574cb9
+  data.tar.gz: f52712ce7b9e9d15f0e0e1efe9208b13ce5931ab
 SHA512:
-  metadata.gz: cb1c750b44e30aa2f387175e57a259a48c2b1b5bafab3acd937da929cb62fa18519ed2b664d55fd05fbdf8d685d93ac192ca3b56c53cdf63a168cc5477c83e84
-  data.tar.gz: 62e1c97fd22b160a960a25532a62a36ad59604a208f45a66be0174490f56c33ff21466815fc6a17b53567bfe683919a2c3f6e0c4bdcf2bf02fc07b4c3b93a8e6
+  metadata.gz: 4bccfdba5b88e7944b199dcf07d214b33b082f22c1128df429cb8fd80f274fab86e21024ec43a4be7154391f95ca078584994ed29828fe8018d8ab9454be3dbd
+  data.tar.gz: 71b0501a29618a80d824ab1eb69b07753eb3f4ff324d103b2c35c02190172e2465bbee5810707193ab1cd2b503937fb1032fcdc455bb9e08a6f6ff982357e5a1

data/README.md

@@ -34,8 +34,8 @@ This nicely complements Ruby's built-in `attr_accessor`, `attr_reader` and `attr
 `attr_initialize :foo, :bar`<br>
 Defines an initializer that takes two arguments and assigns `@foo` and `@bar`.
 
-`attr_initialize :foo, [:bar, :baz]`<br>
-Defines an initializer that takes one regular argument, assigning `@foo`, and one hash argument, assigning `@bar` and `@baz`.
+`attr_initialize :foo, [:bar, :baz!]`<br>
+Defines an initializer that takes one regular argument, assigning `@foo`, and one hash argument, assigning `@bar` (optional) and `@baz` (required).
 
 `attr_private :foo, :bar`<br>
 Defines private readers for `@foo` and `@bar`.

data/attr_extras.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/attr_extras/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Henrik Nyh"]
+  gem.authors       = ["Henrik Nyh", "Joakim Kolsjö"]
   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"

data/lib/attr_extras.rb

@@ -18,11 +18,20 @@ module AttrExtras
           if name_or_names.is_a?(Array)
             value ||= {}
 
-            name_or_names.each do |key|
-              instance_variable_set("@#{key}", value[key])
+            name_or_names.each do |name|
+              if name.to_s.end_with?("!")
+                actual_name = name.to_s.chop.to_sym
+                actual_value = value.fetch(actual_name)
+              else
+                actual_name = name
+                actual_value = value[name]
+              end
+
+              instance_variable_set("@#{actual_name}", actual_value)
             end
           else
-            instance_variable_set("@#{name_or_names}", value)
+            name = name_or_names
+            instance_variable_set("@#{name}", value)
           end
         end
       end
@@ -35,7 +44,9 @@ module AttrExtras
 
     def pattr_initialize(*names)
       attr_initialize(*names)
-      attr_private(*names.flatten)
+
+      flat_names = names.flatten.map { |x| x.to_s.sub(/!\z/, "") }
+      attr_private(*flat_names)
     end
 
     def attr_value(*names)

data/lib/attr_extras/version.rb

@@ -1,3 +1,3 @@
 module AttrExtras
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/spec/attr_extras_spec.rb

@@ -39,7 +39,7 @@ describe Object, ".attr_initialize" do
 
   it "can set ivars from a hash" do
     klass = Class.new do
-      pattr_initialize :foo, [:bar, :baz]
+      attr_initialize :foo, [:bar, :baz]
     end
 
     example = klass.new("Foo", :bar => "Bar", :baz => "Baz")
@@ -50,7 +50,7 @@ describe Object, ".attr_initialize" do
 
   it "treats hash values as optional" do
     klass = Class.new do
-      pattr_initialize :foo, [:bar, :baz]
+      attr_initialize :foo, [:bar, :baz]
     end
 
     example = klass.new("Foo", :bar => "Bar")
@@ -59,6 +59,17 @@ describe Object, ".attr_initialize" do
     example = klass.new("Foo")
     example.instance_variable_get("@bar").must_equal nil
   end
+
+  it "can require hash values" do
+    klass = Class.new do
+      attr_initialize [:optional, :required!]
+    end
+
+    example = klass.new(:required => "X")
+    example.instance_variable_get("@required").must_equal "X"
+
+    lambda { klass.new(:optional => "X") }.must_raise KeyError
+  end
 end
 
 describe Object, ".attr_private" do
@@ -90,11 +101,12 @@ 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")
+    example = klass.new("Foo", :bar => "Bar", :baz => "Baz")
     example.send(:bar).must_equal "Bar"
+    example.send(:baz).must_equal "Baz"
   end
 end
 

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: attr_extras
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Henrik Nyh
+- Joakim Kolsjö
 autorequire: 
 bindir: bin
 cert_chain: []