mongoo 0.5.6 → 0.5.7

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/lib/mongoo.rb

@@ -6,7 +6,7 @@ end
 # Mongoo.db   = "mydb"
 # Mongoo.conn => #<Mongo::Connection:0x00000100db8ac0>
 
-module Mongoo
+module Mongoo  
   class << self
     attr_accessor :verbose_debug
 
@@ -37,6 +37,27 @@ module Mongoo
   end
 end
 
+module Mongoo
+  class MongooException       < RuntimeError; end
+
+  class AlreadyInsertedError  < MongooException; end
+  class NotInsertedError      < MongooException; end
+  class InsertError           < MongooException; end
+  class StaleUpdateError      < MongooException; end
+  class UpdateError           < MongooException; end
+  class RemoveError           < MongooException; end
+  class NotValidError         < MongooException; end
+
+  class DbNameNotSet          < MongooException; end
+  class ConnNotSet            < MongooException; end
+
+  class DuplicateKeyError     < MongooException; end
+  class ModifierUpdateError   < MongooException; end
+  class UnknownAttributeError < MongooException; end
+  class InvalidAttributeValue < MongooException; end
+  class UnknownAttributeError < MongooException; end
+end
+
 require "forwardable"
 
 require "active_support/core_ext"

data/lib/mongoo/attribute_sanitizer.rb

@@ -1,12 +1,12 @@
 module Mongoo
-  class InvalidAttributeValue < Exception; end
-
   class AttributeSanitizer
     class << self
       def sanitize(field_type, val)
         return val if val.nil? || field_type.nil?
 
         case field_type.to_sym
+        when :*
+          val
         when :string then
           val.is_a?(String) ? val : val.to_s
         when :symbol then

data/lib/mongoo/attributes.rb

@@ -1,5 +1,3 @@
-class Mongoo::UnknownAttributeError < Exception; end
-
 module Mongoo::Attributes
   extend ActiveSupport::Concern
 

data/lib/mongoo/modifiers.rb

@@ -1,7 +1,4 @@
 module Mongoo
-  class ModifierUpdateError < Exception; end
-  class UnknownAttributeError < Exception; end
-
   class ModifierBuilder
     def initialize(opts, doc)
       @opts  = opts
@@ -196,7 +193,13 @@ module Mongoo
           raise ModifierUpdateError, ret.inspect
         end
       end # if opts[:find_any_modify]
-    end
+    rescue Mongo::OperationFailure => e
+      if e.message.to_s =~ /^11000\:/
+        raise Mongoo::DuplicateKeyError, e.message
+      else
+        raise e
+      end
+    end # run!
   end
 
   module Modifiers

data/lib/mongoo/persistence.rb

@@ -1,15 +1,4 @@
 module Mongoo
-  class AlreadyInsertedError < Exception; end
-  class NotInsertedError < Exception; end
-  class InsertError < Exception; end
-  class StaleUpdateError < Exception; end
-  class UpdateError < Exception; end
-  class RemoveError < Exception; end
-  class NotValidError < Exception; end
-
-  class DbNameNotSet < Exception; end
-  class ConnNotSet < Exception; end
-
   module Persistence
 
     class RawUpdate
@@ -231,6 +220,12 @@ module Mongoo
       end
       Mongoo::IdentityMap.write(self) if Mongoo::IdentityMap.on?
       ret
+    rescue Mongo::OperationFailure => e
+      if e.message.to_s =~ /^11000\:/
+        raise Mongoo::DuplicateKeyError, e.message
+      else
+        raise e
+      end
     end
 
     def insert!(opts={})
@@ -284,6 +279,12 @@ module Mongoo
           end
         end # if opts.delete(:find_and_modify)
       end
+    rescue Mongo::OperationFailure => e
+      if e.message.to_s =~ /^11000\:/
+        raise Mongoo::DuplicateKeyError, e.message
+      else
+        raise e
+      end
     end
 
     def update!(opts={})

data/mongoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
-  s.date = %q{2011-06-20}
+  s.date = %q{2011-06-24}
   s.description = %q{Simple object mapper for MongoDB}
   s.email = %q{ben.myles@gmail.com}
   s.extra_rdoc_files = [

data/test/helper.rb

@@ -26,6 +26,13 @@ class SearchIndex < Mongoo::Base
   end
 end
 
+class Contact < Mongoo::Base
+  describe do |o|
+    o.attribute "email", :type => :string
+    o.index "email", :unique => true
+  end
+end
+
 class Person < Mongoo::Base
   describe do |d|
     d.attribute "name", :type => :string

data/test/test_mongoo.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestMongoo < Test::Unit::TestCase
 
   def setup
-    [Person, TvShow, SearchIndex].each do |obj|
+    [Person, TvShow, SearchIndex, Contact].each do |obj|
       obj.drop
       obj.create_indexes
     end
@@ -488,5 +488,12 @@ class TestMongoo < Test::Unit::TestCase
     assert_equal ["skydiving", "coding", "reading", "swimming", "base jumping"], p.interests
   end
 
+  should "raise a specific error if a unique constraint is violated" do
+    c = Contact.new(email: "foo@bar.com")
+    assert c.insert!
+    c = Contact.new(email: "foo@bar.com")
+    assert_raise(Mongoo::DuplicateKeyError) { c.insert! }
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoo
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-20 00:00:00.000000000 -07:00
+date: 2011-06-24 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151897000 !ruby/object:Gem::Requirement
+  requirement: &2152536040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151897000
+  version_requirements: *2152536040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151895180 !ruby/object:Gem::Requirement
+  requirement: &2152534700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151895180
+  version_requirements: *2152534700
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2151893580 !ruby/object:Gem::Requirement
+  requirement: &2152533160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151893580
+  version_requirements: *2152533160
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2151891620 !ruby/object:Gem::Requirement
+  requirement: &2152531560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151891620
+  version_requirements: *2152531560
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2151889100 !ruby/object:Gem::Requirement
+  requirement: &2152529860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151889100
+  version_requirements: *2152529860
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151887680 !ruby/object:Gem::Requirement
+  requirement: &2152528720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151887680
+  version_requirements: *2152528720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151885300 !ruby/object:Gem::Requirement
+  requirement: &2152527140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151885300
+  version_requirements: *2152527140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151882720 !ruby/object:Gem::Requirement
+  requirement: &2152525820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2151882720
+  version_requirements: *2152525820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151880160 !ruby/object:Gem::Requirement
+  requirement: &2152524720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151880160
+  version_requirements: *2152524720
 - !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &2151877020 !ruby/object:Gem::Requirement
+  requirement: &2152523660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151877020
+  version_requirements: *2152523660
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2151876040 !ruby/object:Gem::Requirement
+  requirement: &2152522400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151876040
+  version_requirements: *2152522400
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2464241099549832500
+      hash: 4291179620759477448
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: