dm-persevere-adapter 0.70.0 → 0.71.0

data/VERSION

@@ -1 +1 @@
-0.70.0
+0.71.0

data/lib/persevere.rb

@@ -59,18 +59,24 @@ class Persevere
   def initialize(url)
     @server_url = url
     server = URI.parse(@server_url)
-    @root_path = server.path || ''
+    @base_uri = server.path || ''
     @persevere = Net::HTTP.new(server.host, server.port)
+    @client_id = "dm-persevere-adapter-#{(rand*1000)}" # just need a small random string
+    @sequence_id = 0
   end
 
   # Pass in a resource hash
   def create(path, resource, headers = {})
-    path = @root_path + path
-    json_blob = resource.reject{|key,value| value.nil? }.to_json
+    path = @base_uri + path
+    if headers.has_key?('Content-Type') && headers['Content-Type'] != 'application/json'
+      json_blob = resource
+    else
+      json_blob = resource.delete_if{|key,value| value.nil? }.to_json
+    end
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('POST', URI.encode(path), json_blob, HEADERS.merge(headers))
+        response = @persevere.send_request('POST', URI.encode(path), json_blob, default_headers.merge(headers))
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
         puts "Persevere Create Failed: #{e}, Trying again."
@@ -80,11 +86,11 @@ class Persevere
   end
 
   def retrieve(path, headers = {})
-    path = @root_path + path
+    path = @base_uri + path
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('GET', URI.encode(path), nil, HEADERS.merge(headers))
+        response = @persevere.send_request('GET', URI.encode(path), nil, default_headers.merge(headers))
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
         puts "Persevere Retrieve Failed: #{e}, Trying again."
@@ -94,12 +100,12 @@ class Persevere
   end
 
   def update(path, resource, headers = {})
-    path = @root_path + path
+    path = @base_uri + path
     json_blob = resource.to_json
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('PUT', URI.encode(path), json_blob, HEADERS.merge(headers))
+        response = @persevere.send_request('PUT', URI.encode(path), json_blob, default_headers.merge(headers))
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
         puts "Persevere Create Failed: #{e}, Trying again."
@@ -109,11 +115,11 @@ class Persevere
   end
 
   def delete(path, headers = {})
-    path = @root_path + path
+    path = @base_uri + path
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('DELETE', URI.encode(path), nil, HEADERS.merge(headers))
+        response = @persevere.send_request('DELETE', URI.encode(path), nil, default_headers.merge(headers))
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
         puts "Persevere Create Failed: #{e}, Trying again."
@@ -121,4 +127,12 @@ class Persevere
     end
     return PersevereResult.make(response)
   end
-end # class Persevere
+  
+  private
+  
+  def default_headers
+    @sequence_id += 1
+    HEADERS.merge( {'Seq-Id' => @sequence_id.to_s, 'Client-Id' => @client_id } )
+  end
+  
+end # class Persevere

data/lib/persevere_adapter.rb

@@ -267,8 +267,7 @@ module DataMapper
           path = "/#{resource.model.storage_name}/"
           # Invoke to_json_hash with a boolean to indicate this is a create
           # We might want to make this a post-to_json_hash cleanup instead
-          payload = resource.to_json_hash(false)
-#          scrub_data(payload)
+          payload = resource.to_json_hash(false).delete_if{|key,value| value.nil? }
           DataMapper.logger.debug("--> PATH/PAYLOAD: #{path} #{payload.inspect}")
           response = @persevere.create(path, payload)
 
@@ -332,7 +331,6 @@ module DataMapper
           tblname = resource.model.storage_name
           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)
 
@@ -381,8 +379,6 @@ module DataMapper
       # @api semipublic
       def read_many(query)
         connect if @persevere.nil?
-
-#        check_schemas
         
         resources = Array.new
         tblname = query.model.storage_name
@@ -411,15 +407,11 @@ module DataMapper
                 if value.is_a?(Hash)
                   if value.has_key?("$ref")
                     value = value["$ref"].split("/")[-1]
