ajsharp-sinatra-respond_to 0.7.1 → 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)
+    ajsharp-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)
+    rake (0.9.2.2)
+    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)
+    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
+  ajsharp-sinatra-respond_to!
   builder (>= 2.0)
   bundler (~> 1.0.10)
   haml (>= 3.0)
   rack-test (~> 0.5.6)
+  rake
   rcov (~> 0.9.8)
   rspec (~> 2.5.0)
-  sinatra-respond_to!

data/lib/sinatra/respond_to.rb

@@ -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,7 +46,7 @@ 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
@@ -172,7 +172,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.1'
+    Version = '0.8.0'
   end
 end

data/sinatra-respond_to.gemspec

@@ -5,14 +5,14 @@ Gem::Specification.new do |s|
   s.name        = 'ajsharp-sinatra-respond_to'
   s.version     = Sinatra::RespondTo::Version
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Chris Hoffman']
+  s.authors     = ['Alex Sharp', 'Chris Hoffman']
   s.email       = ['cehoffman@gmail.com']
   s.homepage    = 'http://github.com/cehoffman/sinatra-respond_to'
   s.summary     = 'A respond_to style Rails block for baked-in web service support in Sinatra'
 
   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'
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   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 'rake'
 
   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,7 @@ 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')
 
   get '/resource' do
     respond_to do |wants|
@@ -52,4 +52,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
@@ -341,7 +341,7 @@ describe Sinatra::RespondTo do
         TestApp.disable :static
       end
 
-      def options
+      def settings
         TestApp
       end
 

metadata

@@ -1,105 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ajsharp-sinatra-respond_to
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.8.0
   prerelease: 
-  version: 0.7.1
 platform: ruby
-authors: 
+authors:
+- Alex Sharp
 - Chris Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-16 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70344797642820 !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: *70344797642820
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70344797642320 !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: *70344797642320
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70344797641760 !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: *70344797641760
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70344797641120 !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: *70344797641120
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70344797640380 !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 
-  name: haml
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70344797640380
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &70344797637780 !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: *70344797637780
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70344797637160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70344797637160
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70344797636780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70344797636780
 description: 
-email: 
+email:
 - cehoffman@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Changelog.rdoc
@@ -121,35 +128,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: 4593829362998880448
+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.10
 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