sinatra 0.1.6 → 0.1.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.1.7 FIXES:
+
+* test/development/production helpers changed to config_for.  There was a problem with "test" fubar'ing libraries such as the new release of Sequel
+* StaticEvent now makes sure the file it's looking for is really a file.
+
 v0.1.6 Additions:  require users vendor directory on load
 v0.1.5 Mutex and before-filters
 v0.1.0 Released!

data/Manifest

@@ -33,7 +33,6 @@ LICENSE
 Manifest
 RakeFile
 README
-sinatra.gemspec
 site/index.htm
 site/index.html
 site/logo.png

data/README

@@ -93,6 +93,7 @@ It's probably going to happen.. you'll find a bug.  Please help by:
 - Ezra Zygmuntowicz (http://brainspl.at) for answering all those random questions over IM and all the poached code
 - Ditto to Chris Wanstrath (errtheblog.com) and helping me keep things simple, and some cool tricks
 - Ari Lerner over at CitrusByte for ideas, code, and enthusiasm
+- Christian Neukirchen for Rack (http://rack.rubyforge.org/)
 - Koshi (http://www.songbirdnest.com/jkoshi/blog) here at POTI, Inc. for the Sinatra mark
 - Pete Golibersuch for the hat logo
 - John Philip Green (http://www.linkedin.com/in/johngreen) for motivation and evangelism

data/RakeFile

@@ -10,7 +10,7 @@ begin
   require 'echoe'
 
   Echoe.new('sinatra') do |p|
-    p.rubyforge_name = 'bmizerany'
+    p.rubyforge_name = 'sinatra'
     p.dependencies = ['mongrel >=1.0.1', 'rack >=0.2.0']    
     p.summary = "Sinatra is a classy web-framework dressed in a DSL"
     p.description = "Sinatra is a classy web-framework dressed in a DSL"
@@ -20,7 +20,7 @@ begin
     p.test_pattern = 'test/**/*_test.rb'
     p.include_rakefile = true
     p.rdoc_pattern = ['README', 'LICENSE'] + Dir.glob('lib/**/*.rb') + Dir.glob('vendor/**/*.rb')
-    p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/sinatra/"
+    p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/"
   end
 
 rescue LoadError

data/Rakefile

@@ -10,7 +10,7 @@ begin
   require 'echoe'
 
   Echoe.new('sinatra') do |p|
-    p.rubyforge_name = 'bmizerany'
+    p.rubyforge_name = 'sinatra'
     p.dependencies = ['mongrel >=1.0.1', 'rack >=0.2.0']    
     p.summary = "Sinatra is a classy web-framework dressed in a DSL"
     p.description = "Sinatra is a classy web-framework dressed in a DSL"
@@ -20,7 +20,7 @@ begin
     p.test_pattern = 'test/**/*_test.rb'
     p.include_rakefile = true
     p.rdoc_pattern = ['README', 'LICENSE'] + Dir.glob('lib/**/*.rb') + Dir.glob('vendor/**/*.rb')
-    p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/sinatra/"
+    p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/"
   end
 
 rescue LoadError

data/examples/hello/hello.rb

@@ -1,10 +1,15 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
 require 'sinatra'
 
-production do
-  sessions :off
+config_for(:production) do
+
+  get 404 do
+    "Not sure what you're looking for .. try something else."
+  end
 end
 
+sessions :off
+  
 get '/' do
   "Hello World!"
 end
@@ -21,10 +26,3 @@ end
 get '/erb2' do
   erb 'Hello <%= params[:name].capitalize || "World" %> 2!'
 end
-
-# Custom 404
-
-# get 404 do
-#   'Custom 404!!!!'
-# end
-

data/lib/sinatra/dsl.rb

@@ -114,21 +114,11 @@ module Sinatra
       Sinatra::StaticEvent.new(path, root)
     end
     
-    # Execute block if in development mode (Used for configuration)
-    def development
-      yield if Sinatra::Options.environment == :development
+    # Execute block if in environment is equal to env (Used for configuration)
+    def config_for(env = :development)
+      yield if Sinatra::Options.environment == env.to_sym
     end
-  
-    # Execute block if in production mode (Used for configuration)
-    def production
-      yield if Sinatra::Options.environment == :production
-    end
-  
-    # Execute block if in test mode (Used for configuration)
-    def test
-      yield if Sinatra::Options.environment == :test
-    end
-  
+    
     # Define named layouts (default name is <tt>:layout</tt>)
     # 
     # Examples:

data/lib/sinatra/event.rb

@@ -149,7 +149,8 @@ module Sinatra
     end
 
     def recognize(path)
-      File.exists?(physical_path_for(path))
+      filename = physical_path_for(path)
+      File.exists?(filename) && File.file?(filename)
     end
     
     def physical_path_for(path)

data/sinatra.gemspec

@@ -1,19 +1,19 @@
 
-# Gem::Specification for Sinatra-0.1.6
+# Gem::Specification for Sinatra-0.1.7
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra}
-  s.version = "0.1.6"
-  s.date = %q{2007-10-15}
+  s.version = "0.1.7"
+  s.date = %q{2007-10-23}
   s.summary = %q{Sinatra is a classy web-framework dressed in a DSL}
   s.email = %q{blake.mizerany@gmail.com}
   s.homepage = %q{http://sinatra.rubyforge.org/}
-  s.rubyforge_project = %q{bmizerany}
+  s.rubyforge_project = %q{sinatra}
   s.description = %q{Sinatra is a classy web-framework dressed in a DSL}
   s.has_rdoc = true
   s.authors = ["Blake Mizerany"]
-  s.files = ["CHANGELOG", "examples/hello/hello.rb", "examples/hello/views/hello.erb", "examples/todo/todo.rb", "files/default_index.erb", "files/error.erb", "files/logo.png", "files/not_found.erb", "lib/sinatra/context/renderer.rb", "lib/sinatra/context.rb", "lib/sinatra/core_ext/array.rb", "lib/sinatra/core_ext/class.rb", "lib/sinatra/core_ext/hash.rb", "lib/sinatra/core_ext/kernel.rb", "lib/sinatra/core_ext/metaid.rb", "lib/sinatra/core_ext/module.rb", "lib/sinatra/core_ext/symbol.rb", "lib/sinatra/dispatcher.rb", "lib/sinatra/dsl.rb", "lib/sinatra/environment.rb", "lib/sinatra/event.rb", "lib/sinatra/irb.rb", "lib/sinatra/loader.rb", "lib/sinatra/logger.rb", "lib/sinatra/options.rb", "lib/sinatra/rack_ext/request.rb", "lib/sinatra/route.rb", "lib/sinatra/server.rb", "lib/sinatra/sessions.rb", "lib/sinatra/test_methods.rb", "lib/sinatra.rb", "LICENSE", "Manifest", "RakeFile", "README", "sinatra.gemspec", "site/index.htm", "site/index.html", "site/logo.png", "test/helper.rb", "test/sinatra/dispatcher_test.rb", "test/sinatra/event_test.rb", "test/sinatra/renderer_test.rb", "test/sinatra/request_test.rb", "test/sinatra/route_test.rb", "test/sinatra/static_files/foo.txt", "test/sinatra/static_files_test.rb", "test/sinatra/url_test.rb", "vendor/erb/init.rb", "vendor/erb/lib/erb.rb", "vendor/haml/init.rb", "vendor/haml/lib/haml.rb", "Rakefile"]
+  s.files = ["CHANGELOG", "examples/hello/hello.rb", "examples/hello/views/hello.erb", "examples/todo/todo.rb", "files/default_index.erb", "files/error.erb", "files/logo.png", "files/not_found.erb", "lib/sinatra/context/renderer.rb", "lib/sinatra/context.rb", "lib/sinatra/core_ext/array.rb", "lib/sinatra/core_ext/class.rb", "lib/sinatra/core_ext/hash.rb", "lib/sinatra/core_ext/kernel.rb", "lib/sinatra/core_ext/metaid.rb", "lib/sinatra/core_ext/module.rb", "lib/sinatra/core_ext/symbol.rb", "lib/sinatra/dispatcher.rb", "lib/sinatra/dsl.rb", "lib/sinatra/environment.rb", "lib/sinatra/event.rb", "lib/sinatra/irb.rb", "lib/sinatra/loader.rb", "lib/sinatra/logger.rb", "lib/sinatra/options.rb", "lib/sinatra/rack_ext/request.rb", "lib/sinatra/route.rb", "lib/sinatra/server.rb", "lib/sinatra/sessions.rb", "lib/sinatra/test_methods.rb", "lib/sinatra.rb", "LICENSE", "Manifest", "RakeFile", "README", "site/index.htm", "site/index.html", "site/logo.png", "test/helper.rb", "test/sinatra/dispatcher_test.rb", "test/sinatra/event_test.rb", "test/sinatra/renderer_test.rb", "test/sinatra/request_test.rb", "test/sinatra/route_test.rb", "test/sinatra/static_files/foo.txt", "test/sinatra/static_files_test.rb", "test/sinatra/url_test.rb", "vendor/erb/init.rb", "vendor/erb/lib/erb.rb", "vendor/haml/init.rb", "vendor/haml/lib/haml.rb", "Rakefile", "sinatra.gemspec"]
   s.test_files = ["test/sinatra/dispatcher_test.rb", "test/sinatra/event_test.rb", "test/sinatra/renderer_test.rb", "test/sinatra/request_test.rb", "test/sinatra/route_test.rb", "test/sinatra/static_files_test.rb", "test/sinatra/url_test.rb"]
   s.add_dependency(%q<mongrel>, [">= 1.0.1"])
   s.add_dependency(%q<rack>, [">= 0.2.0"])
@@ -34,7 +34,7 @@ end
 #   require 'echoe'
 # 
 #   Echoe.new('sinatra') do |p|
-#     p.rubyforge_name = 'bmizerany'
+#     p.rubyforge_name = 'sinatra'
 #     p.dependencies = ['mongrel >=1.0.1', 'rack >=0.2.0']    
 #     p.summary = "Sinatra is a classy web-framework dressed in a DSL"
 #     p.description = "Sinatra is a classy web-framework dressed in a DSL"
@@ -44,7 +44,7 @@ end
 #     p.test_pattern = 'test/**/*_test.rb'
 #     p.include_rakefile = true
 #     p.rdoc_pattern = ['README', 'LICENSE'] + Dir.glob('lib/**/*.rb') + Dir.glob('vendor/**/*.rb')
-#     p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/sinatra/"
+#     p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/"
 #   end
 # 
 # rescue LoadError

data/test/sinatra/static_files_test.rb

@@ -9,6 +9,7 @@ context "StaticEvent" do
   
   specify "recognizes paths prefixed with it's path" do
     File.expects(:exists?).with('/x/bar/test.jpg').returns(true)
+    File.expects(:file?).with('/x/bar/test.jpg').returns(true)
     Sinatra::StaticEvent.new('/foo', '/x/bar').recognize('/foo/test.jpg').should.equal true
     
     File.expects(:exists?).with('/x/bar/test.jpg').returns(false)
@@ -23,6 +24,12 @@ context "StaticEvent" do
     result.body.each { }
   end
   
+  specify "makes sure it is a file and not a directory" do
+    File.expects(:exists?).with('/x/bar').returns(true)
+    File.expects(:file?).with('/x/bar').returns(false)
+    Sinatra::StaticEvent.new('/foo', '/x').recognize('/foo/bar').should.equal false
+  end
+  
 end
 
 context "StaticEvent (In full context)" do

metadata

@@ -3,14 +3,14 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
-date: 2007-10-15 00:00:00 -07:00
+  version: 0.1.7
+date: 2007-10-23 00:00:00 -07:00
 summary: Sinatra is a classy web-framework dressed in a DSL
 require_paths: 
 - lib
 email: blake.mizerany@gmail.com
 homepage: http://sinatra.rubyforge.org/
-rubyforge_project: bmizerany
+rubyforge_project: sinatra
 description: Sinatra is a classy web-framework dressed in a DSL
 autorequire: 
 default_executable: 
@@ -64,7 +64,6 @@ files:
 - Manifest
 - RakeFile
 - README
-- sinatra.gemspec
 - site/index.htm
 - site/index.html
 - site/logo.png
@@ -82,6 +81,7 @@ files:
 - vendor/haml/init.rb
 - vendor/haml/lib/haml.rb
 - Rakefile
+- sinatra.gemspec
 test_files: 
 - test/sinatra/dispatcher_test.rb
 - test/sinatra/event_test.rb