rrod 1.0.0.alpha.8 → 1.0.0.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21bcd59f68557a964682ed550e6f066b4b62d8c7
-  data.tar.gz: cb7eb976f82092d7013d48418a2de2dbcb1d4a7d
+  metadata.gz: 84fe091ae38ffdc6b135ebe27a64b909d105c7cb
+  data.tar.gz: 3961bd9dc0a7a76f08b2c12254f7fc8b8528ba3a
 SHA512:
-  metadata.gz: ebced7c3a04e6efe2a2b31bae0ee25eadebad2f2120dae03cc6ff646f98f4c7ca4e1a575398ae5a8655d4d69b79757121b4d9b2d3f473386602f414b087e2101
-  data.tar.gz: 084cdd4c9358b4c0ef399667bb5126b59594cec7f806490911865b1ecc37ebd16fb81feedcaeba8509f50821b4e244d1240cc65554fd6eda3aefd9531c451cec
+  metadata.gz: 734a1f634fd1da6d7ec3f199ecce30599cd443fcabdff3be19be5c7be11682aa34d52de755afa929fc0526526c9504f93fae8a03fdb2ed75504af9cb5faff94a
+  data.tar.gz: 613516afd9e7612c8ffa6113548a8f91c2385ccf97348a9697524346e979ae3ad11e770c1a40e5b1b976411ff1f65e1154e1b2cec7b93bf929ece0e8f01670f2

data/lib/rrod/model/attribute_methods.rb

@@ -11,9 +11,10 @@ module Rrod
       end
 
       def initialize(attributes = {})
-        @attributes        = {}
+        @attributes        = {}.with_indifferent_access
+        self._parent       = attributes.delete(:_parent)
         self.magic_methods = attributes.keys
-        self.attributes    = attributes
+        self._attributes   = attributes
         changes_applied
       end
 
@@ -22,15 +23,13 @@ module Rrod
       end
 
       def id=(value)
-        id_will_change! unless id == value
-        robject.key = value
+        write_attribute(:id, robject.key = value)
       end
 
       # Returns a new hash with all of the object's attributes.
       # @return [Hash] the object's attributes
       def attributes
         self.class.attributes.keys.inject({}) { |acc, key|
-        # @attributes.keys.inject({}) { |acc, key|
           acc.tap { |hash| 
             next hash unless self.class.attributes.keys.include?(key.to_s)
             hash[key] = public_send(key)
@@ -41,16 +40,14 @@ module Rrod
       # Mass assign the attributes of the object.
       # @param [Hash] the attributes to mass assign
       def attributes=(attrs)
-        attrs.each do |key, value|
-          public_send "#{key}=", value
-        end
+        self._attributes = attrs
       end
 
       # Read a single attribute of the object.
       # @param [Symbol, String] the key of the attribute to read
       # @return the attribute at the given key
       def read_attribute(key)
-        @attributes[key.to_s] || read_default(key)
+        @attributes[key] || read_default(key)
       end
       alias :[] :read_attribute
 
@@ -58,18 +55,23 @@ module Rrod
       # @param [Symbol, String] the key of the attribute to write
       # @param the value to write to attributes
       def write_attribute(key, value)
-        public_send("#{key}_will_change!") unless read_attribute(key) == value
-        cast_attribute(key, value)
+        send("#{key}_will_change!") if changing_attribute?(key, value)
+        @attributes[key] = cast_attribute(key, value)
       end
       alias :[]= :write_attribute
 
       def cast_attribute(key, value)
-        @attributes[key.to_s] = self.class.cast_attribute(key, value, self)
+        self.class.cast_attribute(key, value, self)
+      end
+
+      def changing_attribute?(key, value)
+        @attributes[key] != cast_attribute(key, value)
       end
 
       def read_default(key)
         method = "#{key}_default"
-        cast_attribute(key, public_send(method)) if respond_to?(method)
+        return unless respond_to?(method)
+        @attributes[key] = cast_attribute(key, send(method))
       end
 
       def nested_model?
@@ -107,6 +109,12 @@ module Rrod
         magic_methods.include? args.first.to_s
       end
 
+      # to be run without the callback
+      def _attributes=(attrs)
+        attrs.each do |key, value|
+          public_send "#{key}=", value
+        end
+      end
     end
   end
 end

data/lib/rrod/model/collection.rb

@@ -20,7 +20,7 @@ module Rrod
       end
 
       def collection=(collection)
-        message = "#{collection.inspect} does not respond to :each"
+        message = "Object type #{collection.class} does not respond to :each"
         raise InvalidCollectionTypeError.new(message) unless collection.respond_to?(:each)
         collection.map { |member| push member }
       rescue InvalidMemberTypeError => e

data/lib/rrod/model/schema.rb

@@ -43,16 +43,14 @@ module Rrod
       def rrod_cast(value, parent=nil)
         return if value.nil?
 
-        cast_model = case value
+        case value
         when Rrod::Model
-          value
+          value.tap { |m| m._parent = parent }
         when Hash
-          new(value)
+          new value.merge(_parent: parent)
         else
           raise UncastableObjectError.new("#{value.inspect} cannot be rrod_cast") unless Hash === value
         end
-
-        cast_model.tap { |m| m._parent = parent }
       end
 
     end           

data/lib/rrod/model/serialization.rb

@@ -15,7 +15,7 @@ module Rrod
       def to_json(options={})
         MultiJson.dump as_json(options)
       end
-
+      
     end
   end
 end

data/lib/rrod/version.rb

@@ -1,2 +1,2 @@
 Rrod = Module.new unless defined? Rrod
-Rrod::VERSION = '1.0.0.alpha.8'
+Rrod::VERSION = '1.0.0.alpha.9'

data/spec/rrod/model/attribute_methods_spec.rb

@@ -94,15 +94,20 @@ describe Rrod::Model do
 
   describe "dirty tracking" do
     let(:model)    { Class.new(Car) { attribute :wheels, Integer, default: 4 } }
-    let(:instance) { model.new }
+    let(:instance) { model.new(make: 'Jeep') }
 
     it "will track if an attribute is changing" do
       instance.wheels = 5
       expect(instance.wheels_changed?).to be true
     end
 
-    it "will not track if an attribute is not changing" do
-      instance.wheels = 4
+    it "will not track if an attribute is set from a default" do
+      expect(instance.wheels).to eq 4
+      expect(instance.wheels_changed?).to be false
+    end
+
+    it "will not track if an attribute has not changed" do
+      instance.make = 'Jeep'
       expect(instance.wheels_changed?).to be false
     end
   end

data/spec/rrod/model/schema_spec.rb

@@ -19,7 +19,7 @@ describe Rrod::Model::Schema do
   end
 
   it "defines a default for the attribute if provided as a proc" do
-    expect(instance.comments).to eq([instance.build_comment])
+    expect(instance.comments).to eq([instance.build_comment.stringify_keys])
   end
 
   context "subclassing" do
@@ -118,4 +118,9 @@ describe Rrod::Model::Schema do
     expect(instance.pets.first.attributes).not_to have_key('id')
   end
 
+  it "will properly nest grandparents" do
+    instance.pets = [pet = Pet.new]
+    expect(instance.pets.first.vaccinations.first.pet).to eq pet
+  end
+
 end

data/spec/support/models/person.rb

@@ -10,8 +10,9 @@ end
 
 class Vaccination
   include Rrod::Model
+  nested_in :pet
 
-  attribute :type, String
+  attribute :type, String, default: -> { 'Temper' unless pet.friendly? }
   attribute :when, Date
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrod
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.8
+  version: 1.0.0.alpha.9
 platform: ruby
 authors:
 - Adam Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client