apipie-bindings 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aff06fcd62b11a1cd42115eed2dc44642d5f312f
-  data.tar.gz: 1752856687b077fb3f35af546d687364b94bc732
+  metadata.gz: 13d22cd6355e9bf1c07c011efb312aa712d3581e
+  data.tar.gz: 76ac815e986f16a031dcb3248cc0653a440888b3
 SHA512:
-  metadata.gz: b0201bb9a4bca428e4a49d8b706daa2873e8e0d3252189b40ceaee3254e42c963b2ea52770c88dfe1b08c82eb454d9cd5713be3a052f9e4b206a979a3e799490
-  data.tar.gz: 2d43831dea22be3f35fcb6d298fabe2c05699ccb6e5300c158926dd4cd42e17e4dcd5498da470462cf22bffaf79b3f43a5b151a9a6eacd298e89b50819edf3cb
+  metadata.gz: 5a1f387ce7e38ab4e0ac66c714c07366d5d49af2778d48ece0f4538af0bd77756135860f936e01a95a316560d248a76eddf8d20d1272d1b33f817197d092b877
+  data.tar.gz: c2aa3d6e688560a763a54112a615e3bacb2beb5f671c56e27f39ffd587756882966125f0a5f5f53c902630b4a94626c9eb70b70c46f92d492af0c1b772a03205

data/doc/release_notes.md

@@ -1,6 +1,11 @@
 Release notes
 =============
 
+### 0.0.17 (2016-06-23)
+* Restrict rest-client version to < 2.0.0 ([#42](https://github.com/Apipie/apipie-bindings/issues/42))
+* Include request in response for rest-client < 1.8.0 ([#11147](http://projects.theforeman.org/issues/11147))
+* Don't try to clear credentials if nil ([#43](https://github.com/Apipie/apipie-bindings/issues/43))
+
 ### 0.0.16 (2016-03-08)
 * Controll following redirection ([#37](https://github.com/Apipie/apipie-bindings/issues/37))
 * Enable for mocking api calls with validations

data/lib/apipie_bindings.rb

@@ -1,4 +1,5 @@
 require 'apipie_bindings/version'
+require 'apipie_bindings/rest_client_extensions'
 require 'apipie_bindings/utils'
 require 'apipie_bindings/credentials'
 require 'apipie_bindings/exceptions'

data/lib/apipie_bindings/api.rb

@@ -1,7 +1,5 @@
 require 'json'
-require 'rest_client'
 require 'oauth'
-require 'apipie_bindings/rest_client_oauth'
 require 'logger'
 require 'tmpdir'
 module ApipieBindings
@@ -115,7 +113,7 @@ module ApipieBindings
 
     def clear_credentials
       @client_with_auth = nil
-      @credentials.clear
+      @credentials.clear if @credentials
     end
 
     def apidoc
@@ -297,6 +295,9 @@ module ApipieBindings
 
     def rest_client_call_block
       Proc.new do |response, request, result, &block|
+        # include request for rest_client < 1.8.0
+        response.request ||= request
+
         if [301, 302, 307].include?(response.code) && [:always, :never].include?(@follow_redirects)
           if @follow_redirects == :always
             log.debug "Response redirected to #{response.headers[:location]}"

data/lib/apipie_bindings/rest_client_extensions.rb

@@ -0,0 +1,34 @@
+require 'rest_client'
+module ApipieBindings
+  module RestClientExtensions
+
+    module RequestAccessor
+      attr_accessor :request
+    end
+
+    RestClient::AbstractResponse.send(:include, RequestAccessor) unless RestClient::AbstractResponse.method_defined?(:request)
+    RestClient::Response.send(:include, RequestAccessor) unless RestClient::Response.method_defined?(:request)
+
+    unless RestClient.const_defined? :OAUTH_EXTENSION
+      RestClient::OAUTH_EXTENSION = lambda do |request, args|
+        if args[:oauth]
+          uri = URI.parse args[:url]
+          default_options = {
+            :site => "#{uri.scheme}://#{uri.host}:#{uri.port.to_s}",
+            :request_token_path => "",
+            :authorize_path => "",
+            :access_token_path  => "" 
+          }
+          options = default_options.merge args[:oauth][:options] || { }
+          consumer = OAuth::Consumer.new(args[:oauth][:consumer_key], args[:oauth][:consumer_secret], options)
+
+          consumer.sign!(request)
+        end
+      end
+    end
+
+    unless RestClient.before_execution_procs.include? RestClient::OAUTH_EXTENSION
+      RestClient.add_before_execution_proc &RestClient::OAUTH_EXTENSION
+    end
+  end
+end

data/lib/apipie_bindings/version.rb

@@ -1,5 +1,5 @@
 module ApipieBindings
   def self.version
-    @version ||= Gem::Version.new '0.0.16'
+    @version ||= Gem::Version.new '0.0.17'
   end
 end

data/test/unit/api_test.rb

@@ -173,11 +173,19 @@ describe ApipieBindings::API do
       api.follow_redirects.must_equal :never
     end
 
-    it "should rise error on redirect when follow_redirects = :never" do
-      api = configure_api_with(:follow_redirects => :never)
-      block = api.send(:rest_client_call_block)
-      response = api.send(:create_fake_response, 301, "", "GET", "/", {})
-      proc { block.call(response) }.must_raise RestClient::MovedPermanently
+    context "follow_redirects = :never" do
+      let(:api) { configure_api_with(:follow_redirects => :never) }
+      let(:block) { api.send(:rest_client_call_block) }
+      let(:response) { api.send(:create_fake_response, 301, "", "GET", "/", {}) }
+
+      it "should rise error on redirect" do
+        proc { block.call(response) }.must_raise RestClient::MovedPermanently
+      end
+
+      it "should rise error that contains the request" do
+        err = proc { block.call(response) }.must_raise RestClient::MovedPermanently
+        err.response.respond_to?(:request).must_equal true
+      end
     end
 
     it "should follow redirect when follow_redirects = :always" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apipie-bindings
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Martin Bačovský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +185,7 @@ files:
 - lib/apipie_bindings/inflector.rb
 - lib/apipie_bindings/param.rb
 - lib/apipie_bindings/resource.rb
-- lib/apipie_bindings/rest_client_oauth.rb
+- lib/apipie_bindings/rest_client_extensions.rb
 - lib/apipie_bindings/route.rb
 - lib/apipie_bindings/utils.rb
 - lib/apipie_bindings/version.rb

data/lib/apipie_bindings/rest_client_oauth.rb

@@ -1,19 +0,0 @@
-unless RestClient.const_defined? :OAUTH_EXTENSION
-  RestClient::OAUTH_EXTENSION = lambda do |request, args|
-    if args[:oauth]
-      uri             = URI.parse args[:url]
-      default_options = { :site               => "#{uri.scheme}://#{uri.host}:#{uri.port.to_s}",
-                          :request_token_path => "",
-                          :authorize_path     => "",
-                          :access_token_path  => "" }
-      options         = default_options.merge args[:oauth][:options] || { }
-      consumer        = OAuth::Consumer.new(args[:oauth][:consumer_key], args[:oauth][:consumer_secret], options)
-
-      consumer.sign!(request)
-    end
-  end
-end
-
-unless RestClient.before_execution_procs.include? RestClient::OAUTH_EXTENSION
-  RestClient.add_before_execution_proc &RestClient::OAUTH_EXTENSION
-end