toystore 0.13.0 → 0.13.1

data/spec/toy/reloadable_spec.rb

@@ -10,10 +10,15 @@ describe Toy::Reloadable do
     end
     let(:user) { @user }
 
-    it "reloads id from database" do
-      id = user.id
+    it "uses persisted id to read from adapter" do
+      User.class_eval do
+        def persisted_id
+          'foo'
+        end
+      end
+      User.adapter.should_receive(:read).with('foo').and_return({})
       user.reload
-      user.id.should == id
+      user.id.should == 'foo'
     end
 
     it "reloads record from the database" do
@@ -78,4 +83,4 @@ describe Toy::Reloadable do
       user.reload.admin.should be_true
     end
   end
-end
+end

data/spec/toy/serialization_spec.rb

@@ -13,7 +13,6 @@ describe Toy::Serialization do
     MultiJson.load(doc.to_json).should == {
       'user' => {
         'name' => 'John',
-        'id' => doc.id,
         'age' => 28
       }
     }
@@ -24,7 +23,6 @@ describe Toy::Serialization do
     Hash.from_xml(doc.to_xml).should == {
       'user' => {
         'name' => 'John',
-        'id' => doc.id,
         'age' => 28
       }
     }
@@ -41,27 +39,27 @@ describe Toy::Serialization do
   end
 
   it "allows using :only" do
-    user = User.new
-    json = user.to_json(:only => :id)
-    MultiJson.load(json).should == {'user' => {'id' => user.id}}
+    user = User.new(:name => 'John', :age => 30)
+    json = user.to_json(:only => :name)
+    MultiJson.load(json).should == {'user' => {'name' => user.name}}
   end
 
   it "allows using :only with strings" do
-    user = User.new
-    json = user.to_json(:only => 'id')
-    MultiJson.load(json).should == {'user' => {'id' => user.id}}
+    user = User.new(:name => 'John', :age => 30)
+    json = user.to_json(:only => 'name')
+    MultiJson.load(json).should == {'user' => {'name' => user.name}}
   end
 
   it "allows using :except" do
-    user = User.new
-    json = user.to_json(:except => :id)
-    MultiJson.load(json)['user'].should_not have_key('id')
+    user = User.new(:name => 'John', :age => 30)
+    json = user.to_json(:except => :name)
+    MultiJson.load(json)['user'].should_not have_key('name')
   end
 
   it "allows using :except with strings" do
-    user = User.new
-    json = user.to_json(:except => 'id')
-    MultiJson.load(json)['user'].should_not have_key('id')
+    user = User.new(:name => 'John', :age => 30)
+    json = user.to_json(:except => 'name')
+    MultiJson.load(json)['user'].should_not have_key('name')
   end
 
   describe "serializing specific attributes" do
@@ -73,7 +71,7 @@ describe Toy::Serialization do
 
     it "should default to all attributes" do
       move = Move.new(:index => 0, :points => 15, :words => ['QI', 'XI'])
-      move.serializable_attributes.should == [:id, :index, :points, :words]
+      move.serializable_attributes.should == [:index, :points, :words]
     end
 
     it "should be set per model" do
@@ -85,7 +83,7 @@ describe Toy::Serialization do
       end
 
       move = Move.new(:index => 0, :points => 15, :words => ['QI', 'XI'])
-      move.serializable_attributes.should == [:id, :points, :words]
+      move.serializable_attributes.should == [:points, :words]
     end
 
     it "should only serialize specified attributes" do
