rack-cachely 0.2.2 → 0.3.0

data/Gemfile.lock

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

data/lib/rack-cachely/config.rb

@@ -5,7 +5,7 @@ module Rack
       attr_accessor :options
 
       def initialize(options = {})
-        self.options = {ignore_query_params: []}
+        self.options = {ignore_query_params: [], timeout: 1.0}
         options.each do |key, value|
           self.send("#{key}=", value)
         end

data/lib/rack-cachely/context.rb

@@ -13,6 +13,7 @@ module Rack
       def call(env)
         @env = env
         if self.perform_caching?
+          handle_refresh_request
           results = Rack::Cachely::Store.get(key)
           if results
             return results
@@ -25,13 +26,19 @@ module Rack
         return results
       end
 
+      def handle_refresh_request
+        if request.params["refresh-cachely"]
+          Rack::Cachely::Store.delete(key)
+        end
+      end
+
       def perform_caching?
-        config = if Kernel.const_defined?(:Rails)
+        perform_caching = if defined?(Rails)
           Rails.application.config.action_controller.perform_caching
         else
           @env['rack-cachely.perform_caching'].to_s == 'true'
         end
-        config && request.request_method == 'GET' && !request.params["no-cachely"]
+        perform_caching && request.request_method == 'GET' && !request.params["no-cachely"]
       end
 
       def is_cacheable?(results)

data/lib/rack-cachely/key.rb

@@ -43,9 +43,9 @@ module Rack
       # and applying consistent escaping.
       def query_string
         return nil if @request.query_string.nil?
-
+        ignore_query_params = ["no-cachely", "refresh-cachely", Rack::Cachely.config.ignore_query_params].flatten
         query = @request.query_string.split(/[&;] */n).map { |p| unescape(p).split('=', 2) }.sort
-        query = query.reject{|k,v| Rack::Cachely.config.ignore_query_params.include?(k)}.map{ |k,v| "#{escape(k)}=#{escape(v)}" }
+        query = query.reject{|k,v| ignore_query_params.include?(k)}.map{ |k,v| "#{escape(k)}=#{escape(v)}" }
 
         query.join('&')
       end

data/lib/rack-cachely/store.rb

@@ -10,6 +10,9 @@ module Rack
       def get(key)
         remote do
           url = "#{config.cachely_url}?_version=#{Rack::Cachely::VERSION}&url=#{CGI.escape(key.to_s)}"
+          if config.verbose
+            logger.debug "Cachely [URL]: #{url}"
+          end
           uri = URI(url)
           http = Net::HTTP.new(uri.host, uri.port)
           request = Net::HTTP::Get.new(uri.request_uri)
@@ -25,7 +28,7 @@ module Rack
             logger.info "Cachely [response.code]: #{response.code}"
             logger.info "Cachely [response.body]: #{response.body}"
           end
-          if response.code.to_i == 200
+          if (200...300).include?(response.code.to_i)
             headers = {}
             response.each_header do |key, value|
               headers[key] = value
@@ -67,8 +70,9 @@ module Rack
 
       def remote(&block)
         begin
-          Timeout::timeout(0.5, &block)
+          Timeout::timeout(config.timeout, &block)
         rescue Timeout::Error, Errno::ECONNREFUSED => e
+          # raise e
           logger.error(e)
         end
       end

data/lib/rack-cachely/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Cachely
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-cachely
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack