content_gateway 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee3e2f6da92f839d6d66363fb6860fe51ca61ff1
-  data.tar.gz: 25fcaa57e51bf4f365133c4d5672ce93cb1076e9
+  metadata.gz: f61a78669daef3d6d8e315286dfc30b809fff617
+  data.tar.gz: dafc8418766cd8db41f12341d2133dfe3e315cb4
 SHA512:
-  metadata.gz: 4e95aa8acf647aaa56102fcc5e28ca6fab2f46d0885d3353d9f785003f6a4848d6ee367cbbc2d79a7ef78679e20f0f296d51f2e889ef29dc4515a6d8e21a2db5
-  data.tar.gz: 79995262957697314650059639726c15d474a199c59c9f96ee377ceadaa9b2c38a0ebbc930c5eededd0ded68f8908112419a9b0ef985919581b2c48389270881
+  metadata.gz: d4a10af76e1d83e84826eabd94a95ade5169f8786c200f39b0a00c884a4e98f0140e6d59c1d54220a9efd3985a1d438ce53887f6c73e25ee22bbaaef05679e0b
+  data.tar.gz: 5039d46047e9549f72a413e607e0db3cb0cf02e8cd2cbf553e40963aa169702f6a7194379cbf2bf1915d51a80cc7af018635599302fe92ae3e7622796dfbc433

data/Changelog

@@ -1,3 +1,7 @@
+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

data/Gemfile.lock

@@ -2,18 +2,18 @@ PATH
   remote: .
   specs:
     content_gateway (0.5.0)
-      activesupport
-      json
-      rest-client
+      activesupport (>= 3)
+      json (~> 1.0)
+      rest-client (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     byebug (3.5.1)
       columnize (~> 0.8)
@@ -22,13 +22,18 @@ GEM
     columnize (0.8.9)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
-    i18n (0.6.11)
-    json (1.8.1)
-    mime-types (2.4.3)
-    minitest (5.5.0)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    mime-types (2.6.2)
+    minitest (5.8.3)
     multi_json (1.7.9)
-    netrc (0.10.2)
-    rest-client (1.7.2)
+    netrc (0.11.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rspec (3.1.0)
@@ -48,9 +53,12 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.6.0)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby
@@ -60,3 +68,6 @@ DEPENDENCIES
   content_gateway!
   rspec (>= 2.3.0)
   simplecov (>= 0.7.1)
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -33,6 +33,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 +44,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"
 )
 ```
 
@@ -167,4 +169,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) 2015 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,9 +16,9 @@ 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",                             "~> 1.0"
+  gem.add_dependency "json",                                    "~> 1.0"
 
   gem.add_development_dependency "rspec",                       ">= 2.3.0"
   gem.add_development_dependency "simplecov",                   ">= 0.7.1"

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.stale_on_error.nil?
+      true
+    end
   end
 end

data/lib/content_gateway/request.rb

@@ -6,6 +6,7 @@ module ContentGateway
         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
 

data/lib/content_gateway/version.rb

@@ -1,3 +1,3 @@
 module ContentGateway
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/integration/content_gateway/gateway_spec.rb

@@ -149,6 +149,30 @@ describe ContentGateway::Gateway do
             it "should serve stale" do
               expect(gateway.get(resource_path)).to eql "cached response"
             end
+
+            context "when stale_on_error configuration is true" do
+              let :gateway do
+                config_with_stale_on_error = config.dup
+                config_with_stale_on_error.stale_on_error = true
+                ContentGateway::Gateway.new "API XPTO", config_with_stale_on_error, url_generator, headers: headers
+              end
+
+              it "should serve stale" do
+                expect(gateway.get(resource_path)).to eql "cached response"
+              end
+            end
+
+            context "when stale_on_error configuration is false" do
+              let :gateway do
+                config_with_stale_on_error = config.dup
+                config_with_stale_on_error.stale_on_error = false
+                ContentGateway::Gateway.new "API XPTO", config_with_stale_on_error, url_generator, headers: headers
+              end
+
+              it "should raise error" do
+                expect { gateway.get resource_path }.to raise_error ContentGateway::ServerError
+              end
+            end
           end
         end
       end

data/spec/unit/content_gateway/request_spec.rb

@@ -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.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -22,42 +22,42 @@ dependencies:
     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: '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: 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
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Content Gateway