ripple 0.6.1 → 0.7.0

data/spec/ripple/embedded_document_spec.rb

@@ -14,9 +14,7 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::EmbeddedDocument do
-  before :all do
-    Object.module_eval { class Address; include Ripple::EmbeddedDocument; end }
-  end
+  require 'support/models/address'
 
   it "should have a model name when included" do
     Address.should respond_to(:model_name)
@@ -26,27 +24,4 @@ describe Ripple::EmbeddedDocument do
   it "should be embeddable" do
     Address.should be_embeddable
   end
-
-  describe "persistence" do
-    before :each do
-      @root = mock("root document")
-      @root.stub!(:new?).and_return(true)
-      @addr = Address.new
-      @addr._root_document = @root
-    end
-
-    it "should delegate new? to the root document" do
-      @root.should_receive(:new?).and_return(true)
-      @addr.should be_new
-    end
-
-    it "should delegate save to the root document" do
-      @root.should_receive(:save).and_return(true)
-      @addr.save.should be_true
-    end
-  end
-
-  after :all do
-    Object.send(:remove_const, :Address)
-  end
 end

data/spec/ripple/finders_spec.rb

@@ -14,15 +14,9 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Finders do
-  before :all do
-    Object.module_eval do
-      class Box
-        include Ripple::Document
-        property :shape, String
-      end
-    end
-  end
-
+  require 'support/models/box'
+  require 'support/models/cardboard_box'
+  
   before :each do
     @http = mock("HTTP Backend")
     @client = Ripple.client
@@ -32,7 +26,11 @@ describe Ripple::Document::Finders do
   end
 
   it "should return an empty array if no keys are passed to find" do
-    Box.find().should == []
+    Box.find().should be_nil
+  end
+
+  it "should raise Ripple::DocumentNotFound if an empty array is passed to find!" do
+    lambda { Box.find!() }.should raise_error(Ripple::DocumentNotFound, "Couldn't find document without a key")
   end
 
   describe "finding single documents" do
@@ -46,16 +44,57 @@ describe Ripple::Document::Finders do
       box.should_not be_new_record
     end
 
+    it "should find the first document using the first key with the bucket's keys" do
+      box  = Box.new
+      keys = ['some_boxes_key']
+      Box.stub!(:find).and_return(box)
+      @bucket.stub!(:keys).and_return(keys)
+      @bucket.should_receive(:keys)
+      keys.should_receive(:first)
+      Box.first.should == box
+    end
+
+    it "should use find! when using first!" do
+      box = Box.new
+      Box.stub!(:find!).and_return(box)
+      @bucket.stub!(:keys).and_return(['key'])
+      Box.first!.should == box
+    end
+
+    it "should not raise an exception when finding an existing document with find!" do
+      @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"shape":"square"}'})
+      lambda { Box.find!("square") }.should_not raise_error(Ripple::DocumentNotFound)
+    end
+
+    it "should return the document when calling find!" do
+      @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"shape":"square"}'})
+      box = Box.find!("square")
+      box.should be_kind_of(Box)
+    end
+
     it "should return nil when no object exists at that key" do
       @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
       box = Box.find("square")
       box.should be_nil
     end
 
+    it "should raise DocumentNotFound when using find! if no object exists at that key" do
+      @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
+      lambda { Box.find!("square") }.should raise_error(Ripple::DocumentNotFound, "Couldn't find document with key: square")
+    end
+
     it "should re-raise the failed request exception if not a 404" do
       @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_raise(Riak::FailedRequest.new(:get, 200, 500, {}, "500 internal server error"))
       lambda { Box.find("square") }.should raise_error(Riak::FailedRequest)
     end
+
+    it "should handle a key with a nil value" do
+      @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => nil})
+      box = Box.find("square")
+      box.should be_kind_of(Box)
+      box.key.should == "square"
+    end
+
   end
 
   describe "finding multiple documents" do
@@ -68,13 +107,22 @@ describe Ripple::Document::Finders do
       boxes.last.shape.should == "rectangle"
     end
 
-    it "should return nil for documents that no longer exist" do
-      @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"shape":"square"}'})
-      @http.should_receive(:get).with(200, "/riak/", "boxes", "rectangle", {}, {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
-      boxes = Box.find("square", "rectangle")
-      boxes.should have(2).items
-      boxes.first.shape.should == "square"
-      boxes.last.should be_nil
+    describe "when using find with missing keys" do
+      before :each do
+        @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"shape":"square"}'})
+        @http.should_receive(:get).with(200, "/riak/", "boxes", "rectangle", {}, {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
+      end
+
+      it "should return nil for documents that no longer exist" do
+        boxes = Box.find("square", "rectangle")
+        boxes.should have(2).items
+        boxes.first.shape.should == "square"
+        boxes.last.should be_nil
+      end
+
+      it "should raise Ripple::DocumentNotFound when calling find! if some of the documents do not exist" do
+        lambda { Box.find!("square", "rectangle") }.should raise_error(Ripple::DocumentNotFound, "Couldn't find documents with keys: rectangle")
+      end
     end
   end
 
@@ -124,25 +172,13 @@ describe Ripple::Document::Finders do
   end
 
   describe "single-bucket inheritance" do
-    before :all do
-      Object.module_eval { class CardboardBox < Box; end }
-    end
-
     it "should instantiate as the proper type if defined in the document" do
       @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"shape":"square"}'})
       @http.should_receive(:get).with(200, "/riak/", "boxes", "rectangle", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"shape":"rectangle", "_type":"CardboardBox"}'})
       boxes = Box.find("square", "rectangle")
       boxes.should have(2).items
-      boxes.first.should_not be_kind_of(CardboardBox)
+      boxes.first.class.should == Box
       boxes.last.should be_kind_of(CardboardBox)
     end
-
-    after :all do
-      Object.send(:remove_const, :CardboardBox)
-    end
-  end
-
-  after :all do
-    Object.send(:remove_const, :Box)
   end
 end

data/spec/ripple/persistence_spec.rb

@@ -14,15 +14,7 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Persistence do
-  before :all do
-    Object.module_eval {
-      class Widget
-        include Ripple::Document
-        property :size, Integer
-        property :name, String, :default => "widget"
-      end
-    }
-  end
+  require 'support/models/widget'
 
   before :each do
     @http = mock("HTTP Backend")
@@ -38,9 +30,27 @@ describe Ripple::Document::Persistence do
     @http.should_receive(:post).with(201, "/riak/", "widgets", an_instance_of(Hash), json, hash_including("Content-Type" => "application/json")).and_return(:code => 201, :headers => {'location' => ["/riak/widgets/new_widget"]})
     @widget.save
     @widget.key.should == "new_widget"
-    @widget.should_not be_new_record
+    @widget.should_not be_a_new_record
     @widget.changes.should be_blank
   end
+  
+  it "should instantiate and save a new object to riak" do
+    json = @widget.attributes.merge(:size => 10, :_type => 'Widget').to_json
+    @http.should_receive(:post).with(201, "/riak/", "widgets", an_instance_of(Hash), json, hash_including("Content-Type" => "application/json")).and_return(:code => 201, :headers => {'location' => ["/riak/widgets/new_widget"]})
+    @widget = Widget.create(:size => 10)
+    @widget.size.should == 10
+    @widget.should_not be_a_new_record
+  end
+  
+  it "should instantiate and save a new object to riak and allow its attributes to be set via a block" do
+    json = @widget.attributes.merge(:size => 10, :_type => 'Widget').to_json
+    @http.should_receive(:post).with(201, "/riak/", "widgets", an_instance_of(Hash), json, hash_including("Content-Type" => "application/json")).and_return(:code => 201, :headers => {'location' => ["/riak/widgets/new_widget"]})
+    @widget = Widget.create do |widget|
+      widget.size = 10
+    end
+    @widget.size.should == 10
+    @widget.should_not be_a_new_record
+  end
 
   it "should reload a saved object" do
     json = @widget.attributes.merge("_type" => "Widget").to_json
@@ -61,17 +71,26 @@ describe Ripple::Document::Persistence do
     @widget.should be_frozen
   end
 
+  it "should destroy all saved objects" do
+    @widget.should_receive(:destroy).and_return(true)
+    Widget.should_receive(:all).and_yield(@widget)
+    Widget.destroy_all.should be_true
+  end
+
   it "should freeze an unsaved object when destroying" do
     @http.should_not_receive(:delete)
     @widget.destroy.should be_true
     @widget.should be_frozen
   end
+  
+  it "should be a root document" do
+    @widget._root_document.should == @widget
+  end
 
   describe "when storing a class using single-bucket inheritance" do
-    before :all do
-      Object.module_eval { class Cog < Widget; property :name, String, :default => "cog"; end }
-    end
-
+    
+    class Cog < Widget; property :name, String, :default => "cog"; end
+    
     before :each do
       @cog = Cog.new(:size => 1000)
     end
@@ -83,12 +102,5 @@ describe Ripple::Document::Persistence do
       @cog.should_not be_new_record
     end
 
-    after :all do
-      Object.send(:remove_const, :Cog)
-    end
-  end
-
-  after :all do
-    Object.send(:remove_const, :Widget)
   end
 end

data/spec/ripple/properties_spec.rb

@@ -14,9 +14,7 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Properties do
-  before :all do
-    Object.module_eval { class Email; include Ripple::Document; end }
-  end
+  require 'support/models/email'
 
   it "should make the model class have a property definition method" do
     Email.should respond_to(:property)
@@ -38,10 +36,6 @@ describe Ripple::Document::Properties do
     Forward.properties[:foo].should == "bar"
   end
 
-
-  after :all do
-    Object.send(:remove_const, :Email)
-  end
 end
 
 describe Ripple::Document::Property do

data/spec/ripple/ripple_spec.rb

@@ -41,4 +41,14 @@ describe Ripple do
     Ripple.client.should_not == c
     Ripple.client.port.should == 9000
   end
+  
+  it "should raise No Such File or Directory when given a bad configuration file" do
+    lambda { Ripple.load_config('not-here') }.should raise_error(Errno::ENOENT)
+  end
+  
+  it "should apply the configuration under the ripple key" do
+    Ripple.load_config(File.join(File.dirname(__FILE__), '..', 'fixtures', 'config.yml'))
+    Ripple.client.port.should == 9000
+    Ripple.client.host.should == 'localhost'
+  end
 end

data/spec/ripple/timestamps_spec.rb

@@ -1,49 +1,42 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Ripple::Document::Timestamps do
-  
-  before :all do
-    Object.module_eval { class Box; include Ripple::Document; property :shape, String; timestamps! end }
-  end
+  require 'support/models/clock'
   
   before :each do
     response = {:headers => {"content-type" => ["application/json"]}, :body => "{}"}
     @client = Ripple.client
     @http = mock("HTTP Backend", :get => response, :put => response, :post => response, :delete => response)
     @client.stub!(:http).and_return(@http)
-    @box = Box.new
+    @clock = Clock.new
   end
   
   it "should add a created_at property" do
-    @box.should respond_to(:created_at)
+    @clock.should respond_to(:created_at)
   end
   
   it "should add an updated_at property" do
-    @box.should respond_to(:updated_at)
+    @clock.should respond_to(:updated_at)
   end
   
   it "should set the created_at timestamp when the object is initialized" do
-    @box.created_at.should_not be_nil
+    @clock.created_at.should_not be_nil
   end
   
   it "should not set the updated_at timestamp when the object is initialized" do
-    @box.updated_at.should be_nil
+    @clock.updated_at.should be_nil
   end
   
   it "should set the updated_at timestamp when the object is created" do
-    @box.save
-    @box.updated_at.should_not be_nil
+    @clock.save
+    @clock.updated_at.should_not be_nil
   end
   
   it "should update the updated_at timestamp when the object is updated" do
-    @box.save
-    start = @box.updated_at
-    @box.save
-    @box.updated_at.should > start
-  end
-  
-  after :all do
-    Object.send(:remove_const, :Box)
+    @clock.save
+    start = @clock.updated_at
+    @clock.save
+    @clock.updated_at.should > start
   end
   
 end

data/spec/ripple/validations_spec.rb

@@ -14,9 +14,7 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Validations do
-  before :all do
-    Object.module_eval { class Box; include Ripple::Document; property :shape, String end }
-  end
+  require 'support/models/box'
 
   before :each do
     @box = Box.new
@@ -41,6 +39,53 @@ describe Ripple::Document::Validations do
     @box.should_receive(:valid?).and_return(false)
     @box.save.should be_false
   end
+  
+  it "should allow skipping validations by passing save :validate => false" do
+    Ripple.client.http.stub!(:perform).and_return(mock_response)
+    @box.should_not_receive(:valid?)
+    @box.save(:validate => false).should be_true
+  end
+  
+  describe "when using save! on an invalid record" do
+    before(:each) { @box.stub!(:valid?).and_return(false) }
+    
+    it "should raise DocumentInvalid" do
+      lambda { @box.save! }.should raise_error(Ripple::DocumentInvalid)
+    end
+  
+    it "should raise an exception that has the invalid document" do
+      begin
+        @box.save!
+      rescue Ripple::DocumentInvalid => invalid
+        invalid.document.should == @box
+      end
+    end
+  end
+  
+  it "should not raise an error when save! is called and the document is valid" do
+    @box.stub!(:save).and_return(true)
+    @box.stub!(:valid?).and_return(true)
+    lambda { @box.save! }.should_not raise_error(Ripple::DocumentInvalid)
+  end
+  
+  it "should return true from save! when no exception is raised" do
+    @box.stub!(:save).and_return(true)
+    @box.stub!(:valid?).and_return(true)
+    @box.save!.should be_true
+  end
+  
+  it "should not raise an error when creating a box with create! succeeds" do
+    @box.stub!(:new?).and_return(false)
+    Box.stub(:create).and_return(@box)
+    lambda { @new_box = Box.create! }.should_not raise_error(Ripple::DocumentInvalid)
+    @new_box.should == @box
+  end
+  
+  it "should raise an error when creating a box with create! fails" do
+    @box.stub!(:new?).and_return(true)
+    Box.stub(:create).and_return(@box)
+    lambda { Box.create! }.should raise_error(Ripple::DocumentInvalid)
+  end
 
   it "should automatically add validations from property options" do
     Box.property :size, Integer, :inclusion => {:in => 1..30 }
@@ -60,7 +105,4 @@ describe Ripple::Document::Validations do
     Box.reset_callbacks(:validate)
   end
   
-  after :all do
-    Object.send(:remove_const, :Box)
-  end
 end

data/spec/spec_helper.rb

@@ -13,20 +13,14 @@
 #    limitations under the License.
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'riak','lib'))
 
 require 'rubygems' # Use the gems path only for the spec suite
 require 'ripple'
-require 'spec'
-require 'spec/autorun'
-require 'fakeweb'
+require 'rspec/autorun'
 
 Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each {|f| require f }
 
-$server = MockServer.new
-at_exit { $server.stop }
-
-Spec::Runner.configure do |config|
-  config.before(:each) do
-    FakeWeb.clean_registry
-  end
+Rspec.configure do |config|
+  config.mock_with :rspec
 end