ripple 0.7.0 → 0.7.1

data/lib/ripple/{document/validations → validations}/associated_validator.rb

@@ -18,20 +18,19 @@
 require 'ripple'
 
 module Ripple
-  module Document
-    module Validations
-      class AssociatedValidator < ActiveModel::EachValidator
-        def validate_each(record, attribute, value)
-          return if (value.is_a?(Array) ? value : [value]).collect{ |r| r.nil? || r.valid? }.all?
+  module Validations
+    class AssociatedValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        unless Array(value).all? {|r| r.nil? || r.valid? }
           record.errors.add(attribute, :invalid, :default => options[:message], :value => value)
         end
       end
+    end
 
-      module ClassMethods
-        def validates_associated(*attr_names)
-          validates_with AssociatedValidator, _merge_attributes(attr_names)
-        end
+    module ClassMethods
+      def validates_associated(*attr_names)
+        validates_with AssociatedValidator, _merge_attributes(attr_names)
       end
     end
   end
-end
+end

data/spec/integration/ripple/associations_spec.rb

@@ -15,7 +15,6 @@ require File.expand_path("../../../spec_helper", __FILE__)
 
 describe "Ripple Associations" do
   before :all do
-    switch_to_test_node
     Object.module_eval do      
       class User
         include Ripple::Document
@@ -78,4 +77,4 @@ describe "Ripple Associations" do
     Object.send(:remove_const, :Address)
   end
   
-end
+end

data/spec/integration/ripple/persistence_spec.rb

@@ -14,8 +14,7 @@
 require File.expand_path("../../../spec_helper", __FILE__)
 
 describe "Ripple Persistence" do
-  before :all do
-    switch_to_test_node
+  before :all do    
     Object.module_eval do
       class Widget
         include Ripple::Document
@@ -51,4 +50,4 @@ describe "Ripple Persistence" do
     Object.send(:remove_const, :Widget)
   end
   
-end
+end

data/spec/ripple/associations/many_embedded_proxy_spec.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 require File.expand_path("../../../spec_helper", __FILE__)
 
-describe Ripple::Document::Associations::ManyEmbeddedProxy do
+describe Ripple::Associations::ManyEmbeddedProxy do
   require 'support/models/user'
   require 'support/models/address'
   require 'support/models/note'
@@ -121,4 +121,4 @@ describe Ripple::Document::Associations::ManyEmbeddedProxy do
     @user.addresses << @address
     @user.addresses.to_ary.should == [@address]
   end
-end
+end

data/spec/ripple/associations/one_embedded_proxy_spec.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 require File.expand_path("../../../spec_helper", __FILE__)
 
-describe Ripple::Document::Associations::OneEmbeddedProxy do
+describe Ripple::Associations::OneEmbeddedProxy do
   require 'support/models/family'
   require 'support/models/user'
   require 'support/models/address'
@@ -127,4 +127,4 @@ describe Ripple::Document::Associations::OneEmbeddedProxy do
     end
   end
 
-end
+end

data/spec/ripple/associations/proxy_spec.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 require File.expand_path("../../../spec_helper", __FILE__)
 
-describe Ripple::Document::Associations::Proxy do
+describe Ripple::Associations::Proxy do
   require 'support/associations/proxies'
 
   before :each do

data/spec/ripple/associations_spec.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 require File.expand_path("../../spec_helper", __FILE__)
 
-describe Ripple::Document::Associations do
+describe Ripple::Associations do
   require 'support/models/invoice'
   require 'support/models/customer'
   require 'support/models/note'
@@ -22,14 +22,9 @@ describe Ripple::Document::Associations do
     Invoice.should respond_to(:associations)
     Invoice.associations.should be_kind_of(Hash)
   end
-  
-  it "should add associations on the class instance" do 
-    Invoice.new.should respond_to(:associations)
-    Invoice.new.associations.should be_kind_of(Hash)
-  end
-  
+
   it "should collect the embedded associations" do
