toystore 0.11.0 → 0.12.0

data/.travis.yml

@@ -4,8 +4,6 @@ gemfile:
   - gemfiles/rails_3_0.gemfile
 language: ruby
 rvm:
-  - 1.8.7
-  - ree
   - 1.9.3
 notifications:
   email: false

data/Changelog.md

@@ -1,5 +1,18 @@
 I will do my best to keep this up to date with significant changes here, starting in 0.8.3.
 
+* 0.12.0
+
+  * Ruby 1.9 only. Officially not supporting Ruby 1.8.x.
+  * Added :native_uuid key factory for using when your data store supports them.
+  * Aliased .find and .read to .get.
+  * Aliased .find_multiple and .read_multiple to .get_multiple.
+
+* 0.10.x => 0.11.0
+
+  * Added get_multiple which returns Hash of id pointed at instance.
+  * Aliased get_multi to get_multiple which means it now returns Hash instead of Array.
+  * Updated to latest version of adapter.
+
 * 0.10.4
   * Support for ActiveSupport/ActiveModel 3.2.*
 

data/README.md

@@ -229,7 +229,7 @@ As of 0.8.3, I started keeping a [changelog](https://github.com/jnunemaker/toyst
 ## Compatibility
 
 * Rails 3.0.*, 3.1.*, 3.2.*, Sinatra, etc. No Rails 2 (because it uses Active Model).
-* Ruby 1.8.7, REE, and 1.9.3
+* Ruby 1.9.3 only
 
 ## Mailing List
 

data/lib/toy.rb

@@ -90,8 +90,9 @@ module Toy
   autoload 'Identity',                'toy/identity'
 
   module Identity
-    autoload 'AbstractKeyFactory', 'toy/identity/abstract_key_factory'
-    autoload 'UUIDKeyFactory',     'toy/identity/uuid_key_factory'
+    autoload 'AbstractKeyFactory',    'toy/identity/abstract_key_factory'
+    autoload 'UUIDKeyFactory',        'toy/identity/uuid_key_factory'
+    autoload 'NativeUUIDKeyFactory',  'toy/identity/native_uuid_key_factory'
   end
 end
 

data/lib/toy/extensions/uuid.rb

@@ -0,0 +1,17 @@
+module Toy
+  module Extensions
+    module UUID
+      def to_store(value, *)
+        SimpleUUID::UUID.new(value)
+      end
+
+      def from_store(value, *)
+        SimpleUUID::UUID.new(value)
+      end
+    end
+  end
+end
+
+class SimpleUUID::UUID
+  extend Toy::Extensions::UUID
+end

data/lib/toy/identity.rb

@@ -10,6 +10,8 @@ module Toy
       def key(name_or_factory = :uuid)
         @key_factory = if name_or_factory == :uuid
           UUIDKeyFactory.new
+        elsif name_or_factory == :native_uuid
+          NativeUUIDKeyFactory.new
         else
           if name_or_factory.respond_to?(:next_key) && name_or_factory.respond_to?(:key_type)
             name_or_factory

data/lib/toy/identity/native_uuid_key_factory.rb

@@ -0,0 +1,13 @@
+module Toy
+  module Identity
+    class NativeUUIDKeyFactory < AbstractKeyFactory
+      def key_type
+        SimpleUUID::UUID
+      end
+
+      def next_key(object)
+        SimpleUUID::UUID.new
+      end
+    end
+  end
+end

data/lib/toy/querying.rb

@@ -9,10 +9,16 @@ module Toy
         end
       end
 
+      alias_method :read, :get
+      alias_method :find, :get
+
       def get!(id)
         get(id) || raise(Toy::NotFound.new(id))
       end
 
+      alias_method :read!, :get!
+      alias_method :find!, :get!
+
       def get_multiple(*ids)
         result = adapter.read_multiple(*ids.flatten)
         result.each do |id, attrs|
@@ -22,6 +28,8 @@ module Toy
       end
 
       alias_method :get_multi, :get_multiple
+      alias_method :read_multiple, :get_multiple
+      alias_method :find_multiple, :get_multiple
 
       def get_or_new(id)
         get(id) || new(:id => id)

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/toy/extensions/uuid_spec.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+describe "SimpleUUID::UUID.to_store" do
+  it "should convert value to uuid" do
+    uuid = SimpleUUID::UUID.new
+    [uuid, uuid.to_guid, uuid.to_s, uuid.to_i].each do |value|
+      SimpleUUID::UUID.from_store(value).should eq(uuid)
+    end
+  end
+end
+
+describe "SimpleUUID::UUID.from_store" do
+  it "should convert value to uuid" do
+    uuid = SimpleUUID::UUID.new
+    [uuid, uuid.to_guid, uuid.to_s, uuid.to_i].each do |value|
+      SimpleUUID::UUID.from_store(value).should eq(uuid)
+    end
+  end
+end

data/spec/toy/identity/native_uuid_key_factory_spec.rb

@@ -0,0 +1,60 @@
+require 'helper'
+
+describe Toy::Identity::NativeUUIDKeyFactory do
+  uses_constants('User')
+
+  it "should use SimpleUUID::UUID as key_type" do
+    subject.key_type.should be(SimpleUUID::UUID)
+  end
+
+  it "should use uuid for next_key" do
+    result = subject.next_key(nil)
+    result.should be_instance_of(SimpleUUID::UUID)
+  end
+
+  describe "#eql?" do
+    it "returns true for same class and key type" do
+      subject.eql?(described_class.new).should be_true
+    end
+
+    it "returns false for same class and different key type" do
+      other = described_class.new
+      other.stub(:key_type).and_return(Integer)
+      subject.eql?(other).should be_false
+    end
+
+    it "returns false for different classes" do
+      subject.eql?(Object.new).should be_false
+    end
+  end
+
+  describe "#==" do
+    it "returns true for same class and key type" do
+      subject.==(described_class.new).should be_true
+    end
+
+    it "returns false for same class and different key type" do
+      other = described_class.new
+      other.stub(:key_type).and_return(Integer)
+      subject.==(other).should be_false
+    end
+
+    it "returns false for different classes" do
+      subject.==(Object.new).should be_false
+    end
+  end
+
+  describe "Declaring key to be uuid" do
+    before(:each) do
+      User.key(:native_uuid)
+    end
+
+    it "returns SimpleUUID::UUID as .key_type" do
+      User.key_type.should be(SimpleUUID::UUID)
+    end
+
+    it "sets id attribute to SimpleUUID::UUID type" do
+      User.attributes['id'].type.should be(SimpleUUID::UUID)
+    end
+  end
+end

data/spec/toy/list_spec.rb

@@ -341,7 +341,6 @@ describe Toy::List do
       @user = User.create
       @game1 = @user.games.create
       @game2 = @user.games.create
-      User.get(@user.id).games.should == [@game1, @game2]
     end
 
     it "should take multiple ids" do
@@ -396,7 +395,6 @@ describe Toy::List do
       @user = User.create
       @game1 = @user.games.create
       @game2 = @user.games.create
-      User.get(@user.id).games.should == [@game1, @game2]
     end
 
     it "should destroy all" do

data/spec/toy/querying_spec.rb

@@ -7,35 +7,35 @@ describe Toy::Querying do
     User.attribute :name, String
   end
 
-  describe ".get" do
+  shared_examples_for "adapter read and load instance" do |method_name|
     it "returns document if found" do
       john = User.create(:name => 'John')
-      User.get(john.id).name.should == 'John'
+      User.send(method_name, john.id).name.should == 'John'
     end
 
     it "returns nil if not found" do
-      User.get('1').should be_nil
+      User.send(method_name, '1').should be_nil
     end
   end
 
-  describe ".get!" do
+  shared_examples_for "adapter read and load instance with bang" do |method_name|
     it "returns document if found" do
       john = User.create(:name => 'John')
-      User.get!(john.id).name.should == 'John'
+      User.send(method_name, john.id).name.should == 'John'
     end
 
     it "raises not found exception if not found" do
       lambda {
-        User.get!('1')
+        User.send(method_name, '1')
       }.should raise_error(Toy::NotFound, 'Could not find document with id: "1"')
     end
   end
 
-  describe ".get_multiple" do
+  shared_examples_for "adapter read_multiple and load instances" do |method_name|
     it "returns Hash of ids pointed at result" do
       john  = User.create(:name => 'John')
       steve = User.create(:name => 'Steve')
-      User.get_multiple(john.id, steve.id, 'foo').should == {
+      User.send(method_name, john.id, steve.id, 'foo').should == {
         john.id  => john,
         steve.id => steve,
         'foo'    => nil,
@@ -43,16 +43,44 @@ describe Toy::Querying do
     end
   end
 
+  describe ".get" do
+    include_examples "adapter read and load instance", :get
+  end
+
+  describe ".read" do
+    include_examples "adapter read and load instance", :read
+  end
+
+  describe ".find" do
+    include_examples "adapter read and load instance", :find
+  end
+
+  describe ".get!" do
+    include_examples "adapter read and load instance with bang", :get!
+  end
+
+  describe ".read!" do
+    include_examples "adapter read and load instance with bang", :read!
+  end
+
+  describe ".find!" do
+    include_examples "adapter read and load instance with bang", :find!
+  end
+
+  describe ".get_multiple" do
+    include_examples "adapter read_multiple and load instances", :get_multiple
+  end
+
+  describe ".read_multiple" do
+    include_examples "adapter read_multiple and load instances", :read_multiple
+  end
+
+  describe ".find_multiple" do
+    include_examples "adapter read_multiple and load instances", :find_multiple
+  end
+
   describe ".get_multi" do
-    it "returns array of documents" do
-      john  = User.create(:name => 'John')
-      steve = User.create(:name => 'Steve')
-      User.get_multi(john.id, steve.id, 'foo').should == {
-        john.id  => john,
-        steve.id => steve,
-        'foo'    => nil,
-      }
-    end
+    include_examples "adapter read_multiple and load instances", :get_multi
   end
 
   describe ".get_or_new" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toystore
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adapter
@@ -128,8 +128,10 @@ files:
 - lib/toy/extensions/set.rb
 - lib/toy/extensions/string.rb
 - lib/toy/extensions/time.rb
+- lib/toy/extensions/uuid.rb
 - lib/toy/identity.rb
 - lib/toy/identity/abstract_key_factory.rb
+- lib/toy/identity/native_uuid_key_factory.rb
 - lib/toy/identity/uuid_key_factory.rb
 - lib/toy/identity_map.rb
 - lib/toy/inheritance.rb
@@ -183,7 +185,9 @@ files:
 - spec/toy/extensions/set_spec.rb
 - spec/toy/extensions/string_spec.rb
 - spec/toy/extensions/time_spec.rb
+- spec/toy/extensions/uuid_spec.rb
 - spec/toy/identity/abstract_key_factory_spec.rb
+- spec/toy/identity/native_uuid_key_factory_spec.rb
 - spec/toy/identity/uuid_key_factory_spec.rb
 - spec/toy/identity_map_spec.rb
 - spec/toy/identity_spec.rb
@@ -221,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1432731575283282863
+      hash: -1651404938588113
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1432731575283282863
+      hash: -1651404938588113
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -265,7 +269,9 @@ test_files:
 - spec/toy/extensions/set_spec.rb
 - spec/toy/extensions/string_spec.rb
 - spec/toy/extensions/time_spec.rb
+- spec/toy/extensions/uuid_spec.rb
 - spec/toy/identity/abstract_key_factory_spec.rb
+- spec/toy/identity/native_uuid_key_factory_spec.rb
 - spec/toy/identity/uuid_key_factory_spec.rb
 - spec/toy/identity_map_spec.rb
 - spec/toy/identity_spec.rb