mongo_mapper 0.8.4 → 0.8.5

data/README.rdoc

@@ -2,6 +2,10 @@
 
 A Ruby Object Mapper for Mongo.
 
+== Install
+
+    $ gem install mongo_mapper
+
 == Note on Patches/Pull Requests
 
 * Fork the project.
@@ -10,9 +14,11 @@ A Ruby Object Mapper for Mongo.
 * Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Install
+== Development
 
- $ gem install mongo_mapper
+    $ gem install bundler (if you don't have it)
+    $ bundle install
+    $ bundle exec rake
 
 == Problems or Questions?
 

data/lib/mongo_mapper/plugins/associations/proxy.rb

@@ -26,7 +26,7 @@ module MongoMapper
         end
 
         # Active support in rails 3 beta 4 can override to_json after this is loaded,
-        # at least when run in mongomapper tests. The implementation was changed in master 
+        # at least when run in mongomapper tests. The implementation was changed in master
         # some time after this, so not sure whether this is still a problem.
         #
         # In rails 2, this isn't a problem however it also solves an issue where
@@ -41,7 +41,7 @@ module MongoMapper
           load_target
           target.as_json(*options)
         end
-        
+
         def inspect
           load_target
           target.inspect
@@ -106,11 +106,7 @@ module MongoMapper
         protected
           def method_missing(method, *args, &block)
             if load_target
-              if block_given?
-                target.send(method, *args)  { |*block_args| block.call(*block_args) }
-              else
-                target.send(method, *args)
-              end
+              target.send(method, *args, &block)
             end
           end
 

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.8.4'
+  Version = '0.8.5'
 end

data/test/functional/test_binary.rb

@@ -10,7 +10,7 @@ class BinaryTest < Test::Unit::TestCase
     doc.save
 
     doc = doc.reload
-    doc.contents.to_s.should == BSON::ByteBuffer.new('010101').to_s
+    doc.contents.to_s.should == BSON::Binary.new('010101').to_s
   end
 
   context "Saving a document with a blank binary value" do

data/test/test_helper.rb

@@ -1,10 +1,5 @@
 require 'rubygems'
-gem 'activesupport',     ENV['ACTIVE_SUPPORT_VERSION']
-gem 'json'
-gem 'jnunemaker-matchy', '~> 0.4.0'
-gem 'shoulda',           '~> 2.11'
-gem 'timecop',           '~> 0.3.5'
-gem 'mocha',             '~> 0.9.8'
+require 'bundler/setup'
 
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'mongo_mapper'
@@ -55,7 +50,7 @@ class Test::Unit::TestCase
       klass.collection.drop_indexes
     end
   end
-  
+
   custom_matcher :be_true do |receiver, matcher, args|
     matcher.positive_failure_message = "Expected #{receiver} to be true but it wasn't"
     matcher.negative_failure_message = "Expected #{receiver} not to be true but it was"

data/test/unit/test_extensions.rb

@@ -20,12 +20,12 @@ class SupportTest < Test::Unit::TestCase
   end
 
   context "Binary.to_mongo" do
-    should "convert to byte buffer if not byte buffer" do
-      Binary.to_mongo('asdfsadasdfs').is_a?(BSON::ByteBuffer).should be_true
+    should "convert to binary if not binary" do
+      Binary.to_mongo('asdfsadasdfs').is_a?(BSON::Binary).should be_true
     end
 
-    should "be byte buffer if byte buffer" do
-      Binary.to_mongo(BSON::ByteBuffer.new('asdfsadasdfs')).is_a?(BSON::ByteBuffer).should be_true
+    should "be binary if binary" do
+      Binary.to_mongo(BSON::Binary.new('asdfsadasdfs')).is_a?(BSON::Binary).should be_true
     end
 
     should "be nil if nil" do
@@ -35,8 +35,8 @@ class SupportTest < Test::Unit::TestCase
 
   context "Binary.from_mongo" do
     should "return value" do
-      buffer = BSON::ByteBuffer.new('asdfasdfasdf')
-      Binary.from_mongo(buffer).to_s.should == buffer.to_s
+      binary = BSON::Binary.new('asdfasdfasdf')
+      Binary.from_mongo(binary).to_s.should == binary.to_s
     end
   end
 
@@ -373,8 +373,4 @@ class SupportTest < Test::Unit::TestCase
       end
     end
   end
-
-  context "BSON::ObjectId.to_json" do
-
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -04:00
+date: 2010-10-11 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 31
         segments: 
         - 0
         - 3
-        - 5
-        version: 0.3.5
+        - 6
+        version: 0.3.6
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency