ripple 0.8.3 → 0.9.0.beta

data/Rakefile

@@ -156,18 +156,18 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 desc "Run Unit Specs Only"
-Rspec::Core::RakeTask.new(:spec) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/ripple/**/*_spec.rb"
 end
 
 namespace :spec do
   desc "Run Integration Specs Only"
-  Rspec::Core::RakeTask.new(:integration) do |spec|
+  RSpec::Core::RakeTask.new(:integration) do |spec|
     spec.pattern = "spec/integration/**/*_spec.rb"
   end
 
   desc "Run All Specs"
-  Rspec::Core::RakeTask.new(:all) do |spec|
+  RSpec::Core::RakeTask.new(:all) do |spec|
     spec.pattern = "spec/**/*_spec.rb"
   end
 end

data/lib/ripple.rb

@@ -39,6 +39,7 @@ module Ripple
   autoload :Timestamps
   autoload :Validations
   autoload :NestedAttributes
+  autoload :Observable
 
   # Exceptions
   autoload :PropertyTypeMismatch

data/lib/ripple/document.rb

@@ -58,6 +58,7 @@ module Ripple
       include Ripple::Validations
       include Ripple::Associations
       include Ripple::Callbacks
+      include Ripple::Observable
       include Ripple::Conversion
       include Ripple::Document::Finders
       include Ripple::Inspection

data/lib/ripple/document/bucket_access.rb

@@ -25,7 +25,7 @@ module Ripple
 
       # @return [Riak::Bucket] The bucket assigned to this class.
       def bucket
-        Riak::Bucket.new(Ripple.client, bucket_name)
+        Ripple.client.bucket(bucket_name)
       end
 
       # Set the bucket name for this class and its subclasses.

data/ripple.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripple}
-  s.version = "0.8.3"
+  s.version = "0.9.0.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2010-12-13}
+  s.date = %q{2010-12-29}
   s.description = %q{ripple is an object-mapper library for Riak, the distributed database by Basho.  It uses ActiveModel to provide an experience that integrates well with Rails 3 applications.}
   s.email = %q{sean@basho.com}
   s.files = ["Gemfile", "lib/rails/generators/ripple/configuration/configuration_generator.rb", "lib/rails/generators/ripple/configuration/templates/ripple.yml", "lib/rails/generators/ripple/js/js_generator.rb", "lib/rails/generators/ripple/js/templates/js/contrib.js", "lib/rails/generators/ripple/js/templates/js/ripple.js", "lib/rails/generators/ripple/model/model_generator.rb", "lib/rails/generators/ripple/model/templates/model.rb", "lib/rails/generators/ripple/test/templates/test_server.rb", "lib/rails/generators/ripple/test/test_generator.rb", "lib/rails/generators/ripple_generator.rb", "lib/ripple/associations/embedded.rb", "lib/ripple/associations/instantiators.rb", "lib/ripple/associations/linked.rb", "lib/ripple/associations/many.rb", "lib/ripple/associations/many_embedded_proxy.rb", "lib/ripple/associations/many_linked_proxy.rb", "lib/ripple/associations/one.rb", "lib/ripple/associations/one_embedded_proxy.rb", "lib/ripple/associations/one_linked_proxy.rb", "lib/ripple/associations/proxy.rb", "lib/ripple/associations.rb", "lib/ripple/attribute_methods/dirty.rb", "lib/ripple/attribute_methods/query.rb", "lib/ripple/attribute_methods/read.rb", "lib/ripple/attribute_methods/write.rb", "lib/ripple/attribute_methods.rb", "lib/ripple/callbacks.rb", "lib/ripple/conversion.rb", "lib/ripple/core_ext/casting.rb", "lib/ripple/core_ext.rb", "lib/ripple/document/bucket_access.rb", "lib/ripple/document/finders.rb", "lib/ripple/document/key.rb", "lib/ripple/document/persistence.rb", "lib/ripple/document.rb", "lib/ripple/embedded_document/finders.rb", "lib/ripple/embedded_document/persistence.rb", "lib/ripple/embedded_document.rb", "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", "lib/ripple/timestamps.rb", "lib/ripple/translation.rb", "lib/ripple/validations/associated_validator.rb", "lib/ripple/validations.rb", "lib/ripple.rb", "Rakefile", "ripple.gemspec", "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", "spec/ripple/associations/one_embedded_proxy_spec.rb", "spec/ripple/associations/one_linked_proxy_spec.rb", "spec/ripple/associations/proxy_spec.rb", "spec/ripple/associations_spec.rb", "spec/ripple/attribute_methods_spec.rb", "spec/ripple/bucket_access_spec.rb", "spec/ripple/callbacks_spec.rb", "spec/ripple/conversion_spec.rb", "spec/ripple/core_ext_spec.rb", "spec/ripple/document_spec.rb", "spec/ripple/embedded_document/finders_spec.rb", "spec/ripple/embedded_document/persistence_spec.rb", "spec/ripple/embedded_document_spec.rb", "spec/ripple/finders_spec.rb", "spec/ripple/inspection_spec.rb", "spec/ripple/key_spec.rb", "spec/ripple/persistence_spec.rb", "spec/ripple/properties_spec.rb", "spec/ripple/ripple_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations_spec.rb", "spec/spec_helper.rb", "spec/support/associations/proxies.rb", "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", "spec/support/models/late_invoice.rb", "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.example"]
