tenacity 0.5.8 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+Version 0.6.0
+-------------
+
+* Minor enhancements
+
+  * Added support for CouchRest 1.1
+  * Added support for Mongoid 3.x
+  * Modified Mongoid extension to work with the moped MongoDB driver (artem-mindrov)
+  * Modified MongoMapper extension to work with the moped MongoDB driver
+
 Version 0.5.8
 -------------
 

data/README.rdoc

@@ -113,6 +113,7 @@ See EXTEND.rdoc for information on extending Tenacity to work with other databas
 
 == Development
 
+* Ruby 1.9.3 is required.
 * SQLite, MongoDB, Riak, and CouchDB must be installed, configured, and running.
 * Install the dependencies
 

data/THANKS.md

@@ -7,6 +7,7 @@ suggesting improvements, or submitting changes.
 
  * [danielgranat](http://github.com/danielgranat)
  * [raphaelcm](http://github.com/raphaelcm)
+ * [artem-mindrov](https://github.com/artem-mindrov)
  
 Patches are welcome. The primary source for this software project is [on Github](http://github.com/jwood/tenacity)
 

data/config/mongoid.yml

@@ -0,0 +1,9 @@
+test:
+  sessions:
+    default:
+      database: tenacity_test
+      hosts:
+        - localhost:27017
+      options:
+        safe: true
+

data/lib/tenacity/associates_proxy.rb

@@ -21,36 +21,55 @@ module Tenacity
     def <<(object)
       object._t_save_if_dirty unless @parent.id.nil?
       @target << AssociateProxy.new(object, @association)
+      mark_parent_dirty
     end
 
     def push(*objects)
       objects.each { |object| object._t_save_if_dirty } unless @parent.id.nil?
       proxies = objects.map { |object| AssociateProxy.new(object, @association) }
       @target.push(*proxies)
+      mark_parent_dirty
     end
 
     def concat(objects)
       objects.each { |object| object._t_save_if_dirty } unless @parent.id.nil?
       proxies = objects.map { |object| AssociateProxy.new(object, @association) }
       @target.concat(proxies)
+      mark_parent_dirty
     end
 
     def destroy_all
       remove_associates_from_parent
       @association.associate_class._t_delete(@parent._t_get_associate_ids(@association))
+      mark_parent_dirty
     end
 
     def delete_all
       remove_associates_from_parent
       @association.associate_class._t_delete(@parent._t_get_associate_ids(@association), false)
+      mark_parent_dirty
     end
 
     def inspect
       @target.inspect
     end
 
+    def delete(*args)
+      mark_parent_dirty
+      @target.delete(*args)
+    end
+
+    def clear(*args)
+      mark_parent_dirty
+      @target.clear(*args)
+    end
+
     private
 
+    def mark_parent_dirty
+      @parent._t_mark_dirty if @parent.respond_to?(:_t_mark_dirty)
+    end
+
     def remove_associates_from_parent
       @parent._t_remove_associates(@association)
       @parent._t_save_if_dirty

data/lib/tenacity/class_methods.rb

@@ -392,6 +392,7 @@ module Tenacity
       end
 
       define_method("#{association.name}=") do |associates|
+        _t_mark_dirty if respond_to?(:_t_mark_dirty)
         set_associate(association, associates) do
           set_has_many_associates(association, associates)
         end
@@ -402,6 +403,7 @@ module Tenacity
       end
 
       define_method("#{ActiveSupport::Inflector.singularize(association.name.to_s)}_ids=") do |associate_ids|
+        _t_mark_dirty if respond_to?(:_t_mark_dirty)
         set_has_many_associate_ids(association, associate_ids)
       end
 

data/lib/tenacity/orm_ext/couchrest.rb

@@ -83,7 +83,7 @@ module Tenacity
           docs = []
           result = database.get_bulk(_t_serialize_ids(ids))
           result['rows'].each do |row|
-            docs << (row['doc'].nil? ? nil : create_from_database(row['doc']))
+            docs << (row['doc'].nil? ? nil : new(row['doc'], :directly_set_attributes => true))
           end
           docs.reject { |doc| doc.nil? }
         end
@@ -111,6 +111,7 @@ module Tenacity
         end
 
         def _t_initialize_has_many_association(association)
+          property :_tenacity_ddt unless self.respond_to?(:_tenacity_ddt)
           after_save { |record| record.class._t_save_associates(record, association) }
           before_destroy { |record| record._t_cleanup_has_many_association(association) }
         end
@@ -136,6 +137,12 @@ module Tenacity
       end
 
       module InstanceMethods #:nodoc:
+        def _t_mark_dirty
+          send :_tenacity_ddt_will_change!
+        rescue NoMethodError
+          # No dirty tracking support for this version of CouchRest
+        end
+
         def _t_reload
           unless self.id.nil?
             new_doc = database.get(self.id)

data/lib/tenacity/orm_ext/mongo_mapper.rb

@@ -66,7 +66,7 @@ module Tenacity
         end
 
         def _t_find_all_ids_by_associate(property, id)
-          results = collection.find({property => _t_serialize(id)}, {:fields => 'id'}).to_a
+          results = collection.find({property => _t_serialize(id)})
           results.map { |r| r['_id'] }
         end
 

data/lib/tenacity/orm_ext/mongoid.rb

@@ -56,22 +56,35 @@ module Tenacity
         end
 
         def _t_find_bulk(ids)
-          docs = find(_t_serialize_ids(ids))
+          if respond_to?(:where)
+            ids = [ids].flatten
+            docs = where(:_id.in => _t_serialize_ids(ids)).all
+          else
+            docs = find(_t_serialize_ids(ids))
+          end
           docs.respond_to?(:each) ? docs : [docs]
         rescue ::Mongoid::Errors::DocumentNotFound
           []
         end
 
         def _t_find_first_by_associate(property, id)
-          find(:first, :conditions => { property => _t_serialize(id) })
+          if respond_to?(:where)
+            where(property => _t_serialize(id)).first
+          else
+            first(:conditions => { property => _t_serialize(id) })
+          end
         end
 
         def _t_find_all_by_associate(property, id)
-          find(:all, :conditions => { property => _t_serialize(id) })
+          if respond_to?(:where)
+            where(property => _t_serialize(id)).all
+          else
+            all(:conditions => { property => _t_serialize(id) })
+          end
         end
 
         def _t_find_all_ids_by_associate(property, id)
-          results = collection.find({property => _t_serialize(id)}, {:fields => 'id'}).to_a
+          results = collection.find(property => _t_serialize(id))
           results.map { |r| r['_id'] }
         end
 

data/lib/tenacity/version.rb

@@ -1,3 +1,3 @@
 module Tenacity
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

data/tenacity.gemspec

@@ -26,28 +26,28 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard", "~> 0.6.4"
 
   # Relational DBs
-  s.add_development_dependency "sqlite3-ruby", "~> 1.3.1"
-  s.add_development_dependency "activerecord", "~> 3.0.7"
+  s.add_development_dependency "sqlite3", "~> 1.3"
+  s.add_development_dependency "activerecord", "~> 3.1"
   s.add_development_dependency "datamapper", "~> 1.0.2"
   s.add_development_dependency "dm-sqlite-adapter", "~> 1.0.2"
   s.add_development_dependency "sequel", "~> 3.19.0"
 
   # MongoDB
-  s.add_development_dependency "mongo_mapper", "~> 0.9.0"
+  s.add_development_dependency "mongo_mapper", "~> 0.12.0"
   s.add_development_dependency "mongo", "~> 1.6.2"
   s.add_development_dependency "bson_ext", "~> 1.6.2"
-  s.add_development_dependency "mongoid", "~> 2.0.0"
+  s.add_development_dependency "mongoid", "~> 3.0"
 
   # CouchDB
-  s.add_development_dependency "couchrest", "~> 1.0.2"
-  s.add_development_dependency "couchrest_model", "~> 1.0.0"
+  s.add_development_dependency "couchrest", "~> 1.1.3"
+  s.add_development_dependency "couchrest_model", "~> 1.1.2"
 
   # Riak
-  s.add_development_dependency "ripple", "~> 0.9.2"
+  #s.add_development_dependency "ripple", "~> 0.9.5"
 
   # Multiple
-  s.add_development_dependency "toystore", "~> 0.8.0"
-  s.add_development_dependency "adapter-mongo", "~> 0.5.4"
+  #s.add_development_dependency "toystore", "~> 0.12.0"
+  #s.add_development_dependency "adapter-mongo", "~> 0.7.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/test/fixtures/active_record_object_with_string_id.rb

@@ -1,5 +1,7 @@
 class ActiveRecordObjectWithStringId < ActiveRecord::Base
   include Tenacity
 
+  self.primary_key = 'id'
+
   t_has_one :mongo_mapper_object
 end

data/test/fixtures/mongoid_has_many_target.rb

@@ -7,10 +7,10 @@ require_mongoid do
     t_belongs_to :couch_rest_object
     t_belongs_to :data_mapper_object
     t_belongs_to :mongo_mapper_object
-    t_belongs_to :mongoid_object
-    t_belongs_to :ripple_object
+    require_mongoid { t_belongs_to :mongoid_object }
+    require_ripple { t_belongs_to :ripple_object }
     t_belongs_to :sequel_object
-    t_belongs_to :toystore_object
+    require_toystore { t_belongs_to :toystore_object }
 
     t_belongs_to :active_record_has_many_target_testable, :polymorphic => true
     t_belongs_to :couch_rest_has_many_target_testable, :polymorphic => true

data/test/fixtures/mongoid_has_one_target.rb

@@ -7,10 +7,10 @@ require_mongoid do
     t_belongs_to :couch_rest_object
     t_belongs_to :data_mapper_object
     t_belongs_to :mongo_mapper_object
-    t_belongs_to :mongoid_object
-    t_belongs_to :ripple_object
+    require_mongoid { t_belongs_to :mongoid_object }
+    require_ripple { t_belongs_to :ripple_object }
     t_belongs_to :sequel_object
-    t_belongs_to :toystore_object
+    require_toystore { t_belongs_to :toystore_object }
 
     t_belongs_to :active_record_has_one_target_testable, :polymorphic => true
     t_belongs_to :couch_rest_has_one_target_testable, :polymorphic => true

data/test/fixtures/mongoid_object.rb

@@ -9,19 +9,19 @@ require_mongoid do
     t_has_one :couch_rest_has_one_target
     t_has_one :data_mapper_has_one_target
     t_has_one :mongo_mapper_has_one_target
-    t_has_one :mongoid_has_one_target
-    t_has_one :ripple_has_one_target
+    require_mongoid { t_has_one :mongoid_has_one_target }
+    require_ripple { t_has_one :ripple_has_one_target }
     t_has_one :sequel_has_one_target
-    t_has_one :toystore_has_one_target
+    require_toystore { t_has_one :toystore_has_one_target }
 
     t_has_many :active_record_has_many_targets
     t_has_many :couch_rest_has_many_targets
     t_has_many :data_mapper_has_many_targets
     t_has_many :mongo_mapper_has_many_targets
-    t_has_many :mongoid_has_many_targets
-    t_has_many :ripple_has_many_targets
+    require_mongoid { t_has_many :mongoid_has_many_targets }
+    require_ripple { t_has_many :ripple_has_many_targets }
     t_has_many :sequel_has_many_targets
-    t_has_many :toystore_has_many_targets
+    require_toystore { t_has_many :toystore_has_many_targets }
 
     t_has_one :active_record_has_one_target, :as => :active_record_has_one_target_testable
     t_has_one :couch_rest_has_one_target, :as => :couch_rest_has_one_target_testable

data/test/helpers/mongoid_test_helper.rb

@@ -8,13 +8,7 @@ end
 
 begin
   require 'mongoid'
-
-  Mongoid.configure do |config|
-    name = "tenacity_test"
-    host = "localhost"
-    config.master = Mongo::Connection.new.db(name)
-    config.persist_in_safe_mode = false
-  end
+  Mongoid.load!(File.expand_path("../../../config/mongoid.yml", __FILE__), :test)
 rescue LoadError
   puts "WARNING:  Mongoid could not be loaded.  Skipping tests."
 end

data/test/orm_ext/couchrest_test.rb

@@ -50,12 +50,12 @@ class CouchRestTest < Test::Unit::TestCase
     end
 
     should "be able to reload an object from the database" do
-      object = CouchRestObject.create({"abc" => "123"})
-      assert_equal "123", object["abc"]
-      object["abc"] = "456"
-      assert_equal "456", object["abc"]
+      object = CouchRestObject.create({"prop" => "123"})
+      assert_equal "123", object["prop"]
+      object["prop"] = "456"
+      assert_equal "456", object["prop"]
       object._t_reload
-      assert_equal "123", object["abc"]
+      assert_equal "123", object["prop"]
     end
 
     should "be able to get the ids of the objects associated with the given object" do

data/test/test_helper.rb

@@ -130,10 +130,21 @@ def foreign_key_id_for(extension, type)
 end
 
 def assert_set_equal(expecteds, actuals, message = nil)
+  expecteds = expecteds.map { |x| to_comparison_format(x) } if expecteds
+  actuals = actuals.map { |x| to_comparison_format(x) } if actuals
+
   assert ((expecteds && Set.new(expecteds)) == (actuals && Set.new(actuals))) || (expecteds == actuals),
     "#{expecteds.inspect} expected but was #{actuals.inspect}"
 end
 
+def to_comparison_format(object)
+  if object.is_a?(CouchRest::Model::Base)
+    object.to_hash.reject { |k,v| v.nil? }
+  else
+    object
+  end
+end
+
 def serialize_id(object)
   object.class._t_serialize(object.id)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tenacity
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164621000 !ruby/object:Gem::Requirement
+  requirement: &70175442535580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2164621000
+  version_requirements: *70175442535580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164619040 !ruby/object:Gem::Requirement
+  requirement: &70175442534900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164619040
+  version_requirements: *70175442534900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164617680 !ruby/object:Gem::Requirement
+  requirement: &70175442534320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2164617680
+  version_requirements: *70175442534320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2164616700 !ruby/object:Gem::Requirement
+  requirement: &70175442519180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2164616700
+  version_requirements: *70175442519180
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2164615920 !ruby/object:Gem::Requirement
+  requirement: &70175442518540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *2164615920
+  version_requirements: *70175442518540
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164615000 !ruby/object:Gem::Requirement
+  requirement: &70175442517860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *2164615000
+  version_requirements: *70175442517860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164613880 !ruby/object:Gem::Requirement
+  requirement: &70175442517320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,32 +87,32 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *2164613880
+  version_requirements: *70175442517320
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &2164612840 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70175442516800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2164612840
+  version_requirements: *70175442516800
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164612100 !ruby/object:Gem::Requirement
+  requirement: &70175442516160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *2164612100
+  version_requirements: *70175442516160
 - !ruby/object:Gem::Dependency
   name: datamapper
-  requirement: &2164610860 !ruby/object:Gem::Requirement
+  requirement: &70175442515520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2164610860
+  version_requirements: *70175442515520
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &2164609900 !ruby/object:Gem::Requirement
+  requirement: &70175442514920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2164609900
+  version_requirements: *70175442514920
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2164592020 !ruby/object:Gem::Requirement
+  requirement: &70175442514340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,21 +142,21 @@ dependencies:
         version: 3.19.0
   type: :development
   prerelease: false
-  version_requirements: *2164592020
+  version_requirements: *70175442514340
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2164590500 !ruby/object:Gem::Requirement
+  requirement: &70175442513820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.12.0
   type: :development
   prerelease: false
-  version_requirements: *2164590500
+  version_requirements: *70175442513820
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2164589080 !ruby/object:Gem::Requirement
+  requirement: &70175442513300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2164589080
+  version_requirements: *70175442513300
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2164588400 !ruby/object:Gem::Requirement
+  requirement: &70175442512720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,73 +175,40 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2164588400
+  version_requirements: *70175442512720
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2164587660 !ruby/object:Gem::Requirement
+  requirement: &70175442512120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2164587660
+  version_requirements: *70175442512120
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &2164586720 !ruby/object:Gem::Requirement
+  requirement: &70175442511640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *2164586720
+  version_requirements: *70175442511640
 - !ruby/object:Gem::Dependency
   name: couchrest_model
-  requirement: &2164585900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *2164585900
-- !ruby/object:Gem::Dependency
-  name: ripple
-  requirement: &2164585300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: *2164585300
-- !ruby/object:Gem::Dependency
-  name: toystore
-  requirement: &2164584560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: *2164584560
-- !ruby/object:Gem::Dependency
-  name: adapter-mongo
-  requirement: &2164583800 !ruby/object:Gem::Requirement
+  requirement: &70175442509840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *2164583800
+  version_requirements: *70175442509840
 description: Tenacity provides a database client independent way of specifying simple
   relationships between models backed by different databases.
 email:
@@ -258,6 +225,7 @@ files:
 - README.rdoc
 - Rakefile
 - THANKS.md
+- config/mongoid.yml
 - lib/tenacity.rb
 - lib/tenacity/associate_proxy.rb
 - lib/tenacity/associates_proxy.rb
@@ -367,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3919623905616374807
+      hash: 2472715654198248663
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -376,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: tenacity
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A database client independent way of specifying simple relationships between