resource_accessor 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca3c89aaa549ea99eba018ece9947848c52f57eb
-  data.tar.gz: 8cbc62dc0212cd28eb6adb06bb62be0360b57d42
+  metadata.gz: 31b1c91d25c84e2ce12e8f0526897c0a289502ea
+  data.tar.gz: 37e2aca6e83c4d706e96da56dfee51471986910b
 SHA512:
-  metadata.gz: 54e5276a18b3690bd82987f2d3d70b425d2a25f76be31c695979056796572a5211ea1f0f23ffbaae416b361eda3b253972a9bd4a561f0bdc844c77a06c3ec253
-  data.tar.gz: 20bb51c302b38a6817b4efa44ba53ccd5f46c8029ac19ba74bfe90431d8653b5aeded463f386362ff79ea721e84494c13db8dcaccec936b712fd421359b0afcd
+  metadata.gz: ebd4d64d7214aabcde7ca05e5dc633fe60a535af75d8fbcbbb8bab40e99f5e525288e33c3c63e9c6c53e4b6e709ebfbdc88c8f8ebf2b6f9c1015b1db01424af5
+  data.tar.gz: b64e6c64168725b6b51ae21e35b44e6804bf56bac08fbd5d2902ed2e0ce71140ce0cab6574d82c2b0bca09a4e580b7f1d80cecfc129a9ed99bee9c715970cfd3

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.1

data/CHANGES

@@ -34,4 +34,9 @@
 
 == Version 1.2.4-1.2.6
 
-* Bug fix
+* Bug fix
+
+== Version 1.2.7
+
+* Bug fix
+* warnings fix

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "2.3.1"
+ruby "2.4.1"
 
 group :default do
 end

data/Gemfile.lock

@@ -1,25 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.4)
-    file_utils (1.0.7)
+    diff-lcs (1.3)
+    file_utils (1.1.2)
     gemcutter (0.7.1)
     gemspec_deps_gen (1.1.2)
       bundler
       file_utils
     log4r (1.1.10)
-    metaclass (0.0.1)
-    mocha (0.14.0)
+    metaclass (0.0.4)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    thor (0.19.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    thor (0.19.4)
 
 PLATFORMS
   ruby
@@ -33,7 +38,7 @@ DEPENDENCIES
   thor (~> 0.19)
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.4.1p111
 
 BUNDLED WITH
-   1.12.5
+   1.15.3

data/lib/resource_accessor/resource_accessor.rb

@@ -1,43 +1,44 @@
 require 'net/https'
 require 'cgi'
+require 'openssl/ssl'
 
 class ResourceAccessor
   attr_accessor :timeout, :ca_file, :validate_ssl_cert
 
   alias validate_ssl_cert? validate_ssl_cert
 
-  def initialize timeout = 10000, ca_file = nil, validate_ssl_cert = false
+  def initialize(timeout = 10000, ca_file = nil, validate_ssl_cert = false)
     @timeout = timeout
     @ca_file = ca_file
     @validate_ssl_cert = validate_ssl_cert
   end
 
-  def get_response params, headers = {}
+  def get_response(params, headers = {})
     locate_response(params[:url], params[:query], params[:method], headers, params[:body], params[:escape], params[:cookie])
   end
 
-  def get_soap_response params, headers = {}
-    headers["SOAPAction"] = params[:soap_action] if params[:soap_action]
-    headers["SOAPAction"] = "" unless headers["SOAPAction"]
-    headers["Content-Type"] = "text/xml;charset=UTF-8" unless headers["Content-Type"]
+  def get_soap_response(params, headers = {})
+    headers['SOAPAction'] = params[:soap_action] if params[:soap_action]
+    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[:escape], params[:cookie])
   end
 
-  def get_ajax_response params, headers = {}
+  def get_ajax_response(params, headers = {})
     headers['X-Requested-With'] = 'XMLHttpRequest'
 
     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"
+  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[:escape], params[:cookie])
   end
 
-  def get_cookie url, user_name, password
-    headers = {"Content-Type" => "application/x-www-form-urlencoded; charset=UTF-8"}
+  def get_cookie(url, user_name, password)
+    headers = {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
 
     body = {:username => user_name, :password => password}
 
@@ -52,7 +53,7 @@ class ResourceAccessor
     encode params, escape
   end
 
-  def locate_response url, query, method, headers, body, escape=true, cookie=nil
+  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
@@ -71,9 +72,9 @@ class ResourceAccessor
     response
   end
 
-  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"]
+  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']
 
     if cookie
       headers['Cookie'] = cookie
@@ -87,7 +88,7 @@ class ResourceAccessor
 
     connection = Net::HTTP.new(uri.host, uri.port)
 
-    if uri.scheme == "https"
+    if uri.scheme == 'https'
       connection.use_ssl = true
 
       if validate_ssl_cert?

data/lib/resource_accessor/version.rb

@@ -1,3 +1,3 @@
-module ResourceAccessor
-  VERSION = "1.2.6"
+class ResourceAccessor
+  VERSION = '1.2.7'
 end

data/spec/gateway_spec.rb

@@ -49,7 +49,7 @@ describe Gateway do
     end.to raise_error(GatewayError)
   end
 
-  it "should set content type to text/xml for soap post request" do
+  it "sets content type to text/xml for soap post request" do
     Net::HTTP.any_instance.expects(:request => simple_response)
 
     params = {:url => some_https_url}
@@ -57,10 +57,10 @@ describe Gateway do
 
     subject.soap_post(params, headers)
 
-    headers["Content-Type"].should match "text/xml"
+    expect(headers["Content-Type"]).to match "text/xml"
   end
 
-  it "should set content type to application/x-www-form-urlencoded for regular post request" do
+  it "sets content type to application/x-www-form-urlencoded for regular post request" do
     Net::HTTP.any_instance.expects(:request => simple_response)
 
     params = {:url => some_https_url}
@@ -68,7 +68,7 @@ describe Gateway do
 
     subject.post(params, headers)
 
-    headers["Content-Type"].should match "application/x-www-form-urlencoded"
+    expect(headers["Content-Type"]).to match "application/x-www-form-urlencoded"
   end
 
   it "logs body of request" do
@@ -79,7 +79,7 @@ describe Gateway do
     subject.soap_post(:url => some_https_url, :body => 'some_request')
   end
 
-  it "should log timeout errors and raise GatewayError" do
+  it "logs timeout errors and raise GatewayError" do
     subject.logger.expects(:error).with("#{subject.class.name} received error: Timeout::Error")
     Net::HTTP.any_instance.expects(:request).raises(Timeout::Error.new(nil))
 

data/spec/resource_accessor_spec.rb

@@ -4,13 +4,13 @@ require 'resource_accessor'
 
 describe ResourceAccessor do
   context "#get_response" do
-    it "should use provided url" do
+    it "uses provided url" do
       Net::HTTP.expects(:new).with("someurl.com", 80).returns(stub_everything(:request => stub_everything))
 
       subject.get_response :url => "http://someurl.com"
     end
 
-    it "should use provided query parameters" do
+    it "uses provided query parameters" do
       Net::HTTP.expects(:new).with("someurl.com", 80).returns(stub_everything(:request => stub_everything))
 
       Net::HTTP::Get.expects(:new).with("/?param1=p1&param2=p2", {'User-Agent' => 'user_agent', 'Content-Type' => 'content_type'})
@@ -22,15 +22,15 @@ describe ResourceAccessor do
 
   context "#query_from_hash" do
     it "escapes ampersands and spaces in values" do
-      subject.class.query_from_hash({:name1 => "name 1", :name2 => "name 2"}).should eql "name1=name+1&name2=name+2"
+      expect(subject.class.query_from_hash({:name1 => "name 1", :name2 => "name 2"})).to eql "name1=name+1&name2=name+2"
     end
 
     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"
+      expect(subject.class.query_from_hash({:param1 => nil, :param2 => "A&B", :param3 => "C & D"})).to 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"
+      expect(subject.class.query_from_hash({:name1 => "name 1", :name2 => "name 2"}, false)).to eql "name1=name 1&name2=name 2"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resource_accessor
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: This library is used to simplify access to protected or unprotected http