ripple 0.8.0 → 0.8.1

data/lib/ripple/attribute_methods.rb

@@ -102,7 +102,7 @@ module Ripple
 
       def attributes_from_property_defaults
         self.class.properties.values.inject({}) do |hash, prop|
-          hash[prop.key] = prop.default if prop.default
+          hash[prop.key] = prop.default unless prop.default.nil?
           hash
         end.with_indifferent_access
       end

data/lib/ripple/document/key.rb

@@ -29,6 +29,9 @@ module Ripple
           def key=(value)
             self.#{prop} = value
           end
+          def key_attr
+            :#{prop}
+          end          
           CODE
         end
       end
@@ -43,6 +46,10 @@ module Ripple
         def key=(value)
           @key = value.to_s
         end
+
+        def key_attr
+          :key
+        end        
       end
     end
   end

data/lib/ripple/document.rb

@@ -61,6 +61,7 @@ module Ripple
       include Ripple::Conversion
       include Ripple::Document::Finders
       include Ripple::Inspection
+      include Ripple::NestedAttributes
     end
 
     module ClassMethods

data/lib/ripple/embedded_document.rb

@@ -37,6 +37,7 @@ module Ripple
       include Ripple::Conversion
       include Finders
       include Ripple::Inspection
+      include Ripple::NestedAttributes
     end
 
     module ClassMethods

data/lib/ripple/nested_attributes.rb

