aduki 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45420ab64b5875f1f53255ea0600451290e07f9a
-  data.tar.gz: 9a4a18aa6898f51506d3cd6161a1c3b3b7d5b628
+  metadata.gz: b2083ed7af6b80549df900d66e0cb35155771108
+  data.tar.gz: 35b6925901470ff78de0eaedc036a14c4fcb2af3
 SHA512:
-  metadata.gz: 4ed7538d054f37e27516b18927a1285f1c827165b44738b47fe656990aa9605aa0a0d1a0dd422096c1554043f7c33e9a2d05129378186642da1ad15a683b5b97
-  data.tar.gz: dbab54e9a51a1e76377f0d9be20dce68240514d4573d365f35202054faaa98bb838e67b8fe85fcf281e62c40528eae52b63efc068657a08cb5c4d6e477706d6c
+  metadata.gz: 885a4d4e4a2430322027ef36ca3881852fbcd25cb8d0ea57b880ecc09e773110365609ca16c47013a8743ee713b26275de58b63874a1ca0eeecf824de2a1afd0
+  data.tar.gz: bfd53ddbae29f3705a6e958b90b3e8d3e59bb17d87a111695f0d7767da14c8951f03d2a5cb89806865d84f6634898fa1f33d139e0ee847359c38c53c6bb9ef8d

data/lib/aduki.rb

@@ -96,16 +96,22 @@ module Aduki
     array << to_value(klass, getter, value)
   end
 
-  def self.apply_single_attribute klass, object, setter, value
-    existing_value = object.send setter
-    if existing_value && value.is_a?(Hash)
-      Aduki.apply_attributes existing_value, value
-    else
-      setter_method = "#{setter}=".to_sym
-      return unless object.respond_to? setter_method
+  def self.apply_new_single_attribute klass, object, setter, value
+    setter_method = "#{setter}=".to_sym
+    return unless object.respond_to? setter_method
 
-      object.send setter_method, to_value(klass, setter, value)
+    object.send setter_method, to_value(klass, setter, value)
+  end
+
+  def self.apply_single_attribute klass, object, setter, value
+    if value.is_a?(Hash)
+      existing_value = object.send setter if object.respond_to?(setter)
+      if existing_value
+        Aduki.apply_attributes existing_value, value
+        return
+      end
     end
+    apply_new_single_attribute klass, object, setter, value
   end
 
   def self.apply_attribute klass, object, setter, value

data/lib/aduki/version.rb

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

data/spec/merge_attributes_spec.rb

@@ -31,4 +31,48 @@ describe Aduki::Initializer do
     expect(model.gadget.speaker.ohms).    to eq "29"
     expect(model.gadget.speaker.diameter).to eq "large"
   end
+
+  it "does not die when reader accessor is absent" do
+    props = {
+      "name"                => "Brackish Water",
+      "gadget.wattage"      => "240",
+      "gadget.name"         => "The Loud Gadget",
+      "gadget.speaker.ohms" => "29"
+    }
+
+    model = Model.new props
+
+    expect(model.name).                   to eq "Brackish Water"
+    expect(model.gadget.name).            to eq "The Loud Gadget"
+    expect(model.gadget.price).           to eq nil
+    expect(model.gadget.watts).           to eq "240"
+    expect(model.gadget.speaker.ohms).    to eq "29"
+    expect(model.gadget.speaker.diameter).to eq nil
+  end
+
+  it "does not die when an existing value is present" do
+    props = {
+      "name"                => "Brackish Water",
+      "gadget.wattage"      => "240",
+      "gadget.name"         => "The Loud Gadget",
+      "gadget.speaker.ohms" => "29"
+    }
+
+    model = Model.new props
+
+    more_props = {
+      "name"                    => "Smelly Brackish Water",
+      "gadget.wattage"          => "120",
+      "gadget.speaker.diameter" => "large"
+    }
+
+    Aduki.apply_attributes model, more_props
+
+    expect(model.name).                   to eq "Smelly Brackish Water"
+    expect(model.gadget.name).            to eq "The Loud Gadget"
+    expect(model.gadget.price).           to eq nil
+    expect(model.gadget.watts).           to eq "120"
+    expect(model.gadget.speaker.ohms).    to eq "29"
+    expect(model.gadget.speaker.diameter).to eq "large"
+  end
 end

data/spec/spec_helper.rb

@@ -46,7 +46,12 @@ end
 class Gadget
   include Aduki::Initializer
   attr_accessor :name, :price, :supplier
+  attr_writer :wattage
   aduki_initialize :speaker, Speaker
+
+  def watts
+    @wattage
+  end
 end
 
 class Machine

metadata

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