databasedotcom 1.1.2 → 1.1.4

data/lib/databasedotcom/client.rb

@@ -181,7 +181,7 @@ module Databasedotcom
     #
     #    client.query("SELECT Name FROM Account") #=> [#<Account @Id=nil, @Name="Foo", ...>, #<Account @Id=nil, @Name="Bar", ...> ...]
     def query(soql_expr)
-      result = http_get("/services/data/v#{self.version}/query?q=#{soql_expr}")
+      result = http_get("/services/data/v#{self.version}/query", :q => soql_expr)
       collection_from(result.body)
     end
 
@@ -189,7 +189,7 @@ module Databasedotcom
     #
     #    client.search("FIND {bar}") #=> [#<Account @Name="foobar", ...>, #<Account @Name="barfoo", ...> ...]
     def search(sosl_expr)
-      result = http_get("/services/data/v#{self.version}/search?q=#{sosl_expr}")
+      result = http_get("/services/data/v#{self.version}/search", :q => sosl_expr)
       collection_from(result.body)
     end
 
@@ -368,13 +368,17 @@ module Databasedotcom
     end
 
     def encode_parameters(parameters={})
-      (parameters || {}).collect { |k, v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join('&')
+      (parameters || {}).collect { |k, v| "#{uri_escape(k)}=#{uri_escape(v)}" }.join('&')
     end
 
     def log_request(path, options={})
       base_url = options[:host] ? "https://#{options[:host]}" : self.instance_url
       puts "***** REQUEST: #{path.include?(':') ? path : URI.join(base_url, path)}#{options[:data] ? " => #{options[:data]}" : ''}" if self.debugging
     end
+    
+    def uri_escape(str)
+      URI.escape(str.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+    end
 
     def log_response(result)
       puts "***** RESPONSE: #{result.class.name} -> #{result.body}" if self.debugging

data/lib/databasedotcom/sobject/sobject.rb

@@ -98,13 +98,14 @@ module Databasedotcom
         end
       end
 
-      # Reloads the record from the Force.com database. Returns the reloaded record.
+      # Reloads the record from the Force.com database. Returns self.
       #
       #    client.materialize("Car")
       #    c = Car.find_by_Color("Yellow")
       #    c.reload
       def reload
-        self.class.find(self.Id)
+        self.attributes = self.class.find(self.Id).attributes
+        self
       end
 
       def [](attr_name)
@@ -303,7 +304,7 @@ module Databasedotcom
         params.inject([]) do |arr, av|
           case av[1]
             when String
-              value_str = "'#{av[1]}'"
+              value_str = "'#{av[1].gsub("'", "\\\\'")}'"
             when DateTime, Time
               value_str = av[1].strftime("%Y-%m-%dT%H:%M:%S.%L%z").insert(-3, ":")
             else

data/lib/databasedotcom/version.rb

@@ -1,3 +1,3 @@
 module Databasedotcom
-  VERSION = "1.1.2"
+  VERSION = "1.1.4"
 end

metadata

@@ -2,7 +2,7 @@
 name: databasedotcom
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors: 
 - Glenn Gillen, Danny Burkes & Richard Zhao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 Z
+date: 2011-10-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post