dm-persevere-adapter 0.60.5 → 0.70.0

data/VERSION

@@ -1 +1 @@
-0.60.5
+0.70.0

data/lib/dm/associations/many_to_many.rb

@@ -19,7 +19,7 @@ module DataMapper
         def query
           @query
         end
-
+        
         def set(source, target)
           assert_kind_of 'source',  source,  source_model
           assert_kind_of 'target', target, Array

data/lib/dm/associations/relationship.rb

@@ -14,21 +14,38 @@ module DataMapper
         relationship_schema = {}
 
         case self
-        when DataMapper::Associations::OneToMany::Relationship, DataMapper::Associations::ManyToMany::Relationship
+        when DataMapper::Associations::ManyToMany::Relationship
+#          puts "-> M:M #{child.storage_name}"
          relationship_schema = { "type"     => "array", 
+                                 "dm_relation" => "many_to_many",
                                  "lazy"     => true,
                                  "optional" => true,  
                                  "items"    => {"$ref" => "/Class/#{child.storage_name}"},
                                  "minItems" => self.min
           }
-          
-
           relationship_schema["maxItems"] = self.max if self.max != Infinity
-           
+        when DataMapper::Associations::OneToMany::Relationship 
+#          puts "-> 1:M #{child.storage_name}"
+          relationship_schema = { "type"     => "array", 
+                                  "dm_relation" => "has_n",
+                                  "lazy"     => true,
+                                  "optional" => true,  
+                                  "items"    => {"$ref" => "/Class/#{child.storage_name}"},
+                                  "minItems" => self.min
+           }
+           relationship_schema["maxItems"] = self.max if self.max != Infinity
+         when DataMapper::Associations::ManyToOne::Relationship
+#           puts "-> M:1 #{parent.storage_name}"
+           relationship_schema = { "type" => { "$ref" => "/Class/#{parent.storage_name}" }, 
+                                   "dm_relation" => "belongs_to",
+                                   "lazy" => true, 
+                                   "optional" => true }
         when DataMapper::Associations::OneToOne::Relationship
-          relationship_schema = { "type" => { "$ref" => "/Class/#{child.storage_name}" }, "lazy" => true, "optional" => true }
-        when DataMapper::Associations::ManyToOne::Relationship
-          relationship_schema = { "type" => { "$ref" => "/Class/#{parent.storage_name}" }, "lazy" => true, "optional" => true }
+#          puts "-> 1:1 #{child.storage_name}"
+          relationship_schema = { "type" => { "$ref" => "/Class/#{child.storage_name}" }, 
+                                  "dm_relation" => "has_n",
+                                  "lazy" => true, 
+                                  "optional" => true }
         end
         
         relationship_schema.merge!("prefix" => @prefix ) unless @prefix.nil?

data/lib/persevere_adapter.rb

@@ -361,6 +361,8 @@ module DataMapper
       # @api semipublic
 
       def read_one(query)
+        # TODO: This would be more efficient if it modified the query to limit = 1,
+        # rather than getting all of them and only returning the first one.
         results = read_many(query)
         results[0,1]
       end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 60
-  - 5
-  version: 0.60.5
+  - 70
+  - 0
+  version: 0.70.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -06:00
+date: 2010-06-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency