content_gateway 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07723d5fea288ca91c4f1da7436168e83daa8fea
-  data.tar.gz: d66d49a1846de645acce9b3a2363056c16992842
+  metadata.gz: 85901cee0dfecc54b74a60365e9edf1dfe7bf5b5
+  data.tar.gz: 331f4a25895c2e6a4cb58ea8db3cba631655efa6
 SHA512:
-  metadata.gz: 45f744929408bf9b41b94a212c9320a152dd9b0a8baa7ed733eb12bb1eb9d9e21de47179d6eedf522a9c30c886740f8ae6ccfe8bba979c720e86f783afab6839
-  data.tar.gz: 39795c45b0a7fcc25619aea6df33cad3d360604b2984a44ac40bd842ff8aaf28e3c35e0350b405a720a802af8f06e30efdab41d8f861a0e0ac78e91fdcf8a957
+  metadata.gz: 47240429d16d7908ec2bb106ff39eb2928bfa0f5ec57cd741ff16cb8e049011f3c459916699e14daa1d0f1cb462e074461104fed5c0188e1cc580ca9b1b147cf
+  data.tar.gz: 28e5febf0e1ebeafc0218e5e7c14a54b0d2c9dc4b79d61a9f53380e821b446d69b37c47baa18039a7149cc535df48b5e9de251673cb58443281a14236405a415

data/Changelog

@@ -1,3 +1,7 @@
+2014-11-06 [0.2.1]
+	* Fix: Do not send connection parameters to url generator. Closes #2
+	* Fix: Send http headers to request object. Closes #3
+
 2014-10-31 [0.2.0]
 
 	* Adding ssl support in requests

data/lib/content_gateway/gateway.rb

@@ -8,11 +8,8 @@ module ContentGateway
     end
 
     def get(resource_path, params = {})
-      timeout = params.delete :timeout
-      expires_in = params.delete :expires_in
-      stale_expires_in = params.delete :stale_expires_in
-      skip_cache = params.delete :skip_cache
-      headers = (params.delete :headers) || @default_params[:headers]
+      aux_params = remove_aux_parameters! params
+      headers = aux_params.delete :headers
 
       url = self.generate_url(resource_path, params)
 
@@ -20,35 +17,73 @@ module ContentGateway
         data = { method: :get, url: url }.tap do |h|
           h[:headers] = headers if headers.present?
         end
-        request_params = { skip_cache: skip_cache, expires_in: expires_in, stale_expires_in: stale_expires_in, timeout: timeout }.merge(params)
+
+        request_params = aux_params.merge(params)
         send_request(data, request_params)
       end
     end
 
     def post(resource_path, params = {})
-      payload = params.delete :payload
+      aux_params = remove_aux_parameters! params
+      headers = aux_params.delete :headers
+      payload = aux_params.delete :payload
+      timeout = aux_params.delete :timeout
+      ssl_certificate = aux_params.delete :ssl_certificate
+
       url = self.generate_url(resource_path, params)
 
       measure("POST - #{url}") do
-        send_request({ method: :post, url: url, payload: payload }, params)
+        data = { method: :post, url: url, payload: payload }.tap do |h|
+          h[:headers] = headers if headers.present?
+        end
+
+        request_params = { timeout: timeout }.merge(params).tap do |h|
+          h[:ssl_certificate] = ssl_certificate unless ssl_certificate.nil?
+        end
+        send_request(data, request_params)
       end
     end
 
     def put(resource_path, params = {})
-      payload = params.delete :payload
+      aux_params = remove_aux_parameters! params
+      headers = aux_params.delete :headers
+      payload = aux_params.delete :payload
+      timeout = aux_params.delete :timeout
+      ssl_certificate = aux_params.delete :ssl_certificate
+
       url = self.generate_url(resource_path, params)
 
       measure("PUT - #{url}") do
-        send_request({ method: :put, url: url, payload: payload }, params)
+        data = { method: :put, url: url, payload: payload }.tap do |h|
+          h[:headers] = headers if headers.present?
+        end
+
+        request_params = { timeout: timeout }.merge(params).tap do |h|
+          h[:ssl_certificate] = ssl_certificate unless ssl_certificate.nil?
+        end
+
+        send_request(data, request_params)
       end
     end
 
     def delete(resource_path, params = {})
-      payload = params.delete :payload
+      aux_params = remove_aux_parameters! params
+      headers = aux_params.delete :headers
+      timeout = aux_params.delete :timeout
+      ssl_certificate = aux_params.delete :ssl_certificate
+
       url = self.generate_url(resource_path, params)
 
       measure("DELETE - #{url}") do
-        send_request({ method: :delete, url: url, payload: payload }, params)
+        data = { method: :delete, url: url }.tap do |h|
+          h[:headers] = headers if headers.present?
+        end
+
+        request_params = { timeout: timeout }.tap do |h|
+          h[:ssl_certificate] = ssl_certificate unless ssl_certificate.nil?
+        end
+
+        send_request(data, request_params)
       end
     end
 
@@ -74,6 +109,22 @@ module ContentGateway
 
     private
 
+    def remove_aux_parameters! params
+      aux_params = params.select do |k, v|
+        [:timeout, :expires_in, :stale_expires_in, :skip_cache, :headers, :payload, :ssl_certificate].include? k
+      end
+
+      aux_params.tap do |p|
+        p[:headers] = p[:headers] || @default_params[:headers]
+      end
+
+      params.delete_if do |k,v|
+        aux_params.keys.include? k
+      end
+
+      aux_params
+    end
+
     def send_request(request_data, params = {})
       method  = request_data[:method] || :get
       url     = request_data[:url]

data/lib/content_gateway/version.rb

@@ -1,3 +1,3 @@
 module ContentGateway
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/integration/content_gateway/gateway_spec.rb

@@ -290,27 +290,27 @@ describe ContentGateway::Gateway do
     end
 
     it "should do request with http post" do
-      stub_request(method: :post, url: resource_url, proxy: config.proxy, payload: payload)
+      stub_request(method: :post, url: resource_url, proxy: config.proxy, payload: payload, headers: headers)
       gateway.post resource_path, payload: payload
     end
 
     it "should raise NotFound exception on 404 error" do
-      stub_request_with_error({ method: :post, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::ResourceNotFound.new)
+      stub_request_with_error({ method: :post, url: resource_url, proxy: config.proxy, payload: payload, headers: headers }, RestClient::ResourceNotFound.new)
       expect { gateway.post resource_path, payload: payload }.to raise_error ContentGateway::ResourceNotFound
     end
 
     it "should raise UnprocessableEntity exception on 401 error" do
-      stub_request_with_error({ method: :post, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::Unauthorized.new)
+      stub_request_with_error({ method: :post, url: resource_url, proxy: config.proxy, payload: payload, headers: headers }, RestClient::Unauthorized.new)
       expect { gateway.post resource_path, payload: payload }.to raise_error(ContentGateway::UnauthorizedError)
     end
 
     it "should raise Forbidden exception on 403 error" do
-      stub_request_with_error({ method: :post, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::Forbidden.new)
+      stub_request_with_error({ method: :post, url: resource_url, proxy: config.proxy, payload: payload, headers: headers }, RestClient::Forbidden.new)
       expect { gateway.post resource_path, payload: payload }.to raise_error(ContentGateway::Forbidden)
     end
 
     it "should raise ConnectionFailure exception on 500 error" do
-      stub_request_with_error({ method: :post, url: resource_url, proxy: config.proxy, payload: payload }, SocketError.new)
+      stub_request_with_error({ method: :post, url: resource_url, proxy: config.proxy, payload: payload, headers: headers }, SocketError.new)
       expect { gateway.post resource_path, payload: payload }.to raise_error ContentGateway::ConnectionFailure
     end
   end
@@ -325,27 +325,27 @@ describe ContentGateway::Gateway do
     end
 
     it "should do request with http post" do
-      stub_request(method: :delete, url: resource_url, proxy: config.proxy, payload: payload)
+      stub_request(method: :delete, url: resource_url, proxy: config.proxy, headers: headers)
       gateway.delete resource_path, payload: payload
     end
 
     it "should raise NotFound exception on 404 error" do
-      stub_request_with_error({ method: :delete, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::ResourceNotFound.new)
+      stub_request_with_error({ method: :delete, url: resource_url, proxy: config.proxy, headers: headers }, RestClient::ResourceNotFound.new)
       expect { gateway.delete resource_path, payload: payload }.to raise_error ContentGateway::ResourceNotFound
     end
 
     it "should raise UnprocessableEntity exception on 401 error" do
-      stub_request_with_error({ method: :delete, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::Unauthorized.new)
+      stub_request_with_error({ method: :delete, url: resource_url, proxy: config.proxy, headers: headers }, RestClient::Unauthorized.new)
       expect { gateway.delete resource_path, payload: payload }.to raise_error(ContentGateway::UnauthorizedError)
     end
 
     it "should raise Forbidden exception on 403 error" do
-      stub_request_with_error({ method: :delete, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::Forbidden.new)
+      stub_request_with_error({ method: :delete, url: resource_url, proxy: config.proxy, headers: headers }, RestClient::Forbidden.new)
       expect { gateway.delete resource_path, payload: payload }.to raise_error(ContentGateway::Forbidden)
     end
 
     it "should raise ConnectionFailure exception on 500 error" do
-      stub_request_with_error({ method: :delete, url: resource_url, proxy: config.proxy, payload: payload }, SocketError.new)
+      stub_request_with_error({ method: :delete, url: resource_url, proxy: config.proxy, headers: headers }, SocketError.new)
       expect { gateway.delete resource_path, payload: payload }.to raise_error ContentGateway::ConnectionFailure
     end
   end
@@ -360,27 +360,27 @@ describe ContentGateway::Gateway do
     end
 
     it "should do request with http put" do
-      stub_request(method: :put, url: resource_url, proxy: config.proxy, payload: payload)
+      stub_request(method: :put, url: resource_url, proxy: config.proxy, payload: payload, headers: headers)
       gateway.put resource_path, payload: payload
     end
 
     it "should raise NotFound exception on 404 error" do
-      stub_request_with_error({ method: :put, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::ResourceNotFound.new)
+      stub_request_with_error({ method: :put, url: resource_url, proxy: config.proxy, payload: payload, headers: headers }, RestClient::ResourceNotFound.new)
       expect { gateway.put resource_path, payload: payload }.to raise_error ContentGateway::ResourceNotFound
     end
 
     it "should raise UnprocessableEntity exception on 422 error" do
-      stub_request_with_error({ method: :put, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::UnprocessableEntity)
+      stub_request_with_error({ method: :put, url: resource_url, proxy: config.proxy, payload: payload, headers: headers }, RestClient::UnprocessableEntity)
       expect { gateway.put resource_path, payload: payload }.to raise_error ContentGateway::ValidationError
     end
 
     it "should raise Forbidden exception on 403 error" do
-      stub_request_with_error({ method: :put, url: resource_url, proxy: config.proxy, payload: payload }, RestClient::Forbidden.new)
+      stub_request_with_error({ method: :put, url: resource_url, proxy: config.proxy, payload: payload, headers: headers }, RestClient::Forbidden.new)
       expect { gateway.put resource_path, payload: payload }.to raise_error(ContentGateway::Forbidden)
     end
 
     it "should raise ConnectionFailure exception on 500 error" do
-      stub_request_with_error({ method: :put, url: resource_url, proxy: config.proxy, payload: payload }, SocketError.new)
+      stub_request_with_error({ method: :put, url: resource_url, proxy: config.proxy, payload: payload, headers: headers }, SocketError.new)
       expect { gateway.put resource_path, payload: payload }.to raise_error ContentGateway::ConnectionFailure
     end
   end

data/spec/unit/content_gateway/gateway_spec.rb

@@ -13,10 +13,15 @@ describe ContentGateway::Gateway do
   let(:cache) { double("cache", use?: false, status: "HIT") }
   let(:request) { double("request", execute: data) }
   let(:data) { '{"param": "value"}' }
-  let(:cache_params) { { timeout: 2, expires_in: 30, stale_expires_in: 180, skip_cache: false } }
+  let(:cache_params) { { timeout: 2, expires_in: 30, stale_expires_in: 180, skip_cache: false, ssl_certificate: {ssl_client_cert: "test", ssl_client_key: "test"} } }
+  let(:connection_params) {{ timeout: 2, ssl_certificate: {ssl_client_cert: "test", ssl_client_key: "test"} }}
 
   before do
-    allow(url_generator).to receive(:generate).and_return("url")
+    allow(File).to receive(:read).with("test").and_return("cert_content")
+    allow(OpenSSL::X509::Certificate).to receive(:new).with("cert_content").and_return("cert")
+    allow(OpenSSL::PKey::RSA).to receive(:new).with("cert_content").and_return("key")
+
+    expect(url_generator).to receive(:generate).with(path, {}).and_return("url")
   end
 
   describe "GET method" do
@@ -48,11 +53,11 @@ describe ContentGateway::Gateway do
     before do
       expect(ContentGateway::Request).
         to receive(:new).
-        with(:post, "url", nil, payload, config.proxy, cache_params).
+        with(:post, "url", nil, payload, config.proxy, connection_params).
         and_return(request)
       expect(ContentGateway::Cache).
         to receive(:new).
-        with(config, "url", :post, cache_params).
+        with(config, "url", :post, connection_params).
         and_return(cache)
     end
 
@@ -73,11 +78,11 @@ describe ContentGateway::Gateway do
     before do
       expect(ContentGateway::Request).
         to receive(:new).
-        with(:put, "url", nil, payload, config.proxy, cache_params).
+        with(:put, "url", nil, payload, config.proxy, connection_params).
         and_return(request)
       expect(ContentGateway::Cache).
         to receive(:new).
-        with(config, "url", :put, cache_params).
+        with(config, "url", :put, connection_params).
         and_return(cache)
     end
 
@@ -98,11 +103,11 @@ describe ContentGateway::Gateway do
     before do
       expect(ContentGateway::Request).
         to receive(:new).
-        with(:delete, "url", nil, payload, config.proxy, cache_params).
+        with(:delete, "url", nil, nil, config.proxy, connection_params).
         and_return(request)
       expect(ContentGateway::Cache).
         to receive(:new).
-        with(config, "url", :delete, cache_params).
+        with(config, "url", :delete, connection_params).
         and_return(cache)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_gateway
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Content Gateway