sinatra-respond_to 0.7.0 → 0.8.0

data/Changelog.rdoc

@@ -1,3 +1,7 @@
+=== 0.8.0 / 2011-10-09
+
+* Compatibility with Sinatra 1.3
+
 === 0.7.0 / 2011-03-20
 
 * Compatibility with Sinatra 1.2

data/Gemfile.lock

@@ -1,40 +1,45 @@
 PATH
   remote: .
   specs:
-    sinatra-respond_to (0.7.0)
-      sinatra (~> 1.2)
+    sinatra-respond_to (0.8.0)
+      sinatra (~> 1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    haml (3.0.22)
-    rack (1.2.1)
-    rack-test (0.5.6)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    haml (3.1.3)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rcov (0.9.9)
+    rcov (0.9.11)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
       rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
+    rspec-core (2.5.2)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    sinatra (1.2.1)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    tilt (1.2.2)
+    sass (3.1.10)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   builder (>= 2.0)
-  bundler (~> 1.0.10)
+  bundler (~> 1.1.rc)
   haml (>= 3.0)
   rack-test (~> 0.5.6)
   rcov (~> 0.9.8)
   rspec (~> 2.5.0)
+  sass (>= 3.0)
   sinatra-respond_to!

data/Rakefile

@@ -1,12 +1,11 @@
-require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
 begin
   require 'rspec/core/rake_task'
   desc 'Run specs'
   RSpec::Core::RakeTask.new do |t|
-    t.rcov = true
+    t.rcov = true unless RUBY_VERSION =~ /^1\.9/
     t.rcov_opts = ['--sort coverage --text-summary --sort-reverse']
     t.rcov_opts << "--comments --exclude spec,pkg,#{ENV['GEM_HOME']}"
   end

data/lib/sinatra/respond_to.rb

@@ -13,7 +13,7 @@ module Sinatra
   module RespondTo
     class UnhandledFormat < Sinatra::NotFound; end
     class MissingTemplate < Sinatra::NotFound
-      def code; 500 end
+      def code; 404 end
     end
 
     def self.registered(app)
@@ -36,7 +36,7 @@ module Sinatra
         # Let through sinatra image urls in development
         next if self.class.development? && request.path_info =~ %r{/__sinatra__/.*?.png}
 
-        unless options.static? && options.public? && (request.get? || request.head?) && static_file?(request.path_info)
+        unless settings.static? && settings.public_folder? && (request.get? || request.head?) && static_file?(request.path_info)
           if request.params.has_key? 'format'
             format params['format']
           else
@@ -46,12 +46,12 @@ module Sinatra
             # for.
             request.path_info = request.path_info.sub %r{\.([^\./]+)$}, ''
 
-            format $1 || (request.xhr? && options.assume_xhr_is_js? ? :js : options.default_content)
+            format $1 || (request.xhr? && settings.assume_xhr_is_js? ? :js : settings.default_content)
           end
         end
       end
 
-     app.configure :development do |dev|
+      app.configure :development do |dev|
         dev.error UnhandledFormat do
           content_type :html, :charset => 'utf-8'
 
@@ -79,7 +79,7 @@ module Sinatra
 
         dev.error MissingTemplate do
           content_type :html, :charset => 'utf-8'
-          response.status = request.env['sinatra.error'].code
+          response.status = 500
 
           engine = request.env['sinatra.error'].message.split('.').last
           engine = 'haml' unless ['haml', 'builder', 'erb'].include? engine
@@ -124,39 +124,30 @@ module Sinatra
           </html>
           HTML
         end
-
-      end
-
-      app.class_eval do
-        # Changes in 1.0 Sinatra reuse render for layout so we store the
-        # original value to tell us if this is an automatic attempt to do a
-        # layout call.  If it is, it might fail with Errno::ENOENT and we want
-        # to pass that back to sinatra since it isn't a MissingTemplate error
-        alias :render_without_format :render
-        def render(*args, &block)
-          assumed_layout = args[1] == :layout
-          args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
-          render_without_format *args, &block
-        rescue Errno::ENOENT => e
-          raise MissingTemplate, "#{args[1]}.#{args[0]}" unless assumed_layout
-          raise e
-        end
-        private :render
       end
     end
 
     module Helpers
+      # Changes in 1.0 Sinatra reuse render for layout so we store the
+      # original value to tell us if this is an automatic attempt to do a
+      # layout call.  If it is, it might fail with Errno::ENOENT and we want
+      # to pass that back to sinatra since it isn't a MissingTemplate error
+      def render(*args, &block)
+        assumed_layout = args[1] == :layout
+        args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
+        super *args, &block
+      rescue Errno::ENOENT
+        raise MissingTemplate, "#{args[1]}.#{args[0]}" unless assumed_layout
+        raise # Reraise original error
+      end
+      private :render
+
       # Patch the content_type function to remember the set type
       # This helps cut down on time in the format helper so it
       # doesn't have to do a reverse lookup on the header
-      def self.included(klass)
-        klass.class_eval do
-          alias :content_type_without_save :content_type
-          def content_type(*args)
-            @_format = args.first.to_sym
-            content_type_without_save *args
-          end
-        end
+      def content_type(*args)
+        @_format = args.first.to_sym
+        super
       end
 
       def format(val=nil)
@@ -174,7 +165,7 @@ module Sinatra
       # This is mostly just a helper so request.path_info isn't changed when
       # serving files from the public directory
       def static_file?(path)
-        public_dir = File.expand_path(options.public)
+        public_dir = File.expand_path(settings.public_folder)
         path = File.expand_path(File.join(public_dir, unescape(path)))
 
         path[0, public_dir.length] == public_dir && File.file?(path)

data/lib/sinatra/respond_to/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RespondTo
-    Version = '0.7.0'
+    Version = '0.8.0'
   end
 end

data/sinatra-respond_to.gemspec

@@ -12,14 +12,15 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = '>= 1.3.6'
 
-  s.add_runtime_dependency 'sinatra', '~> 1.2'
+  s.add_runtime_dependency 'sinatra', '~> 1.3'
 
   s.add_development_dependency 'rspec', '~> 2.5.0'
   s.add_development_dependency 'rack-test', '~> 0.5.6'
   s.add_development_dependency 'rcov', '~> 0.9.8'
   s.add_development_dependency 'builder', '>= 2.0'
   s.add_development_dependency 'haml', '>= 3.0'
-  s.add_development_dependency 'bundler', '~> 1.0.10'
+  s.add_development_dependency 'sass', '>= 3.0'
+  s.add_development_dependency 'bundler', '~> 1.1.rc'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/app/test_app.rb

@@ -8,7 +8,8 @@ class TestApp < Sinatra::Base
   register Sinatra::RespondTo
 
   set :views, File.join(File.dirname(__FILE__), 'views')
-  set :public, File.join(File.dirname(__FILE__), 'public')
+  set :public_folder, File.join(File.dirname(__FILE__), 'public')
+  set :show_exceptions, false
 
   get '/resource' do
     respond_to do |wants|
@@ -52,4 +53,4 @@ class TestApp < Sinatra::Base
       wants.css { sass :missing }
     end
   end
-end
+end

data/spec/extension_spec.rb

@@ -5,7 +5,7 @@ describe Sinatra::RespondTo do
     ::Sinatra::Base.mime_type(sym)
   end
 
-  describe "options" do
+  describe "settings" do
     it "should initialize with :default_content set to :html" do
       TestApp.default_content.should == :html
     end
@@ -197,7 +197,7 @@ describe Sinatra::RespondTo do
       it "should show the /__sinatra__/500.png" do
         get '/missing-template'
 
-        last_response.body.should =~ %r{src='/__sinatra__/500.png'}
+        last_response.body.should =~ %r{src=(?<quote>['"'])/__sinatra__/500.png\k<quote>}
       end
 
       it "should provide a contextual code example for the template engine" do
@@ -341,7 +341,7 @@ describe Sinatra::RespondTo do
         TestApp.disable :static
       end
 
-      def options
+      def settings
         TestApp
       end
 

metadata

@@ -1,105 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-respond_to
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.8.0
   prerelease: 
-  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Chris Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-20 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70288457045960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70288457045960
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70288457044660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70288457044660
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70288457043920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.5.6
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70288457043920
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70288457043240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70288457043240
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70288457042560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70288457042560
+- !ruby/object:Gem::Dependency
   name: haml
+  requirement: &70288457041720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70288457041720
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70288457040280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70288457040280
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70288457038780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.10
+      - !ruby/object:Gem::Version
+        version: 1.1.rc
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70288457038780
 description: 
-email: 
+email:
 - cehoffman@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Changelog.rdoc
@@ -121,35 +127,34 @@ files:
 - spec/app/views/resource.xml.builder
 - spec/extension_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/cehoffman/sinatra-respond_to
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 890127812341403240
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A respond_to style Rails block for baked-in web service support in Sinatra
-test_files: 
+test_files:
 - spec/app/production_error_app.rb
 - spec/app/public/static folder/.keep
 - spec/app/public/static.txt