sinatra-contrib 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89a241902ac4cbe6b66947850f41b59c8ec4df0
-  data.tar.gz: f3eabb61ed63b18eba33dc07fc3dc88681bb91da
+  metadata.gz: 7b10e547ab4dd6286fab1c7d2d5fb9d76f68410f
+  data.tar.gz: f10a9b4b327486c4aab7ea05d4fd7987b4f3ffc1
 SHA512:
-  metadata.gz: 6918bd27ea9e20c5dc3841b623e862aa4894cc42baea4b9497f416ccd99d844d557c23451794168345f7759b3d074d794bd87b2a5e4827e1a720508474c9f660
-  data.tar.gz: 426d596d464fc3865916a65de23ca3effeab6a14da81f0bd11e84fd8d16aeb3a2f0becebb2971551bd561326fbec6864673898f647b5efce9da6bea63e67f84a
+  metadata.gz: d2d939d7d4592bce5e0b191127a99c6b661950d6b3d42f2996b6acac5ef1ee47b88f80f0d74faa2b889c745c62a3b748d7f2c59ab9aea31f500b7e81b690e343
+  data.tar.gz: c85fcf0b78d0826c927beb11ceda86c6f984f04a34373c3cdbae5416391518e58bf1719720af6e5ce616502d275217a272c01facc0b26765c397c7c46ff2fe76

data/LICENSE

@@ -1,3 +1,5 @@
+The MIT License (MIT)
+
 Copyright (c) 2008-2011 Nicolas Sanguinetti, entp.com, Konstantin Haase
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -45,6 +45,9 @@ Currently included:
   depending on the incoming request. Adds helpers `respond_to` and
   `respond_with`.
 
+* `sinatra/custom_logger`: This extension allows you to define your own
+  logger instance using +logger+ setting. That logger then will
+  be available as #logger helper method in your routes and views.
 
 ## Custom Extensions
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'yaml'
 require 'sinatra/contrib/version'
 
 desc "run specs"
-task(:spec) { ruby '-S rspec spec -c' }
+task(:spec) { ruby '-S rspec spec -cw' }
 task(:test => :spec)
 task(:default => :spec)
 
@@ -67,8 +67,8 @@ task :release => :gemspec do
     git commit --allow-empty -a -m '#{Sinatra::Contrib::VERSION} release'  &&
     git tag -s v#{Sinatra::Contrib::VERSION} -m '#{Sinatra::Contrib::VERSION} release'  &&
     git tag -s #{Sinatra::Contrib::VERSION} -m '#{Sinatra::Contrib::VERSION} release'  &&
-    git push && (git push sinatra || true) &&
-    git push --tags && (git push sinatra --tags || true)
+    git push && (git push origin master || true) &&
+    git push --tags && (git push origin --tags || true)
   SH
 end
 

data/lib/sinatra/capture.rb

@@ -95,7 +95,7 @@ module Sinatra
       @capture = nil
       if current_engine == :ruby
         result = block[*args]
-      elsif current_engine == :erb
+      elsif current_engine == :erb || current_engine == :slim
         @_out_buf, _buf_was = '', @_out_buf
         block[*args]
         result = eval('@_out_buf', block.binding)

data/lib/sinatra/config_file.rb

@@ -69,8 +69,9 @@ module Sinatra
   #       b: 2
   #
   # But it also can provide specific environment configuration.  There are two
-  # ways to do that: at the file level and at the setting level.  They are
-  # illustrated, repsectively, as follows:
+  # ways to do that: at the file level and at the settings level.
+  #
+  # At the settings level (e.g. in 'path/to/config.yml'):
   #
   #     development:
   #       foo: development
@@ -82,7 +83,7 @@ module Sinatra
   #       foo: production
   #       bar: bar
   #
-  # and
+  # Or at the file level:
   #
   #     foo:
   #       development: development

data/lib/sinatra/contrib/version.rb

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

data/lib/sinatra/cookies.rb

@@ -66,14 +66,12 @@ module Sinatra
         @deleted         = []
 
         @options = {
-          :path     => @request.script_name,
-          :domain   => @request.host,
+          :path => @request.script_name.to_s.empty? ? '/' : @request.script_name,
+          :domain => @request.host == 'localhost' ? nil : @request.host,
           :secure   => @request.secure?,
           :httponly => true
         }
 
-        @options[:path] = '/' if @options[:path].to_s.empty?
-
         if app.settings.respond_to? :cookie_options
           @options.merge! app.settings.cookie_options
         end

data/lib/sinatra/custom_logger.rb

@@ -0,0 +1,60 @@
+module Sinatra
+
+  # = Sinatra::CustomLogger
+  #
+  # CustomLogger extension allows you to define your own logger instance
+  # using +logger+ setting. That logger then will be available
+  # as #logger helper method in your routes and views.
+  #
+  # == Usage
+  #
+  # === Classic Application
+  #
+  # To define your custom logger instance in a classic application:
+  #
+  #     require 'sinatra'
+  #     require 'sinatra/custom_logger'
+  #     require 'logger'
+  #
+  #     set :logger, Logger.new(STDOUT)
+  #
+  #     get '/' do
+  #       logger.info 'Some message' # STDOUT logger is used
+  #       # Other code...
+  #     end
+  #
+  # === Modular Application
+  #
+  # The same for modular application:
+  #
+  #     require 'sinatra/base'
+  #     require 'sinatra/custom_logger'
+  #     require 'logger'
+  #
+  #     class MyApp < Sinatra::Base
+  #       helpers Sinatra::CustomLogger
+  #
+  #       configure :development, :production do
+  #         logger = Logger.new(File.open("#{root}/log/#{environment}.log", 'a'))
+  #         logger.level = Logger::DEBUG if development?
+  #         set :logger, logger
+  #       end
+  #
+  #       get '/' do
+  #         logger.info 'Some message' # File-based logger is used
+  #         # Other code...
+  #       end
+  #     end
+  #
+  module CustomLogger
+    def logger
+      if settings.respond_to?(:logger)
+        settings.logger
+      else
+        request.logger
+      end
+    end
+  end
+
+  helpers CustomLogger
+end

data/lib/sinatra/decompile.rb

@@ -110,11 +110,17 @@ module Sinatra
 
     def encoded(char)
       return super if defined? super
-      enc = URI.escape(char)
+      enc = uri_parser.escape(char)
       enc = "(?:#{escaped(char, enc).join('|')})" if enc == char
       enc = "(?:#{enc}|#{encoded('+')})" if char == " "
       enc
     end
+
+    def uri_parser
+      #TODO: Remove check after dropping support for 1.8.7
+      @_uri_parser ||= defined?(URI::Parser) ? URI::Parser.new : URI
+    end
+
   end
 
   register Decompile

data/lib/sinatra/namespace.rb

@@ -116,6 +116,8 @@ module Sinatra
   module Namespace
     def self.new(base, pattern, conditions = {}, &block)
       Module.new do
+        #quelch uninitialized variable warnings, since these get used by compile method.
+        @pattern, @conditions = nil, nil
         extend NamespacedMethods
         include InstanceMethods
         @base, @extensions, @errors = base, [], {}
@@ -173,7 +175,7 @@ module Sinatra
       end
 
       def not_found(&block)
-        error(404, &block)
+        error(Sinatra::NotFound, &block)
       end
 
       def errors
@@ -185,9 +187,10 @@ module Sinatra
       end
 
       def error(*codes, &block)
-        args  = Sinatra::Base.send(:compile!, "ERROR", /^#{@pattern}/, block)
+        args  = Sinatra::Base.send(:compile!, "ERROR", regexpify(@pattern), block)
         codes = codes.map { |c| Array(c) }.flatten
         codes << Exception if codes.empty?
+
         codes.each do |c|
           errors = @errors[c] ||= []
           errors << args
@@ -253,7 +256,7 @@ module Sinatra
 
       def regexpify(pattern)
         pattern = Sinatra::Base.send(:compile, pattern).first.inspect
-        pattern.gsub! /^\/(\^|\\A)?|(\$|\\Z)?\/$/, ''
+        pattern.gsub! /^\/(\^|\\A)?|(\$|\\z)?\/$/, ''
         Regexp.new pattern
       end
 
@@ -268,6 +271,10 @@ module Sinatra
       def method_missing(method, *args, &block)
         base.send(method, *args, &block)
       end
+
+      def respond_to?(method, include_private = false)
+        super || base.respond_to?(method, include_private)
+      end
     end
 
     module BaseMethods

data/lib/sinatra/reloader.rb

@@ -164,6 +164,7 @@ module Sinatra
 
       # Creates a new +Watcher+ instance for the file located at +path+.
       def initialize(path)
+        @ignore = nil
         @path, @elements = path, []
         update
       end
@@ -202,7 +203,7 @@ module Sinatra
       end
     end
 
-    # When the extension is registed it extends the Sinatra application
+    # When the extension is registered it extends the Sinatra application
     # +klass+ with the modules +BaseMethods+ and +ExtensionMethods+ and
     # defines a before filter to +perform+ the reload of the modified files.
     def self.registered(klass)
@@ -244,7 +245,7 @@ module Sinatra
       Thread and Thread.list.size > 1 and Thread.respond_to?(:exclusive)
     end
 
-    # Contains the methods defined in Sinatra::Base that are overriden.
+    # Contains the methods defined in Sinatra::Base that are overridden.
     module BaseMethods
       # Protects Sinatra::Base.run! from being called more than once.
       def run!(*args)
@@ -369,7 +370,8 @@ module Sinatra
 
     private
 
-      attr_reader :register_path
+      # attr_reader :register_path warn on -w (private attribute)
+      def register_path; @register_path ||= nil; end
 
       # Indicates an extesion is being registered.
       def start_registering_extension
@@ -391,7 +393,7 @@ module Sinatra
       # in the file located at +path+.
       #
       # If an extension is being registered, it also tells the list to
-      # watch it in the file where the extesion has been registered.
+      # watch it in the file where the extension has been registered.
       # This prevents the duplication of the elements added by the
       # extension in its +registered+ method with every reload.
       def watch_element(path, type, representation=nil)

data/lib/sinatra/respond_with.rb

@@ -1,6 +1,8 @@
 require 'sinatra/json'
 require 'sinatra/base'
 
+$KCODE = "UTF-8"
+
 module Sinatra
   #
   # = Sinatra::RespondWith
@@ -174,7 +176,11 @@ module Sinatra
         end
         possible.each do |engine, template|
           # not exactly like Tilt[engine], but does not trigger a require
-          klass = Tilt.mappings[Tilt.normalize(engine)].first
+          if Tilt.respond_to?(:mappings)
+            klass = Tilt.mappings[Tilt.normalize(engine)].first
+          else
+            klass = Tilt[engine]
+          end
           find_template(settings.views, template, klass) do |file|
             next unless File.exist? file
             return settings.rendering_method(engine) << template.to_sym
@@ -221,22 +227,33 @@ module Sinatra
       super
     end
 
-    ENGINES = {
-      :css  => [:less,  :sass, :scss],
-      :xml  => [:builder, :nokogiri],
-      :js   => [:coffee],
-      :json => [:yajl],
-      :html => [:erb, :erubis, :haml, :slim, :liquid, :radius, :mab, :markdown,
-        :textile, :rdoc],
-      :all  => Sinatra::Templates.instance_methods.map(&:to_sym) + [:mab] -
-        [:find_template, :markaby]
-    }
+    def self.jrubyify(engs)
+      not_supported = [:markdown]
+      engs.keys.each do |key|
+        engs[key].collect! { |eng| (eng == :yajl) ? :json_pure : eng }
+        engs[key].delete_if { |eng| not_supported.include?(eng) }
+      end
+      engs
+    end
 
-    ENGINES.default = []
+    def self.engines
+      engines = {
+        :css  => [:less,  :sass, :scss],
+        :xml  => [:builder, :nokogiri],
+        :js   => [:coffee],
+        :html => [:erb, :erubis, :haml, :slim, :liquid, :radius, :mab,
+          :markdown, :textile, :rdoc],
+        :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) +
+          [:mab] - [:find_template, :markaby]),
+        :json => [:yajl],
+      }
+      engines.default = []
+      (defined? JRUBY_VERSION) ? jrubyify(engines) : engines
+    end  
 
     def self.registered(base)
       base.set :ext_map, Hash.new { |h,k| h[k] = [] }
-      base.set :template_engines, ENGINES.dup
+      base.set :template_engines, engines
       base.remap_extensions
       base.helpers Helpers
     end

data/lib/sinatra/streaming.rb

@@ -6,7 +6,7 @@ module Sinatra
   # = Sinatra::Streaming
   #
   # Sinatra 1.3 introduced the +stream+ helper. This addon improves the
-  # streaming API by making the stream object immitate an IO object, turning
+  # streaming API by making the stream object imitate an IO object, turning
   # it into a real Deferrable and making the body play nicer with middleware
   # unaware of streaming.
   #

data/sinatra-contrib.gemspec

@@ -7,46 +7,57 @@ Gem::Specification.new do |s|
   s.version     = Sinatra::Contrib::VERSION
   s.description = "Collection of useful Sinatra extensions"
   s.homepage    = "http://github.com/sinatra/sinatra-contrib"
+  s.license     = "MIT"
   s.summary     = s.description
 
   # generated from git shortlog -sn
   s.authors = [
     "Konstantin Haase",
     "Gabriel Andretta",
-    "Trevor Bramble",
     "Zachary Scott",
+    "Trevor Bramble",
     "Katrina Owen",
     "Nicolas Sanguinetti",
+    "Ashley Williams",
     "Hrvoje Šimić",
     "Masahiro Fujiwara",
     "Rafael Magana",
+    "Vipul A M",
     "Jack Chu",
     "Ilya Shindyapin",
+    "Jake Worth",
     "Kashyap",
     "Sumeet Singh",
     "lest",
     "Adrian Pacała",
     "Aish",
+    "Alexey Chernenkov",
     "Andrew Crump",
+    "Bo Jeanes",
     "David Asabina",
     "Eliot Shepard",
     "Eric Marden",
     "Gray Manley",
     "Guillaume Bouteille",
     "Jamie Hodge",
+    "Koichi Sasada",
     "Kyle Lacy",
+    "Lars Vonk",
     "Martin Frost",
     "Mathieu Allaire",
     "Matt Lyon",
     "Matthew Conway",
     "Meck",
     "Michi Huber",
+    "Nic Benders",
     "Patricio Mac Adden",
     "Reed Lipman",
     "Samy Dindane",
+    "Sergey Nartimov",
     "Thibaut Sacreste",
     "Uchio KONDO",
     "Will Bailey",
+    "ashley williams",
     "undr"
   ]
 
@@ -55,41 +66,52 @@ Gem::Specification.new do |s|
     "konstantin.mailinglists@googlemail.com",
     "ohhgabriel@gmail.com",
     "inbox@trevorbramble.com",
+    "e@zzak.io",
     "zachary@zacharyscott.net",
     "katrina.owen@gmail.com",
     "contacto@nicolassanguinetti.info",
+    "ashley@bocoup.com",
     "shime.ferovac@gmail.com",
     "m-fujiwara@axsh.net",
     "raf.magana@gmail.com",
+    "vipulnsward@gmail.com",
     "jack@jackchu.com",
     "konstantin.haase@gmail.com",
     "ilya@shindyapin.com",
+    "jworth@prevailhs.com",
     "kashyap.kmbc@gmail.com",
     "ortuna@gmail.com",
-    "e@zzak.io",
+    "tbramble@chef.io",
     "just.lest@gmail.com",
     "altpacala@gmail.com",
     "aisha.fenton@visfleet.com",
+    "laise@pisem.net",
     "andrew.crump@ieee.org",
+    "me@bjeanes.com",
     "david@supr.nu",
     "eshepard@slower.net",
     "eric.marden@gmail.com",
     "g.manley@tukaiz.com",
     "duffman@via.ecp.fr",
     "jamiehodge@me.com",
+    "ko1@atdot.net",
     "kylewlacy@me.com",
+    "lars.vonk@gmail.com",
     "blame@kth.se",
     "mathieuallaire@gmail.com",
     "matt@flowerpowered.com",
     "himself@mattonrails.com",
     "yesmeck@gmail.com",
     "michi.huber@gmail.com",
+    "nic@newrelic.com",
     "patriciomacadden@gmail.com",
     "rmlipman@gmail.com",
     "samy@dindane.com",
+    "just.lest@gmail.com",
     "thibaut.sacreste@gmail.com",
     "udzura@udzura.jp",
     "will.bailey@gmail.com",
+    "ashley666ashley@gmail.com",
     "undr@yandex.ru"
   ]
 
@@ -107,6 +129,7 @@ Gem::Specification.new do |s|
     "lib/sinatra/contrib/setup.rb",
     "lib/sinatra/contrib/version.rb",
     "lib/sinatra/cookies.rb",
+    "lib/sinatra/custom_logger.rb",
     "lib/sinatra/decompile.rb",
     "lib/sinatra/engine_tracking.rb",
     "lib/sinatra/extension.rb",
@@ -161,6 +184,7 @@ Gem::Specification.new do |s|
     "spec/content_for/takes_values.slim",
     "spec/content_for_spec.rb",
     "spec/cookies_spec.rb",
+    "spec/custom_logger_spec.rb",
     "spec/decompile_spec.rb",
     "spec/extension_spec.rb",
     "spec/json_spec.rb",
@@ -184,7 +208,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "sinatra",   "~> 1.4.0"
   s.add_dependency "backports", ">= 2.0"
-  s.add_dependency "tilt",      "~> 1.3"
+  s.add_dependency "tilt",      ">= 1.3", "< 3"
   s.add_dependency "rack-test"
   s.add_dependency "rack-protection"
   s.add_dependency "multi_json"
@@ -193,5 +217,18 @@ Gem::Specification.new do |s|
   s.add_development_dependency "haml"
   s.add_development_dependency "erubis"
   s.add_development_dependency "slim"
+  s.add_development_dependency "less"
+  s.add_development_dependency "sass"
+  s.add_development_dependency "builder"
+  s.add_development_dependency "liquid"
+  s.add_development_dependency "redcarpet"
+  s.add_development_dependency "RedCloth"
+  s.add_development_dependency "asciidoctor"
+  s.add_development_dependency "radius"
+  s.add_development_dependency "coffee-script"
+  s.add_development_dependency "nokogiri"
+  s.add_development_dependency "creole"
+  s.add_development_dependency "wikicloth"
+  s.add_development_dependency "markaby"
   s.add_development_dependency "rake"
 end