ripple 0.7.1 → 0.8.0.beta

data/spec/ripple/associations/one_embedded_proxy_spec.rb

@@ -87,6 +87,11 @@ describe Ripple::Associations::OneEmbeddedProxy do
     @gchild._root_document.should   == @parent
     @gchild._parent_document.should == @child
   end
+
+  it "should refuse assigning a document of the wrong type" do
+    lambda { @parent.child = @gchild }.should raise_error
+    lambda { @child.gchild = [] }.should raise_error
+  end
   
   describe "callbacks" do
     before :each do

data/spec/ripple/associations/one_linked_proxy_spec.rb

@@ -0,0 +1,76 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    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__)
+
+describe Ripple::Associations::OneLinkedProxy do
+  require 'support/models/tasks'
+  
+  before :each do
+    @person = Person.new {|p| p.key = "riak-user" }
+    @profile = Profile.new {|t| t.key = "one" }
+    @other_profile = Profile.new {|t| t.key = "two" }
+    [@person, @profile, @other_profile].each do |doc|
+      doc.stub!(:new?).and_return(false)
+    end
+  end
+
+  it "should be blank before the associated document is set" do
+    @person.profile.should_not be_present
+  end
+  
+  it "should accept a single document" do
+    lambda { @person.profile = @profile }.should_not raise_error
+  end
+
+  it "should set the link on the RObject when assigning" do
+    @person.profile = @profile
+    @person.robject.links.should include(@profile.robject.to_link("profile"))
+  end
+
+  it "should return the assigned document when assigning" do
+    ret = (@person.profile = @profile)
+    ret.should == @profile
+  end
+
+  it "should save the new document when assigning" do
+    @profile.should_receive(:new?).and_return(true)
+    @profile.should_receive(:save).and_return(true)
+    @person.profile = @profile
+  end
+  
+  it "should link-walk to the associated document when accessing" do    
+    @person.robject.links << @profile.robject.to_link("profile")
+    @person.robject.should_receive(:walk).with(Riak::WalkSpec.new(:bucket => "profiles", :tag => "profile")).and_return([[@profile.robject]])
+    @person.profile.should be_present
+  end
+
+  it "should return nil immediately if the association link is missing" do
+    @person.robject.links.should be_empty
+    @person.profile.should be_nil
+  end
+  
+  it "should replace associated document with a new one" do
+    @person.profile = @profile
+    @person.profile = @other_profile
+    @person.profile.should == @other_profile
+  end
+
+  # it "should be able to build a new associated document" do
+  #   @person.profile.build
+  # end
+
+  it "should refuse assigning a document of the wrong type" do
+    lambda { @person.profile = @person }.should raise_error
+  end
+end

data/spec/ripple/associations/proxy_spec.rb

@@ -58,7 +58,7 @@ describe Ripple::Associations::Proxy do
     end
 
     it "should send resulting in a method missing if neither the proxy nor the target respond to the method" do
-      lambda { @proxy.send(:gsub) }.should raise_error(NoMethodError)
+      lambda { @proxy.send(:explode) }.should raise_error(NoMethodError)
     end
   end
 

data/spec/ripple/bucket_access_spec.rb

@@ -31,9 +31,8 @@ describe Ripple::Document::BucketAccess do
   end
 
   it "should allow access to the bucket" do
-    bucket = Riak::Bucket.new(Ripple.client, "invoices")
-    Ripple.client.should_receive(:[]).with("invoices", {:keys => false}).and_return(bucket)
-    Invoice.bucket.should == bucket
+    Invoice.bucket.should be_kind_of(Riak::Bucket)
+    Invoice.bucket.client.should == Ripple.client
+    Invoice.bucket.name.should == "invoices"
   end
-
 end

data/spec/ripple/core_ext_spec.rb

@@ -21,3 +21,14 @@ describe DateTime do
     DateTime.civil(2010,3,16,12).as_json.should == "Tue, 16 Mar 2010 12:00:00 +0000"
   end
 end
+
+describe "Boolean" do
+  it "should be available to properties on documents" do
+    lambda {
+      class BooleanTest
+        include Ripple::Document
+        property :foo, Boolean
+      end
+    }.should_not raise_error(NameError)
+  end
+end

data/spec/ripple/embedded_document/persistence_spec.rb

@@ -71,4 +71,16 @@ describe Ripple::EmbeddedDocument::Persistence do
     @root.addresses << @addr
     @root.attributes_for_persistence.should == {'_type' => 'User', 'addresses' => [{'_type' => 'Address', 'street' => nil}]}
   end
+
+  it "should modify its attributes and save" do
+    @addr.should_receive(:save).and_return(true)
+    @addr.update_attributes(:street => "4 Folsom Ave")
+    @addr.street.should == "4 Folsom Ave"
+  end
+
+  it "should update a single attribute and save without validations" do
+    @addr.should_receive(:save).with(:validate => false).and_return(true)
+    @addr.update_attribute(:street, "4 Folsom Ave")
+    @addr.street.should == "4 Folsom Ave"
+  end
 end

data/spec/ripple/finders_spec.rb

@@ -22,7 +22,7 @@ describe Ripple::Document::Finders do
     @client = Ripple.client
     @client.stub!(:http).and_return(@http)
     @bucket = Riak::Bucket.new(@client, "boxes")
-    @client.stub!(:[]).and_return(@bucket)
+    Box.stub!(:bucket).and_return(@bucket)
   end
 
   it "should return an empty array if no keys are passed to find" do

data/spec/ripple/inspection_spec.rb

@@ -0,0 +1,48 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    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__)
+
+describe Ripple::Inspection do
+  require 'support/models/box'
+  require 'support/models/address'
+
+  before :each do
+    @box = Box.new
+    @address = Address.new
+  end
+  
+  it "should include the class name in the inspect string" do
+    @box.inspect.should be_starts_with("<Box")
+  end
+  
+  it "should include the key in the inspect string for documents" do
+    @box.key = "square"
+    @box.inspect.should be_starts_with("<Box:square")
+  end
+  
+  it "should indicate a new document when no key is specified" do
+    @box.inspect.should be_starts_with("<Box:[new]")
+  end
+
+  it "should enumerate the document's properties and their values" do
+    @box.shape = "square"
+    @box.inspect.should include("shape=\"square\"")
+    @box.inspect.should include("created_at=")
+    @box.inspect.should include("updated_at=")
+  end
+  
+  it "should not display a key for embedded documents" do
+    @address.inspect.should_not include("[new]")
+  end
+end

data/spec/ripple/persistence_spec.rb

@@ -33,7 +33,26 @@ describe Ripple::Document::Persistence do
     @widget.should_not be_a_new_record
     @widget.changes.should be_blank
   end
-  
+
+  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"]})
+    @widget.update_attributes(:size => 5)
+    @widget.key.should == "new_widget"
+    @widget.should_not be_a_new_record
+    @widget.changes.should be_blank
+  end
+
+  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"]})
+    @widget.update_attribute(:size, 5)
+    @widget.key.should == "new_widget"
+    @widget.should_not be_a_new_record
+    @widget.changes.should be_blank
+    @widget.size.should == 5
+  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"]})
@@ -41,7 +60,7 @@ describe Ripple::Document::Persistence do
     @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"]})
@@ -82,15 +101,12 @@ describe Ripple::Document::Persistence do
     @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
-    
-    class Cog < Widget; property :name, String, :default => "cog"; end
-    
     before :each do
       @cog = Cog.new(:size => 1000)
     end
@@ -103,4 +119,34 @@ describe Ripple::Document::Persistence do
     end
 
   end
+
+  describe "modifying the default quorum values" do
+    before :each do
+      Widget.set_quorums :r => 1, :w => 1, :dw => 0, :rw => 1
+      @bucket = mock("bucket", :name => "widgets")
+      @robject = mock("object", :data => {"name" => "bar"}, :key => "gear")
+      Widget.stub(:bucket).and_return(@bucket)
+    end
+
+    it "should use the supplied R value when reading" do
+      @bucket.should_receive(:get).with("gear", :r => 1).and_return(@robject)
+      Widget.find("gear")
+    end
+
+    it "should use the supplied W and DW values when storing" do
+      Widget.new do |widget|
+        widget.key = "gear"
+        widget.send(:robject).should_receive(:store).with({:w => 1, :dw => 0})
+        widget.save
+      end
+    end
+
+    it "should use the supplied RW when deleting" do
+      widget = Widget.new
+      widget.key = "gear"
+      widget.instance_variable_set(:@new, false)
+      widget.send(:robject).should_receive(:delete).with({:rw => 1})
+      widget.destroy
+    end
+  end
 end

