rack-cachely 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f4080bb9c2d7996d66615deb889c894bbb4899d
-  data.tar.gz: 97b741a1f1b6c746c417066cb8191465f647af0f
+  metadata.gz: d5cc375109389743f021cf1f7fb371099ea0131a
+  data.tar.gz: c5871bb7b78afb9d243a5ca315d6dc1cba2a25a0
 SHA512:
-  metadata.gz: 1e95627d21f37a878f4017c57647fb90fc6c51f185631f482d5b3f048562b635bc16e5b77273248d4376991217e5213c079ecae71fb88829e8ee2d4b02cbe4bc
-  data.tar.gz: 9185062d94498de7efa4003205ebd66d0cac8974661f3e94eaabe3e569cc0f59af027c85a36003a8e769585c8ee0bbd6624884fb92b58ecef95cfe50b7aac745
+  metadata.gz: 8e5d8d6a5106081cb2de26431de63c3fc689471bd6e9075fec3be1c4c581b8fa836cc8aa381310cae89eecef121dc24605b9557cb19b70d437b14456f634245b
+  data.tar.gz: 04459c6d33d29e5e9c19fcd8e4bd969427c27c3c07d4f68034228f669773ff6f1abe94496728c898ee648194921eac77968db9995fc5004ea4a21cc179c283ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-cachely (0.4.0)
+    rack-cachely (0.4.1)
       rack
 
 GEM

data/README.md

@@ -18,9 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-**CACHELY IS CURRENTLY IN PRIVATE BETA.**
-
-If you would like to join the private beta, please email [mark+cachely@meta42.com](mailto:mark+cachely@meta42.com)
+Cachely is currently available only as a Heroku Add-on.
 
 ### Rails 3.x
 
@@ -87,4 +85,5 @@ Rack::Cachely::Store.delete("users/\d+")
 ## Contributors
 
 * Mark Bates
+* Sam Beam
 * Tim Raymond

data/lib/rack-cachely/config.rb

@@ -9,7 +9,17 @@ module Rack
         options.each do |key, value|
           self.send("#{key}=", value)
         end
-        self.options[:cachely_url] = "#{(self.options[:cachely_url] ||= ENV["CACHELY_URL"])}/v1/cache"
+
+        url = options[:cachely_url] || ENV["CACHELY_URL"]
+
+        if !url || (url.respond_to?(:empty?) && url.empty?)
+          self.logger.warn("Cachely: config incomplete (cachely_url is missing), disabling cachley.")
+          self.options[:enabled] = false
+        else
+          url = "#{url}/v1/cache"
+          self.options[:enabled] = true
+        end
+        self.cachely_url = url
       end
 
       def ignore_query_params=(*args)

data/lib/rack-cachely/context.rb

@@ -38,7 +38,7 @@ module Rack
         else
           @env['rack-cachely.perform_caching'].to_s == 'true'
         end
-        perform_caching && request.request_method == 'GET' && !request.params["no-cachely"]
+        perform_caching && config.enabled && request.request_method == 'GET' && !request.params["no-cachely"]
       end
 
       def is_cacheable?(results)
@@ -64,4 +64,4 @@ module Rack
     end
 
   end
-end
+end

data/lib/rack-cachely/store.rb

@@ -70,8 +70,8 @@ module Rack
 
       def remote(&block)
         begin
-          Timeout::timeout(config.timeout, &block)
-        rescue Timeout::Error, Errno::ECONNREFUSED => e
+          ::Timeout::timeout(config.timeout, &block)
+        rescue ::Timeout::Error, Errno::ECONNREFUSED => e
           # raise e
           logger.error(e)
         end
@@ -87,4 +87,4 @@ module Rack
 
     end
   end
-end
+end

data/lib/rack-cachely/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Cachely
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/spec/rack-cachely/config_spec.rb

@@ -21,4 +21,37 @@ describe Rack::Cachely::Config do
   
   end
 
-end
+
+  describe "initializer" do
+
+    it "sets cachely_url from ENV" do
+      config.cachely_url.should == "#{ENV['CACHELY_URL']}/v1/cache"
+    end
+
+    it "sets enabled" do
+      config.enabled.should == true
+    end
+
+    context "with no ENV['CACHELY_URL']" do
+
+      before do
+        @old_env = ENV.delete('CACHELY_URL')
+        @logger = mock
+        Rack::Cachely::Config.any_instance.stub(:logger).and_return @logger
+      end
+
+      after do
+        ENV['CACHELY_URL'] = @old_env
+      end
+
+      it "warns and disables if there is no cachely_url" do
+        @logger.should_receive(:warn)
+        config.enabled.should == false
+      end
+
+    end
+
+  end
+
+
+end

data/spec/rack-cachely/context_spec.rb

@@ -2,6 +2,53 @@ require 'spec_helper'
 
 describe Rack::Cachely::Context do
 
-  
+  describe 'call' do
 
-end
+    let(:app) { mock }
+    let(:context) { Rack::Cachely::Context.new(app) }
+
+    context 'when cachely is disabled in config' do
+      before do
+        Rack::Cachely.config.enabled = false
+      end
+
+      it 'invokes the app' do
+        app.should_receive(:call)
+        context.call({})
+      end
+
+    end
+
+    context 'with cachely enabled in config' do
+      before do
+        Rack::Cachely.config.enabled = true
+        @env = { 'rack-cachely.perform_caching' => true }
+        Rack::Cachely::Store.stub(get: true)
+      end
+
+      context 'without no-cachely param' do
+        before do
+          context.stub(:request => mock(:request_method => 'GET', :params => {}))
+        end
+
+        it 'does not invoke the app' do
+          app.should_not_receive(:call)
+          context.call(@env)
+        end
+      end
+
+      context 'with no-cachely param' do
+        before do
+          context.stub(:request => mock(:request_method => 'GET', :params => {'no-cachely' => true}))
+        end
+
+        it 'invokes the app' do
+          app.should_receive(:call)
+          context.call(@env)
+        end
+      end
+    end
+
+  end
+
+end

data/spec/rack-cachely/store_spec.rb

@@ -35,7 +35,7 @@ describe Rack::Cachely::Store do
         store.get(key).should be_nil
       }.to_not raise_error(Timeout::Error)
     end
-  
+
   end
 
   describe "post" do
@@ -82,4 +82,4 @@ describe Rack::Cachely::Store do
 
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-cachely
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mark Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -78,3 +78,4 @@ test_files:
 - spec/rack-cachely/key_spec.rb
 - spec/rack-cachely/store_spec.rb
 - spec/spec_helper.rb
+has_rdoc: