jnunemaker-mongomapper 0.1.0 → 0.1.1

data/History

@@ -1,2 +1,6 @@
+0.1.1 6/28/2009
+* 1 minor change
+  * bumped ruby driver to 0.9 and removed hacks I had in while waiting for it
+  
 0.1.0 6/26/2009
 * Initial release

data/Rakefile

@@ -12,12 +12,11 @@ begin
     gem.rubyforge_project = "mongomapper"
     
     gem.add_dependency('activesupport')
-    gem.add_dependency('mongodb-mongo')
-    gem.add_dependency('jnunemaker-validatable')
+    gem.add_dependency('mongodb-mongo', '0.9')
+    gem.add_dependency('jnunemaker-validatable', '1.7.0')
     
-    gem.add_development_dependency('mocha')
+    gem.add_development_dependency('mocha', '0.9.4')
     gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
-    gem.add_development_dependency('thoughtbot-quietbacktrace')
   end
 
   Jeweler::RubyforgeTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/mongomapper/document.rb

@@ -47,12 +47,6 @@ module MongoMapper
       # TODO: remove the rescuing when ruby driver works correctly
       def count(conditions={})
         collection.count(conditions)
-      rescue => exception
-        if exception.message =~ /Error with count command/
-          0
-        else
-          raise exception
-        end
       end
       
       def create(*docs)

data/lib/mongomapper/embedded_document.rb

@@ -64,12 +64,11 @@ module MongoMapper
         key
       end
       
-      # TODO: remove to_s when ruby driver supports symbols (I sent patch)
       def ensure_index(name_or_array, options={})
         keys_to_index = if name_or_array.is_a?(Array)
-          name_or_array.map { |pair| [pair[0].to_s, pair[1]] }
+          name_or_array.map { |pair| [pair[0], pair[1]] }
         else
-          name_or_array.to_s
+          name_or_array
         end
         
         collection.create_index(keys_to_index, options.delete(:unique))

data/lib/mongomapper.rb

@@ -2,8 +2,8 @@ require 'pathname'
 require 'rubygems'
 
 gem 'activesupport'
-gem 'mongodb-mongo'
-gem 'jnunemaker-validatable'
+gem 'mongodb-mongo', '0.9'
+gem 'jnunemaker-validatable', '1.7.0'
 
 require 'activesupport'
 require 'mongo'

data/mongomapper.gemspec

@@ -0,0 +1,91 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{mongomapper}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Nunemaker"]
+  s.date = %q{2009-06-28}
+  s.email = %q{nunemaker@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/mongomapper.rb",
+     "lib/mongomapper/document.rb",
+     "lib/mongomapper/embedded_document.rb",
+     "lib/mongomapper/finder_options.rb",
+     "lib/mongomapper/key.rb",
+     "lib/mongomapper/rails_compatibility.rb",
+     "lib/mongomapper/save_with_validation.rb",
+     "lib/mongomapper/serialization.rb",
+     "lib/mongomapper/serializers/json_serializer.rb",
+     "mongomapper.gemspec",
+     "test/serializers/test_json_serializer.rb",
+     "test/test_associations.rb",
+     "test/test_callbacks.rb",
+     "test/test_document.rb",
+     "test/test_embedded_document.rb",
+     "test/test_finder_options.rb",
+     "test/test_helper.rb",
+     "test/test_key.rb",
+     "test/test_mongomapper.rb",
+     "test/test_rails_compatibility.rb",
+     "test/test_serializations.rb",
+     "test/test_validations.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/jnunemaker/mongomapper}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{mongomapper}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
+  s.test_files = [
+    "test/serializers/test_json_serializer.rb",
+     "test/test_associations.rb",
+     "test/test_callbacks.rb",
+     "test/test_document.rb",
+     "test/test_embedded_document.rb",
+     "test/test_finder_options.rb",
+     "test/test_helper.rb",
+     "test/test_key.rb",
+     "test/test_mongomapper.rb",
+     "test/test_rails_compatibility.rb",
+     "test/test_serializations.rb",
+     "test/test_validations.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<mongodb-mongo>, ["= 0.9"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.0"])
+      s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
+      s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<mongodb-mongo>, ["= 0.9"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.0"])
+      s.add_dependency(%q<mocha>, ["= 0.9.4"])
+      s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<mongodb-mongo>, ["= 0.9"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.0"])
+    s.add_dependency(%q<mocha>, ["= 0.9.4"])
+    s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+  end
+end

data/test/test_document.rb

@@ -478,13 +478,13 @@ class DocumentTest < Test::Unit::TestCase
           @document.ensure_index :fname
         }.should change { @document.collection.index_information.size }.by(1)
         
-        index = @document.collection.index_information.last
+        index = @document.collection.index_information['fname_1']
         index.should_not be_nil
-        index[:keys].keys.should == %w(fname)
+        index.should include(['fname', 1])
       end
       
       should "allow creating unique index for a key" do        
-        @document.collection.expects(:create_index).with('fname', true)
+        @document.collection.expects(:create_index).with(:fname, true)
         @document.ensure_index :fname, :unique => true
       end
       
@@ -493,9 +493,10 @@ class DocumentTest < Test::Unit::TestCase
           @document.ensure_index [[:fname, 1], [:lname, -1]]
         }.should change { @document.collection.index_information.size }.by(1)
         
