sinatra-contrib 3.0.6 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1dd46868aed6165f3940802775216257f876a7b2d943133a84e88ec18f320be
-  data.tar.gz: be4fc1981c54bc23315f7785b918750abaee125fd7b2c9c36e8803c109520226
+  metadata.gz: 03c164118c404e74ff0c1be0a36177ab2ab8b0409444fa71bc9a4297b4f08a6a
+  data.tar.gz: f55df9470405a33061f506b6dbc24641a85d0067d684d939bb69311e1d762c81
 SHA512:
-  metadata.gz: 643788f4f6cdcdf0fb575b67c2e59d273c30988ca07adf6a42e94043266b2ad5f574bb2586280e7f6e071f9dda9a60cbfb47efedd353c544c56e3175dc728649
-  data.tar.gz: 25efe6011774ca9aa1cdeb3e011e28430aed7041995008e438b95a8419228fb8019658a401a1a6b7d827ff225cc0240b4c80cd92de601578f5b2b548ec505121
+  metadata.gz: 4efe2c51cd24dfcacc0150f2d298edb7358de015fdb6ab37ca023d36df23fd6c08b1823f8d0c7b657306cc2f8a9a72ec440b9a69e87def6d7fc5ad32fa70def3
+  data.tar.gz: b04167f8e4d6532cc6bb118b3e18301cf008c0face2d833cfb596bd83c6080ea586867788f1d6ec2318e75d266cd11a7c892fc8a95f42b8483ba3ef29b1aa424

data/lib/sinatra/contrib/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module Contrib
-    VERSION = '3.0.6'
+    VERSION = '3.2.0'
   end
 end

data/lib/sinatra/contrib.rb

@@ -28,6 +28,8 @@ module Sinatra
     # Other extensions you don't want to be loaded unless needed.
     module Custom
       register :Reloader, 'sinatra/reloader'
+
+      helpers :HamlHelpers, 'sinatra/haml_helpers'
     end
 
     ##

data/lib/sinatra/engine_tracking.rb

@@ -27,6 +27,16 @@ module Sinatra
       @current_engine == :haml
     end
 
+    # @return [Boolean] Returns true if current engine is `:sass`.
+    def sass?
+      @current_engine == :sass
+    end
+
+    # @return [Boolean] Returns true if current engine is `:scss`.
+    def scss?
+      @current_engine == :scss
+    end
+
     # @return [Boolean] Returns true if current engine is `:builder`.
     def builder?
       @current_engine == :builder

data/lib/sinatra/haml_helpers.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'sinatra/base'
+require 'sinatra/capture'
+
+module Sinatra
+  # = Sinatra::HamlHelpers
+  #
+  # This extension provides some of the helper methods that existed in Haml 5
+  # but were removed in Haml 6. To use this in your app, just +register+ it:
+  #
+  #   require 'sinatra/base'
+  #   require 'sinatra/haml_helpers'
+  #
+  #   class Application < Sinatra::Base
+  #     register Sinatra::HamlHelpers
+  #
+  #     # now you can use the helpers in your views
+  #     get '/' do
+  #       haml_code = <<~HAML
+  #         %p
+  #           != surround "(", ")" do
+  #             %a{ href: "https://example.org/" } example.org
+  #       HAML
+  #       haml haml_code
+  #     end
+  #   end
+  #
+  module HamlHelpers
+    include Sinatra::Capture
+
+    def surround(front, back = front, &block)
+      "#{front}#{_capture_haml(&block).chomp}#{back}\n"
+    end
+
+    def precede(str, &block)
+      "#{str}#{_capture_haml(&block).chomp}\n"
+    end
+
+    def succeed(str, &block)
+      "#{_capture_haml(&block).chomp}#{str}\n"
+    end
+
+    def _capture_haml(*args, &block)
+      capture(*args, &block)
+    end
+  end
+
+  helpers HamlHelpers
+end

data/lib/sinatra/namespace.rb

@@ -210,7 +210,7 @@ module Sinatra
       end
 
       def template_cache
-        super.fetch(:nested, @namespace) { Tilt::Cache.new }
+        super.fetch(:nested, @namespace) { TemplateCache.new }
       end
 
       def redirect_to(uri, *args)
@@ -229,7 +229,7 @@ module Sinatra
       attr_reader :base, :templates
 
       ALLOWED_ENGINES = %i[
-        erb erubi haml hamlit builder nokogiri
+        erb erubi haml hamlit builder nokogiri sass scss
         liquid markdown rdoc asciidoc markaby
         rabl slim yajl
       ]

data/lib/sinatra/respond_with.rb

@@ -249,6 +249,7 @@ module Sinatra
 
     def self.engines
       engines = {
+        css: %i[sass scss],
         xml: %i[builder nokogiri],
         html: %i[erb erubi haml hamlit slim liquid
                  mab markdown rdoc],

data/lib/sinatra/runner.rb

@@ -117,7 +117,7 @@ module Sinatra
 
         if Time.now - @started > timeout
           warn command, log
-          raise 'timeout'
+          raise "timeout starting server with command '#{command}'"
         else
           sleep 0.1
         end

data/sinatra-contrib.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.description = 'Collection of useful Sinatra extensions'
   s.homepage    = 'http://sinatrarb.com/contrib/'
   s.license     = 'MIT'
-  s.summary     = s.description
+  s.summary     = "#{s.description}."
   s.authors     = ['https://github.com/sinatra/sinatra/graphs/contributors']
   s.email       = 'sinatrarb@googlegroups.com'
   s.files       = Dir['lib/**/*.rb'] + [
@@ -37,22 +37,9 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
 
   s.required_ruby_version = '>= 2.6.0'
 
-  s.add_dependency 'multi_json'
+  s.add_dependency 'multi_json', '>= 0.0.2'
   s.add_dependency 'mustermann', '~> 3.0'
   s.add_dependency 'rack-protection', version
   s.add_dependency 'sinatra', version
   s.add_dependency 'tilt', '~> 2.0'
-
-  s.add_development_dependency 'asciidoctor'
-  s.add_development_dependency 'builder'
-  s.add_development_dependency 'erubi'
-  s.add_development_dependency 'haml'
-  s.add_development_dependency 'liquid'
-  s.add_development_dependency 'markaby'
-  s.add_development_dependency 'nokogiri'
-  s.add_development_dependency 'rack-test', '~> 2'
-  s.add_development_dependency 'rake', '>= 12.3.3'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'rspec', '~> 3'
-  s.add_development_dependency 'slim'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.2.0
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -80,174 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
-  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: builder
-  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: 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: haml
-  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: liquid
-  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: markaby
-  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: nokogiri
-  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: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: slim
-  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'
 description: Collection of useful Sinatra extensions
 email: sinatrarb@googlegroups.com
 executables: []
@@ -269,6 +101,7 @@ files:
 - lib/sinatra/custom_logger.rb
 - lib/sinatra/engine_tracking.rb
 - lib/sinatra/extension.rb
+- lib/sinatra/haml_helpers.rb
 - lib/sinatra/json.rb
 - lib/sinatra/link_header.rb
 - lib/sinatra/multi_route.rb
@@ -290,7 +123,7 @@ metadata:
   homepage_uri: http://sinatrarb.com/contrib/
   documentation_uri: https://www.rubydoc.info/gems/sinatra-contrib
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -305,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.5.3
+signing_key: 
 specification_version: 4
-summary: Collection of useful Sinatra extensions
+summary: Collection of useful Sinatra extensions.
 test_files: []