dm-persevere-adapter 0.60.2 → 0.60.3

data/Rakefile

@@ -12,16 +12,17 @@ begin
     gemspec.homepage = %q{http://github.com/yogo/dm-persevere-adapter}
     gemspec.authors = ["Ivan R. Judson", "The Yogo Data Management Development Team" ]
     gemspec.rdoc_options = ["--main", "README.txt"]
-    gemspec.add_dependency(%q<dm-core>, [">= 0.10.1"])
+    gemspec.add_dependency(%q<dm-core>, [">= 0.10.2"])
     gemspec.add_dependency(%q<extlib>)
   end
 
   Jeweler::GemcutterTasks.new
-  FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
+FileList['tasks/**/*.rake'].each { |task| import task }
+
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
 WINDOWS = Gem.win_platform?

data/VERSION

@@ -1 +1 @@
-0.60.2
+0.60.3

data/lib/dm/associations/relationship.rb

@@ -0,0 +1,40 @@
+module DataMapper
+  module Associations
+    class Relationship
+      
+      # Prefix
+      # @example property.prefix
+      # @return [String]
+      # @api public
+      attr_accessor :prefix
+      
+      def to_json_schema_hash
+        child = self.child_model
+        parent = self.parent_model
+        relationship_schema = {}
+
+        case self
+        when DataMapper::Associations::OneToMany::Relationship, DataMapper::Associations::ManyToMany::Relationship
+         relationship_schema = { "type"     => "array", 
+                                 "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::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 }
+        end
+        
+        relationship_schema.merge!("prefix" => @prefix ) unless @prefix.nil?
+        return relationship_schema
+        
+      end
+    end
+  end
+end

data/lib/dm/model.rb

@@ -21,27 +21,7 @@ module DataMapper
         # Handle relationships
         relationships.each_pair do |nom,relation|
           next if self.name.downcase == nom
-          child = relation.child_model
-          parent = relation.parent_model
-
-          case relation
-            when DataMapper::Associations::OneToMany::Relationship, DataMapper::Associations::ManyToMany::Relationship
-              schema_hash['properties'][nom] = { "type"     => "array", 
-                                                 "lazy"     => true,
-                                                 "optional" => true,  
-                                                 "items"    => {"$ref" => "/Class/#{child.storage_name}"},
-                                                 "minItems" => relation.min,
-                                               }
-                                               
-              schema_hash['properties'][nom]["maxItems"] = relation.max if relation.max != Infinity 
-            when DataMapper::Associations::ManyToOne::Relationship, DataMapper::Associations::OneToOne::Relationship
-              if self == relation.child_model
-                ref = "/Class/#{parent.storage_name}"
-              else
-                ref = "/Class/#{child.storage_name}"
-              end
-              schema_hash['properties'][nom] = { "type" => { "$ref" => ref }, "lazy" => true, "optional" => true }
-          end
+          schema_hash['properties'][nom] = relation.to_json_schema_hash
         end
         return schema_hash
       end

data/lib/persevere_adapter.rb

@@ -8,6 +8,7 @@ require 'digest/md5'
 
 # Things we add or override in DataMapper
 require 'dm/associations/many_to_many'
+require 'dm/associations/relationship'
 require 'dm/model'
 require 'dm/property'
 require 'dm/query'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-persevere-adapter
 version: !ruby/object:Gem::Version 
+  hash: 233
   prerelease: false
   segments: 
   - 0
   - 60
-  - 2
-  version: 0.60.2
+  - 3
+  version: 0.60.3
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -15,30 +16,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -06:00
+date: 2010-06-15 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
-        - 1
-        version: 0.10.1
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: extlib
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -63,6 +68,7 @@ files:
 - Rakefile
 - VERSION
 - lib/dm/associations/many_to_many.rb
+- lib/dm/associations/relationship.rb
 - lib/dm/model.rb
 - lib/dm/property.rb
 - lib/dm/query.rb
@@ -89,23 +95,27 @@ 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.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A DataMapper Adapter for persevere