dm-persevere-adapter 0.37.0 → 0.38.0

data/VERSION

@@ -1 +1 @@
-0.37.0
+0.38.0

data/lib/persevere.rb

@@ -70,7 +70,7 @@ class Persevere
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('POST', path, json_blob, HEADERS.merge(headers))
+        response = @persevere.send_request('POST', URI.encode(path), json_blob, 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."
@@ -83,7 +83,7 @@ class Persevere
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('GET', path, nil, HEADERS.merge(headers))
+        response = @persevere.send_request('GET', URI.encode(path), nil, 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."
@@ -97,7 +97,7 @@ class Persevere
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('PUT', path, json_blob, HEADERS.merge(headers))
+        response = @persevere.send_request('PUT', URI.encode(path), json_blob, 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."
@@ -110,7 +110,7 @@ class Persevere
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('DELETE', path, nil, HEADERS.merge(headers))
+        response = @persevere.send_request('DELETE', URI.encode(path), nil, 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."

data/lib/persevere_adapter.rb

@@ -357,11 +357,12 @@ module DataMapper
 
         resources = Array.new
         json_query, headers = make_json_query(query)
-
+        
         tblname = query.model.storage_name
         path = "/#{tblname}/#{json_query}"
-        
+
         response = @persevere.retrieve(path, headers)
+
         if response.code.match(/20?/)
           results = JSON.parse(response.body)
           results.each do |rsrc_hash|
@@ -376,10 +377,8 @@ module DataMapper
               end
             end
           end
-
           resources = query.model.load(results, query)
         end
-
         # We could almost elimate this if regexp was working in persevere.
         query.match_records(resources)
       end
@@ -637,7 +636,11 @@ module DataMapper
               inside = process_condition(condition.operand) 
               inside.empty? ? [] : "!(%s)" % inside
             when DataMapper::Query::Conditions::InclusionComparison then process_in(condition.subject.name, condition.value)
-            when DataMapper::Query::Conditions::EqualToComparison then condition.to_s.gsub(' ', '').gsub('nil', 'undefined')              
+            when DataMapper::Query::Conditions::EqualToComparison then
+              cond = condition.loaded_value
+              cond = 'undefined' if condition.loaded_value.nil?
+              cond = "\"#{condition.loaded_value}\"" if condition.loaded_value.is_a?(String)
+              "#{condition.subject.name.to_s}=#{cond}"
             when DataMapper::Query::Conditions::NullOperation then []
             when Array then
                old_statement, bind_values = condition

data/spec/persevere_adapter_spec.rb

@@ -220,4 +220,27 @@ describe DataMapper::Adapters::PersevereAdapter do
       Nugaton.auto_migrate_down!
     end
   end
+  
+  describe 'finding models' do
+    before(:each) do
+      Bozon.auto_migrate!
+    end
+    
+    it "should find simple strings" do
+      Bozon.create(:title => "Story")
+      Bozon.all(:title => "Story").length.should eql(1)
+    end
+    
+    it "should find strings containing spaces" do
+      
+      Bozon.create(:title => "Name with Space", :author => "Mr. Bean")
+      # [?(title = "Name with Space")][/id]
+      # debugger
+      Bozon.all(:title => "Name with Space").length.should eql(1)
+    end
+    
+    after(:all) do
+      Bozon.auto_migrate_down!
+    end
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 37
+  - 38
   - 0
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -07:00
+date: 2010-02-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency