aduki 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2083ed7af6b80549df900d66e0cb35155771108
-  data.tar.gz: 35b6925901470ff78de0eaedc036a14c4fcb2af3
+  metadata.gz: 269ae6607c034416e171d45d6452c4fba0e5bf84
+  data.tar.gz: bcd5234c6bf73552897059acb43633df077ce4bb
 SHA512:
-  metadata.gz: 885a4d4e4a2430322027ef36ca3881852fbcd25cb8d0ea57b880ecc09e773110365609ca16c47013a8743ee713b26275de58b63874a1ca0eeecf824de2a1afd0
-  data.tar.gz: bfd53ddbae29f3705a6e958b90b3e8d3e59bb17d87a111695f0d7767da14c8951f03d2a5cb89806865d84f6634898fa1f33d139e0ee847359c38c53c6bb9ef8d
+  metadata.gz: 30966ec2c14406a5a3d91e7c3943119997c0285f90bf7f4de39166d65801374de6674a6c8278bf39b7710f35d52e720d7257817b8fbc7b542c9bc7c87248d9c0
+  data.tar.gz: cbd2ae5d83392f9b1c6ed3e8158d10b46aff04685ad67ae06cacb137c3e44155e473177d05c00b36de9d7be08a0deac1e3eb7cab045bf647d1220b456f52f887

data/lib/aduki.rb

@@ -146,11 +146,12 @@ module Aduki
       end
     end
 
-    def aduki_initialize name, klass
-      aduki name => klass
+    def aduki_initialize name, initial_klass, type=:notset
+      type = (type == :notset) ? initial_klass : type
+      aduki(name => type) if type
       initializer_name = :"aduki_initialize_#{name}"
       define_method initializer_name do
-        send :"#{name}=", klass.new
+        send :"#{name}=", initial_klass.new
       end
       @@initializers[self] ||= []
       @@initializers[self] << initializer_name

data/lib/aduki/version.rb

@@ -1,3 +1,3 @@
 module Aduki
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/initializer_spec.rb

@@ -206,7 +206,10 @@ describe Aduki::Initializer do
     props = {
       "name"                => "Brackish Water",
       "gadget.name"         => "The Loud Gadget",
-      "gadget.speaker.ohms" => "29"
+      "gadget.speaker.ohms" => "29",
+      "gadget.speaker.dates[1]" => "2015-03-12",
+      "gadget.speaker.dates[2]" => "2015-06-08",
+      "gadget.speaker.dates[3]" => "2015-06-21",
     }
 
     model = Model.new props
@@ -215,5 +218,37 @@ describe Aduki::Initializer do
     model.gadget.name.should == "The Loud Gadget"
     model.gadget.speaker.should be_a Speaker
     model.gadget.speaker.ohms.should == "29"
+
+    expect(model.gadget.speaker.dates).to eq [ Date.parse("2015-03-12"), Date.parse("2015-06-08"), Date.parse("2015-06-21") ]
+  end
+
+  it "should handle pre-initialized arrays without a given array type" do
+    props = {
+      "name"                => "Brackish Water",
+      "gadget.name"         => "The Loud Gadget",
+      "gadget.speaker.ohms" => "29",
+      "gadget.speaker.dimensions[1]" => "12",
+      "gadget.speaker.dimensions[2]" => "8",
+      "gadget.speaker.dimensions[3]" => "21",
+    }
+
+    model = Model.new props
+
+    expect(model.gadget.speaker.dimensions).to eq [ "12", "8", "21" ]
+  end
+
+  it "should handle pre-initialized arrays with a previously-set array type" do
+    props = {
+      "name"                => "Brackish Water",
+      "gadget.name"         => "The Loud Gadget",
+      "gadget.speaker.ohms" => "29",
+      "gadget.speaker.threads[1]" => "12.4",
+      "gadget.speaker.threads[2]" => "8.16",
+      "gadget.speaker.threads[3]" => "21.42",
+    }
+
+    model = Model.new props
+
+    expect(model.gadget.speaker.threads).to eq [ 12.4, 8.16, 21.42 ]
   end
 end

data/spec/merge_attributes_spec.rb

@@ -6,7 +6,10 @@ describe Aduki::Initializer do
     props = {
       "name"                => "Brackish Water",
       "gadget.name"         => "The Loud Gadget",
-      "gadget.speaker.ohms" => "29"
+      "gadget.speaker.ohms" => "29",
+      "gadget.speaker.dates[1]" => "2014-03-12",
+      "gadget.speaker.dates[2]" => "2014-06-08",
+      "gadget.speaker.dates[3]" => "2014-06-21",
     }
 
     model = Model.new props
@@ -16,11 +19,15 @@ describe Aduki::Initializer do
     expect(model.gadget.price).           to eq nil
     expect(model.gadget.speaker.ohms).    to eq "29"
     expect(model.gadget.speaker.diameter).to eq nil
+    expect(model.gadget.speaker.dates).to eq [ Date.parse("2014-03-12"), Date.parse("2014-06-08"), Date.parse("2014-06-21") ]
 
     more_props = {
       "name"                    => "Smelly Brackish Water",
       "gadget.price"            => "42",
-      "gadget.speaker.diameter" => "large"
+      "gadget.speaker.diameter" => "large",
+      "gadget.speaker.dates[1]" => "2015-06-21",
+      "gadget.speaker.dates[2]" => "2015-03-12",
+      "gadget.speaker.dates[3]" => "2015-06-08",
     }
 
     Aduki.apply_attributes model, more_props
@@ -30,6 +37,7 @@ describe Aduki::Initializer do
     expect(model.gadget.price).           to eq "42"
     expect(model.gadget.speaker.ohms).    to eq "29"
     expect(model.gadget.speaker.diameter).to eq "large"
+    expect(model.gadget.speaker.dates).to eq [ Date.parse("2014-03-12"), Date.parse("2014-06-08"), Date.parse("2014-06-21"), Date.parse("2015-06-21"), Date.parse("2015-03-12"), Date.parse("2015-06-08") ]
   end
 
   it "does not die when reader accessor is absent" do

data/spec/spec_helper.rb

@@ -40,7 +40,11 @@ end
 
 class Speaker
   include Aduki::Initializer
-  attr_accessor :ohms, :diameter
+  attr_accessor :ohms, :diameter, :dimensions
+  aduki threads: Float
+  aduki_initialize :dates, Array, Date
+  aduki_initialize :dimensions, Array, nil
+  aduki_initialize :threads, Array, nil
 end
 
 class Gadget

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aduki
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Conan Dalton