data/spec/ripple/properties_spec.rb

@@ -115,12 +115,18 @@ describe Ripple::Property do
         @prop.type_cast("s").should == "s"
         @prop.type_cast(1).should == "1"
         @prop.type_cast(true).should == "true"
+        @prop.type_cast(false).should == "false"
         if RUBY_VERSION < "1.9"
           @prop.type_cast([]).should == ""
         else
           @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/ripple/ripple_spec.rb

@@ -43,7 +43,18 @@ describe Ripple do
   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)
+    lambda { Ripple.load_config('not-here') }.should raise_error(Ripple::MissingConfiguration)
+  end
+  
+  it "should pass an empty hash into configure if the configuration file is missing the key" do
+    Ripple.should_receive(:config=).with({})
+    Ripple.load_config(File.join(File.dirname(__FILE__), '..', 'fixtures', 'config.yml'), [:ripple, 'not-here'])
+  end
+  
+  it "should select the configuration hash from the config keys provided" do
+    Ripple.load_config(File.join(File.dirname(__FILE__), '..', 'fixtures', 'config.yml'), ['ripple_rails', 'development'])
+    Ripple.client.port.should == 9001
+    Ripple.client.host.should == '127.0.0.1'
   end
   
   it "should apply the configuration under the ripple key" do

data/spec/support/models/tasks.rb

@@ -0,0 +1,13 @@
+class Person
+  include Ripple::Document
+  many :tasks
+  one :profile
+end
+
+class Task
+  include Ripple::Document
+end
+
+class Profile
+  include Ripple::Document
+end

data/spec/support/models/widget.rb

@@ -3,4 +3,8 @@ class Widget
   include Ripple::Document
   property :size, Integer
   property :name, String, :default => "widget"
-end
+end
+
+class Cog < Widget
+  property :name, String, :default => "cog"
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ripple
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  - beta
+  version: 0.8.0.beta
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -29,28 +31,31 @@ dependencies:
         - 0
         - 0
         - beta
-        - 6
-        version: 2.0.0.beta.6
+        - 18
+        version: 2.0.0.beta.18
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: riak-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        - 1
-        version: 0.7.1
+        - 8
+        - 0
+        - beta
+        version: 0.8.0.beta
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -58,14 +63,15 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -73,8 +79,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id004
 description: 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.
@@ -86,13 +92,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/rails/generators/ripple/model/model_generator.rb
+- lib/rails/generators/ripple/model/templates/model.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
@@ -103,6 +114,7 @@ files:
 - 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/persistence.rb
@@ -111,6 +123,7 @@ files:
 - 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/properties.rb
 - lib/ripple/property_type_mismatch.rb
@@ -125,7 +138,9 @@ files:
 - spec/integration/ripple/associations_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
@@ -138,6 +153,7 @@ files:
 - 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/persistence_spec.rb
 - spec/ripple/properties_spec.rb
 - spec/ripple/ripple_spec.rb
@@ -159,6 +175,7 @@ files:
 - spec/support/models/note.rb
 - spec/support/models/page.rb
 - spec/support/models/paid_invoice.rb
+- spec/support/models/tasks.rb
 - spec/support/models/tree.rb
 - spec/support/models/user.rb
 - spec/support/models/widget.rb
@@ -172,6 +189,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -179,16 +197,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ripple is an object-mapper library for Riak, the distributed database by Basho.
@@ -196,7 +217,9 @@ test_files:
 - spec/integration/ripple/associations_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
@@ -209,6 +232,7 @@ test_files:
 - 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/persistence_spec.rb
 - spec/ripple/properties_spec.rb
 - spec/ripple/ripple_spec.rb
@@ -230,6 +254,7 @@ test_files:
 - spec/support/models/note.rb
 - spec/support/models/page.rb
 - spec/support/models/paid_invoice.rb
+- spec/support/models/tasks.rb
 - spec/support/models/tree.rb
 - spec/support/models/user.rb
 - spec/support/models/widget.rb