otto 0.2.0.001 → 0.2.1.003

data/CHANGES.txt

@@ -1,5 +1,9 @@
 OTTO, CHANGES
 
+#### 0.2.1 (2011-07-07) ###############################
+
+* ADDED: Otto#add_static_path
+
 #### 0.2.0 (2011-07-06) ###############################
 
 Initial public release

data/Rakefile

@@ -26,7 +26,7 @@ begin
     gem.homepage = "http://github.com/delano/otto"
     gem.authors = ["Delano Mandelbaum"]
     gem.add_dependency('rack',          '>= 1.2.1')
-    gem.add_dependency('addressable',    '= 2.2.4')
+    gem.add_dependency('addressable',    '>= 2.2.6')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -45,21 +45,3 @@ Rake::RDocTask.new do |rdoc|
 end
 
 
-# Rubyforge Release / Publish Tasks ==================================
-
-#about 'Publish website to rubyforge'
-task 'publish:rdoc' => 'doc/index.html' do
-  sh "scp -rp doc/* rubyforge.org:/var/www/gforge-projects/#{name}/"
-end
-
-#about 'Public release to rubyforge'
-task 'publish:gem' => [:package] do |t|
-  sh <<-end
-    rubyforge add_release -o Any -a CHANGES.txt -f -n README.md #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.gem &&
-    rubyforge add_file -o Any -a CHANGES.txt -f -n README.md #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.tgz 
-  end
-end
-
-
-
-

data/VERSION.yml

@@ -1,4 +1,4 @@
 :MAJOR: 0
 :MINOR: 2
-:PATCH: 0
-:BUILD: '001'
+:PATCH: 1
+:BUILD: '003'

data/lib/otto.rb

@@ -61,13 +61,30 @@ class Otto
     }
     self
   end
-  def safe_file?(path)
+
+  def safe_file? path
     globstr = File.join(option[:public], '*')
     pathstr = File.join(option[:public], path)
-    File.fnmatch?(globstr, pathstr) && File.owned?(pathstr) && !File.directory?(pathstr)
+    File.fnmatch?(globstr, pathstr) && (File.owned?(pathstr) || File.grpowned?(pathstr)) && File.readable?(pathstr) && !File.directory?(pathstr)
+  end
+  
+  def safe_dir? path
+    (File.owned?(path) || File.grpowned?(path)) && File.directory?(path)
   end
+  
+  def add_static_path path
+    if safe_file?(path)
+      base_path = File.split(path).first
+      # Files in the root directory can refer to themselves
+      base_path = path if base_path == '/'
+      static_path = File.join(option[:public], base_path)
+      STDERR.puts "new static route: #{base_path} (#{path})"
+      routes_static[:GET][base_path] = base_path
+    end
+  end
+  
   def call env
-    if option[:public] && File.owned?(option[:public])
+    if option[:public] && safe_dir?(option[:public])
       @static_route ||= Rack::File.new(option[:public]) 
     end
     path_info = Rack::Utils.unescape(env['PATH_INFO'])

data/otto.gemspec

@@ -1,50 +1,49 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{otto}
-  s.version = "0.2.0.001"
+  s.name = "otto"
+  s.version = "0.2.1.003"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2011-07-07}
-  s.description = %q{Auto-define your rack-apps in plaintext.}
-  s.email = %q{delano@solutious.com}
+  s.date = "2011-10-19"
+  s.description = "Auto-define your rack-apps in plaintext."
+  s.email = "delano@solutious.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     "CHANGES.txt",
-     "LICENSE.txt",
-     "README.md",
-     "Rakefile",
-     "VERSION.yml",
-     "lib/otto.rb",
-     "otto.gemspec"
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION.yml",
+    "lib/otto.rb",
+    "otto.gemspec"
   ]
-  s.homepage = %q{http://github.com/delano/otto}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/delano/otto"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{otto}
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Auto-define your rack-apps in plaintext.}
+  s.rubyforge_project = "otto"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Auto-define your rack-apps in plaintext."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.2.1"])
-      s.add_runtime_dependency(%q<addressable>, ["= 2.2.4"])
+      s.add_runtime_dependency(%q<addressable>, [">= 2.2.6"])
     else
       s.add_dependency(%q<rack>, [">= 1.2.1"])
-      s.add_dependency(%q<addressable>, ["= 2.2.4"])
+      s.add_dependency(%q<addressable>, [">= 2.2.6"])
     end
   else
     s.add_dependency(%q<rack>, [">= 1.2.1"])
-    s.add_dependency(%q<addressable>, ["= 2.2.4"])
+    s.add_dependency(%q<addressable>, [">= 2.2.6"])
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: otto
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0.001
+  version: 0.2.1.003
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -04:00
-default_executable: 
+date: 2011-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -30,9 +29,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.4
+        version: 2.2.6
   type: :runtime
   version_requirements: *id002
 description: Auto-define your rack-apps in plaintext.
@@ -52,13 +51,12 @@ files:
 - VERSION.yml
 - lib/otto.rb
 - otto.gemspec
-has_rdoc: true
 homepage: http://github.com/delano/otto
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -76,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: otto
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Auto-define your rack-apps in plaintext.