-    Invoice.new.embedded_associations.should == Array(Invoice.associations[:note])
+    Invoice.embedded_associations.should == Array(Invoice.associations[:note])
   end
 
   it "should copy associations to a subclass" do
@@ -56,24 +51,24 @@ describe Ripple::Document::Associations do
   end
 end
 
-describe Ripple::Document::Association do
+describe Ripple::Association do
   it "should initialize with a type and name" do
-    lambda { Ripple::Document::Association.new(:many, :pages) }.should_not raise_error
+    lambda { Ripple::Association.new(:many, :pages) }.should_not raise_error
   end
 
   describe "determining the class name" do
     it "should default to the camelized class name on :one relationships" do
-      @association = Ripple::Document::Association.new(:one, :page)
+      @association = Ripple::Association.new(:one, :page)
       @association.class_name.should == "Page"
     end
 
     it "should default to the singularized camelized class name on :many relationships" do
-      @association = Ripple::Document::Association.new(:many, :pages)
+      @association = Ripple::Association.new(:many, :pages)
       @association.class_name.should == "Page"
     end
 
     it "should use the :class_name option when given" do
-      @association = Ripple::Document::Association.new(:many, :pages, :class_name => "Note")
+      @association = Ripple::Association.new(:many, :pages, :class_name => "Note")
       @association.class_name.should == "Note"
     end
   end
@@ -82,30 +77,30 @@ describe Ripple::Document::Association do
     require 'support/models/tree'
 
     it "should default to the constantized class name" do
-      @association = Ripple::Document::Association.new(:one, :t, :class_name => "Trunk")
+      @association = Ripple::Association.new(:one, :t, :class_name => "Trunk")
       @association.klass.should == Trunk
     end
 
     it "should be determined by the derived class name" do
-      @association = Ripple::Document::Association.new(:many, :branches)
+      @association = Ripple::Association.new(:many, :branches)
       @association.klass.should == Branch
     end
 
     it "should use the :class option when given" do
-      @association = Ripple::Document::Association.new(:many, :pages, :class => Leaf)
+      @association = Ripple::Association.new(:many, :pages, :class => Leaf)
       @association.klass.should == Leaf
     end
   end
 
   it "should be many when type is :many" do
-    Ripple::Document::Association.new(:many, :pages).should be_many
+    Ripple::Association.new(:many, :pages).should be_many
   end
 
   it "should be one when type is :one" do
-    Ripple::Document::Association.new(:one, :pages).should be_one
+    Ripple::Association.new(:one, :pages).should be_one
   end
 
   it "should determine an instance variable based on the name" do
-    Ripple::Document::Association.new(:many, :pages).ivar.should == "@_pages"
+    Ripple::Association.new(:many, :pages).ivar.should == "@_pages"
   end
-end
+end

data/spec/ripple/attribute_methods_spec.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 require File.expand_path("../../spec_helper", __FILE__)
 
-describe Ripple::Document::AttributeMethods do
+describe Ripple::AttributeMethods do
   require 'support/models/widget'
   
   before :each do
@@ -42,7 +42,6 @@ describe Ripple::Document::AttributeMethods do
       @widget.key = 10
       @widget.key.should == "10"
     end
-
   end
 
   describe "accessors" do
@@ -130,7 +129,6 @@ describe Ripple::Document::AttributeMethods do
     @widget.changes.should == {"name" => ["widget", "foobar"]}
   end
 
-
   it "should refresh the attribute methods when adding a new property" do
     Widget.should_receive(:undefine_attribute_methods)
     Widget.property :start_date, Date
@@ -157,13 +155,13 @@ describe Ripple::Document::AttributeMethods do
     @widget.changes.should be_blank
   end
   
-  it "should allow adding to the @attributes hash for attributes that do no exist" do
+  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 no exist" do
+  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'
@@ -173,5 +171,4 @@ describe Ripple::Document::AttributeMethods do
     @widget = Widget.new { |w| w.key = 'some-key' }
     @widget.key.should == 'some-key'
   end
-
 end

data/spec/ripple/callbacks_spec.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 require File.expand_path("../../spec_helper", __FILE__)
 
-describe Ripple::Document::Callbacks do
+describe Ripple::Callbacks do
   require 'support/models/box'
 
   it "should add create, update, save, and destroy callback declarations" do

data/spec/ripple/{embedded_document/conversion_spec.rb → conversion_spec.rb}

@@ -11,9 +11,9 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-require File.expand_path("../../../spec_helper", __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
-describe Ripple::EmbeddedDocument::Conversion do
+describe Ripple::Conversion do
   require 'support/models/address'
 
   before :each do
@@ -24,11 +24,11 @@ describe Ripple::EmbeddedDocument::Conversion do
   it "should return the key as an array for to_key" do
     @addr.to_key.should == ['some-key']
   end
-  
+
   it "should be able to be converted to a param" do
     @addr.to_param.should == 'some-key'
   end
-  
+
   it "should be able to be converted to a model" do
     @addr.to_model.should == @addr
   end

data/spec/ripple/embedded_document/persistence_spec.rb

@@ -19,21 +19,9 @@ describe Ripple::EmbeddedDocument::Persistence do
   
   before :each do
     @root = User.new
-    @addr = Address.new
+    @addr = Address.new(:street => "196 Broadway")
     @addr._parent_document = @root
   end
-  
-  it "should be embeddable if including Ripple::EmbeddedDocument" do
-    @addr.should be_embeddable
-  end
-  
-  it "should not be a root document if including Ripple::EmbeddedDocument" do
-    @addr.should_not be__root_document
-  end
-  
-  it "should be a root document if including Ripple::Document" do
-    @root.should be__root_document
-  end
 
   it "should delegate new? to the root document" do
     @root.should_receive(:new?).and_return(true)
@@ -46,17 +34,17 @@ describe Ripple::EmbeddedDocument::Persistence do
   end
   
   it "should delegate save! to the root document" do
-    @root.should_receive(:save!).and_return(true)
+    @root.should_receive(:save).and_return(true)
     @addr.save!.should be_true
   end
   
   it "should raise NoRootDocument when calling save without a root document" do
-    @addr = Address.new
+    @addr._parent_document = nil
     lambda { @addr.save }.should raise_error(Ripple::NoRootDocument)
   end
   
   it "should raise NoRootDocument when calling save! without a root document" do
-    @addr = Address.new
+    @addr._parent_document = nil
     lambda { @addr.save! }.should raise_error(Ripple::NoRootDocument)
   end
 

data/spec/ripple/properties_spec.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 require File.expand_path("../../spec_helper", __FILE__)
 
-describe Ripple::Document::Properties do
+describe Ripple::Properties do
   require 'support/models/email'
 
   it "should make the model class have a property definition method" do
@@ -35,51 +35,50 @@ describe Ripple::Document::Properties do
     class Forward < Email; end
     Forward.properties[:foo].should == "bar"
   end
-
 end
 
-describe Ripple::Document::Property do
+describe Ripple::Property do
   it "should have a key symbol" do
-    prop = Ripple::Document::Property.new('foo', String)
+    prop = Ripple::Property.new('foo', String)
     prop.should respond_to(:key)
     prop.key.should == :foo
   end
 
   it "should have a type" do
-    prop = Ripple::Document::Property.new('foo', String)
+    prop = Ripple::Property.new('foo', String)
     prop.should respond_to(:type)
     prop.type.should == String
   end
 
   it "should capture extra options" do
-    prop = Ripple::Document::Property.new('foo', String, 'default' => "bar")
+    prop = Ripple::Property.new('foo', String, 'default' => "bar")
     prop.should respond_to(:options)
     prop.options.should == {:default => "bar"}
   end
 
   it "should expose validation options" do
-    prop = Ripple::Document::Property.new('foo', String, 'default' => "bar", :presence => true)
+    prop = Ripple::Property.new('foo', String, 'default' => "bar", :presence => true)
     prop.validation_options.should == {:presence => true}
   end
 
   describe "default value" do
     it "should be nil when not specified" do
-      prop = Ripple::Document::Property.new('foo', String)
+      prop = Ripple::Property.new('foo', String)
       prop.default.should be_nil
     end
 
     it "should allow literal values" do
-      prop = Ripple::Document::Property.new('foo', String, :default => "bar")
+      prop = Ripple::Property.new('foo', String, :default => "bar")
       prop.default.should == "bar"
     end
 
     it "should cast to the proper type" do
-      prop = Ripple::Document::Property.new('foo', String, :default => :bar)
+      prop = Ripple::Property.new('foo', String, :default => :bar)
       prop.default.should == "bar"
     end
 
     it "should allow lambdas for deferred evaluation" do
-      prop = Ripple::Document::Property.new('foo', String, :default => lambda { "bar" })
+      prop = Ripple::Property.new('foo', String, :default => lambda { "bar" })
       prop.default.should == "bar"
     end
   end
@@ -87,7 +86,7 @@ describe Ripple::Document::Property do
   describe "casting a value" do
     describe "when type is Boolean" do
       before :each do
-        @prop = Ripple::Document::Property.new('foo', Boolean)
+        @prop = Ripple::Property.new('foo', Boolean)
       end
 
       [0, 0.0, "", [], false, "f", "FALSE"].each do |v|
@@ -109,7 +108,7 @@ describe Ripple::Document::Property do
 
     describe "when type is String" do
       before :each do
-        @prop = Ripple::Document::Property.new('foo', String)
+        @prop = Ripple::Property.new('foo', String)
       end
 
       it "should cast anything to a string using to_s" do
@@ -126,7 +125,7 @@ describe Ripple::Document::Property do
 
     describe "when type is an Integer type" do
       before :each do
-        @prop = Ripple::Document::Property.new(:foo, Integer)
+        @prop = Ripple::Property.new(:foo, Integer)
       end
 
       [5.0, "5", "     5", "05", Rational(10,2)].each do |v|
@@ -150,7 +149,7 @@ describe Ripple::Document::Property do
 
     describe "when type is a Float type" do
       before :each do
-        @prop = Ripple::Document::Property.new(:foo, Float)
+        @prop = Ripple::Property.new(:foo, Float)
       end
 
       [0, "0", "0.0", "    0.0", ""].each do |v|
@@ -174,7 +173,7 @@ describe Ripple::Document::Property do
 
     describe "when type is a Numeric type" do
       before :each do
-        @prop = Ripple::Document::Property.new(:foo, Numeric)
+        @prop = Ripple::Property.new(:foo, Numeric)
       end
 
       [5.0, "5", "      5.0", "05"].each do |v|
@@ -192,7 +191,7 @@ describe Ripple::Document::Property do
 
     describe "when type is a Time type" do
       before :each do
-        @prop = Ripple::Document::Property.new(:foo, Time)
+        @prop = Ripple::Property.new(:foo, Time)
       end
 
       ["Tue, 16 Mar 2010 12:00:00 -0000","2010/03/16 12:00:00 GMT", Time.utc(2010,03,16,12)].each do |v|
@@ -204,7 +203,7 @@ describe Ripple::Document::Property do
 
     describe "when type is a Date type" do
       before :each do
-        @prop = Ripple::Document::Property.new(:foo, Date)
+        @prop = Ripple::Property.new(:foo, Date)
       end
 
       ["Tue, 16 Mar 2010 00:00:00 -0000", "2010/03/16 12:00:00 GMT", Time.utc(2010,03,16,12), "2010/03/16"].each do |v|