content_gateway 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa85efc4f1c83ec7bdd1a6759fb1fda12afcbea4
-  data.tar.gz: aab412e14cccaac8e3110a82b9067e95dc5c034a
+  metadata.gz: 0fbe5c94a8e75a4bd2d1b593393bf7e95fb00eb2
+  data.tar.gz: 4dea345804cdab15b2aa85df240e0b3f8d4178ea
 SHA512:
-  metadata.gz: 89ce05e82342e19a45d4cdf54bcbd065d6ee2f897230d5af0aaecad301b636c455fa4f531fc2dc5abe08fffa0bdb522d7d8c26383b5acfd32942459fd1e58241
-  data.tar.gz: bd179384af08df8c163fd8e2e32509bff4dcdbcf8aed44192dd27b5c039114edceec71f3018d9b759860b728086e61b0adcb547d7f20aab0ebf2e9e5d63f5641
+  metadata.gz: 8133b6e29883e98d16a3d23cc70dd44f8020a4406456821f160639ae1722c11d80ab0087c9fa17b9d1f7fdf2e05bfd93e32b639c06651862efee7841ddca86cc
+  data.tar.gz: 0643f896c0087a921fc159ecac8d92d95f76759243abe5182873e9e5bcff1fdfacddd79b7960b55e2ef594dfdc5692f50ee1199894384ff07df5a69129684fe7

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p598
+ruby-2.3.8

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+sudo: false
+script: bundle exec rake spec

data/Changelog

@@ -1,10 +1,30 @@
+2022-02-11 [0.6.0]
+
+  * Bugfix: Updated the rest-client gem from 1.0 to 2.1 to fix memory leak issues caused by the old version
+
+2016-12-19 [0.5.2]
+
+  * Bugfix: Now stale_on_error returns true if theres no config
+  * Add default url generator
+
+2015-11-19 [0.5.1]
+
+  * Bugfix proxy implementation wrapper on rest-client
+
+2015-07-24 [0.5.0]
+
+  * Mapping JSON parse errors to ContentGateway::ParserError
+
 2015-06-16 [0.4.0]
+
   * Adding ssl_version support to ssl_certificate hash
 
 2015-01-05 [0.3.0]
+
   * Optional url generator. (Without the url generator on boot the content gateway will use the get/post/delete/put resource argument as full url for request). Closes #4
 
 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
 

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
-ruby '2.0.0'
+ruby '2.3.8'
+
+gem 'coveralls', require: false
 
 gemspec

data/Gemfile.lock

@@ -1,55 +1,79 @@
 PATH
   remote: .
   specs:
-    content_gateway (0.3.0)
-      activesupport
-      json
-      rest-client
+    content_gateway (0.6.0)
+      activesupport (>= 3)
+      json (~> 1.0)
+      rest-client (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
+    activesupport (5.2.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    byebug (11.0.1)
+    concurrent-ruby (1.1.9)
+    coveralls (0.7.1)
       multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    columnize (0.8.9)
-    debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    i18n (0.6.9)
-    json (1.8.1)
-    mime-types (2.0)
-    minitest (4.7.5)
-    multi_json (1.7.9)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    diff-lcs (1.5.0)
+    docile (1.3.5)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.4)
+      domain_name (~> 0.5)
+    i18n (1.9.1)
+      concurrent-ruby (~> 1.0)
+    json (1.8.6)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
+    multi_json (1.15.0)
+    netrc (0.11.0)
+    rake (13.0.6)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.2)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.6.0)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (1.2.1)
+    thread_safe (0.3.6)
+    tins (1.31.0)
+      sync
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8)
 
 PLATFORMS
   ruby
@@ -57,5 +81,13 @@ PLATFORMS
 DEPENDENCIES
   byebug
   content_gateway!
+  coveralls
+  rake
   rspec (>= 2.3.0)
   simplecov (>= 0.7.1)
+
+RUBY VERSION
+   ruby 2.3.8p459
+
+BUNDLED WITH
+   2.3.6

data/README.md

@@ -1,5 +1,8 @@
 # Content Gateway
 
+[![Build Status](https://travis-ci.org/globocom/content-gateway-ruby.svg)](https://travis-ci.org/globocom/content-gateway-ruby)
+[![Coverage Status](https://coveralls.io/repos/github/globocom/content-gateway-ruby/badge.svg?branch=master)](https://coveralls.io/github/globocom/content-gateway-ruby?branch=master)
+
 An easy way to get external content with two cache levels. The first is a performance cache and second is the stale.
 
 Content Gateway lets you set a timeout for any request.
@@ -33,6 +36,7 @@ Or install it yourself as:
 - `timeout`: request timeout in seconds
 - `cache_expires_in`: cache data expiration time, in seconds
 - `cache_stale_expires_in`: stale cache data expiration time, in seconds
+- `stale_on_error`: if `true`, returns value from cache stale (if available) after a server error. Default value: `true`
 - `cache`: cache store instance. This may be an instance of `ActiveSupport::Cache`
 - `proxy`: proxy address, if needed
 
@@ -43,8 +47,9 @@ config = OpenStruct.new(
   timeout: 2,
   cache_expires_in: 1800,
   cache_stale_expires_in: 86400,
+  stale_on_error: false,
   cache: ActiveSupport::Cache.lookup_store(:memory_store),
-  proxy: "http://proxy.example.com/"
+  proxy: "http://proxy.example.com:3128"
 )
 ```
 
@@ -54,13 +59,12 @@ config = OpenStruct.new(
 
 - a label, which is used in the log messages
 - a config object, just as described above
-- an URL Generator object. This may be any object that responds to a `generate` method, like this:
-- an optional hash with default params. Currently, it only supports default headers
+- (optional) an URL Generator object. This may be any object that responds to a `generate` method, like this:
+- (optional) a hash with default params. Currently, it only supports default headers
 
 ```ruby
 class UrlGenerator
   def generate(resource_path, params = {})
-    args = ""
     args = "?#{params.map {|k, v| "#{k}=#{v}"}.join("&")}" if params.any?
     "http://example.com/#{resource_path}#{args}"
   end
@@ -71,7 +75,7 @@ default_params = { headers: { Accept: "application/json" } }
 gateway = ContentGateway::Gateway.new("My API", config, UrlGenerator.new, default_params)
 ```
 
-Every param may be overrided on each request.
+If ommited, the default URL Generator adds the method call params as query string parameters. Every param may be overrided on each request.
 
 This Gateway object supports the following methods:
 
@@ -167,4 +171,4 @@ gateway.post("/api/post_example", payload: { param1: "value" }, ssl_certificate:
 
 ## License
 
-Copyright (c) 2014 Globo.com - Webmedia. See [LICENSE.txt](https://github.com/globocom/content-gateway-ruby/blob/master/LICENSE.txt) for more details.
+Copyright (c) 2016 Globo.com - Webmedia. See [LICENSE.txt](https://github.com/globocom/content-gateway-ruby/blob/master/LICENSE.txt) for more details.

data/content-gateway.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activesupport"
-  gem.add_dependency "rest-client"
-  gem.add_dependency "json"
+  gem.add_dependency "activesupport",                           ">= 3"
+  gem.add_dependency "rest-client",                             "~> 2.1"
+  gem.add_dependency "json",                                    "~> 1.0"
 
   gem.add_development_dependency "rspec",                       ">= 2.3.0"
   gem.add_development_dependency "simplecov",                   ">= 0.7.1"
   gem.add_development_dependency "byebug"
+  gem.add_development_dependency "rake"
 end

data/lib/content_gateway/cache.rb

@@ -17,6 +17,7 @@ module ContentGateway
       timeout = params[:timeout] || @config.timeout
       expires_in = params[:expires_in] || @config.cache_expires_in
       stale_expires_in = params[:stale_expires_in] || @config.cache_stale_expires_in
+      stale_on_error = config_stale_on_error params, @config
 
       begin
         Timeout.timeout(timeout) do
@@ -39,6 +40,7 @@ module ContentGateway
 
       rescue ContentGateway::ServerError => e
         begin
+          raise e unless stale_on_error
           serve_stale
         rescue ContentGateway::StaleCacheNotAvailableError
           raise e
@@ -56,5 +58,12 @@ module ContentGateway
     def stale_key
       @stale_key ||= "stale:#{@url}"
     end
+
+    private
+    def config_stale_on_error params, config
+      return params[:stale_on_error] unless params[:stale_on_error].nil?
+      return config.stale_on_error unless config.try(:stale_on_error).nil?
+      true
+    end
   end
 end

data/lib/content_gateway/exceptions.rb

@@ -81,5 +81,7 @@ module ContentGateway
     end
   end
 
+  class ParserError < BaseError; end
+
   class StaleCacheNotAvailableError < StandardError; end
 end

data/lib/content_gateway/gateway.rb

@@ -3,7 +3,7 @@ module ContentGateway
     def initialize(label, config, url_generator = nil, default_params = {})
       @label = label
       @config = config
-      @url_generator = url_generator
+      @url_generator = url_generator || DefaultUrlGenerator
       @default_params = default_params
     end
 
@@ -88,19 +88,19 @@ module ContentGateway
     end
 
     def get_json(resource_path, params = {})
-      JSON.parse get(resource_path, params)
+      json_request(:get, resource_path, params)
     end
 
     def post_json(resource_path, params = {})
-      JSON.parse post(resource_path, params)
+      json_request(:post, resource_path, params)
     end
 
     def put_json(resource_path, params = {})
-      JSON.parse put(resource_path, params)
+      json_request(:put, resource_path, params)
     end
 
     def delete_json(resource_path, params = {})
-      JSON.parse delete(resource_path, params)
+      json_request(:delete, resource_path, params)
     end
 
     def generate_url(resource_path, params = {})
@@ -158,6 +158,13 @@ module ContentGateway
       end
     end
 
+    def json_request(verb, resource_path, params = {})
+      JSON.parse(self.send(verb, resource_path, params))
+    rescue JSON::ParserError => e
+      url = generate_url(resource_path, params) rescue resource_path
+      raise ContentGateway::ParserError.new(url, e)
+    end
+
     def measure(message)
       result = nil
       time_elapsed = Benchmark.measure { result = yield }
@@ -205,5 +212,12 @@ module ContentGateway
         end
       end.yield
     end
+
+    class DefaultUrlGenerator
+      def generate(resource_path, params = {})
+        args = "?#{params.map {|k, v| "#{k}=#{v}"}.join("&")}" if params.any?
+        "#{resource_path}#{args}"
+      end
+    end
   end
 end

data/lib/content_gateway/request.rb

@@ -1,17 +1,17 @@
 module ContentGateway
   class Request
     def initialize(method, url, headers = {}, payload = {}, proxy = nil, params = {})
-      data = { method: method, url: url, proxy: proxy || :none }.tap do |h|
+      data = { method: method, url: url, proxy: proxy }.tap do |h|
         h[:payload] = payload if payload.present?
         h[:headers] = headers if headers.present?
         h = load_ssl_params(h, params) if params.has_key?(:ssl_certificate)
       end
+      RestClient.proxy = proxy
       @client = RestClient::Request.new(data)
     end
 
     def execute
-      @client.execute
-
+      @client.execute.to_s
     rescue RestClient::ResourceNotFound => e1
       raise ContentGateway::ResourceNotFound.new url, e1
 

data/lib/content_gateway/version.rb

@@ -1,3 +1,3 @@
 module ContentGateway
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/lib/content_gateway.rb

@@ -5,6 +5,7 @@ require "benchmark"
 require "json"
 require "rest-client"
 require "active_support/cache"
+require "active_support/notifications"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/date_time/calculations"
 require "active_support/core_ext/hash/indifferent_access"

data/spec/integration/content_gateway/gateway_spec.rb

@@ -8,11 +8,24 @@ describe ContentGateway::Gateway do
   end
 
   let! :config do
-    OpenStruct.new(
+    class FakeConfig
+      attr_accessor :cache, :cache_expires_in, :cache_stale_expires_in, :proxy, :timeout
+
+      def initialize(params)
+        @cache = params[:cache]
+        @cache_expires_in = params[:cache_expires_in]
+        @cache_stale_expires_in = params[:cache_stale_expires_in]
+        @proxy = params[:proxy]
+        @timeout = params[:timeout]
+      end
+    end
+
+    FakeConfig.new(
       cache: ActiveSupport::Cache::NullStore.new,
       cache_expires_in: 15.minutes,
       cache_stale_expires_in: 1.hour,
-      proxy: "proxy"
+      proxy: "proxy",
+      timeout: 2
     )
   end
 
@@ -123,9 +136,10 @@ describe ContentGateway::Gateway do
         end
 
         context "with stale cache" do
+          let(:cache_store) {double("cache_store")}
+
           context "on timeout" do
             before do
-              cache_store = double("cache_store")
               allow(cache_store).to receive(:fetch).with(resource_url, expires_in: default_expires_in).and_raise(Timeout::Error)
               allow(cache_store).to receive(:read).with(stale_cache_key).and_return(cached_response)
               config.cache = cache_store
@@ -140,14 +154,29 @@ describe ContentGateway::Gateway do
             before do
               stub_request_with_error({method: :get, url: resource_url, proxy: config.proxy, headers: headers}, RestClient::InternalServerError.new(nil, 500))
 
-              cache_store = double("cache_store")
               allow(cache_store).to receive(:fetch).with(resource_url, expires_in: default_expires_in).and_yield
               allow(cache_store).to receive(:read).with(stale_cache_key).and_return(cached_response)
               config.cache = cache_store
             end
 
-            it "should serve stale" do
-              expect(gateway.get(resource_path)).to eql "cached response"
+            context "give a config without stale_on_error" do
+              context "uses the default value" do
+                it "returns cached stale" do
+                  expect(gateway.get(resource_path)).to eql "cached response"
+                end
+              end
+            end
+
+            context "when stale_on_error configuration is false" do
+              let :gateway do
+                config_with_stale_on_error = config.dup
+                allow(config_with_stale_on_error).to receive(:stale_on_error).and_return(false)
+                ContentGateway::Gateway.new "API XPTO", config_with_stale_on_error, url_generator, headers: headers
+              end
+
+              it "raises error" do
+                expect { gateway.get resource_path }.to raise_error ContentGateway::ServerError
+              end
             end
           end
         end
@@ -388,7 +417,7 @@ describe ContentGateway::Gateway do
   private
 
   def stub_request(opts, payload = {}, &block)
-    opts = { method: :get, proxy: :none }.merge(opts)
+    opts = { method: :get, proxy: nil }.merge(opts)
     request = RestClient::Request.new(opts)
     allow(RestClient::Request).to receive(:new).with(opts).and_return(request)
 
@@ -400,7 +429,7 @@ describe ContentGateway::Gateway do
   end
 
   def stub_request_with_error(opts, exc)
-    opts = { method: :get, proxy: :none }.merge(opts)
+    opts = { method: :get, proxy: nil }.merge(opts)
 
     request = RestClient::Request.new(opts)
     allow(RestClient::Request).to receive(:new).with(opts).and_return(request)

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ ENV['RACK_ENV'] = 'test'
 
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
+require 'coveralls'
+Coveralls.wear!
+
 require 'byebug'
 require 'rspec'
 require 'content_gateway'

data/spec/unit/content_gateway/gateway_spec.rb

@@ -18,6 +18,7 @@ describe ContentGateway::Gateway do
   let(:cache) { double("cache", use?: false, status: "HIT") }
   let(:request) { double("request", execute: data) }
   let(:data) { '{"param": "value"}' }
+  let(:invalid_data) { "" }
   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"} }}
 
@@ -27,22 +28,48 @@ describe ContentGateway::Gateway do
     allow(OpenSSL::PKey::RSA).to receive(:new).with("cert_content").and_return("key")
   end
 
+  shared_examples "request" do
+    describe "doing a request" do
+      it "should do a # {verb} request passing the correct parameters" do
+        expect(subject.send(verb, path, params)).to eql data
+      end
+    end
+
+    describe "doing a json request" do
+      it "should parse the response as JSON" do
+        expect(subject.send("#{verb}_json", path, params)).to eql JSON.parse(data)
+      end
+
+      context "when the answer is not a valid JSON" do
+        let(:data) { invalid_data }
+
+        it "should raise ContentGateway::ParserError" do
+          expect { subject.send("#{verb}_json", path, params) }.
+            to raise_error(ContentGateway::ParserError)
+        end
+      end
+    end
+  end
+
   describe "Without url generator" do
     describe "GET method" do
+      let(:query_string) { { a: 1, b: 2 } }
+
       before do
         expect(ContentGateway::Request).
-        to receive(:new).
-        with(:get, fullpath, headers, nil, config.proxy, cache_params).
-        and_return(request)
+          to receive(:new).
+          with(:get, fullpath, headers, nil, config.proxy, cache_params.merge(query_string)).
+          and_return(request)
+
         expect(ContentGateway::Cache).
-        to receive(:new).
-        with(config, fullpath, :get, cache_params).
-        and_return(cache)
+          to receive(:new).
+          with(config, fullpath, :get, cache_params.merge(query_string)).
+          and_return(cache)
       end
 
       describe "#get" do
         it "should do a get request passing the correct parameters" do
-          expect(gateway_without_url_generator.get(fullpath, cache_params.merge(headers: headers))).to eql data
+          expect(gateway_without_url_generator.get(fullpath, cache_params.merge(query_string).merge(headers: headers))).to eql data
         end
       end
     end
@@ -50,13 +77,14 @@ describe ContentGateway::Gateway do
     describe "POST method" do
       before do
         expect(ContentGateway::Request).
-        to receive(:new).
-        with(:post, fullpath, nil, payload, config.proxy, connection_params).
-        and_return(request)
+          to receive(:new).
+          with(:post, fullpath, nil, payload, config.proxy, connection_params).
+          and_return(request)
+
         expect(ContentGateway::Cache).
-        to receive(:new).
-        with(config, fullpath, :post, connection_params).
-        and_return(cache)
+          to receive(:new).
+          with(config, fullpath, :post, connection_params).
+          and_return(cache)
       end
 
       describe "#post" do
@@ -69,13 +97,14 @@ describe ContentGateway::Gateway do
     describe "PUT method" do
       before do
         expect(ContentGateway::Request).
-        to receive(:new).
-        with(:put, fullpath, nil, payload, config.proxy, connection_params).
-        and_return(request)
+          to receive(:new).
+          with(:put, fullpath, nil, payload, config.proxy, connection_params).
+          and_return(request)
+
         expect(ContentGateway::Cache).
-        to receive(:new).
-        with(config, fullpath, :put, connection_params).
-        and_return(cache)
+          to receive(:new).
+          with(config, fullpath, :put, connection_params).
+          and_return(cache)
       end
 
       describe "#put" do
@@ -88,13 +117,14 @@ describe ContentGateway::Gateway do
     describe "DELETE method" do
       before do
         expect(ContentGateway::Request).
-        to receive(:new).
-        with(:delete, fullpath, nil, nil, config.proxy, connection_params).
-        and_return(request)
+          to receive(:new).
+          with(:delete, fullpath, nil, nil, config.proxy, connection_params).
+          and_return(request)
+
         expect(ContentGateway::Cache).
-        to receive(:new).
-        with(config, fullpath, :delete, connection_params).
-        and_return(cache)
+          to receive(:new).
+          with(config, fullpath, :delete, connection_params).
+          and_return(cache)
       end
 
       describe "#delete" do
@@ -107,106 +137,82 @@ describe ContentGateway::Gateway do
 
   describe "With url generator" do
     before do
-      expect(url_generator).to receive(:generate).with(path, {}).and_return("url")
+      expect(url_generator).to receive(:generate).at_least(:once).with(path, {}).and_return("url")
     end
 
     describe "GET method" do
       before do
         expect(ContentGateway::Request).
-        to receive(:new).
-        with(:get, "url", headers, nil, config.proxy, cache_params).
-        and_return(request)
-        expect(ContentGateway::Cache).
-        to receive(:new).
-        with(config, "url", :get, cache_params).
-        and_return(cache)
-      end
+          to receive(:new).
+          with(:get, "url", headers, nil, config.proxy, cache_params).
+          and_return(request)
 
-      describe "#get" do
-        it "should do a get request passing the correct parameters" do
-          expect(subject.get(path, cache_params.merge(headers: headers))).to eql data
-        end
+        expect(ContentGateway::Cache).
+          to receive(:new).
+          with(config, "url", :get, cache_params).
+          and_return(cache)
       end
 
-      describe "#get_json" do
-        it "should parse the response as JSON" do
-          expect(subject.get_json(path, cache_params.merge(headers: headers))).to eql JSON.parse(data)
-        end
+      it_should_behave_like "request" do
+        let(:verb) { "get" }
+        let(:params) { cache_params.merge(headers: headers) }
       end
     end
 
     describe "POST method" do
       before do
         expect(ContentGateway::Request).
-        to receive(:new).
-        with(:post, "url", nil, payload, config.proxy, connection_params).
-        and_return(request)
-        expect(ContentGateway::Cache).
-        to receive(:new).
-        with(config, "url", :post, connection_params).
-        and_return(cache)
-      end
+          to receive(:new).
+          with(:post, "url", nil, payload, config.proxy, connection_params).
+          and_return(request)
 
-      describe "#post" do
-        it "should do a post request passing the correct parameters" do
-          expect(subject.post(path, cache_params.merge(payload: payload))).to eql data
-        end
+        expect(ContentGateway::Cache).
+          to receive(:new).
+          with(config, "url", :post, connection_params).
+          and_return(cache)
       end
 
-      describe "#post_json" do
-        it "should parse the response as JSON" do
-          expect(subject.post_json(path, cache_params.merge(payload: payload))).to eql JSON.parse(data)
-        end
+      it_should_behave_like "request" do
+        let(:verb) { "post" }
+        let(:params) { cache_params.merge(payload: payload) }
       end
     end
 
     describe "PUT method" do
       before do
         expect(ContentGateway::Request).
-        to receive(:new).
-        with(:put, "url", nil, payload, config.proxy, connection_params).
-        and_return(request)
-        expect(ContentGateway::Cache).
-        to receive(:new).
-        with(config, "url", :put, connection_params).
-        and_return(cache)
-      end
+          to receive(:new).
+          with(:put, "url", nil, payload, config.proxy, connection_params).
+          and_return(request)
 
-      describe "#put" do
-        it "should do a put request passing the correct parameters" do
-          expect(subject.put(path, cache_params.merge(payload: payload))).to eql data
-        end
+        expect(ContentGateway::Cache).
+          to receive(:new).
+          with(config, "url", :put, connection_params).
+          and_return(cache)
       end
 
-      describe "#put_json" do
-        it "should parse the response as JSON" do
-          expect(subject.put_json(path, cache_params.merge(payload: payload))).to eql JSON.parse(data)
-        end
+      it_should_behave_like "request" do
+        let(:verb) { "put" }
+        let(:params) { cache_params.merge(payload: payload) }
       end
     end
 
     describe "DELETE method" do
       before do
         expect(ContentGateway::Request).
-        to receive(:new).
-        with(:delete, "url", nil, nil, config.proxy, connection_params).
-        and_return(request)
-        expect(ContentGateway::Cache).
-        to receive(:new).
-        with(config, "url", :delete, connection_params).
-        and_return(cache)
-      end
+          to receive(:new).
+          with(:delete, "url", nil, nil, config.proxy, connection_params).
+          and_return(request)
 
-      describe "#delete" do
-        it "should do a delete request passing the correct parameters" do
-          expect(subject.delete(path, cache_params.merge(payload: payload))).to eql data
-        end
+        expect(ContentGateway::Cache).
+          to receive(:new).
+          with(config, "url", :delete, connection_params).
+          and_return(cache)
       end
 
-      describe "#delete_json" do
-        it "should parse the response as JSON" do
-          expect(subject.delete_json(path, cache_params.merge(payload: payload))).to eql JSON.parse(data)
-        end
+      it_should_behave_like "request" do
+        let(:verb) { "delete" }
+        let(:params) { cache_params.merge(payload: payload) }
       end
     end
   end

data/spec/unit/content_gateway/request_spec.rb

@@ -11,7 +11,7 @@ describe ContentGateway::Request do
 
   let(:client) { double("rest client", execute: "data", url: "/url") }
 
-  let(:request_params) { { method: :get, url: "/url", proxy: :none } }
+  let(:request_params) { { method: :get, url: "/url", proxy: nil } }
 
   describe "#execute" do
     context "when request is successful" do
@@ -156,7 +156,7 @@ describe ContentGateway::Request do
 
       context "when request fails" do
         it "should return ssl failure error if certificate was not found" do
-          expect { subject_ssl.execute }.to raise_error(ContentGateway::OpenSSLFailure).with_message("/url - No such file or directory - test")
+          expect { subject_ssl.execute }.to raise_error(ContentGateway::OpenSSLFailure).with_message(/^\/url - No such file or directory/)
         end
 
         it "should return ssl failure error if certificate cert was not valid" do
@@ -171,5 +171,17 @@ describe ContentGateway::Request do
         end
       end
     end
+
+    context "when proxy is used" do
+      let(:proxy) { 'http://proxy.test:3128' }
+      subject { ContentGateway::Request.new(:get, "/url", {}, {}, proxy) }
+      let(:request_params) { { method: :get, url: "/url", proxy: proxy } }
+
+      it "should set proxy on RestClient" do
+        expect(subject.execute).to eql "data"
+        expect(RestClient.proxy).to eql(proxy)
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_gateway
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -11,93 +11,107 @@ authors:
 - Daniel Martins
 - Rafael Biriba
 - Célio Latorraca
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An easy way to get external content with two cache levels. The first
@@ -114,10 +128,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Changelog
 - Gemfile
 - Gemfile.lock
@@ -139,24 +154,24 @@ files:
 homepage: https://github.com/globocom/content-gateway-ruby
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.2.3
+signing_key:
 specification_version: 4
 summary: Content Gateway
 test_files: