adapter-mongo 0.5.6 → 0.6.0

data/.travis.yml

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

data/adapter-mongo.gemspec

@@ -17,6 +17,6 @@ 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'
+  s.add_dependency 'adapter', '~> 0.6.1'
   s.add_dependency 'mongo', '~> 1.5'
 end

data/lib/adapter/mongo/version.rb

@@ -1,5 +1,5 @@
 module Adapter
   module Mongo
-    VERSION = "0.5.6"
+    VERSION = "0.6.0"
   end
 end

data/lib/adapter/mongo.rb

@@ -3,8 +3,6 @@ require 'mongo'
 
 module Adapter
   module Mongo
-    NonHashValueKeyName = '_value'
-
     def read(key)
       if doc = client.find_one('_id' => key_for(key))
         decode(doc)
@@ -23,22 +21,9 @@ module Adapter
       client.remove
     end
 
-    def key_for(key)
-      case key
-      when BSON::ObjectId, Hash
-        key
-      else
-        super
-      end
-    end
-
-    def encode(value)
-      value.is_a?(Hash) ? value : {NonHashValueKeyName => value}
-    end
-
     def decode(value)
-      return if value.nil?
-      value.key?(NonHashValueKeyName) ? value[NonHashValueKeyName] : value
+      value.delete('_id')
+      value
     end
   end
 end

data/spec/helper.rb

@@ -7,7 +7,6 @@ require 'bundler'
 Bundler.require(:default, :test)
 
 require 'adapter/spec/an_adapter'
-require 'adapter/spec/types'
 require 'adapter-mongo'
 
 require 'support/shared_mongo_adapter'

data/spec/mongo_atomic_spec.rb

@@ -19,7 +19,6 @@ describe "Mongo atomic adapter" do
     adapter.write(oid, {'a' => 'c', 'b' => 'd'})
     adapter.write(oid, {'a' => 'z'})
     adapter.read(oid).should eq({
-      '_id' => oid,
       'a' => 'z',
       'b' => 'd',
     })

data/spec/support/shared_mongo_adapter.rb

@@ -1,33 +1,28 @@
 shared_examples_for "a mongo adapter" do
   it_should_behave_like 'an adapter'
 
-  Adapter::Spec::Types.each do |type, (key, key2)|
-    it "writes Object values to keys that are #{type}s like a Hash" do
-      adapter[key] = {:foo => :bar}
-      # mongo knows hashes and can serialize symbol values
-      adapter[key].should == {'_id' => 'key', 'foo' => :bar}
-    end
-  end
-
   it "allows using object id's as keys in correct type" do
     id = BSON::ObjectId.new
-    adapter.write(id, 'ham')
+    attributes = {'one' => 'two'}
+    adapter.write(id, attributes)
     client.find_one('_id' => id).should_not be_nil
-    adapter.read(id).should == 'ham'
+    adapter.read(id).should == attributes
   end
 
   it "allows using ordered hashes as keys" do
     key = BSON::OrderedHash['d', 1, 'n', 1]
-    adapter.write(key, 'ham')
+    attributes = {'one' => 'two'}
+    adapter.write(key, attributes)
     client.find_one('_id' => key).should_not be_nil
-    adapter.read(key).should == 'ham'
+    adapter.read(key).should == attributes
   end
 
   it "allows using hashes as keys" do
     key = {:d => 1}
-    adapter.write(key, 'ham')
+    attributes = {'one' => 'two'}
+    adapter.write(key, attributes)
     client.find_one('_id' => key).should_not be_nil
-    adapter.read(key).should == 'ham'
+    adapter.read(key).should == attributes
   end
 
   it "stores hashes right in document" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adapter-mongo
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adapter
-  requirement: &70364766280940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70364766280940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70364766280440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70364766280440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Adapter for mongo
 email:
 - nunemaker@gmail.com
@@ -73,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3131877323408847219
+      hash: -1642697742902591333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -82,10 +92,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3131877323408847219
+      hash: -1642697742902591333
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Adapter for mongo