toystore-mongo 0.11.0 → 0.12.0

data/.travis.yml

@@ -7,3 +7,4 @@ rvm:
 notifications:
   email: false
 bundler_args: --without guard
+services: mongodb

data/Gemfile

@@ -4,9 +4,9 @@ gemspec
 gem 'rake', '~> 0.9.0'
 
 # keep mongo and bson ext at same version
-gem 'adapter-mongo', '~> 0.5.5'
 gem 'mongo', '~> 1.6.0'
 gem 'bson_ext', '~> 1.6.0', :require => false
+gem 'adapter-mongo', :path => '/Users/jnunemaker/projects/adapter-mongo'
 
 group(:guard) do
   gem 'guard',          '~> 1.0.0'

data/lib/toy/mongo.rb

@@ -9,13 +9,12 @@ require 'adapter/mongo'
 module Toy
   module Mongo
     extend ActiveSupport::Concern
+    include Toy::Store
+    include Querying
 
     class Error < StandardError; end
 
     included do
-      include Toy::Store
-      include Querying
-
       key Toy::Identity::ObjectIdKeyFactory.new
     end
   end

data/lib/toy/mongo/querying.rb

@@ -25,22 +25,6 @@ module Toy
           super Plucky.to_object_id(id)
         end
 
-        # Mongo does not guarantee sort order when using $in.
-        # So we manually sort in ruby for now. Not stoked about
-        # this, but it gets the job done.
-        def get_multi(*ids)
-          ids  = ids.flatten
-          all(:_id => {'$in' => ids}).sort do |a, b|
-            index_a = ids.index(a.id)
-            index_b = ids.index(b.id)
-            if index_a.nil? || index_b.nil?
-              1
-            else
-              index_a <=> index_b
-            end
-          end
-        end
-
         def query
           Plucky::Query.new(adapter.client, :transformer => transformer).object_ids(object_id_attributes)
         end

data/lib/toy/mongo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Mongo
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 end

data/spec/toy/mongo/querying_spec.rb

@@ -40,22 +40,4 @@ describe Toy::Mongo::Querying do
       User.get('1234').should be_nil
     end
   end
-
-  describe "#get_multi" do
-    before(:each) do
-      @user1 = User.create
-      @user2 = User.create
-      @users = User.get_multi(@user2.id, @user1.id)
-    end
-
-    it "returns multiple documents in correct order" do
-      @users.should == [@user2, @user1]
-    end
-
-    it "performs one query" do
-      User.should_not_receive(:get)
-      User.should_receive(:all).once.and_return([])
-      User.get_multi(@user1.id, @user2.id)
-    end
-  end
 end

data/toystore-mongo.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'plucky', '~> 0.5'
   s.add_dependency 'toystore', '~> 0.10'
-  s.add_dependency 'adapter-mongo', '~> 0.5.5'
+  s.add_dependency 'adapter-mongo', '~> 0.7.0'
 
   s.files         = `git ls-files`.split("\n") - ['specs.watchr']
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,78 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: toystore-mongo
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 0.12.0
   prerelease: 
-  segments: 
-  - 0
-  - 11
-  - 0
-  version: 0.11.0
 platform: ruby
-authors: 
+authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: plucky
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
-  version_requirements: *id001
-  name: plucky
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
-  version_requirements: *id002
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   name: toystore
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        - 5
-        version: 0.5.5
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
   name: adapter-mongo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: Mongo integration for Toystore
-email: 
+email:
 - nunemaker@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -98,40 +91,37 @@ files:
 - spec/toy/mongo/querying_spec.rb
 - spec/toy/mongo_spec.rb
 - toystore-mongo.gemspec
-homepage: ""
+homepage: ''
 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: 3552750684028256836
+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: 3552750684028256836
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Mongo integration for Toystore
-test_files: 
+test_files:
 - spec/helper.rb
 - spec/spec.opts
 - spec/support/callbacks_helper.rb