apipie-bindings 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 177475068b8dce6f1eabdf990f717306ff7a42b9
-  data.tar.gz: 9965d19d825aebeb323199ed2cb4909692f24d2c
+  metadata.gz: 6e8560165daeb6cae4d2530f42a9adc58e1511e3
+  data.tar.gz: 9291144917dc1a6111ba60e01de1096338c47b3a
 SHA512:
-  metadata.gz: f9cf54f46216b7e354d43219646ffc112355d298cc4ef27f23b8d47621e0344a069561deedb549ae78d8f3e5c9afaa85bc31f3c997f59201db060d504ef90e99
-  data.tar.gz: f7dd4ec05a1f5e5f664157832c97d3ed07ddb22f248aa9fa3065d385d2fe899b79f268b00ed5b31fe43785482c96359ad61857f9c3bd1e645d771bf2af67905a
+  metadata.gz: 59e41d190c6bf09379b1a2b9b7f6f56923a1f9e4adb3289e49a61c61fc23d6c6831c1e57e0273c4b6f1a5cb6f067db502016812e5c3d2c13c093f307060e7891
+  data.tar.gz: 360e2e4781f437a0627b015acfb59de2cd291e9c66941d21c548fab65dacf164f3a5fbb88f037125be78ff1f3d7bdee640ed31e5c8c34eba6a620b5ae5317b30

data/doc/release_notes.md

@@ -1,6 +1,11 @@
 Release notes
 =============
 
+### 0.2.0 (2017-04-24)
+* Support for overriding exceptions from authorizers ([PR #64](https://github.com/Apipie/apipie-bindings/pull/64))
+* Use ssl_ca_file with ssl_ca_path (rest-client < 1.7.0) ([PR #63](https://github.com/Apipie/apipie-bindings/pull/63)) ([#62](https://github.com/Apipie/apipie-bindings/issues/62))
+* Make following redirects compatible with rest-client > 1.8 ([PR #61](https://github.com/Apipie/apipie-bindings/pull/61)) ([#60](https://github.com/Apipie/apipie-bindings/issues/60))
+
 ### 0.1.0 (2017-03-28)
 * Verify SSL by default ([PR #59](https://github.com/Apipie/apipie-bindings/pull/59))
 * Do not hide exceptions during cache retrieval ([PR #57](https://github.com/Apipie/apipie-bindings/pull/57))

data/lib/apipie_bindings/api.rb

@@ -98,6 +98,17 @@ module ApipieBindings
       if (config[:timeout] && config[:timeout].to_i < 0)
         config[:timeout] = (RestClient.version < '1.7.0') ? -1 : nil
       end
+
+      # RestClient < 1.7.0 does not support ssl_ca_path use ssl_ca_file instead
+      if options[:ssl_ca_path] && !RestClient::Request.method_defined?(:ssl_opts)
+        parsed_uri = URI.parse(@uri)
+        cert_file =  File.join(options[:ssl_ca_path], "#{parsed_uri.host}.pem")
+        if File.exist?(cert_file)
+          options[:ssl_ca_file] = cert_file
+          log.warn "ssl_ca_path is not supported by RestClient. ssl_ca_file = #{cert_file} was used instead."
+        end
+      end
+
       @resource_config = {
         :timeout  => config[:timeout],
         :headers  => headers,
@@ -229,10 +240,10 @@ module ApipieBindings
           response = call_client(client, path, args)
           update_cache(response.headers[:apipie_checksum])
         rescue => e
-          @authenticator.error(e) if authenticate && @authenticator
           log.error e.message
           log.debug inspect_data(e)
-          raise
+          override_e = @authenticator.error(e) if authenticate && @authenticator
+          raise override_e.is_a?(StandardError) ? override_e : e
         end
       end
 
@@ -323,7 +334,14 @@ module ApipieBindings
         if [301, 302, 307].include?(response.code) && [:always, :never].include?(@follow_redirects)
           if @follow_redirects == :always
             log.debug "Response redirected to #{response.headers[:location]}"
-            response.follow_redirection(request, result, &block)
+
+            if response.method(:follow_redirection).arity == 0
+              # rest-client > 1.8
+              response.follow_redirection(&block)
+            else
+              # rest-client <= 1.8
+              response.follow_redirection(request, result, &block)
+            end
           else
             raise exception_with_response(response)
           end

data/lib/apipie_bindings/version.rb

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

data/test/unit/api_test.rb

@@ -259,6 +259,18 @@ describe ApipieBindings::API do
         end
       end
 
+      it "raises exception returned from authenticator" do
+        Dir.mktmpdir do |dir|
+          api = ApipieBindings::API.new(binding_params(dir))
+          api.stubs(:call_client).raises(RestClient::Unauthorized)
+          authenticator.expects(:error).returns(RuntimeError.new('Custom unauthorized exception'))
+          ex = assert_raises RuntimeError do
+            api.http_call(:get, '/path')
+          end
+          assert_equal 'Custom unauthorized exception', ex.message
+        end
+      end
+
       it "raises exception when authenticator wasn't provided" do
         Dir.mktmpdir do |dir|
           api = ApipieBindings::API.new(binding_params(dir, :authenticator => nil))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apipie-bindings
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Martin Bačovský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json