toystore 0.5 → 0.6

data/Gemfile

@@ -7,4 +7,7 @@ group(:development) do
   gem 'timecop',    '~> 0.3.5'
   gem 'tzinfo',     '~> 0.3.23'
   gem 'log_buddy',  '~> 0.5.0'
+
+  gem 'bson'
+  gem 'bson_ext'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toystore (0.5)
+    toystore (0.6)
       activemodel (~> 3.0.3)
       activesupport (~> 3.0.3)
       adapter (~> 0.5.1)
@@ -16,6 +16,8 @@ GEM
       i18n (~> 0.4)
     activesupport (3.0.3)
     adapter (0.5.1)
+    bson (1.2.0)
+    bson_ext (1.2.0)
     builder (2.1.2)
     diff-lcs (1.1.2)
     i18n (0.5.0)
@@ -40,6 +42,8 @@ DEPENDENCIES
   activemodel (~> 3.0.3)
   activesupport (~> 3.0.3)
   adapter (~> 0.5.1)
+  bson
+  bson_ext
   log_buddy (~> 0.5.0)
   rake (~> 0.8.7)
   rspec (~> 2.3)

data/examples/changing_key_factory.rb

@@ -0,0 +1,16 @@
+require 'pp'
+require 'rubygems'
+require 'pathname'
+
+root_path = Pathname(__FILE__).dirname.join('..').expand_path
+lib_path  = root_path.join('lib')
+$:.unshift(lib_path)
+
+require 'toystore'
+
+class User
+  include Toy::Store
+  key :object_id
+end
+
+puts User.new.id # BSON::ObjectId ...

data/examples/riak.rb

@@ -0,0 +1,20 @@
+require 'pp'
+require 'rubygems'
+require 'toystore'
+require 'adapter/riak'
+
+class GameList
+  include Toy::Store
+  store :riak, Riak::Client.new['adapter_example']
+
+  attribute :source, Hash
+end
+
+list = GameList.create(:source => {'foo' => 'bar'})
+
+pp list
+pp GameList.get(list.id)
+
+list.destroy
+
+pp GameList.get(list.id)

data/lib/toy/identity.rb

@@ -11,6 +11,9 @@ module Toy
         @key_factory = case name_or_factory
         when :uuid
           UUIDKeyFactory.new
+        when :object_id
+          require 'toy/identity/object_id_key_factory'
+          ObjectIdKeyFactory.new
         else
           name_or_factory
         end

data/lib/toy/identity/object_id_key_factory.rb

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

data/lib/toy/persistence.rb

@@ -25,18 +25,8 @@ module Toy
         !@cache.nil?
       end
 
-      def namespace(new_namespace=nil)
-        if new_namespace.nil?
-          @namespace ||= self.name
-        else
-          @namespace = new_namespace
-        end
-
-        @namespace
-      end
-
       def store_key(id)
-        [namespace, id].join(':')
+        id
       end
 
       def create(attrs={})

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.5"
+  VERSION = "0.6"
 end

data/spec/toy/identity/object_id_key_factory_spec.rb

@@ -0,0 +1,9 @@
+require 'helper'
+require 'toy/identity/object_id_key_factory'
+
+describe Toy::Identity::ObjectIdKeyFactory do
+  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
+end

data/spec/toy/identity_spec.rb

@@ -8,6 +8,10 @@ describe Toy::Identity do
       User.key(:uuid).should be_instance_of(Toy::Identity::UUIDKeyFactory)
     end
 
+    it "should use ObjectIdKeyFactory if :object_id" do
+      User.key(:object_id).should be_instance_of(Toy::Identity::ObjectIdKeyFactory)
+    end
+
     it "should set key factory passed in factory" do
       factory = Toy::Identity::UUIDKeyFactory
       User.key(factory).should == factory

data/spec/toy/persistence_spec.rb

@@ -73,23 +73,9 @@ describe Toy::Persistence do
   end
 
   describe ".store_key" do
-    it "returns namespace and id" do
+    it "returns id" do
       doc = User.new
-
-      User.store_key(doc.id).should == "User:#{doc.id}"
-      User.namespace('Crazy')
-      User.store_key(doc.id).should == "Crazy:#{doc.id}"
-    end
-  end
-
-  describe ".namespace" do
-    it "defaults to class name" do
-      User.namespace.should == 'User'
-    end
-
-    it "sets if argument and reads if not" do
-      User.namespace('CrazyUser')
-      User.namespace.should == 'CrazyUser'
+      User.store_key(doc.id).should == doc.id
     end
   end
 
@@ -167,9 +153,9 @@ describe Toy::Persistence do
   end
 
   describe "#store_key" do
-    it "returns pluralized human name and id" do
+    it "returns id" do
       doc = User.new
-      doc.store_key.should == "User:#{doc.id}"
+      doc.store_key.should == doc.id
     end
   end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: toystore
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Geoffrey Dagley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,10 +102,12 @@ files:
 - LOGGING.rdoc
 - README.rdoc
 - Rakefile
+- examples/changing_key_factory.rb
 - examples/memcached.rb
 - examples/memory.rb
 - examples/models.rb
 - examples/redis.rb
+- examples/riak.rb
 - lib/toy.rb
 - lib/toy/attribute.rb
 - lib/toy/attributes.rb
@@ -132,6 +134,7 @@ files:
 - lib/toy/extensions/time.rb
 - lib/toy/identity.rb
 - lib/toy/identity/abstract_key_factory.rb
+- lib/toy/identity/object_id_key_factory.rb
 - lib/toy/identity/uuid_key_factory.rb
 - lib/toy/identity_map.rb
 - lib/toy/index.rb
@@ -182,6 +185,7 @@ files:
 - spec/toy/extensions/string_spec.rb
 - spec/toy/extensions/time_spec.rb
 - spec/toy/identity/abstract_key_factory_spec.rb
+- spec/toy/identity/object_id_key_factory_spec.rb
 - spec/toy/identity/uuid_key_factory_spec.rb
 - spec/toy/identity_map_spec.rb
 - spec/toy/identity_spec.rb
@@ -267,6 +271,7 @@ test_files:
 - spec/toy/extensions/string_spec.rb
 - spec/toy/extensions/time_spec.rb
 - spec/toy/identity/abstract_key_factory_spec.rb
+- spec/toy/identity/object_id_key_factory_spec.rb
 - spec/toy/identity/uuid_key_factory_spec.rb
 - spec/toy/identity_map_spec.rb
 - spec/toy/identity_spec.rb