RubyGems - sinatra - Versions diffs - 1.0.b → 1.0 - Mend

sinatra 1.0.b → 1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of sinatra might be problematic. Click here for more details.

Files changed (7) hide show

data/CHANGES CHANGED

@@ -65,6 +65,9 @@
  * Filters do not run when serving static files anymore. (Ryan Tomayko)
+ * pass takes an optional block to be used as the route handler if no
+   subsequent route matches the request. (Blake Mizerany)
 The following Sinatra features have been obsoleted (removed entirely) in
 the 1.0 release:

data/lib/sinatra/base.rb CHANGED

@@ -19,7 +19,7 @@ rescue LoadError
 end
 module Sinatra
-  VERSION = '1.0.b'
+  VERSION = '1.0'
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -648,21 +648,11 @@ module Sinatra
     end
     def dump_errors!(boom)
-      backtrace = clean_backtrace(boom.backtrace)
       msg = ["#{boom.class} - #{boom.message}:",
-        *backtrace].join("\n ")
+        *boom.backtrace].join("\n ")
       @env['rack.errors'].puts(msg)
     end
-    def clean_backtrace(trace)
-      return trace unless settings.clean_trace?
-      trace.reject { |line|
-        line =~ /lib\/sinatra.*\.rb/ ||
-          (defined?(Gem) && line.include?(Gem.dir))
-      }.map! { |line| line.gsub(/^\.\//, '') }
-    end
     class << self
       attr_reader :routes, :before_filters, :after_filters, :templates, :errors
@@ -1053,7 +1043,6 @@ module Sinatra
     set :raise_errors, Proc.new { test? }
     set :dump_errors, Proc.new { !test? }
     set :show_exceptions, Proc.new { development? }
-    set :clean_trace, true
     set :sessions, false
     set :logging, false
     set :method_override, false

data/sinatra.gemspec CHANGED

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.name = 'sinatra'
-  s.version = '1.0.b'
-  s.date = '2010-03-07'
+  s.version = '1.0'
+  s.date = '2010-03-23'
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"

data/test/haml_test.rb CHANGED

@@ -1,4 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
+begin
 require 'haml'
 class HAMLTest < Test::Unit::TestCase
@@ -88,3 +90,6 @@ class HAMLTest < Test::Unit::TestCase
     assert_match(/^<!DOCTYPE html PUBLIC (.*) HTML 4.01/, body)
   end
 end
+rescue
+  warn "#{$!.to_s}: skipping haml tests"
+end

data/test/sass_test.rb CHANGED

@@ -1,4 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
+begin
 require 'sass'
 class SassTest < Test::Unit::TestCase
@@ -77,3 +79,7 @@ class SassTest < Test::Unit::TestCase
     assert_equal "#sass {\n  background-color: #FFF;\n  color: #000;\n}\n", body
   end
 end
+rescue
+  warn "#{$!.to_s}: skipping sass tests"
+end

data/test/settings_test.rb CHANGED

@@ -135,52 +135,6 @@ class SettingsTest < Test::Unit::TestCase
     end
   end
-  describe 'clean_trace' do
-    def clean_backtrace(trace)
-      Sinatra::Base.new.send(:clean_backtrace, trace)
-    end
-    it 'is enabled on Base' do
-      assert @base.clean_trace?
-    end
-    it 'is enabled on Application' do
-      assert @application.clean_trace?
-    end
-    it 'does nothing when disabled' do
-      backtrace = [
-        "./lib/sinatra/base.rb",
-        "./myapp:42",
-        ("#{Gem.dir}/some/lib.rb" if defined?(Gem))
-      ].compact
-      klass = Class.new(Sinatra::Base)
-      klass.disable :clean_trace
-      assert_equal backtrace, klass.new.send(:clean_backtrace, backtrace)
-    end
-    it 'removes sinatra lib paths from backtrace when enabled' do
-      backtrace = [
-        "./lib/sinatra/base.rb",
-        "./lib/sinatra/compat.rb:42",
-        "./lib/sinatra/main.rb:55 in `foo'"
-      ]
-      assert clean_backtrace(backtrace).empty?
-    end
-    it 'removes ./ prefix from backtrace paths when enabled' do
-      assert_equal ['myapp.rb:42'], clean_backtrace(['./myapp.rb:42'])
-    end
-    if defined?(Gem)
-      it 'removes gem lib paths from backtrace when enabled' do
-        assert clean_backtrace(["#{Gem.dir}/some/lib"]).empty?
-      end
-    end
-  end
   describe 'run' do
     it 'is disabled on Base' do
       assert ! @base.run?

metadata CHANGED

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  prerelease: true
+  prerelease: false
   segments:
   - 1
   - 0
-  - b
-  version: 1.0.b
+  version: "1.0"
 platform: ruby
 authors:
 - Blake Mizerany
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-03-07 00:00:00 -08:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -203,13 +202,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
       segments:
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 rubyforge_project: sinatra