-                  else
-#                    value = value["id"].split("/")[-1]
                   end
                 elsif value.is_a?(Array)
                   value = value.map do |v| 
                     if v.has_key?("$ref")
                       v = v["$ref"].split("/")[-1]
-                    else
-#                      v = v["id"].split("/")[-1]
                     end
                   end
                 end
@@ -470,8 +462,6 @@ module DataMapper
         connect if @persevere.nil?
 
         deleted = 0
-        
-#        check_schemas
 
         if ! query.is_a?(DataMapper::Query)
           resources = [query].flatten
@@ -500,8 +490,6 @@ module DataMapper
       def get_schema(name = nil, project = nil)
         path = nil
         single = false
-
-#        check_schemas
         
         if name.nil? & project.nil?
           path = "/Class/"
@@ -520,7 +508,6 @@ module DataMapper
               schema['properties']['id'] = { 'type' => "serial", 'index' => true }
             end
           end
-#          save_schemas
 
           return name.nil? ? schemas : schemas[0..0]
         else
@@ -542,14 +529,11 @@ module DataMapper
           end
         end
         
-#        check_schemas
-        
         scrub_schema(schema_hash['properties'])
         schema_hash['extends'] = { "$ref" => "/Class/Versioned" } if @options[:versioned]
-        
+        schema_hash.delete_if{|key,value| value.nil? }
         result = @persevere.create(path, schema_hash)
         if result.code == '201'
-#          save_schemas
 
           return JSON.parse(result.body)
         else
@@ -565,8 +549,6 @@ module DataMapper
         scrub_schema(payload['properties'])
         payload['extends'] = { "$ref" => "/Class/Versioned" } if @options[:versioned]
 
-#        check_schemas
-
         if project.nil?
           path = "/Class/#{id}"
         else
@@ -576,7 +558,6 @@ module DataMapper
         result = @persevere.update(path, payload)
 
         if result.code == '200'
-#          save_schemas
           return result.body
         else
           return false
@@ -595,14 +576,11 @@ module DataMapper
             DataMapper.logger.error("You need an id key/value in the hash")
           end
         end
-
-#        check_schemas
-
+        
         path = "/Class/#{schema_hash['id']}"
         result = @persevere.delete(path)
 
         if result.code == "204"
-#          save_schemas
           return true
         else
           return false
@@ -642,7 +620,12 @@ module DataMapper
         @options[:scheme] = @options[:adapter]
         @options.delete(:scheme)
 
-        @resource_naming_convention = NamingConventions::Resource::Underscored
+        # @resource_naming_convention = NamingConventions::Resource::Underscored
+        @resource_naming_convention = lambda do |value|
+          # value.split('::').map{ |val| Extlib::Inflection.underscore(val) }.join('__')
+          Extlib::Inflection.underscore(value).gsub('/', '__')
+        end
+        
         @identity_maps = {}
         @persevere = nil
         @prepped = false
@@ -729,7 +712,7 @@ module DataMapper
         # If the user specified a versioned datastore load the versioning REST code
         # 
         unless get_classes.include?("Versioned") && @options[:versioned]
-          versioned_class = <<-EOF
+          versioned_class =<<-EOF
           {
               id: "Versioned",
               prototype: {
@@ -775,12 +758,25 @@ module DataMapper
               }
           }
           EOF
-          begin
-            response = @persevere.persevere.send_request('POST', URI.encode('/Class/'), versioned_class, { 'Content-Type' => 'application/javascript' } )
-          rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-                Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-            DataMapper.logger.error("Persevere Create Failed: #{e}, Trying again.")
+          
+          response = @persevere.create('/Class/', versioned_class, { 'Content-Type' => 'application/javascript' } )
+          
+          # Check the response, this needs to be more robust and raise
+          # exceptions when there's a problem
+          if response.code == "201"# good:
+            DataMapper.logger.info("Created versioned class.")
+          else
+            DataMapper.logger.info("Failed to create versioned class.")
           end