@@ -0,0 +1,263 @@
+require 'ripple'
+module Ripple
+  module NestedAttributes #:nodoc:
+    extend ActiveSupport::Concern
+
+    UNASSIGNABLE_KEYS = %w{ _destroy }
+    TRUE_VALUES = [ true, "true", 1, "1", "yes", "ok", "y" ]
+
+    included do
+      class_inheritable_accessor :nested_attributes_options, :instance_writer => false
+      self.nested_attributes_options = {}
+    end
+    
+    # = Nested Attributes
+    #
+    # This is similar to the `accepts_nested_attributes` functionality
+    # as found in AR.  This allows the use update attributes and create
+    # new child records through the parent.  It also allows the use of
+    # the `fields_for` form view helper, using a presenter pattern.
+    #
+    # To enable in the model, call the class method, using the same
+    # relationship as defined in the `one` or `many`.
+    #
+    #   class Shipment
+    #     include Ripple::Document
+    #     one :box
+    #     many :addresses
+    #     accepts_nested_attributes_for :box, :addresses
+    #   end
+    #
+    # == One
+    #
+    # Given this model:
+    #
+    #   class Shipment
+    #     include Ripple::Document
+    #     one :box
+    #     accepts_nested_attributes_for :box
+    #   end
+    #
+    # This allows creating a box child during creation:
+    #
+    #   shipment = Shipment.create(:box_attributes => { :shape => 'square' })
+    #   shipment.box.shape # => 'square'
+    #
+    # This also allows updating box attributes:
+    #
+    #   shipment.update_attributes(:box_attributes => { :key => 'xxx', :shape => 'triangle' })
+    #   shipment.box.shape # => 'triangle'
+    #
+    # == Many
+    #
+    # Given this model
+    #
+    #   class Manifest
+    #     include Ripple::Document
+    #     many :shipments
+    #     accepts_nested_attributes_for :shipments
+    #   end
+    #
+    # This allows creating several shipments during manifest creation:
+    #
+    #   manifest = Manifest.create(:shipments_attributes => [ { :reference => "foo1" }, { :reference => "foo2" } ])
+    #   manifest.shipments.size # => 2
+    #   manifest.shipments.first.reference # => foo1
+    #   manifest.shipments.second.reference # => foo2
+    #
+    # And updating shipment attributes:
+    #
+    #   manifest.update_attributes(:shipment_attributes => [ { :key => 'xxx', :reference => 'updated foo1' },
+    #                                                        { :key => 'yyy', :reference => 'updated foo2' } ])
+    #   manifest.shipments.first.reference # => updated foo1
+    #   manifest.shipments.second.reference # => updated foo2
+    # 
+    # NOTE: On many embedded, then entire collection of embedded documents is replaced, as there
+    # is no key to specifically update.
+    #
+    # Given
+    #
+    #   class Manifest
+    #     include Ripple::Documnet
+    #     many :signatures
+    #     accepts_nested_attributes_for :signatures
+    #   end
+    #
+    #   class Signature
+    #     include Ripple::EmbeddedDocument
+    #     property :esignature, String
+    #   end
+    #
+    # The assigning of attributes replaces existing:
+    #   
+    #   manifest = Manifest.create(:signature_attributes => [ { :esig => 'a00001' }, { :esig => 'b00001' } ]
+    #   manifest.signatures # => [<Signature esig="a00001">, <Signature esig="b00001">]
+    #
+    #   manifest.signature_attributes = [ { :esig => 'c00001' } ]
+    #   manifest.signatures # => [<Signature esig="c00001">]
+    #     
+    module ClassMethods
+    
+      def accepts_nested_attributes_for(*attr_names)
+        options = { :allow_destroy => false }
+        options.update(attr_names.extract_options!)
+        
+        attr_names.each do |association_name|
+          if association = self.associations[association_name]
+            nested_attributes_options[association_name.to_sym] = options
+         
+            class_eval %{
+              def #{association_name}_attributes=(attributes)
+                assign_nested_attributes_for_#{association.type}_association(:#{association_name}, attributes)
+              end
+
+              before_save :autosave_nested_attributes_for_#{association_name}
+              before_save :destroy_marked_for_destruction
+
+              private
+
+              def autosave_nested_attributes_for_#{association_name}
+                save_nested_attributes_for_#{association.type}_association(:#{association_name}) if self.autosave[:#{association_name}]
+              end
+            }, __FILE__, __LINE__
+          else
+            raise ArgumentError, "Association #{association_name} not found!"
+          end
+        end        
+      end
+    end
+
+    module InstanceMethods
+
+      protected
+
+      def autosave
+        @autosave_nested_attributes_for ||= {}
+      end
+
+      def marked_for_destruction
+        @marked_for_destruction ||= {}
+      end
+
+      private
+      
+      def save_nested_attributes_for_one_association(association_name)
+        send(association_name).save
+      end
+
+      def save_nested_attributes_for_many_association(association_name)
+        send(association_name).map(&:save)
+      end
+
+      def destroy_marked_for_destruction
+        self.marked_for_destruction.each_pair do |association_name, resources|
+          resources.map(&:destroy)
+          send(association_name).reload
+        end
+      end
+
+      def destroy_nested_many_association(association_name)
+        send(association_name).map(&:destroy)
+      end
+
+      def assign_nested_attributes_for_one_association(association_name, attributes)
+        association = self.class.associations[association_name]
+        if association.embeddable?
+          assign_nested_attributes_for_one_embedded_association(association_name, attributes)
+        else
+          self.autosave[association_name] = true
+          assign_nested_attributes_for_one_linked_association(association_name, attributes)
+        end
+      end
+      
+      def assign_nested_attributes_for_one_embedded_association(association_name, attributes)
+        send(association_name).build(attributes.except(*UNASSIGNABLE_KEYS))
+      end
+
+      def assign_nested_attributes_for_one_linked_association(association_name, attributes)
+        attributes = attributes.stringify_keys
+        options = nested_attributes_options[association_name]
+
+        if attributes[key_attr.to_s].blank? && !reject_new_record?(association_name, attributes)
+          send(association_name).build(attributes.except(*UNASSIGNABLE_KEYS))
+        else
+          if ((existing_record = send(association_name)).key.to_s == attributes[key_attr.to_s].to_s)
+            assign_to_or_mark_for_destruction(existing_record, attributes, association_name, options[:allow_destroy])
+          else
+            raise ArgumentError, "Attempting to update a child that isn't already associated to the parent."
+          end
+        end
+      end
+
+      def assign_nested_attributes_for_many_association(association_name, attributes_collection)
+        unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array)
+          raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
+        end
+
+        if attributes_collection.is_a? Hash
+          attributes_collection = attributes_collection.sort_by { |index, _| index.to_i }.map { |_, attributes| attributes }
+        end
+
+        association = self.class.associations[association_name]
+        if association.embeddable?
+          assign_nested_attributes_for_many_embedded_association(association_name, attributes_collection)
+        else
+          self.autosave[association_name] = true
+          assign_nested_attributes_for_many_linked_association(association_name, attributes_collection)
+        end
+      end
+
+      def assign_nested_attributes_for_many_embedded_association(association_name, attributes_collection)
+        options = nested_attributes_options[association_name]
+        send(:"#{association_name}=", []) # Clobber existing
+        attributes_collection.each do |attributes|
+          attributes = attributes.stringify_keys
+          if !reject_new_record?(association_name, attributes)
+            send(association_name).build(attributes.except(*UNASSIGNABLE_KEYS))
+          end
+        end
+      end
+
+      def assign_nested_attributes_for_many_linked_association(association_name, attributes_collection)
+        options = nested_attributes_options[association_name]
+        attributes_collection.each do |attributes|
+          attributes = attributes.stringify_keys
+
+          if attributes[key_attr.to_s].blank? && !reject_new_record?(association_name, attributes)
+            send(association_name).build(attributes.except(*UNASSIGNABLE_KEYS))
+          elsif existing_record = send(association_name).detect { |record| record.key.to_s == attributes[key_attr.to_s].to_s }
+            assign_to_or_mark_for_destruction(existing_record, attributes, association_name, options[:allow_destroy])
+          end
+        end
+      end
+    end
+
+    def assign_to_or_mark_for_destruction(record, attributes, association_name, allow_destroy)
+      if has_destroy_flag?(attributes) && allow_destroy
+        (self.marked_for_destruction[association_name] ||= []) << record
+      else
+        record.attributes = attributes.except(*UNASSIGNABLE_KEYS)
+      end
+    end
+    
+    def has_destroy_flag?(hash)
+      TRUE_VALUES.include?(hash.stringify_keys['_destroy'])
+    end
+
+    def reject_new_record?(association_name, attributes)
+      has_destroy_flag?(attributes) || call_reject_if(association_name, attributes)
+    end
+
+    def call_reject_if(association_name, attributes)
+      attributes = attributes.stringify_keys
+      case callback = nested_attributes_options[association_name][:reject_if]
+      when Symbol
+        method(callback).arity == 0 ? send(callback) : send(callback, attributes)
+      when Proc
+        callback.call(attributes)
+      end
+    end
+
+  end
+  
+end

data/lib/ripple/properties.rb

@@ -58,9 +58,10 @@ module Ripple
 
     # @return [Object] The default value for this property if defined, or nil.
     def default
-      if default = options[:default]
-        type_cast(default.respond_to?(:call) ? default.call : default)
-      end
+      default = options[:default]
+
+      return nil if default.nil?
+      type_cast(default.respond_to?(:call) ? default.call : default)
     end
 
     # @return [Hash] options appropriate for the validates class method

data/lib/ripple.rb

@@ -37,6 +37,7 @@ module Ripple
   autoload :Property, "ripple/properties"
   autoload :Timestamps
   autoload :Validations
+  autoload :NestedAttributes
 
   # Exceptions
   autoload :PropertyTypeMismatch

data/spec/integration/ripple/associations_spec.rb

@@ -14,8 +14,10 @@
 require File.expand_path("../../../spec_helper", __FILE__)
 
 describe "Ripple Associations" do
+  require 'support/test_server'
+
   before :all do
-    Object.module_eval do      
+    Object.module_eval do
       class User
         include Ripple::Document
         one  :profile
@@ -37,7 +39,7 @@ describe "Ripple Associations" do
       end
     end
   end
-  
+
   before :each do
     @user     = User.new(:email => 'riak@ripple.com')
     @profile  = Profile.new(:name => 'Ripple')
@@ -46,7 +48,7 @@ describe "Ripple Associations" do
     @friend1 = User.create(:email => "friend@ripple.com")
     @friend2 = User.create(:email => "friend2@ripple.com")
   end
-  
+
   it "should save one embedded associations" do
     @user.profile = @profile
     @user.save
@@ -55,7 +57,7 @@ describe "Ripple Associations" do
     @found.profile.should be_a(Profile)
     @found.profile.user.should == @found
   end
-  
+
   it "should save many embedded associations" do
     @user.addresses << @billing << @shipping
     @user.save
@@ -71,7 +73,7 @@ describe "Ripple Associations" do
     @ship.should be_a(Address)
   end
 
-  it "should save a many linked association" do    
+  it "should save a many linked association" do
     @user.friends << @friend1 << @friend2
     @user.save
     @user.should_not be_new_record
@@ -87,7 +89,7 @@ describe "Ripple Associations" do
     @found = User.find(@user.key)
     @found.emergency_contact.key.should == @friend1.key
   end
-  
+
   after :each do
     User.destroy_all
   end
@@ -97,5 +99,5 @@ describe "Ripple Associations" do
     Object.send(:remove_const, :Profile)
     Object.send(:remove_const, :Address)
   end
-  
+
 end

data/spec/integration/ripple/nested_attributes_spec.rb

@@ -0,0 +1,260 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Ripple::NestedAttributes do
+  require 'support/models/car'
+  require 'support/models/driver'
+  require 'support/models/passenger'
+  require 'support/models/engine'
+  require 'support/models/seat'
+  require 'support/models/wheel'
+  require 'support/test_server'
+
+  context "one :driver (link)" do
+    subject { Car.new }
+
+    it { should respond_to(:driver_attributes=) }
+
+    it "should not have a driver" do
+      subject.driver.should be_nil
+    end
+
+    describe "creation" do
+      subject { Car.new(:make => 'VW', :model => 'Rabbit', :driver_attributes => { :name => 'Speed Racer' }) }
+
+      it "should have a driver of class Driver" do
+        subject.driver.should be_a(Driver)
+      end
+
+      it "should have a driver with name 'Speed Racer'" do
+        subject.driver.name.should == 'Speed Racer'
+      end
+
+      it "should save the child when saving the parent" do
+        subject.driver.should_receive(:save)
+        subject.save
+      end
+    end
+
+    describe "update" do
+      let(:driver) { Driver.create(:name => 'Slow Racer') }
+
+      before do
+        subject.driver = driver
+        subject.save
+      end
+
+      it "should have a driver" do
+        subject.driver.should == driver
+      end
+
+      it "should update attributes" do
+        subject.driver_attributes = { :name => 'Speed Racer' }
+        subject.driver.name.should == 'Speed Racer'
+      end
+
+      it "should not save the child if attributes haven't been updated" do
+        subject.driver.should_not_receive(:save)
+        subject.save
+      end
+
+      it "should save the child when saving the parent" do
+        subject.driver_attributes = { :name => 'Speed Racer' }
+        subject.driver.should_receive(:save)
+        subject.save
+      end
+    end
+  end
+
+  context "many :passengers (link)" do
+    subject { Car.new }
+
+    it { should respond_to(:passengers_attributes=) }
+
+    it "should not have passengers" do
+      subject.passengers.should == []
+    end
+
+    describe "creation" do
+      subject { Car.new(:make => 'VW',
+                        :model => 'Rabbit',
+                        :passengers_attributes => [ { :name => 'Joe' },
+                                                    { :name => 'Sue' },
+                                                    { :name => 'Pat' } ] ) }
+
+      it "should have 3 passengers" do
+        subject.passengers.size.should == 3
+      end
+
+      it "should have 3 passengers with specified names" do
+        subject.passengers.first.name.should == 'Joe'
+        subject.passengers.second.name.should == 'Sue'
+        subject.passengers.third.name.should == 'Pat'
+      end
+
+      it "should save the children when saving the parent" do
+        subject.passengers.each do |passenger|
+          passenger.should_receive(:save)
+        end
+        subject.save
+      end
+    end
+
+    describe "update" do
+      let(:passenger1) { Passenger.create(:name => 'One') }
+      let(:passenger2) { Passenger.create(:name => 'Two') }
+      let(:passenger3) { Passenger.create(:name => 'Three') }
+
+      before do
+        subject.passengers << passenger1
+        subject.passengers << passenger2
+        subject.passengers << passenger3
+        subject.save
+      end
+
+      it "should have 3 passengers" do
+        subject.passengers.size.should == 3
+      end
+
+      it "should update attributes" do
+        subject.passengers_attributes = [ { :key => passenger1.key, :name => 'UPDATED One' },
+                                          { :key => passenger2.key, :name => 'UPDATED Two' },
+                                          { :key => passenger3.key, :name => 'UPDATED Three' } ]
+        subject.passengers.first.name.should == 'UPDATED One'
+        subject.passengers.second.name.should == 'UPDATED Two'
+        subject.passengers.third.name.should == 'UPDATED Three'
+      end
+
+      it "should not save the child if attributes haven't been updated" do
+        subject.passengers.each do |passenger|
+          passenger.should_not_receive(:save)
+        end
+        subject.save
+      end
+
+      it "should save the child when saving the parent" do
+        subject.passengers_attributes = [ { :key => passenger1.key, :name => 'UPDATED One' },
+                                          { :key => passenger1.key, :name => 'UPDATED Two' },
+                                          { :key => passenger1.key, :name => 'UPDATED Three' } ]
+        subject.passengers.each do |passenger|
+          passenger.should_receive(:save)
+        end
+        subject.save
+      end
+    end
+  end
+
+  context "one :engine (embedded)" do
+    subject { Car.new }
+
+    it { should respond_to(:engine_attributes=) }
+
+    it "should not have an engine" do
+      subject.engine.should be_nil
+    end
+
+    describe "creation" do
+      subject { Car.new(:make => 'VW', :model => 'Rabbit', :engine_attributes => { :displacement => '2.5L' }) }
+
+      it "should have an engine of class Engine" do
+        subject.engine.should be_a(Engine)
+      end
+
+      it "should have a engine with displacement '2.5L'" do
+        subject.engine.displacement.should == '2.5L'
+      end
+
+      it "should save the child when saving the parent" do
+        subject.engine.should_not_receive(:save)
+        subject.save
+      end
+    end
+
+    describe "update" do
+      before do
+        subject.engine.build(:displacement => '3.6L')
+        subject.save
+      end
+
+      it "should have a specified engine" do
+        subject.engine.displacement.should == '3.6L'
+      end
+
+      it "should update attributes" do
+        subject.engine_attributes = { :displacement => 'UPDATED 3.6L' }
+        subject.engine.displacement.should == 'UPDATED 3.6L'
+      end
+
+      it "should not save the child if attributes haven't been updated" do
+        subject.engine.should_not_receive(:save)
+        subject.save
+      end
+
+      it "should not save the child when saving the parent" do
+        subject.engine_attributes = { :displacement => 'UPDATED 3.6L' }
+        subject.engine.should_not_receive(:save)
+        subject.save
+      end
+    end
+  end
+
+  context "many :seats (embedded)" do
+    subject { Car.new }
+
+    it { should respond_to(:seats_attributes=) }
+
+    it "should not have passengers" do
+      subject.seats.should == []
+    end
+
+    describe "creation" do
+      subject { Car.new(:make => 'VW',
+                        :model => 'Rabbit',
+                        :seats_attributes => [ { :color => 'red' },
+                                               { :color => 'blue' },
+                                               { :color => 'brown' } ] ) }
+
+      it "should have 3 seats" do
+        subject.seats.size.should == 3
+      end
+
+      it "should have 3 passengers with specified names" do
+        subject.seats.first.color.should == 'red'
+        subject.seats.second.color.should == 'blue'
+        subject.seats.third.color.should == 'brown'
+      end
+
+      specify "replace/clobber" do
+        subject.seats_attributes = [ { :color => 'orange' } ]
+        subject.seats.size.should == 1
+        subject.seats.first.color.should == 'orange'
+      end
+
+    end
+  end
+
+  context ":reject_if" do
+    it "should not create a wheel" do
+      car = Car.new(:wheels_attributes => [ { :diameter => 10 } ])
+      car.wheels.should == []
+    end
+
+    it "should create a wheel" do
+      car = Car.new(:wheels_attributes => [ { :diameter => 16 } ])
+      car.wheels.size.should == 1
+      car.wheels.first.diameter.should == 16
+    end
+  end
+
+  context ":allow_delete" do
+    let(:wheel) { Wheel.create(:diameter => 17) }
+    subject { Car.create(:wheels => [ wheel ] ) }
+
+    it "should allow us to delete the wheel" do
+      subject.wheels_attributes = [ { :key => wheel.key, :_destroy => "1" } ]
+      subject.save
+      subject.wheels.should == []
+    end
+
+  end
+
+end