@@ -22,18 +22,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_runtime_dependency(%q<riak-client>, ["~> 0.8.3"])
+      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.0.beta"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_dependency(%q<riak-client>, ["~> 0.8.3"])
+      s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-    s.add_dependency(%q<riak-client>, ["~> 0.8.3"])
+    s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
     s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
   end

data/spec/ripple/callbacks_spec.rb

@@ -35,8 +35,8 @@ describe Ripple::Callbacks do
     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)
+      @backend = mock("Backend", :store_object => true)
+      @client.stub!(:backend).and_return(@backend)
       $pinger = mock("callback verifier")
     end
 
@@ -76,7 +76,7 @@ describe Ripple::Callbacks do
       @box = Box.new
       @box.destroy
     end
-    
+
     describe "validation callbacks" do
       it "should call validation callbacks" do
         Box.before_validation { $pinger.ping }
@@ -85,7 +85,7 @@ describe Ripple::Callbacks do
         @box = Box.new
         @box.valid?
       end
-      
+
       it "should call validation callbacks only if the document is new" do
         Box.before_validation(:on => :create) { $pinger.ping }
         Box.after_validation(:on => :create) { $pinger.ping }
@@ -101,7 +101,7 @@ describe Ripple::Callbacks do
         @box = Box.new
         @box.valid?
       end
-      
+
       it "should call validation callbacks only if the document is not new" do
         Box.before_validation(:on => :update) { $pinger.ping }
         Box.after_validation(:on => :update) { $pinger.ping }

data/spec/ripple/embedded_document/finders_spec.rb

@@ -33,5 +33,4 @@ describe Ripple::EmbeddedDocument::Finders do
   it "should use self if being called from a class including Ripple::EmbeddedDocument and _type is not present" do
     Address.instantiate({}).class.should == Address
   end
-
 end

data/spec/ripple/finders_spec.rb

@@ -18,11 +18,12 @@ describe Ripple::Document::Finders do
   require 'support/models/cardboard_box'
   
   before :each do
-    @http = mock("HTTP Backend")
+    @backend = mock("Backend")
     @client = Ripple.client