+          
+          # headers = { 'Content-Type' => 'application/javascript', 'Accept' => 'application/json' }
+          # begin
+          #   puts "POST #{URI.encode('/Class')}, #{versioned_class}, #{headers.inspect}"
+          #   response = @persevere.persevere.send_request('POST', URI.encode('/Class/'), versioned_class, headers )
+          # rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+          #       Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+          #   DataMapper.logger.error("Persevere Create Failed: #{e}, Trying again.")
+          # end
         end
       end
     end # class PersevereAdapter

data/spec/persevere_adapter_spec.rb

@@ -11,7 +11,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'lib/persevere_adapter'
 
 describe DataMapper::Adapters::PersevereAdapter do
   before :all do
-    DataMapper::Logger.new(STDOUT, :debug)
+#    DataMapper::Logger.new(STDOUT, :debug)
     @adapter = DataMapper.setup(:default, { 
       :adapter => 'persevere', 
       :host => 'localhost', 
@@ -518,6 +518,64 @@ describe DataMapper::Adapters::PersevereAdapter do
         
         Bozon.first.nugatons.length.should be(1)
       end
+
+      it "should remove resources from both sides of the relationship when there are many on each side" do
+
+        bozon1 = Bozon.create(:author => 'Jade', :title => "Jade's the author")
+        bozon2 = Bozon.create(:author => 'Ivan', :title => "Blow up the world!")
+        nugat1 = Nugaton.new(:name => "numero uno")
+        nugat2 = Nugaton.new(:name => "numero duo")
+        
+        bozon1.nugatons.push(nugat1, nugat2)
+        bozon2.nugatons = [nugat1,nugat2]
+        bozon1.save
+        bozon2.save
+        
+        bozon1.nugatons.delete(nugat1)
+        bozon1.save
+        
+        # Bozon1 should have only nugaton2        
+        Bozon.get(bozon1.id).nugatons.length.should eql 1
+        Bozon.get(bozon1.id).nugatons.should_not include(nugat1)
+        Bozon.get(bozon1.id).nugatons.should include(nugat2)
+        
+        # Bozon2 should have both nugatons        
+        Bozon.get(bozon2.id).nugatons.length.should eql 2
+        Bozon.get(bozon2.id).nugatons.should include(nugat1)
+        Bozon.get(bozon2.id).nugatons.should include(nugat2)
+        
+        # Nugaton1 should have Bozon2
+        Nugaton.get(nugat1.id).bozons.length.should eql 1
+        Nugaton.get(nugat1.id).bozons.should_not include(bozon1)
+        Nugaton.get(nugat1.id).bozons.should include(bozon2)
+        
+        # Nugaton2 should have both bozons
+        Nugaton.get(nugat2.id).bozons.length.should eql 2
+        Nugaton.get(nugat2.id).bozons.should include(bozon1)
+        Nugaton.get(nugat2.id).bozons.should include(bozon2)
+      end      
+
+      it "should act sanely" do
+        Bozon.has(Infinity, :nugatons, {:through => DataMapper::Resource})
+        Nugaton.has(Infinity, :bozons, {:through => DataMapper::Resource})
+        Bozon.auto_upgrade!
+        Nugaton.auto_upgrade!
+
+        bozon = Bozon.create(:author => 'Jade', :title => "Jade's the author")
+      
+        nugat1 = Nugaton.create(:name => "numero uno")
+        nugat2 = Nugaton.create(:name => "numero duo")
+        
+        nugat1.bozons << bozon
+        nugat1.save
+        
+        n = Nugaton.get(nugat2.id)
+        n.bozons << Bozon.first
+        n.save
+
+        Bozon.get(bozon.id).nugatons.length.should eql 2
+        
+      end
       
     end
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-persevere-adapter
 version: !ruby/object:Gem::Version 
+  hash: 259
   prerelease: false
   segments: 
   - 0
-  - 70
+  - 71
   - 0
-  version: 0.70.0
+  version: 0.71.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -06:00
+date: 2010-07-01 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
@@ -36,9 +39,11 @@ dependencies:
   name: extlib
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -90,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