data/spec/integration/ripple/persistence_spec.rb

@@ -14,6 +14,8 @@
 require File.expand_path("../../../spec_helper", __FILE__)
 
 describe "Ripple Persistence" do
+  require 'support/test_server'
+
   before :all do    
     Object.module_eval do
       class Widget

data/spec/ripple/attribute_methods_spec.rb

@@ -15,7 +15,7 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::AttributeMethods do
   require 'support/models/widget'
-  
+
   before :each do
     @widget = Widget.new
   end
@@ -37,7 +37,7 @@ describe Ripple::AttributeMethods do
       @widget.attributes = {'key' => 'new-key'}
       @widget.key.should == 'widget-key'
     end
-    
+
     it "should typecast the key to a string" do
       @widget.key = 10
       @widget.key.should == "10"
@@ -56,8 +56,9 @@ describe Ripple::AttributeMethods do
 
     it "should return the property default if defined and not set" do
       @widget.name.should == "widget"
+      @widget.manufactured.should == false
     end
-    
+
     it "should allow raw attribute access when accessing the document with []" do
       @widget['name'].should == 'widget'
     end
@@ -78,7 +79,7 @@ describe Ripple::AttributeMethods do
       @widget.size = 10
       @widget.size.should == 10
     end
-    
+
     it "should allow assignment of undefined attributes when assigning to the document with []=" do
       @widget['name'] = 'sprocket'
       @widget.name.should == 'sprocket'
@@ -136,7 +137,7 @@ describe Ripple::AttributeMethods do
   end
 
   it "should provide a hash representation of all of the attributes" do
-    @widget.attributes.should == {"name" => "widget", "size" => nil}
+    @widget.attributes.should == {"name" => "widget", "size" => nil, "manufactured" => false}
   end
 
   it "should load attributes from mass assignment" do
@@ -154,24 +155,24 @@ describe Ripple::AttributeMethods do
     @widget = Widget.new(:name => "Riak")
     @widget.changes.should be_blank
   end
-  
+
   it "should allow adding to the @attributes hash for attributes that do not exist" do
     @widget = Widget.new
     @widget['foo'] = 'bar'
     @widget.instance_eval { @attributes['foo'] }.should == 'bar'
   end
-  
+
   it "should allow reading from the @attributes hash for attributes that do not exist" do
     @widget = Widget.new
     @widget['foo'] = 'bar'
     @widget['foo'].should == 'bar'
   end
-  
+
   it "should allow a block upon initialization to set attributes protected from mass assignment" do
     @widget = Widget.new { |w| w.key = 'some-key' }
     @widget.key.should == 'some-key'
   end
-  
+
   it "should raise an argument error when assigning a non hash to attributes" do
     @widget = Widget.new
     lambda { @widget.attributes = nil }.should raise_error(ArgumentError)

data/spec/ripple/properties_spec.rb

@@ -77,6 +77,11 @@ describe Ripple::Property do
       prop.default.should == "bar"
     end
 
+    it "should allow false for a Boolean" do
+      prop = Ripple::Property.new('foo', Boolean, :default => false)
+      prop.default.should == false
+    end
+
     it "should allow lambdas for deferred evaluation" do
       prop = Ripple::Property.new('foo', String, :default => lambda { "bar" })
       prop.default.should == "bar"
@@ -122,11 +127,11 @@ describe Ripple::Property do
           @prop.type_cast([]).should == "[]"
         end
       end
-      
+
       it "should not cast nil" do
         @prop.type_cast(nil).should be_nil
       end
-    
+
     end
 
     describe "when type is an Integer type" do

data/spec/spec_helper.rb

@@ -17,10 +17,13 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'riak-client','
 
 require 'rubygems' # Use the gems path only for the spec suite
 require 'ripple'
-require 'rspec/autorun'
+require 'rspec'
 
 Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each {|f| require f }
 
 Rspec.configure do |config|
   config.mock_with :rspec
+  config.after(:each) do
+    $test_server.recycle if $test_server
+  end
 end

data/spec/support/models/car.rb

@@ -0,0 +1,15 @@
+class Car
+  include Ripple::Document
+  
+  property :make, String
+  property :model, String
+
+  one :driver       # linked, key_on :name
+  many :passengers  # linked, standard :key
+  one :engine       # embedded
+  many :seats       # embedded
+  many :wheels
+
+  accepts_nested_attributes_for :driver, :passengers, :engine, :seats
+  accepts_nested_attributes_for :wheels, :reject_if => proc{|attrs| attrs['diameter'] < 12 }, :allow_destroy => true
+end

data/spec/support/models/driver.rb

@@ -0,0 +1,5 @@
+class Driver
+  include Ripple::Document
+  property :name, String
+  key_on :name
+end

data/spec/support/models/engine.rb

@@ -0,0 +1,4 @@
+class Engine
+  include Ripple::EmbeddedDocument
+  property :displacement, String  
+end

data/spec/support/models/passenger.rb

@@ -0,0 +1,5 @@
+class Passenger
+  include Ripple::Document
+  property :name, String
+
+end

data/spec/support/models/seat.rb

@@ -0,0 +1,4 @@
+class Seat
+  include Ripple::EmbeddedDocument
+  property :color, String
+end

data/spec/support/models/wheel.rb

@@ -0,0 +1,5 @@
+class Wheel
+  include Ripple::Document
+  property :diameter, Integer
+
+end

data/spec/support/models/widget.rb

@@ -16,6 +16,7 @@ class Widget
   include Ripple::Document
   property :size, Integer
   property :name, String, :default => "widget"
+  property :manufactured, Boolean, :default => false
 end
 
 class Cog < Widget

data/spec/support/test_server.rb

@@ -0,0 +1,17 @@
+require 'riak/test_server'
+
+unless $test_server
+  begin    
+    require 'yaml'
+    config = YAML.load_file("spec/support/test_server.yml")
+    $test_server = Riak::TestServer.new(config.symbolize_keys)
+    $test_server.prepare!
+    $test_server.start
+    Ripple.config = {:port => 9000 }
+    at_exit { $test_server.cleanup }
+  rescue => e
+    warn "Can't run Riak::TestServer specs. Specify the location of your Riak installation in spec/support/test_server.yml. See Riak::TestServer docs for more info."
+    warn e.inspect
+    $test_server = nil
+  end
+end

