toystore-mongo 0.8.2 → 0.9.0

data/README.rdoc

@@ -10,7 +10,7 @@ Mongo integration for Toystore.
 
   class User
     include Toy::Mongo
-    store Mongo::Connection.new.db('myapp')['users']
+    adapter :mongo, Mongo::Connection.new.db('myapp')['users']
 
     attribute :name, String
   end

data/lib/toy/extensions/bson_object_id.rb

@@ -1,9 +1,13 @@
-class BSON::ObjectId
-  def self.to_store(value, *)
+module ObjectIdConversions
+  def to_store(value, *)
     Plucky.to_object_id(value)
   end
 
-  def self.from_store(value, *args)
+  def from_store(value, *)
     Plucky.to_object_id(value)
   end
 end
+
+class BSON::ObjectId
+  extend ObjectIdConversions
+end

data/lib/toy/mongo/querying.rb

@@ -51,7 +51,7 @@ module Toy
 
         def query
           # TODO: add object id keys to convert
-          Plucky::Query.new(store.client, :transformer => transformer).object_ids(object_id_attributes)
+          Plucky::Query.new(adapter.client, :transformer => transformer).object_ids(object_id_attributes)
         end
 
         PluckyMethods.each do |name|
@@ -85,7 +85,7 @@ module Toy
             run_callbacks(:update) do
               criteria = {'_id' => id}
               update   = {'$set' => persistable_changes}
-              store.client.update(criteria, update, {:safe => store.options[:safe]})
+              adapter.client.update(criteria, update, {:safe => adapter.options[:safe]})
               true
             end
           end
@@ -98,11 +98,11 @@ module Toy
         options  = {}
         criteria = {'_id' => id}
         criteria.update(opts[:criteria]) if opts[:criteria]
-        options[:safe] = opts.key?(:safe) ? opts[:safe] : store.options[:safe]
+        options[:safe] = opts.key?(:safe) ? opts[:safe] : adapter.options[:safe]
 
         run_callbacks(:save) do
           run_callbacks(:update) do
-            store.client.update(criteria, update, options)
+            adapter.client.update(criteria, update, options)
           end
         end
       end

data/lib/toy/mongo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Mongo
-    VERSION = '0.8.2'
+    VERSION = '0.9.0'
   end
 end

data/spec/support/constants.rb

@@ -33,8 +33,9 @@ module Support
           def self.name; '#{name}' end
           def self.to_s; '#{name}' end
         """ if name
-        model.send(:include, Toy::Mongo)
-        model.store(:mongo, STORE)
+
+        model.send :include, Toy::Mongo
+        model.adapter :mongo, STORE
       end
     end
   end

data/spec/toy/identity/object_id_key_factory_spec.rb

@@ -29,7 +29,7 @@ describe Toy::Identity::ObjectIdKeyFactory do
     it "correctly stores id in database" do
       user = User.create(:name => 'John')
       user.id.should be_instance_of(BSON::ObjectId)
-      key = user.store.client.find_one(user.id)['_id']
+      key = user.adapter.client.find_one(user.id)['_id']
       key.should be_instance_of(BSON::ObjectId)
       user.id.should == key
     end

data/spec/toy/mongo/querying_spec.rb

@@ -5,7 +5,6 @@ describe Toy::Mongo::Querying do
 
   before(:each) do
     User.send(:include, CallbacksHelper)
-    User.identity_map_off
     User.attribute(:name, String)
     User.attribute(:bio, String)
   end
@@ -36,16 +35,16 @@ describe Toy::Mongo::Querying do
       @user.name.should == 'Frank'
     end
 
-    it "defaults to store's :safe option" do
-      @user.store.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => nil)
+    it "defaults to adapter's :safe option" do
+      @user.adapter.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => nil)
       @user.atomic_update('$set' => {'name' => 'Frank'})
 
-      User.store(:mongo, STORE, :safe => false)
-      @user.store.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => false)
+      User.adapter(:mongo, STORE, :safe => false)
+      @user.adapter.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => false)
       @user.atomic_update('$set' => {'name' => 'Frank'})
 
-      User.store(:mongo, STORE, :safe => true)
-      @user.store.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => true)
+      User.adapter(:mongo, STORE, :safe => true)
+      @user.adapter.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => true)
       @user.atomic_update('$set' => {'name' => 'Frank'})
     end
 
@@ -56,13 +55,13 @@ describe Toy::Mongo::Querying do
     end
 
     context "with :safe option" do
-      it "overrides store's :safe option" do
-        User.store(:mongo, STORE, :safe => false)
-        @user.store.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => true)
+      it "overrides adapter's :safe option" do
+        User.adapter(:mongo, STORE, :safe => false)
+        @user.adapter.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => true)
         @user.atomic_update({'$set' => {'name' => 'Frank'}}, :safe => true)
 
-        User.store(:mongo, STORE, :safe => true)
-        @user.store.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => false)
+        User.adapter(:mongo, STORE, :safe => true)
+        @user.adapter.client.should_receive(:update).with(kind_of(Hash), kind_of(Hash), :safe => false)
         @user.atomic_update({'$set' => {'name' => 'Frank'}}, :safe => false)
       end
     end
@@ -137,15 +136,15 @@ describe Toy::Mongo::Querying do
     it "only persists changes" do
       query = {'_id' => @user.id}
       update = {'$set' => {'name' => 'Frank'}}
-      @user.store.client.should_receive(:update).with(query, update, {:safe => nil})
+      @user.adapter.client.should_receive(:update).with(query, update, {:safe => nil})
       @user.atomic_update_attributes(:name => 'Frank')
     end
 
-    it "persists changes with safe option from store" do
-      User.store(:mongo, STORE, :safe => true)
+    it "persists changes with safe option from adapter" do
+      User.adapter(:mongo, STORE, :safe => true)
       query = {'_id' => @user.id}
       update = {'$set' => {'name' => 'Frank'}}
-      @user.store.client.should_receive(:update).with(query, update, {:safe => true})
+      @user.adapter.client.should_receive(:update).with(query, update, {:safe => true})
       @user.atomic_update_attributes(:name => 'Frank')
     end
 

data/toystore-mongo.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Mongo integration for Toystore}
 
   s.add_dependency('plucky',        '~> 0.4.1')
-  s.add_dependency('toystore',      '~> 0.8.0')
+  s.add_dependency('toystore',      '~> 0.9.0')
   s.add_dependency('adapter-mongo', '~> 0.5.3')
 
   s.files         = `git ls-files`.split("\n") - ['specs.watchr']

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-03-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plucky
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 59
         segments: 
         - 0
-        - 8
+        - 9
         - 0
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency