reviewed 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d738df20dc24d39375300b0a37b0a9e0532759c
-  data.tar.gz: f6dfd6688353ac8a48d4969773aa5631848d8960
+  metadata.gz: cb80d253dffaf3400f36312ac88e8b23ff0cebb0
+  data.tar.gz: 58cf68e0686953752759e43a84b1ba10391c7532
 SHA512:
-  metadata.gz: c1a7b307ba762476e641730fc1ae6a81e58af8c7d036a936883ba467c52e1d5ed5463cbd580befbcf0ed44c86b4c032cd090beaae5476e85945a9ee0813da6f8
-  data.tar.gz: ee756006f5a2d295ecef726d4c25001aa433eb15a20ad2b0067ebff113402536c505bf1c6e6d1e8b8170ebfbf9318cfa561db1940a22b9b20e1a877617e4b217
+  metadata.gz: 7f27184cff50410fe59a27c30b2e24b3130652f320934bdf231537e92925b87720ddad50b84b597ae5504e112a42e3770ba45baa868083ec5a6481a33e263e38
+  data.tar.gz: 777670dd116d31c39ec4b12b92568be2d37e16d8bc5d2fd9a1a8cc14f110861adf874451ce09f5815a70e99801e7294f7fe06c4ad251a4c2ecc05d450effb041

data/lib/reviewed/client.rb

@@ -64,7 +64,6 @@ module Reviewed
 
     def connection
       @connection ||= ::Faraday.new(url: base_uri) do |faraday|
-        faraday.use      Faraday::Cache if ENV['REVIEWED_CACHE_REDIS_URL']
         faraday.response :mashify
         faraday.response :errors
         faraday.response :json

data/lib/reviewed/version.rb

@@ -1,4 +1,4 @@
 module Reviewed
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
   API_VERSION = 'v1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reviewed
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nick Plante
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -222,7 +222,6 @@ files:
 - README.md
 - Rakefile
 - lib/faraday/api_key.rb
-- lib/faraday/cache.rb
 - lib/faraday/errors.rb
 - lib/reviewed.rb
 - lib/reviewed/article.rb
@@ -232,7 +231,6 @@ files:
 - lib/reviewed/award.rb
 - lib/reviewed/base.rb
 - lib/reviewed/brand.rb
-- lib/reviewed/cache.rb
 - lib/reviewed/client.rb
 - lib/reviewed/collection.rb
 - lib/reviewed/deal.rb
@@ -257,7 +255,6 @@ files:
 - spec/embeddable_spec.rb
 - spec/error_spec.rb
 - spec/faraday/api_key_spec.rb
-- spec/faraday/cache_spec.rb
 - spec/faraday/errors_spec.rb
 - spec/fixtures/vcr/Reviewed_Article/associations/attachments/assigns_attachments_to_the_correct_class.yml
 - spec/fixtures/vcr/Reviewed_Article/associations/attachments/does_not_has_many_attachments.yml
@@ -335,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A Ruby Gem for Accessing the Reviewed.com API
@@ -351,7 +348,6 @@ test_files:
 - spec/embeddable_spec.rb
 - spec/error_spec.rb
 - spec/faraday/api_key_spec.rb
-- spec/faraday/cache_spec.rb
 - spec/faraday/errors_spec.rb
 - spec/fixtures/vcr/Reviewed_Article/associations/attachments/assigns_attachments_to_the_correct_class.yml
 - spec/fixtures/vcr/Reviewed_Article/associations/attachments/does_not_has_many_attachments.yml

data/lib/faraday/cache.rb

@@ -1,56 +0,0 @@
-require 'reviewed/cache'
-
-module Faraday
-  class Cache
-
-    def initialize(app)
-      @app = app
-    end
-
-    def store
-      Reviewed::Cache.store
-    end
-
-    def call(env)
-      @url = env[:url]
-
-      @website_id = env[:request_headers]['x-reviewed-website']
-
-      if serve_from_cache? && store.exist?(cache_key)
-        begin
-          Hashie::Mash.new(MultiJson.load( store.read(cache_key) ))
-        rescue => e
-          raise e.message + ": #{cache_key}"
-        end
-      else
-        @app.call(env).on_complete do |response|
-          if store_response?(response)
-            store.delete(cache_key)
-            storeable_response = MultiJson.dump(response.slice(:status, :body, :response_headers))
-            store.write(cache_key, storeable_response, write_options)
-          end
-        end
-      end
-    end
-
-    private
-
-    def serve_from_cache?
-      @url.query.blank? || !@url.query.match(/\b(skip|reset)-cache\b/)
-    end
-
-    def store_response?(resp)
-      return false if resp[:status] != 200
-      @url.query.blank? || !@url.query.match(/\bskip-cache\b/)
-    end
-
-    def cache_key
-      [@website_id, @url.request_uri].join(':')
-    end
-
-    def write_options
-      { expires_in: Integer(ENV['REVIEWED_CACHE_TIMEOUT'] || 90).minutes }
-    end
-
-  end
-end

data/lib/reviewed/cache.rb

@@ -1,18 +0,0 @@
-require 'active_support/cache'
-require 'singleton'
-
-module Reviewed
-  class Cache
-    include Singleton
-
-    def self.store
-      @store ||= if ENV['REVIEWED_CACHE_REDIS_URL']
-                   puts "Reviewed::Cache - connecting to #{ENV['REVIEWED_CACHE_REDIS_URL']}"
-                   ActiveSupport::Cache.lookup_store(:redis_store, ENV['REVIEWED_CACHE_REDIS_URL'])
-                 else
-                   ActiveSupport::Cache.lookup_store(:memory_store)
-                 end
-    end
-
-  end
-end

data/spec/faraday/cache_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-
-describe Faraday::Cache do
-
-  describe 'call' do
-
-    conn = Faraday.new do |builder|
-      builder.use Faraday::Cache
-      builder.adapter :test, Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get('/articles') { [200, {}, 'I like turtles'] }
-        stub.get('/products') { [200, {}, 'Weee products'] }
-        stub.get('/kaboom') { [500, {}, 'Kaboom'] }
-      end
-    end
-
-    conn.headers = { "X-Reviewed-Website" => 'f0000123' }
-
-    it "caches anything that doesn't have skip-cache or reset-cache" do
-      mock_cache_val = double
-      MultiJson.stub(:dump).with(hash_including(:body => 'I like turtles')).and_return(mock_cache_val)
-      Reviewed::Cache.store.should_receive(:write).with("f0000123:/articles", mock_cache_val, anything)
-      conn.get('/articles')
-    end
-
-    it "can cache more than one thing" do
-      mock_cache_val = double
-      MultiJson.stub(:dump => mock_cache_val)
-      Reviewed::Cache.store.should_receive(:write).with("f0000123:/articles", mock_cache_val, anything)
-      Reviewed::Cache.store.should_receive(:write).with("f0000123:/products", mock_cache_val, anything)
-
-      conn.get('/articles')
-      conn.get('/products')
-    end
-
-    it "serves responses from the cache when fresh and does not call the app" do
-      marshalled_response = MultiJson.dump(body: 'old musty response')
-      Reviewed::Cache.store.stub(:exist? => true)
-      Reviewed::Cache.store.should_receive(:read).with("f0000123:/articles").and_return(marshalled_response)
-      resp = conn.get '/articles'
-      resp[:body].should eq("old musty response")
-    end
-
-    it "does not store response when result is 500" do
-      Reviewed::Cache.store.should_not_receive(:write)
-      conn.get('/kaboom')
-    end
-
-    describe "cache busting and skipping" do
-      it "does not cache responses with skip-cache as a query param" do
-        Reviewed::Cache.store.should_not_receive(:read)
-        Reviewed::Cache.store.should_not_receive(:write)
-        conn.get '/articles', {:"skip-cache" => true}
-      end
-
-      it "replaces cached content with app response when reset-cache is a query param" do
-        mock_cache_val = double
-        MultiJson.stub(:dump).and_return(mock_cache_val)
-        Reviewed::Cache.store.should_not_receive(:read)
-        Reviewed::Cache.store.should_receive(:write)
-        conn.get '/articles', {:"reset-cache" => true}
-      end
-    end
-
-  end
-
-end