sinatra-contrib 1.4.0 → 1.4.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDFlYmNlNDNmMGJjMWE5Yjk4NjZiMDk2ZTQ3YWIyNTBhYjYzZWRkMg==
+  data.tar.gz: !binary |-
+    OGUyYjcwNTM5MzdmNDVmMmNiMWQ3ZjY5Yjk3YmRkMTJlOTk4NmIyMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDM5ZTk2MmE0ZWZkZWFkMzc1N2IwMjRlNzlmZThlMWIwYTllNmU3MDMzY2I3
+    YTkzNWJjMmI5NzU0MTg1NzhlOGIxMjk0MzAzOGNlZmM5N2FmOTJlZDA0Mzgw
+    MGVmOWQ4M2QwMzYzMWM4OTM3NGQyZmQzM2U0ZDZjNmYwODFlNDk=
+  data.tar.gz: !binary |-
+    MGQ3YzllNGE0M2I5MDc5ZWVlM2JjODU0NWE4MjEyOWJlNDJmNjIyNmY4Y2Y1
+    ODgyOGZjMTk0MmNmOWRkZWM5ZDNhNjNiMWY5ZTNjYTlkZGY0YTg4NWUyOGJk
+    N2MwOGNiNjQ2MDFjNWY3MWQ0MWExZDk2Y2U3ZTM1MmVkM2MyZTA=

data/README.md

@@ -134,3 +134,8 @@ class MyApp < Sinatra::Base
   register Sinatra::Contrib
 end
 ```
+
+## Documentation
+
+For more info check the [official docs](http://www.sinatrarb.com/contrib/) and
+[api docs](http://rubydoc.info/gems/sinatra-contrib/1.4.0/frames).

data/Rakefile

@@ -44,7 +44,6 @@ task 'sinatra-contrib.gemspec' do
     content.sub!(/  s\.#{field} = \[\n(    .*\n)*  \]/, updated)
   end
 
-  content.sub! /(s\.version.*=\s+).*/, "\\1\"#{Sinatra::Contrib::VERSION}\""
   File.open('sinatra-contrib.gemspec', 'w') { |f| f << content }
 end
 

data/lib/sinatra/contrib/version.rb

@@ -4,7 +4,7 @@ module Sinatra
       VERSION
     end
 
-    SIGNATURE = [1, 3, 1]
+    SIGNATURE = [1, 4, 1]
     VERSION   = SIGNATURE.join('.')
 
     VERSION.extend Comparable

data/lib/sinatra/json.rb

@@ -1,5 +1,5 @@
 require 'sinatra/base'
-
+require 'multi_json'
 module Sinatra
 
   # = Sinatra::JSON
@@ -32,7 +32,6 @@ module Sinatra
   #     require "sinatra/json"
   #
   #     class MyApp < Sinatra::Base
-  #       helpers Sinatra::JSON
   #
   #       # define a route that uses the helper
   #       get '/' do
@@ -126,5 +125,7 @@ module Sinatra
   end
 
   Base.set :json_content_type, :json
-  helpers JSON
+
+  # Load the JSON helpers in modular style automatically
+  Base.helpers JSON
 end

data/lib/sinatra/respond_with.rb

@@ -14,7 +14,7 @@ module Sinatra
   #   get '/' do
   #     data = { :name => 'example' }
   #     request.accept.each do |type|
-  #       case type
+  #       case type.to_s
   #       when 'text/html'
   #         halt haml(:index, :locals => data)
   #       when 'text/json'
@@ -184,8 +184,6 @@ module Sinatra
       end
     end
 
-    attr_accessor :ext_map
-
     def remap_extensions
       ext_map.clear
       Rack::Mime::MIME_TYPES.each { |e,t| ext_map[t] << e[1..-1].to_sym }
@@ -237,7 +235,7 @@ module Sinatra
     ENGINES.default = []
 
     def self.registered(base)
-      base.ext_map = Hash.new { |h,k| h[k] = [] }
+      base.set :ext_map, Hash.new { |h,k| h[k] = [] }
       base.set :template_engines, ENGINES.dup
       base.remap_extensions
       base.helpers Helpers

data/lib/sinatra/streaming.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'eventmachine'
 require 'backports'
 
 module Sinatra
@@ -25,23 +24,6 @@ module Sinatra
   #     end
   #   end
   #
-  # == Proper Deferrable
-  #
-  # Handy when using EventMachine.
-  #
-  #   list = []
-  #
-  #   get '/' do
-  #     stream(:keep_open) do |out|
-  #       list << out
-  #       out.callback { list.delete out }
-  #       out.errback do
-  #         logger.warn "lost connection"
-  #         list.delete out
-  #       end
-  #     end
-  #   end
-  #
   # == Better Middleware Handling
   #
   # Blocks passed to #map! or #map will actually be applied when streaming
@@ -103,7 +85,6 @@ module Sinatra
     end
 
     module Stream
-      include EventMachine::Deferrable
 
       attr_accessor :app, :lineno, :pos, :transformer, :closed
       alias tell pos
@@ -169,11 +150,6 @@ module Sinatra
         nil
       end
 
-      def close
-        @scheduler.schedule { succeed }
-        nil
-      end
-
       def close_read
         raise IOError, "closing non-duplex IO for reading"
       end

data/sinatra-contrib.gemspec

@@ -1,7 +1,8 @@
 # Run `rake sinatra-contrib.gemspec` to update the gemspec.
+require File.expand_path('../lib/sinatra/contrib/version', __FILE__)
 Gem::Specification.new do |s|
   s.name        = "sinatra-contrib"
-  s.version     = "1.4.0"
+  s.version     = Sinatra::Contrib::VERSION
   s.description = "Collection of useful Sinatra extensions"
   s.homepage    = "http://github.com/sinatra/sinatra-contrib"
   s.summary     = s.description
@@ -10,22 +11,82 @@ Gem::Specification.new do |s|
   s.authors = [
     "Konstantin Haase",
     "Gabriel Andretta",
+    "Trevor Bramble",
+    "Zachary Scott",
+    "Katrina Owen",
     "Nicolas Sanguinetti",
-    "Eliot Shepard",
+    "Masahiro Fujiwara",
+    "Rafael Magana",
+    "Hrvoje Šimić",
+    "Jack Chu",
+    "Sumeet Singh",
+    "Ilya Shindyapin",
+    "lest",
+    "Kashyap",
+    "Michi Huber",
+    "Patricio Mac Adden",
+    "Reed Lipman",
+    "Samy Dindane",
+    "Thibaut Sacreste",
+    "Uchio KONDO",
+    "Will Bailey",
+    "Adrian Pacała",
+    "undr",
+    "Aish",
     "Andrew Crump",
+    "David Asabina",
+    "Eliot Shepard",
+    "Eric Marden",
+    "Gray Manley",
+    "Guillaume Bouteille",
+    "Jamie Hodge",
+    "Kyle Lacy",
+    "Martin Frost",
     "Matt Lyon",
-    "undr"
+    "Matthew Conway",
+    "Meck"
   ]
 
   # generated from git shortlog -sne
   s.email = [
     "konstantin.mailinglists@googlemail.com",
     "ohhgabriel@gmail.com",
+    "inbox@trevorbramble.com",
+    "zachary@zacharyscott.net",
+    "katrina.owen@gmail.com",
     "contacto@nicolassanguinetti.info",
-    "eshepard@slower.net",
+    "m-fujiwara@axsh.net",
+    "raf.magana@gmail.com",
+    "shime.ferovac@gmail.com",
+    "konstantin.haase@gmail.com",
+    "jack@jackchu.com",
+    "ilya@shindyapin.com",
+    "ortuna@gmail.com",
+    "kashyap.kmbc@gmail.com",
+    "e@zzak.io",
+    "just.lest@gmail.com",
+    "rmlipman@gmail.com",
+    "samy@dindane.com",
+    "thibaut.sacreste@gmail.com",
+    "udzura@udzura.jp",
+    "will.bailey@gmail.com",
+    "altpacala@gmail.com",
+    "undr@yandex.ru",
+    "aisha.fenton@visfleet.com",
     "andrew.crump@ieee.org",
+    "david@supr.nu",
+    "eshepard@slower.net",
+    "eric.marden@gmail.com",
+    "g.manley@tukaiz.com",
+    "duffman@via.ecp.fr",
+    "jamiehodge@me.com",
+    "kylewlacy@me.com",
+    "blame@kth.se",
     "matt@flowerpowered.com",
-    "undr@yandex.ru"
+    "himself@mattonrails.com",
+    "yesmeck@gmail.com",
+    "michi.huber@gmail.com",
+    "patriciomacadden@gmail.com"
   ]
 
   # generated from git ls-files
@@ -66,6 +127,10 @@ Gem::Specification.new do |s|
     "spec/content_for/different_key.erubis",
     "spec/content_for/different_key.haml",
     "spec/content_for/different_key.slim",
+    "spec/content_for/footer.erb",
+    "spec/content_for/footer.erubis",
+    "spec/content_for/footer.haml",
+    "spec/content_for/footer.slim",
     "spec/content_for/layout.erb",
     "spec/content_for/layout.erubis",
     "spec/content_for/layout.haml",
@@ -105,6 +170,7 @@ Gem::Specification.new do |s|
     "spec/reloader_spec.rb",
     "spec/respond_with/bar.erb",
     "spec/respond_with/bar.json.erb",
+    "spec/respond_with/baz.yajl",
     "spec/respond_with/foo.html.erb",
     "spec/respond_with/not_html.sass",
     "spec/respond_with_spec.rb",
@@ -112,12 +178,12 @@ Gem::Specification.new do |s|
     "spec/streaming_spec.rb"
   ]
 
-  s.add_dependency "sinatra",   "~> 1.4.2"
+  s.add_dependency "sinatra",   "~> 1.4.0"
   s.add_dependency "backports", ">= 2.0"
   s.add_dependency "tilt",      "~> 1.3"
   s.add_dependency "rack-test"
   s.add_dependency "rack-protection"
-  s.add_dependency "eventmachine"
+  s.add_dependency "multi_json"
 
   s.add_development_dependency "rspec", "~> 2.3"
   s.add_development_dependency "haml"

data/spec/content_for/footer.erb

@@ -0,0 +1,3 @@
+<% if content_for? :foo %>
+  <%= yield_content :foo %>
+<% end %>

data/spec/content_for/footer.erubis

@@ -0,0 +1,3 @@
+<% if content_for? :foo %>
+  <%= yield_content :foo %>
+<% end %>

data/spec/content_for/footer.haml

@@ -0,0 +1,2 @@
+- if content_for? :foo
+	= yield_content :foo

data/spec/content_for/footer.slim

@@ -0,0 +1,2 @@
+- if content_for? :foo
+	= yield_content :foo

data/spec/json_spec.rb

@@ -33,7 +33,6 @@ end
 describe Sinatra::JSON do
   def mock_app(&block)
     super do
-      helpers Sinatra::JSON
       class_eval(&block)
     end
   end

data/spec/respond_with/baz.yajl

@@ -0,0 +1 @@
+json = "yajl!"

data/spec/respond_with_spec.rb

@@ -257,6 +257,23 @@ describe Sinatra::RespondWith do
         body.should == "generic!"
       end
     end
+
+    describe "inherited" do
+      it "registers RespondWith in an inherited app" do
+        app = Sinatra.new do
+          set :app_file, __FILE__
+          set :views, root + '/respond_with'
+          register Sinatra::RespondWith
+
+          get '/a' do
+            respond_with :json
+          end
+        end
+
+        self.app = Sinatra.new(app)
+        req('/a', :json).should_not be_ok
+      end
+    end
   end
 
   describe :respond_to do

data/spec/spec_helper.rb

@@ -2,6 +2,6 @@ ENV['RACK_ENV'] = 'test'
 require 'sinatra/contrib'
 
 RSpec.configure do |config|
-  config.expect_with :rspec, :stdlib
+  config.expect_with :rspec#, :stdlib
   config.include Sinatra::TestHelpers
 end

data/spec/streaming_spec.rb

@@ -62,27 +62,6 @@ describe Sinatra::Streaming do
     end
   end
 
-  context EventMachine::Deferrable do
-    it 'allows attaching more than one callback' do
-      a = b = false
-      stream do |out|
-        out.callback { a = true }
-        out.callback { b = true }
-      end
-      a.should be_true
-      b.should be_true
-    end
-
-    it 'triggers callbacks after streaming' do
-      triggered = false
-      stream do |out|
-        out.callback { triggered = true }
-        triggered.should be_false
-      end
-      triggered.should be_true
-    end
-  end
-
   context 'app' do
     it 'is the app instance the stream was created from' do
       out = stream { }

metadata

@@ -1,42 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors:
 - Konstantin Haase
 - Gabriel Andretta
+- Trevor Bramble
+- Zachary Scott
+- Katrina Owen
 - Nicolas Sanguinetti
-- Eliot Shepard
+- Masahiro Fujiwara
+- Rafael Magana
+- Hrvoje Šimić
+- Jack Chu
+- Sumeet Singh
+- Ilya Shindyapin
+- lest
+- Kashyap
+- Michi Huber
+- Patricio Mac Adden
+- Reed Lipman
+- Samy Dindane
+- Thibaut Sacreste
+- Uchio KONDO
+- Will Bailey
+- Adrian Pacała
+- undr
+- Aish
 - Andrew Crump
+- David Asabina
+- Eliot Shepard
+- Eric Marden
+- Gray Manley
+- Guillaume Bouteille
+- Jamie Hodge
+- Kyle Lacy
+- Martin Frost
 - Matt Lyon
-- undr
+- Matthew Conway
+- Meck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -44,7 +69,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -52,7 +76,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -60,7 +83,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -68,7 +90,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,7 +97,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,7 +104,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -92,15 +111,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -108,7 +125,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -116,7 +132,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -124,7 +139,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,7 +146,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -140,7 +153,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -148,7 +160,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -156,7 +167,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -164,7 +174,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -172,7 +181,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -180,7 +188,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,7 +195,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -197,11 +203,42 @@ description: Collection of useful Sinatra extensions
 email:
 - konstantin.mailinglists@googlemail.com
 - ohhgabriel@gmail.com
+- inbox@trevorbramble.com
+- zachary@zacharyscott.net
+- katrina.owen@gmail.com
 - contacto@nicolassanguinetti.info
-- eshepard@slower.net
+- m-fujiwara@axsh.net
+- raf.magana@gmail.com
+- shime.ferovac@gmail.com
+- konstantin.haase@gmail.com
+- jack@jackchu.com
+- ilya@shindyapin.com
+- ortuna@gmail.com
+- kashyap.kmbc@gmail.com
+- e@zzak.io
+- just.lest@gmail.com
+- rmlipman@gmail.com
+- samy@dindane.com
+- thibaut.sacreste@gmail.com
+- udzura@udzura.jp
+- will.bailey@gmail.com
+- altpacala@gmail.com
+- undr@yandex.ru
+- aisha.fenton@visfleet.com
 - andrew.crump@ieee.org
+- david@supr.nu
+- eshepard@slower.net
+- eric.marden@gmail.com
+- g.manley@tukaiz.com
+- duffman@via.ecp.fr
+- jamiehodge@me.com
+- kylewlacy@me.com
+- blame@kth.se
 - matt@flowerpowered.com
-- undr@yandex.ru
+- himself@mattonrails.com
+- yesmeck@gmail.com
+- michi.huber@gmail.com
+- patriciomacadden@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -242,6 +279,10 @@ files:
 - spec/content_for/different_key.erubis
 - spec/content_for/different_key.haml
 - spec/content_for/different_key.slim
+- spec/content_for/footer.erb
+- spec/content_for/footer.erubis
+- spec/content_for/footer.haml
+- spec/content_for/footer.slim
 - spec/content_for/layout.erb
 - spec/content_for/layout.erubis
 - spec/content_for/layout.haml
@@ -281,6 +322,7 @@ files:
 - spec/reloader_spec.rb
 - spec/respond_with/bar.erb
 - spec/respond_with/bar.json.erb
+- spec/respond_with/baz.yajl
 - spec/respond_with/foo.html.erb
 - spec/respond_with/not_html.sass
 - spec/respond_with_spec.rb
@@ -288,26 +330,25 @@ files:
 - spec/streaming_spec.rb
 homepage: http://github.com/sinatra/sinatra-contrib
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Collection of useful Sinatra extensions
 test_files: []