lhc-core-interceptors 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d8f1d606680b4dc30c467b4b7dd83cabb19423
-  data.tar.gz: 77ec5ff865484eb71beea6c04dc648d4f8ff4f16
+  metadata.gz: a1bcc91b0161bd232e2487449b928a351fcb92e7
+  data.tar.gz: d1a91579f20175af675aa6455bbf2412c68eeee4
 SHA512:
-  metadata.gz: c9a8c8e363242f90b9ffb3cfb39c5ef95e93a2a9687d7c2accb19deadc6311cc1a65fa8db48d1ed101a5ec46ff3c38d2ca97b8bee643b823ca0bb1ea887ea02d
-  data.tar.gz: 3e419cec01d175b226a222c165170b1f5612fb77f2d155a3a368acbdba32419f722ab751886c88855a80476aa1192436a8621e08d05583c5436ead05e15153d2
+  metadata.gz: 25ed9660ad091992ec955b65744ad9adde2b99cd18ca77f9d4e04e8c5c2923cd53e0aa869fc78bf83000f5fb75adbc14035e7f3c4c3d82013ea479a066307dfb
+  data.tar.gz: 86d7df8895e1f7ce2c37a3d6859a2214580a3c96778c725f1b9d4e310be5237b36578da5e05d46e041af676353efd308b3e8777edeb6923c0b2f3177c1d928d9

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.intra.local.ch/'
+source 'https://rubygems.org'
 
 # Declare your gem's dependencies in lhc.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and

data/lhc-core-interceptors.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.requirements << 'Ruby >= 1.9.2'
   s.required_ruby_version = '>= 1.9.2'
 
-  s.add_dependency 'lhc'
+  s.add_dependency 'lhc', '~> 3.1'
 
   s.add_development_dependency 'rspec-rails', '>= 3.0.0'
   s.add_development_dependency 'rails', '>= 4.0.0'

data/lib/lhc-core-interceptors/caching.rb

@@ -1,5 +1,7 @@
 class LHC::Caching < LHC::Interceptor
 
+  CACHE_VERSION = '1'
+
   # Options forwarded to the cache
   FORWARDED_OPTIONS = {
     cache_expires_in: :expires_in,
@@ -35,6 +37,8 @@ class LHC::Caching < LHC::Interceptor
     data[:code] = response.code
     # convert into a actual hash because the typhoeus headers object breaks marshaling
     data[:headers] = response.headers ? Hash[response.headers] : response.headers
+    # return_code is quite important as Typhoeus relies on it in order to determin 'success?'
+    data[:return_code] = response.options[:return_code]
     data
   end
 
@@ -44,7 +48,7 @@ class LHC::Caching < LHC::Interceptor
       key = "#{request.method.upcase} #{request.url}"
       key += "?#{request.params.to_query}" unless request.params.blank?
     end
-    "LHC_CACHE: #{key}"
+    "LHC_CACHE(v#{CACHE_VERSION}): #{key}"
   end
 
   def options(input = {})

data/lib/lhc-core-interceptors/version.rb

@@ -1,3 +1,3 @@
 module LHCCoreInterceptors
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

data/spec/caching/main_spec.rb

@@ -13,7 +13,15 @@ describe LHC::Caching do
     stub
     LHC.config.endpoint(:local, 'http://local.ch', cache: true, cache_expires_in: 5.minutes)
     expect(Rails.cache).to receive(:write)
-      .with('LHC_CACHE: GET http://local.ch', {body: "The Website", code: 200, headers: nil}, {expires_in: 5.minutes})
+      .with(
+        "LHC_CACHE(v#{LHC::Caching::CACHE_VERSION}): GET http://local.ch", 
+        {
+          body: 'The Website',
+          code: 200,
+          headers: nil,
+          return_code: nil
+        }, expires_in: 5.minutes
+      )
       .and_call_original
     original_response = LHC.get(:local)
     cached_response = LHC.get(:local)
@@ -35,8 +43,8 @@ describe LHC::Caching do
 
   it 'lets you configure the cache key that will be used' do
     LHC.config.endpoint(:local, 'http://local.ch', cache: true, cache_key: 'STATICKEY')
-    expect(Rails.cache).to receive(:fetch).with('LHC_CACHE: STATICKEY').and_call_original
-    expect(Rails.cache).to receive(:write).with('LHC_CACHE: STATICKEY', anything, anything).and_call_original
+    expect(Rails.cache).to receive(:fetch).with("LHC_CACHE(v#{LHC::Caching::CACHE_VERSION}): STATICKEY").and_call_original
+    expect(Rails.cache).to receive(:write).with("LHC_CACHE(v#{LHC::Caching::CACHE_VERSION}): STATICKEY", anything, anything).and_call_original
     stub
     LHC.get(:local)
   end

data/spec/caching/response_status_spec.rb

@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+describe LHC::Caching do
+
+  before(:each) do
+    LHC.config.interceptors = [LHC::Caching]
+    LHC.config.endpoint(:local, 'http://local.ch', cache: true, cache_expires_in: 5.minutes)
+    Rails.cache.clear
+    # leverage the Typhoeus internal mock attribute in order to get Typhoeus evaluate the return_code
+    # lib/typhoeus/response/status.rb:48
+    allow_any_instance_of(Typhoeus::Response).to receive(:mock).and_return(false)
+  end
+
+  let!(:stub) { stub_request(:get, 'http://local.ch').to_return(status: 200, body: 'The Website') }
+
+  it 'provides the correct response status for responses from cache' do
+    stub
+    # the real request provides the return_code
+    allow_any_instance_of(Typhoeus::Response).to receive(:options)
+      .and_return(code: 200, status_message: '', body: 'The Website', headers: nil, return_code: :ok)
+    response = LHC.get(:local)
+    expect(response.success?).to eq true
+    # the cached response should get it from the cache
+    allow_any_instance_of(Typhoeus::Response).to receive(:options).and_call_original
+    cached_response = LHC.get(:local)
+    expect(cached_response.success?).to eq true
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lhc-core-interceptors
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ files:
 - spec/auth/bearer_spec.rb
 - spec/caching/main_spec.rb
 - spec/caching/parameters_spec.rb
+- spec/caching/response_status_spec.rb
 - spec/caching/to_cache_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -202,6 +203,7 @@ test_files:
 - spec/auth/bearer_spec.rb
 - spec/caching/main_spec.rb
 - spec/caching/parameters_spec.rb
+- spec/caching/response_status_spec.rb
 - spec/caching/to_cache_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile