toystore-mongo 0.6.0 → 0.7.0

data/Gemfile

@@ -1,8 +1,10 @@
 source "http://rubygems.org"
 gemspec
 
+require 'plucky/version'
+
 group(:development) do
-  gem 'bson_ext'
+  gem 'bson_ext', Plucky::MongoVersion, :require => false
   gem 'SystemTimer'
   gem 'rake',       '~> 0.8.7'
   gem 'rspec',      '~> 2.3'

data/lib/toy/extensions/bson_object_id.rb

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

data/lib/toy/identity/object_id_key_factory.rb

@@ -0,0 +1,13 @@
+module Toy
+  module Identity
+    class ObjectIdKeyFactory < AbstractKeyFactory
+      def key_type
+        BSON::ObjectId
+      end
+
+      def next_key(object)
+        BSON::ObjectId.new
+      end
+    end
+  end
+end

data/lib/toy/mongo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Mongo
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/toy/mongo.rb

@@ -1,10 +1,10 @@
 require 'plucky'
 require 'toy'
+require 'toy/extensions/bson_object_id'
 require 'toy/identity/object_id_key_factory'
 require 'toy/mongo/querying'
 require 'adapter/mongo'
 
-
 module Toy
   module Mongo
     extend ActiveSupport::Concern

data/spec/toy/extensions/bson_object_id_spec.rb

@@ -0,0 +1,41 @@
+require 'helper'
+
+describe "BSON::ObjectId.to_store" do
+  it "returns nil if value nil" do
+    BSON::ObjectId.to_store(nil).should be_nil
+  end
+
+  it "returns value if already bson object id" do
+    id = BSON::ObjectId.new
+    BSON::ObjectId.to_store(id).should be(id)
+  end
+
+  it "returns bson object id if string and valid bson object id" do
+    id = BSON::ObjectId.new
+    BSON::ObjectId.to_store(id.to_s).should == id
+  end
+  
+  it "returns whatever is passed in if not object id or string version of object id" do
+    BSON::ObjectId.to_store('foo').should == 'foo'
+  end
+end
+
+describe "BSON::ObjectId.from_store" do
+  it "returns nil if value nil" do
+    BSON::ObjectId.from_store(nil).should be_nil
+  end
+
+  it "returns value if already bson object id" do
+    id = BSON::ObjectId.new
+    BSON::ObjectId.from_store(id).should be(id)
+  end
+
+  it "returns bson object id if string and valid bson object id" do
+    id = BSON::ObjectId.new
+    BSON::ObjectId.from_store(id.to_s).should == id
+  end
+  
+  it "returns whatever is passed in if not object id or string version of object id" do
+    BSON::ObjectId.from_store('foo').should == 'foo'
+  end
+end

data/spec/toy/identity/object_id_key_factory_spec.rb

@@ -0,0 +1,37 @@
+require 'helper'
+
+describe Toy::Identity::ObjectIdKeyFactory do
+  uses_constants('User')
+
+  it "should use BSON::ObjectId as key_type" do
+    Toy::Identity::ObjectIdKeyFactory.new.key_type.should be(BSON::ObjectId)
+  end
+
+  it "should use object id for next key" do
+    key = Toy::Identity::ObjectIdKeyFactory.new.next_key(nil)
+    key.should be_instance_of(BSON::ObjectId)
+  end
+
+  describe "Declaring key to be object_id" do
+    before(:each) do
+      User.key(Toy::Identity::ObjectIdKeyFactory.new)
+      User.attribute(:name, String)
+    end
+
+    it "returns BSON::ObjectId as .key_type" do
+      User.key_type.should be(BSON::ObjectId)
+    end
+
+    it "sets id attribute to BSON::ObjectId type" do
+      User.attributes['id'].type.should be(BSON::ObjectId)
+    end
+
+    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.should be_instance_of(BSON::ObjectId)
+      user.id.should == key
+    end
+  end
+end

data/toystore-mongo.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toystore-mongo
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 Z
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plucky
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 4
-        - 0
-        version: 0.4.0
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
         - 0
-        - 7
+        - 8
         - 0
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,8 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- lib/toy/extensions/bson_object_id.rb
+- lib/toy/identity/object_id_key_factory.rb
 - lib/toy/mongo.rb
 - lib/toy/mongo/querying.rb
 - lib/toy/mongo/version.rb
@@ -87,6 +89,8 @@ files:
 - spec/helper.rb
 - spec/spec.opts
 - spec/support/constants.rb
+- spec/toy/extensions/bson_object_id_spec.rb
+- spec/toy/identity/object_id_key_factory_spec.rb
 - spec/toy/mongo/querying_spec.rb
 - spec/toy/mongo_spec.rb
 - toystore-mongo.gemspec
@@ -127,6 +131,8 @@ test_files:
 - spec/helper.rb
 - spec/spec.opts
 - spec/support/constants.rb
+- spec/toy/extensions/bson_object_id_spec.rb
+- spec/toy/identity/object_id_key_factory_spec.rb
 - spec/toy/mongo/querying_spec.rb
 - spec/toy/mongo_spec.rb
 has_rdoc: