mongo_mapper 0.7.4 → 0.7.5

data/Rakefile

@@ -13,7 +13,7 @@ Jeweler::Tasks.new do |gem|
   gem.version     = MongoMapper::Version
 
   gem.add_dependency('activesupport', '>= 2.3.4')
-  gem.add_dependency('mongo', '0.20.1')
+  gem.add_dependency('mongo', '1.0')
   gem.add_dependency('jnunemaker-validatable', '1.8.4')
 
   gem.add_development_dependency('json', '>= 1.2.3')

data/lib/mongo_mapper.rb

@@ -1,6 +1,6 @@
 # Make sure you have the following libs in your load path or you could have issues:
 #   gem 'activesupport', '>= 2.3.4'
-#   gem 'mongo', '0.20.1'
+#   gem 'mongo', '1.0'
 #   gem 'jnunemaker-validatable', '1.8.4'
 require 'set'
 require 'uri'

data/lib/mongo_mapper/document.rb

@@ -79,12 +79,12 @@ module MongoMapper
         find(id)
       end
 
-      def first_or_create(arg)
-        first(arg) || create(arg)
+      def first_or_create(args)
+        first(args) || create(args.reject { |key, value| !key?(key) })
       end
 
-      def first_or_new(arg)
-        first(arg) || new(arg)
+      def first_or_new(args)
+        first(args) || new(args.reject { |key, value| !key?(key) })
       end
 
       def first(options={})

data/lib/mongo_mapper/plugins/keys.rb

@@ -28,6 +28,10 @@ module MongoMapper
           key
         end
 
+        def key?(key)
+          keys.keys.include?(key.to_s)
+        end
+
         def using_object_id?
           object_id_key?(:_id)
         end
@@ -147,7 +151,7 @@ module MongoMapper
       module InstanceMethods
         def initialize(attrs={}, from_database=false)
           default_id_value(attrs)
-          
+
           if from_database
             @new = false
             self.attributes = attrs
@@ -155,7 +159,7 @@ module MongoMapper
             @new = true
             assign(attrs)
           end
-          
+
           assign_type
         end
 

data/lib/mongo_mapper/version.rb

@@ -1,3 +1,3 @@
 module MongoMapper
-  Version = '0.7.4'
+  Version = '0.7.5'
 end

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2010-04-18}
+  s.date = %q{2010-04-30}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -183,7 +183,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.20.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 1.0"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.4"])
       s.add_development_dependency(%q<json>, [">= 1.2.3"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
@@ -192,7 +192,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<mongo>, ["= 0.20.1"])
+      s.add_dependency(%q<mongo>, ["= 1.0"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.4"])
       s.add_dependency(%q<json>, [">= 1.2.3"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
@@ -202,7 +202,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<mongo>, ["= 0.20.1"])
+    s.add_dependency(%q<mongo>, ["= 1.0"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.4"])
     s.add_dependency(%q<json>, [">= 1.2.3"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])

data/test/functional/test_document.rb

@@ -448,6 +448,15 @@ class DocumentTest < Test::Unit::TestCase
         created.last_name.should == 'Nunemaker'
       }.should change { @document.count }.by(1)
     end
+    
+    should "disregard non-keys when creating, but use them in the query" do
+      assert_nothing_raised do
+        @document.create(:first_name => 'John', :age => 9)
+        lambda {
+          @document.first_or_create(:first_name => 'John', :age.gt => 10).first_name.should == 'John'
+        }.should change { @document.count }.by(1)
+      end
+    end
   end
 
   context "first_or_new" do
@@ -467,6 +476,13 @@ class DocumentTest < Test::Unit::TestCase
         created.should be_new
       }.should_not change { @document.count }
     end
+    
+    should "disregard non-keys when initializing, but use them in the query" do
+      assert_nothing_raised do
+        @document.create(:first_name => 'John', :age => 9)
+        @document.first_or_new(:first_name => 'John', :age.gt => 10).first_name.should == 'John'
+      end
+    end
   end
 
   context "ClassMethods#delete (single document)" do

data/test/unit/test_keys.rb

@@ -22,6 +22,18 @@ end
 class KeyTest < Test::Unit::TestCase
   include MongoMapper::Plugins::Keys
 
+  context ".key?" do
+    should "be true if document has key" do
+      Address.key?(:city).should be_true
+      Address.key?('city').should be_true
+    end
+    
+    should "be false if document does not have key" do
+      Address.key?(:foo).should be_false
+      Address.key?('foo').should be_false
+    end
+  end
+
   context "Initializing a new key" do
     should "allow setting the name" do
       Key.new(:foo, String).name.should == 'foo'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 -04:00
+date: 2010-04-30 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,10 +39,9 @@ dependencies:
     - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 20
         - 1
-        version: 0.20.1
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency