sinatra-packrat 0.2.2 → 0.2.3

data/lib/sinatra/packrat.rb

@@ -17,9 +17,14 @@ module Sinatra
       # Allow settings.public to be an Array (or Enumerable...)
       # for multiple-path static file lookup.
       def static!
-        return if settings.public.nil?
-        if settings.public.respond_to? :each
-          settings.public.each do |dir|
+        if settings.respond_to? :public_folder
+          cur_view = settings.public_folder || []
+        else
+          cur_view = settings.public || []
+        end
+        return if cur_view.nil?
+        if cur_view.respond_to? :each
+          cur_view.each do |dir|
             public_dir = File.expand_path(dir)
             path = File.expand_path(public_dir + unescape(request.path_info))
             next unless path.start_with?(public_dir) and File.file?(path)
@@ -73,14 +78,23 @@ module Sinatra
     end
 
     def add_public_path(path)
-      cur_view = settings.public || []
+      if settings.respond_to? :public_folder
+        cur_view = settings.public_folder || []
+      else
+        cur_view = settings.public || []
+      end
       
       if cur_view.class == String
         cur_view = Array(cur_view)
       end
       
       cur_view << path
-      set :public, cur_view
+
+      if settings.respond_to? :public_folder
+        set :public_folder, cur_view
+      else
+        set :public, cur_view
+      end
     end
 
     def register_modules_from_yaml(path)
@@ -143,4 +157,4 @@ module Sinatra
   end
   
   register Packrat
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-packrat
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Brennan Roberts
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 -07:00
-default_executable: 
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -25,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -46,7 +45,6 @@ extra_rdoc_files: []
 files: 
 - lib/sinatra/packrat.rb
 - bin/packrat
-has_rdoc: true
 homepage: http://rubygems.org/gems/sinatra-packrat
 licenses: []
 
@@ -76,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Sinatra extension to enable modular application design