-    @client.stub!(:http).and_return(@http)
-    @bucket = Riak::Bucket.new(@client, "boxes")
-    Box.stub!(:bucket).and_return(@bucket)
+    @client.stub!(:backend).and_return(@backend)
+    @bucket = Ripple.client.bucket("boxes")
+    @plain = Riak::RObject.new(@bucket, "square"){|o| o.content_type = "application/json"; o.raw_data = '{"shape":"square"}'}
+    @cb = Riak::RObject.new(@bucket, "rectangle"){|o| o.content_type = "application/json"; o.raw_data = '{"shape":"rectangle"}'}
   end
 
   it "should return nil if no keys are passed to find" do
@@ -39,8 +40,12 @@ describe Ripple::Document::Finders do
   end
 
   describe "finding single documents" do
+    before do
+      @bucket.stub!(:get).with("square", {}).and_return(@plain)
+    end
+    
     it "should find a single document by key and assign its attributes" do
-      @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"shape":"square"}'})
+      @bucket.should_receive(:get).with("square", {}).and_return(@plain)
       box = Box.find("square")
       box.should be_kind_of(Box)
       box.shape.should == "square"
@@ -67,50 +72,48 @@ describe Ripple::Document::Finders do
     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 raise an exception when finding an existing document that has properties we don't know about" do
-      @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"non_existent_property":"whatever"}'})
+      @plain.raw_data = '{"non_existent_property":"whatever"}'
       lambda { Box.find("square") }.should raise_error
     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"))
+      @bucket.should_receive(:get).with("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"))
+      @bucket.should_receive(:get).with("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"))
+      @bucket.should_receive(:get).with("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})
+      @plain.raw_data = nil
+      @plain.data = nil
       box = Box.find("square")
       box.should be_kind_of(Box)
       box.key.should == "square"
     end
-
   end
 
   describe "finding multiple documents" do
     it "should find multiple documents by the keys" 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"}'})
+      @bucket.should_receive(:get).with("square", {}).and_return(@plain)
+      @bucket.should_receive(:get).with("rectangle", {}).and_return(@cb)
       boxes = Box.find("square", "rectangle")
       boxes.should have(2).items
       boxes.first.shape.should == "square"
@@ -119,8 +122,8 @@ describe Ripple::Document::Finders do
 
     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"))
+        @bucket.should_receive(:get).with("square", {}).and_return(@plain)
+        @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
       end
 
       it "should return nil for documents that no longer exist" do
@@ -139,8 +142,8 @@ describe Ripple::Document::Finders do
   describe "finding all documents in the bucket" do
     it "should load all objects in the bucket" do
       @bucket.should_receive(:keys).and_return(["square", "rectangle"])
-      @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"}'})
+      @bucket.should_receive(:get).with("square", {}).and_return(@plain)
+      @bucket.should_receive(:get).with("rectangle", {}).and_return(@cb)
       boxes = Box.all
       boxes.should have(2).items
       boxes.first.shape.should == "square"
@@ -149,29 +152,17 @@ describe Ripple::Document::Finders do
 
     it "should exclude objects that are not found" do
       @bucket.should_receive(:keys).and_return(["square", "rectangle"])
-      @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"))
+      @bucket.should_receive(:get).with("square", {}).and_return(@plain)
+      @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
       boxes = Box.all
       boxes.should have(1).item
       boxes.first.shape.should == "square"
     end
 
-    it "should yield found objects to the passed block and return an empty array" do
-      @bucket.should_receive(:keys).and_yield(["square"]).and_yield(["rectangle"])
-      @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"}'})
-      @block = mock()
-      @block.should_receive(:ping).twice
-      Box.all do |box|
-        @block.ping
-        ["square", "rectangle"].should include(box.shape)
-      end.should == []
-    end
-
     it "should yield found objects to the passed block, excluding missing objects, and return an empty array" do
       @bucket.should_receive(:keys).and_yield(["square"]).and_yield(["rectangle"])
-      @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"))
+      @bucket.should_receive(:get).with("square", {}).and_return(@plain)
+      @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
       @block = mock()
       @block.should_receive(:ping).once
       Box.all do |box|
@@ -183,8 +174,9 @@ describe Ripple::Document::Finders do
 
   describe "single-bucket inheritance" do
     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"}'})
+      @cb.raw_data = '{"shape":"rectangle", "_type":"CardboardBox"}'
+      @bucket.should_receive(:get).with("square", {}).and_return(@plain)
+      @bucket.should_receive(:get).with("rectangle", {}).and_return(@cb)
       boxes = Box.find("square", "rectangle")
       boxes.should have(2).items
       boxes.first.class.should == Box

data/spec/ripple/persistence_spec.rb

@@ -17,17 +17,21 @@ describe Ripple::Document::Persistence do
   require 'support/models/widget'
 
   before :each do
-    @http = mock("HTTP Backend")
+    @backend = mock("Backend")
     @client = Ripple.client
-    @client.stub!(:http).and_return(@http)
-    @bucket = Riak::Bucket.new(@client, "widgets")
-    @client.stub!(:[]).and_return(@bucket)
+    @client.stub!(:backend).and_return(@backend)
+    @bucket = Ripple.client.bucket("widgets")
     @widget = Widget.new(:size => 1000)
   end
 
   it "should save a new object to Riak" do
     json = @widget.attributes.merge("_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"]})
+    @backend.should_receive(:store_object) do |obj, _, _, _|
+      obj.raw_data.should == json
+      obj.key.should be_nil
+      # Simulate loading the response with the key
+      obj.key = "new_widget"
+    end
     @widget.save
     @widget.key.should == "new_widget"
     @widget.should_not be_a_new_record
@@ -36,7 +40,12 @@ describe Ripple::Document::Persistence do
 
   it "should modify attributes and save a new object" do
     json = @widget.attributes.merge("_type" => "Widget", "size" => 5).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"]})
+    @backend.should_receive(:store_object) do |obj, _, _, _|
+      obj.raw_data.should == json
+      obj.key.should be_nil
+      # Simulate loading the response with the key
+      obj.key = "new_widget"
+    end
     @widget.update_attributes(:size => 5)
     @widget.key.should == "new_widget"
     @widget.should_not be_a_new_record
@@ -45,7 +54,12 @@ describe Ripple::Document::Persistence do
 
   it "should modify a single attribute and save a new object" do
     json = @widget.attributes.merge("_type" => "Widget", "size" => 5).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"]})
+    @backend.should_receive(:store_object) do |obj, _, _, _|
+      obj.raw_data.should == json
+      obj.key.should be_nil
+      # Simulate loading the response with the key
+      obj.key = "new_widget"
+    end
     @widget.update_attribute(:size, 5)
     @widget.key.should == "new_widget"
     @widget.should_not be_a_new_record
@@ -55,7 +69,12 @@ describe Ripple::Document::Persistence do
 
   it "should instantiate and save a new object to riak" do
     json = @widget.attributes.merge(:size => 10, :shipped_at => "Sat, 01 Jan 2000 20:15:01 -0000", :_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"]})
+    @backend.should_receive(:store_object) do |obj, _, _, _|
+      obj.raw_data.should == json
+      obj.key.should be_nil
+      # Simulate loading the response with the key
+      obj.key = "new_widget"
+    end
     @widget = Widget.create(:size => 10, :shipped_at => Time.utc(2000,"jan",1,20,15,1))
     @widget.size.should == 10
     @widget.shipped_at.should == Time.utc(2000,"jan",1,20,15,1)
@@ -64,7 +83,12 @@ describe Ripple::Document::Persistence do
 
   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"]})
+    @backend.should_receive(:store_object) do |obj, _, _, _|
+      obj.raw_data.should == json
+      obj.key.should be_nil
+      # Simulate loading the response with the key
+      obj.key = "new_widget"
+    end
     @widget = Widget.create do |widget|
       widget.size = 10
     end
@@ -74,9 +98,17 @@ describe Ripple::Document::Persistence do
 
   it "should reload a saved object" do
     json = @widget.attributes.merge(:_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"]})
+    @backend.should_receive(:store_object) do |obj, _, _, _|
+      obj.raw_data.should == json
+      obj.key.should be_nil
+      # Simulate loading the response with the key
+      obj.key = "new_widget"
+    end
     @widget.save
-    @http.should_receive(:get).and_return(:code => 200, :headers => {'content-type' => ["application/json"]}, :body => '{"name":"spring","size":10,"shipped_at":"Sat, 01 Jan 2000 20:15:01 -0000","_type":"Widget"}')
+    @backend.should_receive(:reload_object) do |obj, _|
+      obj.key.should == "new_widget"
+      obj.raw_data = '{"name":"spring","size":10,"shipped_at":"Sat, 01 Jan 2000 20:15:01 -0000","_type":"Widget"}'
+    end
     @widget.reload
     @widget.changes.should be_blank
     @widget.name.should == "spring"
@@ -85,9 +117,11 @@ describe Ripple::Document::Persistence do
   end
 
   it "should destroy a saved object" do
-    @http.should_receive(:post).and_return(:code => 201, :headers => {'location' => ["/riak/widgets/new_widget"]})
+    @backend.should_receive(:store_object).and_return(true)
+    @widget.key = "foo"
     @widget.save
-    @http.should_receive(:delete).and_return(:code => 204, :headers => {})
+    @widget.should_not be_new
+    @backend.should_receive(:delete_object).and_return(true)
     @widget.destroy.should be_true
     @widget.should be_frozen
   end
@@ -99,7 +133,7 @@ describe Ripple::Document::Persistence do
   end
 
   it "should freeze an unsaved object when destroying" do
-    @http.should_not_receive(:delete)
+    @backend.should_not_receive(:delete_object)
     @widget.destroy.should be_true
     @widget.should be_frozen
   end
@@ -115,11 +149,13 @@ describe Ripple::Document::Persistence do
 
     it "should store the _type field as the class name" do
       json = @cog.attributes.merge("_type" => "Cog").to_json
-      @http.should_receive(:post).and_return(:code => 201, :headers => {'location' => ["/riak/widgets/new_widget"]})
+      @backend.should_receive(:store_object) do |obj, _, _, _|
+        obj.raw_data.should == json
+        obj.key = "new_widget"
+      end
       @cog.save
       @cog.should_not be_new_record
     end
-
   end
 
   describe "modifying the default quorum values" do

data/spec/ripple/timestamps_spec.rb

@@ -20,8 +20,8 @@ describe Ripple::Timestamps do
   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)
+    @backend = mock("Backend", :store_object => true)
+    @client.stub!(:backend).and_return(@backend)
     @clock = Clock.new
   end
   
@@ -51,6 +51,5 @@ describe Ripple::Timestamps do
     start = @clock.updated_at
     @clock.save
     @clock.updated_at.should > start
-  end
-  
+  end  
 end

data/spec/ripple/validations_spec.rb

@@ -18,6 +18,8 @@ describe Ripple::Validations do
 
   before :each do
     @box = Box.new
+    @client = Ripple.client
+    @client.stub!(:backend).and_return(mock("Backend", :store_object => true))
   end
 
   it "should add validation declarations to the class" do
@@ -103,6 +105,5 @@ describe Ripple::Validations do
   
   after :each do
     Box.reset_callbacks(:validate)
-  end
-  
+  end  
 end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ require 'rspec'
 
 Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each {|f| require f }
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.mock_with :rspec
   config.after(:each) do
     $test_server.recycle if $test_server

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ripple
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31098121
+  prerelease: true
   segments: 
   - 0
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  - 0
+  - beta
+  version: 0.9.0.beta
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -06:00
+date: 2010-12-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +27,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -40,11 +43,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31098121
         segments: 
         - 0
-        - 8
-        - 3
-        version: 0.8.3
+        - 9
+        - 0
+        - beta
+        version: 0.9.0.beta
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,6 +60,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -70,6 +76,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -208,17 +215,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: