RubyGems - sinatra - Versions diffs - 1.3.5 → 1.3.6 - Mend

sinatra 1.3.5 → 1.3.6

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

Files changed (11) hide show

data/CHANGES CHANGED

@@ -1,3 +1,13 @@
+= 1.3.6 (backport release) / 2013-03-15
+Backported from 1.4.0:
+ * Take views option into account for template caching. (Konstantin Haase)
+ * Improve documentation (Konstantin Haase)
+ * No longer override `define_singleton_method`. (Konstantin Haase)
 = 1.3.5 / 2013-02-25
  * Fix for RubyGems 2.0 (Uchio KONDO)
@@ -213,6 +223,20 @@
  * Fix handling of broken query params when displaying exceptions. (Luke
    Jahnke)
+= 1.2.9 (backports release) / 2013-03-15
+IMPORTANT: THIS IS THE LAST 1.2.x RELEASE, PLEASE UPGRADE.
+ * Display EOL warning when loading Sinatra. (Konstantin Haase)
+ * Improve documentation. (Anurag Priyam, Konstantin Haase)
+ * Do not modify the load path. (Konstantin Haase)
+ * Display deprecation warning if RUBY_IGNORE_CALLERS is used. (Konstantin Haase)
+ * Add backports library so we can still run on Ruby 1.8.6. (Konstantin Haase)
 = 1.2.8 (backports release) / 2011-12-30
 Backported from 1.3.2:

data/Gemfile CHANGED

@@ -7,7 +7,7 @@
 # If you have issues with a gem: `bundle install --without-coffee-script`.
 RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
-source :rubygems unless ENV['QUICK']
+source 'https://rubygems.org/' unless ENV['QUICK']
 gemspec
 gem 'rake'
@@ -36,7 +36,7 @@ gem 'liquid' unless RUBY_ENGINE == 'rbx' and RUBY_VERSION > '1.9'
 gem 'slim', '~> 1.0'
 gem 'temple', '!= 0.3.3'
 gem 'coffee-script', '>= 2.0'
-gem 'rdoc', '~> 3.12'
+gem 'rdoc', RUBY_VERSION < '1.9' ? '~> 3.12' : '>= 4.0'
 gem 'kramdown'
 gem 'maruku'
 gem 'creole'
@@ -54,8 +54,6 @@ end
 if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9'
   gem 'less', '~> 2.0'
-else
-  gem 'less', '~> 1.0'
 end
 if RUBY_ENGINE != 'jruby' or not ENV['TRAVIS']

data/Rakefile CHANGED

@@ -99,8 +99,8 @@ desc "list of contributors"
 task :thanks, [:release,:backports] do |t, a|
   a.with_defaults :release => "#{prev_version}..HEAD",
     :backports => "#{prev_feature}.0..#{prev_feature}.x"
-  included = `git log --format=format:"%aN\t%s" #{a.release}`.lines.to_a
-  excluded = `git log --format=format:"%aN\t%s" #{a.backports}`.lines.to_a
+  included = `git log --format=format:"%aN\t%s" #{a.release}`.lines.map { |l| l.force_encoding('binary') }
+  excluded = `git log --format=format:"%aN\t%s" #{a.backports}`.lines.map { |l| l.force_encoding('binary') }
   commits  = (included - excluded).group_by { |c| c[/^[^\t]+/] }
   authors  = commits.keys.sort_by { |n| - commits[n].size } - team
   puts authors[0..-2].join(', ') << " and " << authors.last,

data/examples/chat.rb CHANGED

@@ -25,11 +25,11 @@ __END__
@@ layout
 <html>
-  <head>
-    <title>Super Simple Chat with Sinatra</title>
+  <head>
+    <title>Super Simple Chat with Sinatra</title>
     <meta charset="utf-8" />
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
-  </head>
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+  </head>
   <body><%= yield %></body>
 </html>
@@ -42,6 +42,9 @@ __END__
@@ chat
 <pre id='chat'></pre>
+<form>
+  <input id='msg' placeholder='type message here...' />
+</form>
 <script>
   // reading