@@ -99,7 +97,6 @@ describe Toy::Serialization do
       move = Move.new(:index => 0, :points => 15, :words => ['QI', 'XI'])
       MultiJson.load(move.to_json).should == {
        'move' => {
-         'id'     => move.id,
          'points' => 15,
          'words'  => ["QI", "XI"]
         }
@@ -121,7 +118,6 @@ describe Toy::Serialization do
       move = Move.new(:index => 0, :points => 15, :words => ['QI', 'XI'])
       MultiJson.load(move.to_json).should == {
        'move' => {
-         'id'                   => move.id,
          'index'                => 0,
          'points'               => 15,
          'words'                => ["QI", "XI"],
@@ -137,12 +133,11 @@ describe Toy::Serialization do
         Move.class_eval { attr_accessor :creator }
       end
 
-      let(:move) { Move.new(:creator => User.new) }
+      let(:move) { Move.new(:creator => User.new(:name => 'John')) }
 
       it "returns serializable hash of object" do
         move.serializable_hash(:methods => [:creator]).should == {
-          'id'         => move.id,
-          'creator'    => {'id' => move.creator.id}
+          'creator'    => {'name' => move.creator.name}
         }
       end
     end

data/spec/toy/types/json_spec.rb

@@ -0,0 +1,37 @@
+require 'helper'
+
+describe Toy::Types::JSON do
+  describe ".to_store" do
+    it "encodes as json" do
+      value = {'foo' => 'bar'}
+      expected = ActiveSupport::JSON.encode(value)
+      described_class.to_store(value).should eq(expected)
+    end
+
+    it "returns nil if nil" do
+      described_class.to_store(nil).should be_nil
+    end
+  end
+
+  describe ".from_store" do
+    it "decodes strings as json" do
+      value = {'foo' => 'bar'}
+      encoded = ActiveSupport::JSON.encode(value)
+      described_class.from_store(encoded).should eq(value)
+    end
+
+    it "leaves other values alone" do
+      [
+        {'foo' => 'bar'},
+        ['foo', 'bar'],
+        23,
+      ].each do |value|
+        described_class.from_store(value).should eq(value)
+      end
+    end
+
+    it "returns nil if nil" do
+      described_class.from_store(nil).should be_nil
+    end
+  end
+end

data/spec/toy/validations_spec.rb

@@ -141,4 +141,17 @@ describe Toy::Validations do
       end
     end
   end
+
+  context "validating presence of uuid attribute" do
+    before do
+      User.attribute :app_id, SimpleUUID::UUID
+      User.validates_presence_of :app_id
+    end
+
+    it "is invalid if nil" do
+      user = User.new(app_id: nil)
+      user.should_not be_valid
+      user.errors[:app_id].should include("can't be blank")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toystore
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adapter
@@ -130,6 +130,7 @@ files:
 - lib/toy/extensions/object.rb
 - lib/toy/extensions/set.rb
 - lib/toy/extensions/string.rb
+- lib/toy/extensions/symbol.rb
 - lib/toy/extensions/time.rb
 - lib/toy/extensions/uuid.rb
 - lib/toy/identity.rb
@@ -155,6 +156,7 @@ files:
 - lib/toy/serialization.rb
 - lib/toy/store.rb
 - lib/toy/timestamps.rb
+- lib/toy/types/json.rb
 - lib/toy/validations.rb
 - lib/toy/version.rb
 - lib/toystore.rb
@@ -186,6 +188,7 @@ files:
 - spec/toy/extensions/nil_class_spec.rb
 - spec/toy/extensions/set_spec.rb
 - spec/toy/extensions/string_spec.rb
+- spec/toy/extensions/symbol_spec.rb
 - spec/toy/extensions/time_spec.rb
 - spec/toy/extensions/uuid_spec.rb
 - spec/toy/identity/abstract_key_factory_spec.rb
@@ -209,6 +212,7 @@ files:
 - spec/toy/serialization_spec.rb
 - spec/toy/store_spec.rb
 - spec/toy/timestamps_spec.rb
+- spec/toy/types/json_spec.rb
 - spec/toy/validations_spec.rb
 - spec/toy_spec.rb
 - toystore.gemspec
@@ -226,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1758812902377714196
+      hash: 3156935686083657765
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1758812902377714196
+      hash: 3156935686083657765
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -269,6 +273,7 @@ test_files:
 - spec/toy/extensions/nil_class_spec.rb
 - spec/toy/extensions/set_spec.rb
 - spec/toy/extensions/string_spec.rb
+- spec/toy/extensions/symbol_spec.rb
 - spec/toy/extensions/time_spec.rb
 - spec/toy/extensions/uuid_spec.rb
 - spec/toy/identity/abstract_key_factory_spec.rb
@@ -292,5 +297,6 @@ test_files:
 - spec/toy/serialization_spec.rb
 - spec/toy/store_spec.rb
 - spec/toy/timestamps_spec.rb
+- spec/toy/types/json_spec.rb
 - spec/toy/validations_spec.rb
 - spec/toy_spec.rb