sinatra-respond_to 0.5.0 → 0.6.0

data/.gitignore

@@ -0,0 +1,5 @@
+.bundle
+.DS_Store
+pkg/
+coverage/
+coverage.info

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--profile

data/Gemfile.lock

@@ -2,38 +2,42 @@ PATH
   remote: .
   specs:
     sinatra-respond_to (0.5.0)
-      sinatra (~> 1.0)
+      sinatra (~> 1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     builder (2.1.2)
     diff-lcs (1.1.2)
-    haml (3.0.17)
+    haml (3.0.22)
     rack (1.2.1)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
-    rcov (0.9.8)
-    rspec (2.0.0.beta.19)
-      rspec-core (= 2.0.0.beta.19)
-      rspec-expectations (= 2.0.0.beta.19)
-      rspec-mocks (= 2.0.0.beta.19)
-    rspec-core (2.0.0.beta.19)
-    rspec-expectations (2.0.0.beta.19)
+    rcov (0.9.9)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.19)
-    sinatra (1.0)
-      rack (>= 1.0)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    sinatra (1.1.0)
+      rack (~> 1.1)
+      tilt (~> 1.1)
+    tilt (1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   builder (>= 2.0)
-  bundler (~> 1.0.0.rc.5)
+  bundler (~> 1.0.0)
   haml (>= 2.0)
-  rack-test (~> 0.5.4)
+  rack-test (~> 0.5.6)
   rcov (~> 0.9.8)
-  rspec (~> 2.0.0.beta.19)
-  sinatra (~> 1.0)
+  rspec (~> 2.0.1)
+  sinatra (~> 1.1)
   sinatra-respond_to!

data/README.md

@@ -8,7 +8,6 @@ A respond\_to style Rails block for baked-in web service support in Sinatra
 
 ## FEATURES/PROBLEMS:
 
-* Handles setting charset for appropriate types
 * Handles setting the content type depending on what is being served
 * Automatically can adjust XMLHttpRequests to return Javascript
 
@@ -70,9 +69,6 @@ To change the character set of the response, there is a `charset` helper.  For e
 
 There a few options available for configuring the default behavior of respond\_to using Sinatra's `set` utility.
 
-* **default\_charset - utf-8**
-      Assumes all text documents are encoded using this character set.
-      This can be overridden within the respond_to block for the appropriate format
 * **default\_content - :html**
       When a user vists a url without an extension, for example /post this will be
       the assumed content to serve first.  Expects a symbol as used in setting content_type.
@@ -83,7 +79,9 @@ There a few options available for configuring the default behavior of respond\_t
 
 ## REQUIREMENTS:
 
-* sinatra 1.x
+* sinatra 1.1
+
+If you would like to use Sinatra 1.0, use version `0.5.0`.
 
 ## INSTALL:
 
@@ -93,11 +91,10 @@ There a few options available for configuring the default behavior of respond\_t
 Due to the way respond\_to works, all incoming requests have the extension striped from the request.path\_info. This causes routes like the following to fail.
 
     get '/style.css' do
-      content_type :css, :charset => 'utf-8'
       sass :style   # => renders views/style.sass
     end
 
-They need to be changed to the following.  Note that you no longer have to set the content\_type or charset.
+They need to be changed to the following.
 
     get '/style' do
       sass :style   # => renders views/style.css.sass
@@ -114,7 +111,7 @@ If you want to ensure the route only gets called for css requests try this.  Thi
 After checking out the source, run:
 
     $ bundle install
-    $ rake spec:spec
+    $ rake spec
 
 This task will install any missing dependencies, run the tests/specs, and generate the RDoc.
 

data/Rakefile

@@ -3,13 +3,11 @@ Bundler::GemHelper.install_tasks
 
 begin
   require 'rspec/core/rake_task'
-  namespace :spec do
-    desc 'Run specs'
-    RSpec::Core::RakeTask.new do |t|
-      t.rcov = true
-      t.rcov_opts = ['--sort coverage --text-summary --sort-reverse']
-      t.rcov_opts << "--comments --exclude spec,pkg,#{ENV['GEM_HOME']}"
-    end
+  desc 'Run specs'
+  RSpec::Core::RakeTask.new do |t|
+    t.rcov = true
+    t.rcov_opts = ['--sort coverage --text-summary --sort-reverse']
+    t.rcov_opts << "--comments --exclude spec,pkg,#{ENV['GEM_HOME']}"
   end
 rescue LoadError
   puts 'RSpec not available, try a bundle install'

data/lib/sinatra/respond_to.rb

@@ -16,16 +16,9 @@ module Sinatra
       def code; 500 end
     end
 
-    TEXT_MIME_TYPES = [:txt, :html, :js, :json, :xml, :rss, :atom, :css, :asm, :c, :cc, :conf,
-                       :csv, :cxx, :diff, :dtd, :f, :f77, :f90, :for, :gemspec, :h, :hh, :htm,
-                       :log, :mathml, :mml, :p, :pas, :pl, :pm, :py, :rake, :rb, :rdf, :rtf, :ru,
-                       :s, :sgm, :sgml, :sh, :svg, :svgz, :text, :wsdl, :xhtml, :xsl, :xslt, :yaml,
-                       :yml, :ics]
-
     def self.registered(app)
       app.helpers RespondTo::Helpers
 
-      app.set :default_charset, 'utf-8'
       app.set :default_content, :html
       app.set :assume_xhr_is_js, true
 
@@ -51,7 +44,6 @@ module Sinatra
 
             format request.xhr? && options.assume_xhr_is_js? ? :js : $1 || options.default_content
           end
-          charset options.default_charset if Sinatra::RespondTo::TEXT_MIME_TYPES.include? format
         end
       end
 
@@ -157,9 +149,8 @@ module Sinatra
         klass.class_eval do
           alias :content_type_without_save :content_type
           def content_type(*args)
-            content_type_without_save *args
             @_format = args.first.to_sym
-            response['Content-Type']
+            content_type_without_save *args
           end
         end
       end
@@ -170,7 +161,7 @@ module Sinatra
           fail "Unknown media type #{val}\nTry registering the extension with a mime type" if mime_type.nil?
 
           @_format = val.to_sym
-          response['Content-Type'].sub!(/^[^;]+/, mime_type)
+          response['Content-Type'] ? response['Content-Type'].sub!(/^[^;]+/, mime_type) : content_type(@_format)
         end
 
         @_format

data/lib/sinatra/respond_to/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RespondTo
-    Version = '0.5.0'
+    Version = '0.6.0'
   end
 end

data/sinatra-respond_to.gemspec

@@ -12,16 +12,17 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = '>= 1.3.6'
 
-  s.add_runtime_dependency 'sinatra', '~> 1.0'
+  s.add_runtime_dependency 'sinatra', '~> 1.1'
 
-  s.add_development_dependency 'bundler', '~> 1.0.0.rc.5'
-  s.add_development_dependency 'rspec', '~> 2.0.0.beta.19'
-  s.add_development_dependency 'rack-test', '~> 0.5.4'
+  s.add_development_dependency 'rspec', '~> 2.0.1'
+  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', '>= 2.0'
+  s.add_development_dependency 'bundler', '~> 1.0.0'
 
-  s.test_files   = Dir['spec/**/*']
-  s.files        = `git ls-files`.split("\n") - ['.gitignore', '.rspec']
+  s.files        = `git ls-files`.split("\n")
+  s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_path = 'lib'
 end

data/spec/extension_spec.rb

@@ -6,10 +6,6 @@ describe Sinatra::RespondTo do
   end
 
   describe "options" do
-    it "should initialize with :default_charset set to 'utf-8'" do
-      TestApp.default_charset.should == 'utf-8'
-    end
-
     it "should initialize with :default_content set to :html" do
       TestApp.default_content.should == :html
     end
@@ -84,24 +80,12 @@ describe Sinatra::RespondTo do
       last_response['Content-Type'].should =~ %r{#{mime_type(:xml)}}
     end
 
-    it "should set the character set to the default character set" do
-      get "/default_charset"
-
-      last_response['Content-Type'].should =~ %r{charset=#{TestApp.default_charset}}
-    end
-
     it "should honor a change in character set in block" do
       get "/iso-8859-1"
 
       last_response['Content-Type'].should =~ %r{charset=iso-8859-1}
     end
 
-    it "should not set the character set when requesting a non text resource" do
-      get "/resource.png"
-
-      last_response['Content-Type'].should_not =~ /charset/
-    end
-
     it "should return not found when path does not exist" do
       get "/nonexistant-path.txt"
 
@@ -149,23 +133,11 @@ describe Sinatra::RespondTo do
       last_response['Content-Type'].should =~ %r{#{mime_type(TestApp.default_content)}}
     end
 
-    it "should set the default character when no extension" do
-      get "/normal-no-respond_to"
-
-      last_response['Content-Type'].should =~ %r{charset=#{TestApp.default_charset}}
-    end
-
     it "should set the appropriate content type when given an extension" do
       get "/normal-no-respond_to.css"
 
       last_response['Content-Type'].should =~ %r{#{mime_type(:css)}}
     end
-
-    it "should set the default charset when given an extension" do
-      get "/normal-no-respond_to.css"
-
-      last_response['Content-Type'].should =~ %r{charset=#{TestApp.default_charset}}
-    end
   end
 
   describe "error pages in production" do
@@ -340,6 +312,10 @@ describe Sinatra::RespondTo do
       end
 
       it "should not return nil when only content_type sets headers" do
+        settings = mock('settings')
+        settings.should_receive(:default_encoding).and_return('utf-8')
+        stub!(:settings).and_return(settings)
+
         content_type :xhtml
 
         format.should == :xhtml

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-respond_to
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Chris Hoffman
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 -05:00
+date: 2010-11-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,90 +25,79 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 1
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424063
         segments: 
-        - 1
-        - 0
+        - 2
         - 0
-        - rc
-        - 5
-        version: 1.0.0.rc.5
+        - 1
+        version: 2.0.1
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
-        - 2
-        - 0
         - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
+        - 5
+        - 6
+        version: 0.5.6
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rcov
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        - 5
-        - 4
-        version: 0.5.4
+        - 9
+        - 8
+        version: 0.9.8
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: builder
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
+        - 2
         - 0
-        - 9
-        - 8
-        version: 0.9.8
+        version: "2.0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: haml
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
@@ -117,18 +105,18 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: bundler
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
-        - 2
+        - 1
         - 0
-        version: "2.0"
+        - 0
+        version: 1.0.0
   type: :development
   version_requirements: *id007
 description: 
@@ -141,6 +129,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- .rspec
 - Changelog.rdoc
 - Gemfile
 - Gemfile.lock
@@ -174,7 +164,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -183,7 +172,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -198,6 +186,7 @@ specification_version: 3
 summary: A respond_to style Rails block for baked-in web service support in Sinatra
 test_files: 
 - spec/app/production_error_app.rb
+- spec/app/public/static folder/.keep
 - spec/app/public/static.txt
 - spec/app/test_app.rb
 - spec/app/unreachable_static.txt