sinatra-contrib 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 20a1e473bbc0246851a1a86b2e442c28a18b55a3
-  data.tar.gz: 295208b6345310d88a8776955a0fc43d5305fd3f
+SHA256:
+  metadata.gz: 875fcac85ec3549476fa9363e6d74a93169d9bff6a285afa085dd9927e377b8f
+  data.tar.gz: a6f37d1271320146ef8a988b236276bb9b5385a44839f26ccc9740e5bd1fba85
 SHA512:
-  metadata.gz: 016d33f9ff45a86a64c76b63adb6bddf59cfe99742223172091cc748b0fa7cab05a8f031c4566b15c8ef0facc944593eeb8d97c3e8d5bce45bf89db046d7be3e
-  data.tar.gz: 50dba04560023eed92a8e6d4190d8032d771f56aaa237ceec781d6b859bf23eb423f1dedf1591fbda8d4267f97bcf04de9529c7d05e6d4571a1e1519e3ad6e1e
+  metadata.gz: 129dad2460c8a80bca9db661361479bf78a8c1369c053056414df493fc37a4b4135dd155c7bc0660b37a5ab03acc68da5dacea9fe35bf48e7493aab833ae5fde
+  data.tar.gz: ee1bccd800b4636a48a74e31c0371ed3be754e5037c1bf9afe95d782cb3ce8ddabced908fbe1a32cc9841dce16729513cd5c61baf1c0853ca30eb27b8404e60e

data/README.md

@@ -22,7 +22,7 @@ Currently included:
 
 * [`sinatra/config_file`][sinatra-config-file]: Allows loading configuration from yaml files.
 
-* [`sinatra/content_for`][sinatra-content-for]: Adds Rails-style `content_for` helpers to Haml, Erb,
+* [`sinatra/content_for`][sinatra-content-for]: Adds Rails-style `content_for` helpers to Haml, Erb, Erubi,
   Erubis and Slim.
 
 * [`sinatra/cookies`][sinatra-cookies]: A `cookies` helper for reading and writing cookies.

data/lib/sinatra/capture.rb

@@ -1,6 +1,5 @@
 require 'sinatra/base'
 require 'sinatra/engine_tracking'
-require 'active_support/core_ext/object/try.rb'
 
 module Sinatra
   #
@@ -85,38 +84,26 @@ module Sinatra
   module Capture
     include Sinatra::EngineTracking
 
-    DUMMIES = {
-      :haml   => "!= capture_haml(*args, &block)",
-      :erubis => "<% @capture = yield(*args) %>",
-      :slim   => "== yield(*args)"
-    }
-
     def capture(*args, &block)
-      @capture = nil
-      if current_engine == :ruby
-        result = block[*args]
-      elsif current_engine == :erb || current_engine == :slim
-        @_out_buf, _buf_was = '', @_out_buf
-        block[*args]
-        result = eval('@_out_buf', block.binding)
-        @_out_buf = _buf_was
+      return block[*args] if ruby?
+      if haml?
+        buffer = Haml::Buffer.new(nil, Haml::Options.new.for_buffer)
+        with_haml_buffer(buffer) { capture_haml(*args, &block) }
       else
-        buffer     = eval '_buf if defined?(_buf)', block.binding
-        old_buffer = buffer.dup if buffer
-        dummy      = DUMMIES.fetch(current_engine)
-        options    = { :layout => false, :locals => {:args => args, :block => block }}
-
-        buffer.try :clear
-        result = render(current_engine, dummy, options, &block)
+        @_out_buf, _buf_was = '', @_out_buf
+        begin
+          raw = block[*args]
+          captured = block.binding.eval('@_out_buf')
+          captured.empty? ? raw : captured
+        ensure
+          @_out_buf = _buf_was
+        end
       end
-      result.strip.empty? && @capture ? @capture : result
-    ensure
-      buffer.try :replace, old_buffer
     end
 
     def capture_later(&block)
       engine = current_engine
-      proc { |*a| with_engine(engine) { @capture = capture(*a, &block) }}
+      proc { |*a| with_engine(engine) { @capture = capture(*a, &block) } }
     end
   end
 

data/lib/sinatra/content_for.rb

@@ -9,7 +9,7 @@ module Sinatra
   # blocks inside views to be rendered later during the request. The most
   # common use is to populate different parts of your layout from your view.
   #
-  # The currently supported engines are: Erb, Erubis, Haml and Slim.
+  # The currently supported engines are: Erb, Erubi, Erubis, Haml and Slim.
   #
   # == Usage
   #
@@ -32,7 +32,7 @@ module Sinatra
   # to yield_content.
   #
   #     # layout.erb
-  #     <%= yield_content :some_key_with_no_content do %>
+  #     <% yield_content :some_key_with_no_content do %>
   #       <chunk of="default html">...</chunk>
   #     <% end %>
   #
@@ -128,8 +128,9 @@ module Sinatra
     #
     # Your blocks can also receive values, which are passed to them
     # by <tt>yield_content</tt>
-    def content_for(key, value = nil, &block)
+    def content_for(key, value = nil, options = {}, &block)
       block ||= proc { |*| value }
+      clear_content_for(key) if options[:flush]
       content_blocks[key.to_sym] << capture_later(&block)
     end
 
@@ -171,9 +172,17 @@ module Sinatra
     #
     # Would pass <tt>1</tt> and <tt>2</tt> to all the blocks registered
     # for <tt>:head</tt>.
-    def yield_content(key, *args)
-      return yield(*args) if block_given? && content_blocks[key.to_sym].empty?
-      content_blocks[key.to_sym].map { |b| capture(*args, &b) }.join
+    def yield_content(key, *args, &block)
+      if block_given? && !content_for?(key)
+        haml? ? capture_haml(*args, &block) : yield(*args)
+      else
+        content = content_blocks[key.to_sym].map { |b| capture(*args, &b) }
+        content.join.tap do |c|
+          if block_given? && (erb? || erubi? || erubis?)
+            @_out_buf << c
+          end
+        end
+      end
     end
 
     private

data/lib/sinatra/contrib/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Contrib
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
   end
 end
 

data/lib/sinatra/engine_tracking.rb

@@ -11,6 +11,15 @@ module Sinatra
       @current_engine == :erb
     end
 
+    # Returns true if the current engine is `:erubi`, or `Tilt[:erb]` is set
+    # to Tilt::ErubisTemplate.
+    #
+    # @return [Boolean] Returns true if current engine is `:erubi`.
+    def erubi?
+      @current_engine == :erubi or
+      erb? && Tilt[:erb] == Tilt::ErubiTemplate
+    end
+
     # Returns true if the current engine is `:erubis`, or `Tilt[:erb]` is set
     # to Tilt::ErubisTemplate.
     #
@@ -95,6 +104,11 @@ module Sinatra
       @current_engine == :creole
     end
 
+    # @return [Boolean] Returns true if current engine is `:ruby`.
+    def ruby?
+      @current_engine == :ruby
+    end
+
     def initialize(*)
       @current_engine = :ruby
       super

data/lib/sinatra/namespace.rb

@@ -146,7 +146,7 @@ module Sinatra
   #     module Zomg # Keep everything under "Zomg" namespace for sanity
   #       module Routes # Define a new "Routes" module
   #
-  #         self.registered(app)
+  #         def self.registered(app)
   #           # First, register the Namespace extension
   #           app.register Sinatra::Namespace
   #

data/lib/sinatra/respond_with.rb

@@ -245,7 +245,7 @@ module Sinatra
         :css  => [:less,  :sass, :scss],
         :xml  => [:builder, :nokogiri],
         :js   => [:coffee],
-        :html => [:erb, :erubis, :haml, :slim, :liquid, :radius, :mab,
+        :html => [:erb, :erubi, :erubis, :haml, :slim, :liquid, :radius, :mab,
           :markdown, :textile, :rdoc],
         :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) +
           [:mab] - [:find_template, :markaby]),

data/sinatra-contrib.gemspec

@@ -39,13 +39,13 @@ EOF
   s.add_dependency "sinatra", version
   s.add_dependency "mustermann", "~> 1.0"
   s.add_dependency "backports", ">= 2.8.2"
-  s.add_dependency "activesupport", ">= 4.0.0"
   s.add_dependency "tilt",      ">= 1.3", "< 3"
   s.add_dependency "rack-protection", version
   s.add_dependency "multi_json"
 
   s.add_development_dependency "rspec", "~> 3.4"
   s.add_development_dependency "haml"
+  s.add_development_dependency "erubi"
   s.add_development_dependency "erubis"
   s.add_development_dependency "slim"
   s.add_development_dependency "less"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.2
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Collection of useful Sinatra extensions