rack-offline 0.6.1 → 0.6.2

data/lib/rack-offline.rb

@@ -7,7 +7,7 @@ module Rails
       @app.call(env)
     end
 
-    def initialize(app = Rails.application, &block)
+    def initialize(options = {}, app = Rails.application, &block)
       config = app.config
       root = config.paths.public.to_a.first
 
@@ -17,7 +17,7 @@ module Rails
         :cache => config.cache_classes,
         :root => root,
         :logger => Rails.logger
-      }
+      }.merge(options)
 
       super opts, &block
     end
@@ -30,7 +30,7 @@ module Rails
           "#{root}/**/*.html",
           "#{root}/stylesheets/**/*.css",
           "#{root}/javascripts/**/*.js",
-          "#{root}/images/**"]
+          "#{root}/images/**/*.*"]
         
         files.each do |file|
           cache Pathname.new(file).relative_path_from(root)

data/lib/rack/offline.rb

@@ -3,12 +3,20 @@ require "rack/offline/version"
 require "digest/sha2"
 require "logger"
 require "pathname"
+require 'uri'
 
 module Rack
   class Offline
     def self.configure(*args, &block)
       new(*args, &block)
     end
+    
+    # interval in seconds used to compute the cache key when in uncached mode
+    # which can be set by passing in options[:cache_interval]
+    # note: setting it to 0 or a low value will change the cache key every request
+    # which means the manifest will never successfully download
+    # (since it gets downloaded again at the end)
+    UNCACHED_KEY_INTERVAL = 10
 
     def initialize(options = {}, &block)
       @cache    = options[:cache]
@@ -28,45 +36,54 @@ module Rack
               "you need to supply a root so Rack::Offline can " \
               "calculate a hash of the files." unless @root
         precache_key!
+      else
+        @cache_interval = (options[:cache_interval] || UNCACHED_KEY_INTERVAL).to_i
       end
     end
 
     def call(env)
-      key = @key || Digest::SHA2.hexdigest(Time.now.to_s + Time.now.usec.to_s)
+      key = @key || uncached_key
 
       body = ["CACHE MANIFEST"]
       body << "# #{key}"
       @config.cache.each do |item|
-        body << item
+        body << URI.escape(item.to_s)
       end
 
       unless @config.network.empty?
         body << "" << "NETWORK:"
         @config.network.each do |item|
-          body << item
+          body << URI.escape(item.to_s)
         end
       end
 
       unless @config.fallback.empty?
         body << "" << "FALLBACK:"
         @config.fallback.each do |namespace, url|
-          body << "#{namespace} #{url}"
+          body << "#{namespace} #{URI.escape(url.to_s)}"
         end
       end
 
       @logger.debug body.join("\n")
 
-      [200, {"Content-Type" => "text/cache-manifest"}, body.join("\n")]
+      [200, {"Content-Type" => "text/cache-manifest"}, [body.join("\n")]]
     end
 
   private
 
     def precache_key!
       hash = @config.cache.map do |item|
-        Digest::SHA2.hexdigest(@root.join(item).read)
+        path = @root.join(item)
+        Digest::SHA2.hexdigest(path.read) if ::File.file?(path)
       end
 
       @key = Digest::SHA2.hexdigest(hash.join)
     end
+    
+    def uncached_key
+      now = Time.now.to_i - Time.now.to_i % @cache_interval
+      Digest::SHA2.hexdigest(now.to_s)
+    end
+    
   end
 end

data/lib/rack/offline/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Offline
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
-end
+end

metadata

@@ -1,66 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-offline
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
+version: !ruby/object:Gem::Version
+  version: 0.6.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-06-17 00:00:00 -07:00
-default_executable: 
+date: 2011-08-16 00:00:00.000000000 Z
 dependencies: []
-
-description: A Rack endpoint that generates cache manifests and other useful HTML5 offline utilities that are useful on the server-side. Rack::Offline also provides a conventional Rails endpoint (Rails::Offline) that configures Rack::Offline using expected Rails settings
+description: A Rack endpoint that generates cache manifests and other useful HTML5
+  offline utilities that are useful on the server-side. Rack::Offline also provides
+  a conventional Rails endpoint (Rails::Offline) that configures Rack::Offline using
+  expected Rails settings
 email: wycats@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - lib/rack/offline/config.rb
 - lib/rack/offline/version.rb
 - lib/rack/offline.rb
 - lib/rack-offline.rb
-has_rdoc: true
 homepage: http://www.yehudakatz.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rack-offline
-rubygems_version: 1.3.6
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A Rack toolkit for working with offline applications
 test_files: []
-