toystore 0.10.4 → 0.11.0

data/README.md

@@ -85,7 +85,7 @@ pp person.role # "guest"
 
 # Querying
 pp Person.get(john.id)
-pp Person.get_multi(john.id)
+pp Person.get_multiple(john.id)
 pp Person.get('NOT HERE') # nil
 pp Person.get_or_new('NOT HERE') # new person with id of 'NOT HERE'
 

data/examples/plain_old_object_on_roids.rb

@@ -34,7 +34,7 @@ pp person.role # "guest"
 
 # Querying
 pp Person.get(john.id)
-pp Person.get_multi(john.id)
+pp Person.get_multiple(john.id)
 pp Person.get('NOT HERE') # nil
 pp Person.get_or_new('NOT HERE') # new person with id of 'NOT HERE'
 

data/lib/toy/callbacks.rb

@@ -1,7 +1,6 @@
 module Toy
   module Callbacks
     extend ActiveSupport::Concern
-    include ActiveSupport::Callbacks
 
     included do
       extend ActiveModel::Callbacks
@@ -26,4 +25,4 @@ module Toy
       run_callbacks(:update) { super }
     end
   end
-end
+end

data/lib/toy/identity_map.rb

@@ -1,5 +1,4 @@
 module Toy
-
   module IdentityMap
     extend ActiveSupport::Concern
 
@@ -79,4 +78,4 @@ module Toy
       IdentityMap.repository.delete(id) if IdentityMap.enabled?
     end
   end
-end
+end

data/lib/toy/object.rb

@@ -1,19 +1,18 @@
 module Toy
   module Object
     extend ActiveSupport::Concern
+    extend  ActiveModel::Naming
+    include ActiveModel::Conversion
+    include ActiveModel::Validations
 
-    included do
-      extend  ActiveModel::Naming
-      include ActiveModel::Conversion
-      include Attributes
-      include Cloneable
-      include Dirty
-      include Equality
-      include Inspect
-      include Logger
-      include Inheritance
-      include Serialization
-    end
+    include Attributes
+    include Cloneable
+    include Dirty
+    include Equality
+    include Inspect
+    include Logger
+    include Inheritance
+    include Serialization
 
     def persisted?
       false

data/lib/toy/proxies/list.rb

@@ -73,7 +73,7 @@ module Toy
 
       def find_target
         return [] if target_ids.blank?
-        proxy_class.get_multi(target_ids)
+        proxy_class.get_multiple(target_ids).values
       end
 
       def target_ids
@@ -95,4 +95,4 @@ module Toy
       end
     end
   end
-end
+end

data/lib/toy/querying.rb

@@ -13,10 +13,16 @@ module Toy
         get(id) || raise(Toy::NotFound.new(id))
       end
 
-      def get_multi(*ids)
-        ids.flatten.map { |id| get(id) }
+      def get_multiple(*ids)
+        result = adapter.read_multiple(*ids.flatten)
+        result.each do |id, attrs|
+          result[id] = attrs.nil? ? nil : load(id, attrs)
+        end
+        result
       end
 
+      alias_method :get_multi, :get_multiple
+
       def get_or_new(id)
         get(id) || new(:id => id)
       end

data/lib/toy/reloadable.rb

@@ -1,5 +1,7 @@
 module Toy
   module Reloadable
+    extend ActiveSupport::Concern
+
     def reload
       if attrs = adapter.read(id)
         attrs['id'] = id

data/lib/toy/store.rb

@@ -3,24 +3,22 @@ module Toy
     extend ActiveSupport::Concern
     extend Plugins
 
-    included do
-      include Toy::Object
-      include Persistence
-      include MassAssignmentSecurity
-      include DirtyStore
-      include Querying
-      include Reloadable
+    include Toy::Object
+    include Persistence
+    include MassAssignmentSecurity
+    include DirtyStore
+    include Querying
+    include Reloadable
 
-      include Callbacks
-      include Validations
-      include Timestamps
+    include Callbacks
+    include Validations
+    include Timestamps
 
-      include Lists
-      include References
-      include AssociationSerialization
+    include Lists
+    include References
+    include AssociationSerialization
 
-      include IdentityMap
-      include Caching
-    end
+    include IdentityMap
+    include Caching
   end
 end

data/lib/toy/validations.rb

@@ -27,4 +27,4 @@ module Toy
       save || raise(RecordInvalid.new(self))
     end
   end
-end
+end

data/lib/toy/version.rb

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

data/spec/helper.rb

@@ -18,6 +18,7 @@ require 'support/constants'
 require 'support/objects'
 require 'support/identity_map_matcher'
 require 'support/name_and_number_key_factory'
+require 'support/shared_active_model_lint'
 
 Logger.new(log_path.join('test.log')).tap do |log|
   Toy.logger = log

data/spec/support/shared_active_model_lint.rb

@@ -0,0 +1,15 @@
+require "active_model/lint"
+require "test/unit/assertions"
+
+shared_examples_for 'ActiveModel' do
+  include ActiveModel::Lint::Tests
+  include Test::Unit::Assertions
+
+  before { @model = subject }
+
+  ActiveModel::Lint::Tests.public_instance_methods.map(&:to_s).grep(/^test/).each do |test|
+    example test.gsub("_", " ") do
+      send test
+    end
+  end
+end

data/spec/toy/list_spec.rb

@@ -93,14 +93,14 @@ describe Toy::List do
 
     it "memoizes result" do
       @user.games.should == [@game]
-      Game.should_not_receive(:get_multi)
+      Game.should_not_receive(:get_multiple)
       Game.should_not_receive(:get)
       @user.games.should == [@game]
     end
 
     it "does not query if ids attribute is blank" do
       user = User.create
-      Game.should_not_receive(:get_multi)
+      Game.should_not_receive(:get_multiple)
       Game.should_not_receive(:get)
       user.games.should == []
     end
@@ -132,19 +132,19 @@ describe Toy::List do
     end
 
     it "unmemoizes the list" do
-      games = [@game]
-      @user.games.should == games
+      games = {@game.id => @game}
+      @user.games.should == games.values
       @user.games.reset
-      Game.should_receive(:get_multi).and_return(games)
-      @user.games.should == games
+      Game.should_receive(:get_multiple).and_return(games)
+      @user.games.should == games.values
     end
 
     it "should be reset when owner is reloaded" do
-      games = [@game]
-      @user.games.should == games
+      games = {@game.id => @game}
+      @user.games.should == games.values
       @user.reload
-      Game.should_receive(:get_multi).and_return(games)
-      @user.games.should == games
+      Game.should_receive(:get_multiple).and_return(games)
+      @user.games.should == games.values
     end
   end
 

data/spec/toy/object_spec.rb

@@ -3,6 +3,10 @@ require 'helper'
 describe Toy::Object do
   uses_objects('User')
 
+  subject { User.new }
+
+  it_should_behave_like 'ActiveModel'
+
   it "adds model naming" do
     model_name = User.model_name
     model_name.should           == 'User'

data/spec/toy/querying_spec.rb

@@ -31,11 +31,27 @@ describe Toy::Querying do
     end
   end
 
+  describe ".get_multiple" do
+    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 == {
+        john.id  => john,
+        steve.id => steve,
+        'foo'    => nil,
+      }
+    end
+  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).should == [john, steve]
+      User.get_multi(john.id, steve.id, 'foo').should == {
+        john.id  => john,
+        steve.id => steve,
+        'foo'    => nil,
+      }
     end
   end
 

data/spec/toy/store_spec.rb

@@ -3,6 +3,10 @@ require 'helper'
 describe Toy::Store do
   uses_constants('User')
 
+  subject { User.new }
+
+  it_should_behave_like 'ActiveModel'
+
   describe "#to_key" do
     it "returns [id] if persisted" do
       user = User.create

data/toystore.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'adapter',       '~> 0.5.1'
+  s.add_dependency 'adapter',       '~> 0.6.0'
   s.add_dependency 'activemodel',   '~> 3.0'
   s.add_dependency 'activesupport', '~> 3.0'
   s.add_dependency 'simple_uuid',   '~> 0.2'

metadata

@@ -1,96 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: toystore
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.11.0
   prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 4
-  version: 0.10.4
 platform: ruby
-authors: 
+authors:
 - Geoffrey Dagley
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-29 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: adapter
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
-        version: 0.5.1
-  version_requirements: *id001
-  name: adapter
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  version_requirements: *id002
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
-  version_requirements: *id004
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: simple_uuid
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: An object mapper for anything that can read, write and delete data
-email: 
+email:
 - gdagley@gmail.com
 - nunemaker@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -169,6 +162,7 @@ files:
 - spec/support/identity_map_matcher.rb
 - spec/support/name_and_number_key_factory.rb
 - spec/support/objects.rb
+- spec/support/shared_active_model_lint.rb
 - spec/toy/association_serialization_spec.rb
 - spec/toy/attribute_spec.rb
 - spec/toy/attributes_spec.rb
@@ -212,49 +206,45 @@ files:
 - spec/toy/timestamps_spec.rb
 - spec/toy/validations_spec.rb
 - spec/toy_spec.rb
-- test/lint_test.rb
 - toystore.gemspec
-has_rdoc: true
 homepage: http://jnunemaker.github.com/toystore/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1432731575283282863
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1432731575283282863
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An object mapper for anything that can read, write and delete data
-test_files: 
+test_files:
 - spec/helper.rb
 - spec/spec.opts
 - spec/support/constants.rb
 - spec/support/identity_map_matcher.rb
 - spec/support/name_and_number_key_factory.rb
 - spec/support/objects.rb
+- spec/support/shared_active_model_lint.rb
 - spec/toy/association_serialization_spec.rb
 - spec/toy/attribute_spec.rb
 - spec/toy/attributes_spec.rb
@@ -298,4 +288,3 @@ test_files:
 - spec/toy/timestamps_spec.rb
 - spec/toy/validations_spec.rb
 - spec/toy_spec.rb
-- test/lint_test.rb

data/test/lint_test.rb

@@ -1,40 +0,0 @@
-require 'bundler/setup'
-require 'pathname'
-
-root_path   = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path    = root_path.join('lib')
-
-$:.unshift(lib_path)
-
-require 'toy'
-
-Adapter.define(:memory) do
-  def read(key)
-    deserialize(client[key_for(key)])
-  end
-
-  def write(key, value)
-    client[key_for(key)] = serialize(value)
-  end
-
-  def delete(key)
-    client.delete(key_for(key))
-  end
-
-  def clear
-    client.clear
-  end
-end
-
-class User
-  include Toy::Store
-  adapter :memory, {}
-end
-
-class LintTest < ActiveModel::TestCase
-  include ActiveModel::Lint::Tests
-
-  def setup
-    @model = User.new
-  end
-end