resource_accessor 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2d15b6055967cca8b862fd69813d5c8154699e
-  data.tar.gz: afc9134f365de6600f67232fbc034779b6bb8848
+  metadata.gz: 6169d6db0bcfd5e5cf81ae4c8e6e505fc0750753
+  data.tar.gz: b34e9360c0a8f64f56d4893069157341ea1444ff
 SHA512:
-  metadata.gz: 1e00590a84cfb5c3db0ed097220efd85bb6dd5d2f377582d6fe17623feea583456952e3457af82b1ee28c21487631b11d96bbc056f71e92cd803760cc1af8746
-  data.tar.gz: cd15639dc413a520b7cbb26c6a9be6a9cc53534dbe12e48650837a0e1acdeefad316250d209323cc0b046b04bfab23b454a268b0afd620adb91700f0eba8e767
+  metadata.gz: a33e7e4f12caaeff42aad4933991468617b8ed0d7e883fdab557c8ac3e5920d80934fb12b1b7694c338a8d954324f5e94f1a8de732ea1b6df56502ae9a7f9238
+  data.tar.gz: dfdb921a481be36821c21e54103d8e116caf6b0ad2093c3db80eada4fb6a105176aa1ecf6095b2de4837e13e2c8378cfbbc9a937715bd74106380625ece17ce7

data/CHANGES

@@ -26,4 +26,8 @@
 
 == Version 1.2.2
 
-* Bug fix for 'put' http method.
+* Bug fix for 'put' http method.
+
+== Version 1.2.3
+
+* Adding escape flag in order to control whether we want to escape parameter or not.

data/lib/resource_accessor/resource_accessor.rb

@@ -13,7 +13,7 @@ class ResourceAccessor
   end
 
   def get_response params, headers = {}
-    locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:cookie])
+    locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:escape], params[:cookie])
   end
 
   def get_soap_response params, headers = {}
@@ -21,19 +21,19 @@ class ResourceAccessor
     headers["SOAPAction"] = "" unless headers["SOAPAction"]
     headers["Content-Type"] = "text/xml;charset=UTF-8" unless headers["Content-Type"]
 
-    locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:cookie])
+    locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:escape], params[:cookie])
   end
 
   def get_ajax_response params, headers = {}
     headers['X-Requested-With'] = 'XMLHttpRequest'
 
-    locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:cookie])
+    locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:escape], params[:cookie])
   end
 
   def get_json_response params, headers = {}
     headers["Content-Type"] = "application/json;charset=UTF-8"
 
-    locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:cookie])
+    locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:escape], params[:cookie])
   end
 
   def get_cookie url, user_name, password
@@ -46,25 +46,29 @@ class ResourceAccessor
     response.response['set-cookie']
   end
 
-  def self.query_from_hash(params)
+  def self.query_from_hash(params, escape=true)
     return nil if params.nil? or params.empty?
 
-    params.sort.map {|key, value| "#{key}=#{value.nil? ? '' : CGI.escape(value)}"}.join("&")
+    params.sort.map do |key, value|
+      new_value = value.nil? ? '' : (escape ? CGI.escape(value) : value)
+
+      "#{key}=#{new_value}"
+    end.join("&")
   end
 
   private
 
-  def locate_response url, query, method, headers, body, cookie=nil
-    response = execute_request url, query, method, headers, body, cookie
+  def locate_response url, query, method, headers, body, escape=true, cookie=nil
+    response = execute_request url, query, method, headers, body, escape, cookie
 
     if response.class == Net::HTTPMovedPermanently
-      response = execute_request response['location'], method, headers, body, cookie
+      response = execute_request response['location'], method, headers, body, escape, cookie
     end
 
     response
   end
 
-  def execute_request url, query, method, headers, body, cookie=nil
+  def execute_request url, query, method, headers, body, escape, cookie=nil
     headers["User-Agent"] = "Ruby/#{RUBY_VERSION}" unless headers["User-Agent"]
     headers["Content-Type"] = "application/x-www-form-urlencoded; charset=UTF-8" unless headers["Content-Type"]
 
@@ -72,8 +76,9 @@ class ResourceAccessor
       headers['Cookie'] = cookie
     end
 
-    query_string = ResourceAccessor.query_from_hash(query)
+    query_string = ResourceAccessor.query_from_hash(query, escape)
     new_url = query_string.nil? ? url : "#{url}?#{query_string}"
+    # new_url = escape ? URI.escape(new_url) : new_url
 
     uri = URI.parse(URI.escape(new_url))
 

data/lib/resource_accessor/version.rb

@@ -1,3 +1,3 @@
 class ResourceAccessor
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/resource_accessor_spec.rb

@@ -28,6 +28,10 @@ describe ResourceAccessor do
     it "maps properly nil values " do
       subject.class.query_from_hash({:param1 => nil, :param2 => "A&B", :param3 => "C & D"}).should eql "param1=&param2=A%26B&param3=C+%26+D"
     end
+
+    it "does not escapes ampersands if escape is turned off" do
+      subject.class.query_from_hash({:name1 => "name 1", :name2 => "name 2"}, false).should eql "name1=name 1&name2=name 2"
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resource_accessor
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen