RubyGems - sinatra-respond_to - Versions diffs - 0.3.8 → 0.4.0 - Mend

sinatra-respond_to 0.3.8 → 0.4.0

Files changed (8) hide show

data/Changelog.rdoc +14 -0
data/README.rdoc +3 -10
data/Rakefile +1 -2
data/lib/sinatra/respond_to.rb +43 -22
data/lib/sinatra/respond_to/version.rb +1 -1
data/spec/app/test_app.rb +1 -0
data/spec/extension_spec.rb +19 -11
metadata +1 -11

data/Changelog.rdoc CHANGED Viewed

@@ -1,3 +1,17 @@
+=== 0.4.0 / 2010-01-30
+* Specify that when running into unknown template languages the error message defaults to a generic template example
+* Update code example
+* Update supported sinatra versions in README
+* Remove issues section because I believe it has been corrected
+* Update development error message for new builder syntax
+* Remove redundant hoe dependency and update rcov opts
+* Fix the media_type -> mime_type conversion on Sinatra 0.9
+* Fix rendering with extensions, e.g. resource.html.haml
+* Add spec and passing code for content_type usage
+* Changed how development error images are shown
+* Update media_type to mime_type for Sinatra 1.0 while maintaining backward compat
 === 0.3.8 / 2010-01-30
 * Need to bump because of wrong gem name

data/README.rdoc CHANGED Viewed

@@ -16,6 +16,8 @@ A respond_to style Rails block for baked-in web service support in Sinatra
     require 'sinatra'
     require 'sinatra/respond_to'
+    register Sinatra::RespondTo
     get '/posts' do
       @posts = Post.recent
@@ -80,7 +82,7 @@ There a few options available for configuring the default behavior of respond_to
 == REQUIREMENTS:
-* sinatra 0.9.4 - 0.10
+* sinatra 0.9.4 - 1.0
 == INSTALL:
@@ -116,15 +118,6 @@ After checking out the source, run:
 This task will install any missing dependencies, run the tests/specs,
 and generate the RDoc.
-== ISSUES
-Sinatra has a bug that affects Classic style applications and extensions see 215[https://sinatra.lighthouseapp.com/projects/9779/tickets/215-extensions-cannot-define-before-filters-for-classic-apps] and 180[https://sinatra.lighthouseapp.com/projects/9779/tickets/180-better-route-inheritence].
-I have worked around this by explicitly registering RespondTo with the top level Sinatra::Application when
-requiring sinatra/respond\_to.
-* {Extensions cannot define before filters for classic apps}[https://sinatra.lighthouseapp.com/projects/9779/tickets/215-extensions-cannot-define-before-filters-for-classic-apps]
-* {Better route inheritence}[https://sinatra.lighthouseapp.com/projects/9779/tickets/180-better-route-inheritence]
 == LICENSE:
 (The MIT License)

data/Rakefile CHANGED Viewed

@@ -11,7 +11,6 @@ Hoe.plugin :git
 Hoe.spec 'sinatra-respond_to' do
   developer('Chris Hoffman', 'cehoffman@gmail.com')
   extra_deps << ['sinatra', '>= 0.9.4']
-  extra_dev_deps << ['hoe', '>= 2.5.0']
   extra_dev_deps << ['rspec', '>= 1.3.0']
   extra_dev_deps << ['rcov', '>= 0.9.7.1']
   extra_dev_deps << ['rack-test', '>= 0.5.3']
@@ -33,7 +32,7 @@ begin
     t.rcov = true
     t.rcov_opts << '--text-summary'
     t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-    t.rcov_opts << '--exclude' << 'pkg,spec'
+    t.rcov_opts << '--comments' << '--exclude' << 'pkg,gems'
   end
 rescue LoadError
   puts "RSpec not available. Install it with sudo gem install rspec."

data/lib/sinatra/respond_to.rb CHANGED Viewed

@@ -40,6 +40,9 @@ module Sinatra
       #
       # and the format will automatically be available in <tt>format</tt>
       app.before do
+        # 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)
           request.path_info.sub! %r{\.([^\./]+)$}, ''
@@ -50,12 +53,6 @@ module Sinatra
       end
      app.configure :development do |dev|
-        # Very, very, very hackish but only for development at least
-        # Modifies the regex matching /__sinatra__/:image.png to not have the extension
-        ["GET", "HEAD"].each do |verb|
-          dev.routes[verb][1][0] = Regexp.new(dev.routes[verb][1][0].source.gsub(/\\\.[^\.\/]+\$$/, '$'))
-        end
         dev.error UnhandledFormat do
           content_type :html, :charset => 'utf-8'
@@ -96,7 +93,7 @@ module Sinatra
           layout = case engine
                    when 'haml' then "!!!\n%html\n  %body= yield"
                    when 'erb' then "<html>\n  <body>\n    <%= yield %>\n  </body>\n</html>"
-                   when 'builder' then "builder do |xml|\n  xml << yield\nend"
+                   when 'builder' then ::Sinatra::VERSION =~ /^1.0/ ? "xml << yield" : "builder do |xml|\n  xml << yield\nend"
                    end
           layout = "<small>app.#{format}.#{engine}</small>\n<pre>#{escape_html(layout)}</pre>"
@@ -133,28 +130,56 @@ module Sinatra
       app.class_eval do
         private
-          def render_with_format(*args)
+          # 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_with_format(*args, &block)
+            assumed_layout = args[1] == :layout
             args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
-            render_without_format *args
-          rescue Errno::ENOENT
-            raise MissingTemplate, "#{args[1]}.#{args[0]}"
+            render_without_format *args, &block
+          rescue Errno::ENOENT => e
+            raise MissingTemplate, "#{args[1]}.#{args[0]}" unless assumed_layout
+            raise e
           end
           alias_method :render_without_format, :render
           alias_method :render, :render_with_format
-          def lookup_layout_with_format(*args)
-            args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
-            lookup_layout_without_format *args
+          if ::Sinatra::VERSION =~ /^0\.9/
+            def lookup_layout_with_format(*args)
+              args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
+              lookup_layout_without_format *args
+            end
+            alias_method :lookup_layout_without_format, :lookup_layout
+            alias_method :lookup_layout, :lookup_layout_with_format
           end
-          alias_method :lookup_layout_without_format, :lookup_layout
-          alias_method :lookup_layout, :lookup_layout_with_format
       end
     end
     module Helpers
+      # 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
+          def content_type_with_save(*args)
+            content_type_without_save *args
+            @format = args.first.to_sym
+            response['Content-Type']
+          end
+          alias_method :content_type_without_save, :content_type
+          alias_method :content_type, :content_type_with_save
+        end if ::Sinatra::VERSION =~ /^1.0/
+      end
+      def self.mime_type(sym)
+        ::Sinatra::Base.respond_to?(:media_type) && ::Sinatra::Base.media_type(sym) || ::Sinatra::Base.mime_type(sym)
+      end
       def format(val=nil)
         unless val.nil?
-          mime_type = media_type(val)
+          mime_type = ::Sinatra::RespondTo::Helpers.mime_type(val)
           fail "Unknown media type #{val}\nTry registering the extension with a mime type" if mime_type.nil?
           @format = val.to_sym
@@ -188,7 +213,7 @@ module Sinatra
       def respond_to(&block)
         wants = {}
         def wants.method_missing(type, *args, &handler)
-          Sinatra::Base.send(:fail, "Unknown media type for respond_to: #{type}\nTry registering the extension with a mime type") if Sinatra::Base.media_type(type).nil?
+          ::Sinatra::Base.send(:fail, "Unknown media type for respond_to: #{type}\nTry registering the extension with a mime type") if ::Sinatra::RespondTo::Helpers.mime_type(type).nil?
           self[type] = handler
         end
@@ -199,8 +224,4 @@ module Sinatra
       end
     end
   end
-  # Get around before filter problem for classic applications by registering
-  # with the context they are run in explicitly instead of Sinatra::Default
-  Sinatra::Application.register RespondTo
 end

data/lib/sinatra/respond_to/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Sinatra
   module RespondTo
-    Version = '0.3.8'
+    Version = '0.4.0'
   end
 end

data/spec/app/test_app.rb CHANGED Viewed

@@ -48,6 +48,7 @@ class TestApp < Sinatra::Base
       wants.html { haml :missing }
       wants.xml { builder :missing }
       wants.js { erb :missing }
+      wants.css { sass :missing }
     end
   end
 end

data/spec/extension_spec.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 describe Sinatra::RespondTo do
-  def media_type(sym)
-    Sinatra::Base.media_type(sym)
+  def mime_type(sym)
+    ::Sinatra::Base.respond_to?(:media_type) && ::Sinatra::Base.media_type(sym) || ::Sinatra::Base.mime_type(sym)
   end
   describe "options" do
@@ -25,7 +25,7 @@ describe Sinatra::RespondTo do
       get '/resource'
-      last_response['Content-Type'].should =~ %r{#{media_type(:js)}}
+      last_response['Content-Type'].should =~ %r{#{mime_type(:js)}}
     end
     it "should not set the content type to application/javascript for an XMLHttpRequest when assume_xhr_is_js is false" do
@@ -33,7 +33,7 @@ describe Sinatra::RespondTo do
       header 'X_REQUESTED_WITH', 'XMLHttpRequest'
       get '/resource'
-      last_response['Content-Type'].should_not =~ %r{#{media_type(:js)}}
+      last_response['Content-Type'].should_not =~ %r{#{mime_type(:js)}}
       # Put back the option, no side effects here
       TestApp.enable :assume_xhr_is_js
@@ -76,7 +76,7 @@ describe Sinatra::RespondTo do
     it "should set the appropriate content-type for route with an extension" do
       get "/resource.xml"
-      last_response['Content-Type'].should =~ %r{#{media_type(:xml)}}
+      last_response['Content-Type'].should =~ %r{#{mime_type(:xml)}}
     end
     it "should set the character set to the default character set" do
@@ -141,7 +141,7 @@ describe Sinatra::RespondTo do
     it "should set the default content type when no extension" do
       get "/normal-no-respond_to"
-      last_response['Content-Type'].should =~ %r{#{media_type(TestApp.default_content)}}
+      last_response['Content-Type'].should =~ %r{#{mime_type(TestApp.default_content)}}
     end
     it "should set the default character when no extension" do
@@ -153,7 +153,7 @@ describe Sinatra::RespondTo do
     it "should set the appropriate content type when given an extension" do
       get "/normal-no-respond_to.css"
-      last_response['Content-Type'].should =~ %r{#{media_type(:css)}}
+      last_response['Content-Type'].should =~ %r{#{mime_type(:css)}}
     end
     it "should set the default charset when given an extension" do
@@ -202,10 +202,11 @@ describe Sinatra::RespondTo do
         last_response.status.should == 500
       end
-      it "should provide a helpful error message for a missing template when in development" do
-        get '/missing-template'
+      it "should provide a helpful generic error message for a missing template when in development" do
+        get '/missing-template.css'
-        last_response.body.should =~ /missing\.html\.haml/
+        last_response.body.should =~ /missing-template\.html\.haml/
+        last_response.body.should =~ %r{get '/missing-template' do respond_to do |wants| wants.html \{ haml :missing-template, layout => :app \} end end}
       end
       it "should show the /__sinatra__/500.png" do
@@ -260,6 +261,7 @@ describe Sinatra::RespondTo do
   end
   describe "helpers:" do
+    include Sinatra::Helpers
     include Sinatra::RespondTo::Helpers
     before(:each) do
@@ -311,7 +313,7 @@ describe Sinatra::RespondTo do
       it "should set the correct mime type when given an extension" do
         format :xml
-        response['Content-Type'].split(';').should include(media_type(:xml))
+        response['Content-Type'].split(';').should include(mime_type(:xml))
       end
       it "should fail when set to an unknown extension type" do
@@ -331,6 +333,12 @@ describe Sinatra::RespondTo do
         response['Content-Type'].should == "application/xml;charset=utf-8"
       end
+      it "should not return nil when only content_type sets headers" do
+        content_type :xhtml
+        format.should == :xhtml
+      end if Sinatra::VERSION =~ /^1.0/
     end
     describe "static_file?" do

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-respond_to
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Hoffman
@@ -42,16 +42,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
     version:
-- !ruby/object:Gem::Dependency
-  name: hoe
-  type: :development
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-    version:
 - !ruby/object:Gem::Dependency
   name: rspec
   type: :development