-        index = @document.collection.index_information.last
+        index = @document.collection.index_information['lname_-1_fname_1']
         index.should_not be_nil
-        index[:keys].keys.should == %w(fname lname)
+        index.should include(['fname', 1])
+        index.should include(['lname', -1])
       end
       
       should "work with :index shortcut when defining key" do
@@ -503,12 +504,11 @@ class DocumentTest < Test::Unit::TestCase
           @document.key :father, String, :index => true
         }.should change { @document.collection.index_information.size }.by(1)
         
-        index = @document.collection.index_information.last
+        index = @document.collection.index_information['father_1']
         index.should_not be_nil
-        index[:keys].keys.should == %w(father)
+        index.should include(['father', 1])
       end
     end
-    
   end # Database operations
   
   context "An instance of a document" do

data/test/test_helper.rb

@@ -3,13 +3,11 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 
+gem 'mocha', '0.9.4'
 gem 'jnunemaker-matchy', '0.4.0'
-gem 'mocha'
-gem 'thoughtbot-quietbacktrace'
 
 require 'matchy'
 require 'mocha'
-require 'quietbacktrace'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 dir = (Pathname(__FILE__).dirname +  '..' + 'lib').expand_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-27 00:00:00 -07:00
+date: 2009-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.9"
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -38,9 +38,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.7.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -48,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-matchy
@@ -62,16 +62,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.4.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-quietbacktrace
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: 
 email: nunemaker@gmail.com
 executables: []
@@ -97,6 +87,7 @@ files:
 - lib/mongomapper/save_with_validation.rb
 - lib/mongomapper/serialization.rb
 - lib/mongomapper/serializers/json_serializer.rb
+- mongomapper.gemspec
 - test/serializers/test_json_serializer.rb
 - test/test_associations.rb
 - test/test_callbacks.rb
@@ -105,7 +96,7 @@ files:
 - test/test_finder_options.rb
 - test/test_helper.rb
 - test/test_key.rb
-- test/test_mongo_mapper.rb
+- test/test_mongomapper.rb
 - test/test_rails_compatibility.rb
 - test/test_serializations.rb
 - test/test_validations.rb
@@ -144,7 +135,7 @@ test_files:
 - test/test_finder_options.rb
 - test/test_helper.rb
 - test/test_key.rb
-- test/test_mongo_mapper.rb
+- test/test_mongomapper.rb
 - test/test_rails_compatibility.rb
 - test/test_serializations.rb
 - test/test_validations.rb