dm-persevere-adapter 0.60.4 → 0.60.5

data/VERSION

@@ -1 +1 @@
-0.60.4
+0.60.5

data/lib/dm/associations/many_to_many.rb

@@ -22,9 +22,12 @@ module DataMapper
 
         def set(source, target)
           assert_kind_of 'source',  source,  source_model
-          assert_kind_of 'target', target, target_model
+          assert_kind_of 'target', target, Array
+          target.each {|item| assert_kind_of 'target array element', item, target_model }
           lazy_load(source) unless loaded?(source)
-          get!(source).replace([target])
+          # NOTE: This seems semantically wrong, a set should just erase the contents, 
+          # not calculate the difference and replace the common elements...
+          get!(source).replace(target)
         end
         
         # Loads association targets and sets resulting value on
@@ -37,9 +40,10 @@ module DataMapper
         #
         # @api private
         def lazy_load(source)
-
+          
           # SEL: load all related resources in the source collection
           collection = source.collection
+          
           # if source.saved? && collection.size > 1 #OLD LINE --IRJ
           if source.saved?
             eager_load(collection)
@@ -102,7 +106,8 @@ module DataMapper
         end
 
         def inverse_name
-          Extlib::Inflection.underscore(Extlib::Inflection.demodulize(source_model.name)).pluralize.to_sym
+          self.prefix = "" if self.prefix.nil? 
+          (self.prefix + Extlib::Inflection.underscore(Extlib::Inflection.demodulize(source_model.name)).pluralize).to_sym
         end
 
         # @api private
@@ -140,7 +145,7 @@ module DataMapper
           resource.send(relationship.inverse.name)._original_add(source)
           _original_add(resource)
         end
-
+        
         alias :_original_concat :concat
         def concat(resources)
           inverse_add(*resources)
@@ -212,8 +217,11 @@ module DataMapper
           removed = entries - other
           new_resources = other - removed
           resources_removed(removed)
-          removed.each{|r| r._original_delete(source) }
-          new_resources.each{|r| r._original_add(source) }
+          removed.each{ |r| delete(r) }
+          new_resources.each do |resource| 
+            resource.send(relationship.inverse.name)._original_add(source)
+            _original_add(resource)
+          end
           super(other)
         end
         

data/lib/dm/query.rb

@@ -65,7 +65,6 @@ module DataMapper
           result_string = Array.new
           condition.value.to_a.each do |candidate|
             if condition.subject.is_a?(DataMapper::Associations::Relationship)
-              # debugger
               result_string << _fugly_munger(condition, candidate)
             else
               result_string << "#{condition.subject.name}=#{candidate}"

data/lib/persevere_adapter.rb

@@ -404,7 +404,6 @@ module DataMapper
                 object_reference = true
               end
               value = rsrc_hash[pname]
-#              debugger
               # Dereference references
               unless value.nil?
                 if value.is_a?(Hash)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-persevere-adapter
 version: !ruby/object:Gem::Version 
-  hash: 231
   prerelease: false
   segments: 
   - 0
   - 60
-  - 4
-  version: 0.60.4
+  - 5
+  version: 0.60.5
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -16,18 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -06:00
+date: 2010-06-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 10
@@ -39,11 +36,9 @@ dependencies:
   name: extlib
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -95,27 +90,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A DataMapper Adapter for persevere