@@ -49,13 +52,10 @@ __END__
   es.onmessage = function(e) { $('#chat').append(e.data + "\n") };
   // writing
-  $("form").live("submit", function(e) {
+  $("form").on('submit',function(e) {
     $.post('/', {msg: "<%= user %>: " + $('#msg').val()});
     $('#msg').val(''); $('#msg').focus();
     e.preventDefault();
   });
 </script>
-<form>
-  <input id='msg' placeholder='type message here...' />
-</form>

data/lib/sinatra/base.rb CHANGED

@@ -96,7 +96,7 @@ module Sinatra
         headers["Content-Length"] = body.inject(0) { |l, p| l + Rack::Utils.bytesize(p) }.to_s
       end
-      [status.to_i, header, result]
+      [status.to_i, headers, result]
     end
     private
@@ -130,7 +130,7 @@ module Sinatra
     private
-    def setup_close(env, status, header, body)
+    def setup_close(env, status, headers, body)
       return unless body.respond_to? :close and env.include? 'async.close'
       env['async.close'].callback { body.close }
       env['async.close'].errback { body.close }
@@ -1076,9 +1076,9 @@ module Sinatra
           end
         end
-        define_singleton_method("#{option}=", setter) if setter
-        define_singleton_method(option, getter) if getter
-        define_singleton_method("#{option}?", "!!#{option}") unless method_defined? "#{option}?"
+        define_singleton("#{option}=", setter) if setter
+        define_singleton(option, getter) if getter
+        define_singleton("#{option}?", "!!#{option}") unless method_defined? "#{option}?"
         self
       end
@@ -1200,7 +1200,7 @@ module Sinatra
     private
       # Dynamically defines a method on settings.
-      def define_singleton_method(name, content = Proc.new)
+      def define_singleton(name, content = Proc.new)
         # replace with call to singleton_class once we're 1.9 only
         (class << self; self; end).class_eval do
           undef_method(name) if method_defined? name

data/lib/sinatra/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

data/test/contest.rb CHANGED

@@ -82,7 +82,9 @@ private
   end
   def self.test_name(name)
-    "test_#{sanitize_name(name).gsub(/\s+/,'_')}".to_sym
+    name = "test_#{sanitize_name(name).gsub(/\s+/,'_')}_0"
+    name = name.succ while method_defined? name
+    name.to_sym
   end
   def self.sanitize_name(name)

data/test/helpers_test.rb CHANGED

@@ -434,7 +434,10 @@ class HelpersTest < Test::Unit::TestCase
         end
       end
-      get '/'
+      # Silence warnings since Rack::Session::Cookie complains about the non-present session secret
+      silence_warnings do
+        get '/'
+      end
       assert_body 'ok'
     end

data/test/rdoc_test.rb CHANGED

@@ -16,13 +16,13 @@ class RdocTest < Test::Unit::TestCase
   it 'renders inline rdoc strings' do
     rdoc_app { rdoc '= Hiya' }
     assert ok?
-    assert_body /<h1[^>]*>Hiya<\/h1>/
+    assert_body /<h1[^>]*>Hiya(<span><a href=\"#label-Hiya\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/
   end
   it 'renders .rdoc files in views path' do
     rdoc_app { rdoc :hello }
     assert ok?
-    assert_body /<h1[^>]*>Hello From RDoc<\/h1>/
+    assert_body /<h1[^>]*>Hello From RDoc(<span><a href=\"#label-Hello\+From\+RDoc\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/
   end
   it "raises error if template not found" do

data/test/response_test.rb CHANGED

@@ -8,8 +8,7 @@ class ResponseTest < Test::Unit::TestCase
   end
   def assert_same_body(a, b)
-    enum = Enumerable.const_get(:Enumerator)
-    assert_equal enum.new(a).to_a, enum.new(b).to_a
+    assert_equal a.to_enum(:each).to_a, b.to_enum(:each).to_a
   end
   it "initializes with 200, text/html, and empty body" do

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
   prerelease:
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -219,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2069879997840551551
+      hash: -3428773898316879023
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2069879997840551551
+      hash: -3428773898316879023
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.23