data/spec/support/test_server.yml

@@ -0,0 +1,2 @@
+bin_dir: /Users/sean/Development/riak/rel/riak/bin
+temp_dir: /Users/sean/Development/ripple/.riaktest

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -04:00
+date: 2010-10-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,8 @@ dependencies:
         segments: 
         - 0
         - 8
-        - 0
-        version: 0.8.0
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -122,6 +122,7 @@ files:
 - lib/ripple/i18n.rb
 - lib/ripple/inspection.rb
 - lib/ripple/locale/en.yml
+- lib/ripple/nested_attributes.rb
 - lib/ripple/properties.rb
 - lib/ripple/property_type_mismatch.rb
 - lib/ripple/railtie.rb
@@ -133,6 +134,7 @@ files:
 - Rakefile
 - spec/fixtures/config.yml
 - spec/integration/ripple/associations_spec.rb
+- spec/integration/ripple/nested_attributes_spec.rb
 - spec/integration/ripple/persistence_spec.rb
 - spec/ripple/associations/many_embedded_proxy_spec.rb
 - spec/ripple/associations/many_linked_proxy_spec.rb
@@ -162,10 +164,13 @@ files:
 - spec/support/mocks.rb
 - spec/support/models/address.rb
 - spec/support/models/box.rb
+- spec/support/models/car.rb
 - spec/support/models/cardboard_box.rb
 - spec/support/models/clock.rb
 - spec/support/models/customer.rb
+- spec/support/models/driver.rb
 - spec/support/models/email.rb
+- spec/support/models/engine.rb
 - spec/support/models/family.rb
 - spec/support/models/favorite.rb
 - spec/support/models/invoice.rb
@@ -173,10 +178,15 @@ files:
 - spec/support/models/note.rb
 - spec/support/models/page.rb
 - spec/support/models/paid_invoice.rb
+- spec/support/models/passenger.rb
+- spec/support/models/seat.rb
 - spec/support/models/tasks.rb
 - spec/support/models/tree.rb
 - spec/support/models/user.rb
+- spec/support/models/wheel.rb
 - spec/support/models/widget.rb
+- spec/support/test_server.rb
+- spec/support/test_server.yml
 has_rdoc: true
 homepage: http://seancribbs.github.com/ripple
 licenses: []
@@ -211,6 +221,7 @@ specification_version: 3
 summary: ripple is an object-mapper library for Riak, the distributed database by Basho.
 test_files: 
 - spec/integration/ripple/associations_spec.rb
+- spec/integration/ripple/nested_attributes_spec.rb
 - spec/integration/ripple/persistence_spec.rb
 - spec/ripple/associations/many_embedded_proxy_spec.rb
 - spec/ripple/associations/many_linked_proxy_spec.rb
@@ -240,10 +251,13 @@ test_files:
 - spec/support/mocks.rb
 - spec/support/models/address.rb
 - spec/support/models/box.rb
+- spec/support/models/car.rb
 - spec/support/models/cardboard_box.rb
 - spec/support/models/clock.rb
 - spec/support/models/customer.rb
+- spec/support/models/driver.rb
 - spec/support/models/email.rb
+- spec/support/models/engine.rb
 - spec/support/models/family.rb
 - spec/support/models/favorite.rb
 - spec/support/models/invoice.rb
@@ -251,7 +265,11 @@ test_files:
 - spec/support/models/note.rb
 - spec/support/models/page.rb
 - spec/support/models/paid_invoice.rb
+- spec/support/models/passenger.rb
+- spec/support/models/seat.rb
 - spec/support/models/tasks.rb
 - spec/support/models/tree.rb
 - spec/support/models/user.rb
+- spec/support/models/wheel.rb
 - spec/support/models/widget.rb
+- spec/support/test_server.rb