perpetuity 0.4.5 → 0.4.6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.4.6
+
+- Fix an inconsistency between `mongo` and `moped` gems. Previously, the MongoDB adapter relied on the fail-fast behavior of the `mongo` gem so we had no need to check for errors. Moped does not do that by default, which resulted in incorrect behavior of the gem when an object was not persisted.
+- The `Mapper#select` DSL now allows the use of `!=` as criteria. Not all supported Ruby implementations allowed that operator to be overridden when the DSL was created, but they do now.
+
 ## Version 0.4.5
 
 - Move from the `mongo` gem from 10gen to the `moped` gem for talking to MongoDB. This resulted in performance gains of 30-80%, depending on query size.

data/lib/perpetuity/exceptions/duplicate_key_error.rb

@@ -0,0 +1,3 @@
+module Perpetuity
+  DuplicateKeyError = Class.new(StandardError)
+end

data/lib/perpetuity/mongodb.rb

@@ -2,6 +2,7 @@ require 'moped'
 require 'perpetuity/mongodb/query'
 require 'perpetuity/mongodb/index'
 require 'set'
+require 'perpetuity/exceptions/duplicate_key_error'
 
 module Perpetuity
   class MongoDB
@@ -20,6 +21,7 @@ module Perpetuity
 
     def session
       @session ||= Moped::Session.new(["#{host}:#{port}"])
+      @session.with(safe: true)
     end
 
     def connect
@@ -50,6 +52,13 @@ module Perpetuity
 
       collection(klass).insert attributes
       attributes[:_id]
+    rescue Moped::Errors::OperationFailure => e
+      if e.message =~ /duplicate key/
+        e.message =~ /\$(\w+)_\d.*dup key: { : (.*) }/
+        key = $1
+        value = $2.gsub("\\\"", "\"")
+        raise DuplicateKeyError, "Tried to insert #{klass} with duplicate unique index: #{key} => #{value}"
+      end
     end
 
     def count klass

data/lib/perpetuity/mongodb/query_attribute.rb

@@ -29,9 +29,10 @@ module Perpetuity
         QueryExpression.new self, :lte, value
       end
 
-      def not_equal? value
+      def != value
         QueryExpression.new self, :not_equal, value
       end
+      alias :not_equal? :'!='
 
       def =~ regexp
         QueryExpression.new self, :matches, regexp

data/lib/perpetuity/version.rb

@@ -1,3 +1,3 @@
 module Perpetuity
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/integration/retrieval_spec.rb

@@ -91,7 +91,7 @@ describe "retrieval" do
     end
 
     it 'selects objects using inequality' do
-      selected = Perpetuity[Article].select { |article| article.title.not_equal? 'Draft' }
+      selected = Perpetuity[Article].select { |article| article.title != 'Draft' }
       ids = selected.map(&:id)
       ids.should_not include draft.id
       ids.should include published.id

data/spec/perpetuity/mongodb/query_attribute_spec.rb

@@ -28,7 +28,7 @@ module Perpetuity
     end
 
     it 'checks for inequality' do
-      attribute.not_equal?(1).should be_a MongoDB::QueryExpression
+      (attribute != 1).should be_a MongoDB::QueryExpression
     end
 
     it 'checks for regexp matches' do

data/spec/perpetuity/mongodb_spec.rb

@@ -135,5 +135,20 @@ module Perpetuity
         mongo.active_indexes(collection).should_not include index
       end
     end
+
+    describe 'operation errors' do
+      let(:data) { { foo: 'bar' } }
+      let(:index) { mongo.index Object, :foo, unique: true }
+
+      before { mongo.activate_index! index }
+      after { mongo.drop_collection Object }
+
+      it 'raises an exception when insertion fails' do
+        mongo.insert Object, data
+
+        expect { mongo.insert Object, data }.to raise_error DuplicateKeyError,
+          'Tried to insert Object with duplicate unique index: foo => "bar"'
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,6 +79,7 @@ files:
 - lib/perpetuity/attribute_set.rb
 - lib/perpetuity/config.rb
 - lib/perpetuity/data_injectable.rb
+- lib/perpetuity/exceptions/duplicate_key_error.rb
 - lib/perpetuity/identity_map.rb
 - lib/perpetuity/mapper.rb
 - lib/perpetuity/mapper_registry.rb
@@ -150,21 +151,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3190074601022311513
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3190074601022311513
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Persistence library allowing serialization of Ruby objects