dm-persevere-adapter 0.60.1 → 0.60.2

data/VERSION

@@ -1 +1 @@
-0.60.1
+0.60.2

data/lib/dm/model.rb

@@ -27,19 +27,20 @@ module DataMapper
           case relation
             when DataMapper::Associations::OneToMany::Relationship, DataMapper::Associations::ManyToMany::Relationship
               schema_hash['properties'][nom] = { "type"     => "array", 
+                                                 "lazy"     => true,
                                                  "optional" => true,  
-                                                 "items"    => {"$ref" => "../#{child.storage_name}"},
+                                                 "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 = "../#{parent.storage_name}"
+                ref = "/Class/#{parent.storage_name}"
               else
-                ref = "../#{child.storage_name}"
+                ref = "/Class/#{child.storage_name}"
               end
-              schema_hash['properties'][nom] = { "type" => { "$ref" => ref }, "optional" => true }
+              schema_hash['properties'][nom] = { "type" => { "$ref" => ref }, "lazy" => true, "optional" => true }
           end
         end
         return schema_hash

data/lib/dm/query.rb

@@ -21,18 +21,27 @@ module DataMapper
 
     def _fugly_munger(condition, loaded_value)
       subject = condition.subject
+
       case subject
         when DataMapper::Associations::ManyToMany::Relationship then
           return_value = "#{condition.subject.field}.contains(/#{subject.child_model.storage_name}/#{loaded_value.key.first})"            
         when DataMapper::Associations::OneToMany::Relationship then
           return_value = "#{condition.subject.field}.contains(/#{subject.parent_model.storage_name}/#{loaded_value.key.first})"
         when DataMapper::Associations::OneToOne::Relationship then 
-          return_value = "#{condition.subject.field}#{condition.__send__(:comparator_string)}/#{subject.parent_model.storage_name}/#{loaded_value.key.first}"
+          if loaded_value.nil?
+            return_value = "#{condition.subject.field}#{condition.__send__(:comparator_string)}undefined"
+          else
+           return_value = "#{condition.subject.field}#{condition.__send__(:comparator_string)}/#{subject.parent_model.storage_name}/#{loaded_value.key.first}"
+         end
         when DataMapper::Associations::ManyToOne::Relationship then
           if self.model != subject.child_model
             return_value = "#{condition.subject.field}.contains(/#{subject.parent_model.storage_name}/#{loaded_value.key.first})"
           else
-           return_value = "#{condition.subject.field}#{condition.__send__(:comparator_string)}/#{subject.parent_model.storage_name}/#{loaded_value.key.first}"
+            if loaded_value.nil?
+              return_value = "#{condition.subject.field}#{condition.__send__(:comparator_string)}undefined"
+            else
+             return_value = "#{condition.subject.field}#{condition.__send__(:comparator_string)}/#{subject.parent_model.storage_name}/#{loaded_value.key.first}"
+           end
           end
       end
     end

data/lib/persevere_adapter.rb

@@ -268,6 +268,7 @@ module DataMapper
           # We might want to make this a post-to_json_hash cleanup instead
           payload = resource.to_json_hash(false)
 #          scrub_data(payload)
+          DataMapper.logger.debug("--> PATH/PAYLOAD: #{path} #{payload.inspect}")
           response = @persevere.create(path, payload)
 
           # Check the response, this needs to be more robust and raise
@@ -331,6 +332,7 @@ module DataMapper
           path = "/#{tblname}/#{resource.key.first}"
           payload = resource.to_json_hash()
 #          scrub_data(payload)
+          DataMapper.logger.debug("--> PATH/PAYLOAD: #{path} #{payload.inspect}")
           result = @persevere.update(path, payload)
 
           if result.code == "200"

data/spec/persevere_adapter_spec.rb

@@ -9,9 +9,6 @@ require agg_dir / 'spec' / 'public' / 'shared' / 'aggregate_shared_spec'
 
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/persevere_adapter'
 
-require 'ruby-debug'
-Debugger.start
-
 describe DataMapper::Adapters::PersevereAdapter do
   before :all do
     DataMapper::Logger.new(STDOUT, :debug)
@@ -395,6 +392,28 @@ describe DataMapper::Adapters::PersevereAdapter do
         Nugaton.first.bozon.id.should eql bozon.id
       end
       
+      it "should not be required to be in a relationship" do
+        Bozon.has(Infinity, :nugatons)
+        Nugaton.belongs_to(:bozon, :required => false)
+        
+        Bozon.auto_upgrade!
+        Nugaton.auto_upgrade!
+        
+        bozon = Bozon.create(:author => 'Jade', :title => "Jade's the author")
+      
+        nugat1 = Nugaton.new(:name => "numero uno")
+        nugat2 = Nugaton.new(:name => "numero duo")
+        
+        bozon.nugatons.push( nugat1 )
+        bozon.save
+        
+        nugat2.save
+        
+        Nugaton.all(:bozon => bozon).length.should eql 1
+        Nugaton.all(:bozon => nil).length.should eql 1
+        
+      end
+      
       it "should create one to many (has n) associations between models" do
         Bozon.has(Infinity, :nugatons)
         Nugaton.belongs_to(:bozon)
@@ -499,5 +518,6 @@ describe DataMapper::Adapters::PersevereAdapter do
         
         Bozon.first.nugatons.length.should be(1)
       end
+      
     end
   end

data/spec/spec_helper.rb

@@ -2,7 +2,10 @@ require 'pathname'
 require 'rubygems'
 require 'addressable/uri'
 require 'spec'
- 
+
+require 'ruby-debug'
+Debugger.start
+
 require 'dm-core'
 
 def path_to(gem_name, version=nil)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 60
-  - 1
-  version: 0.60.1
+  - 2
+  version: 0.60.2
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -06:00
+date: 2010-06-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency