sinatra-contrib 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0bffd33869745287a4ebe72f36cb2f7f5261f4875d6527ea5ae0c6bf4c0b7ab
-  data.tar.gz: 14bde99fedc38325348371a7b8cb414177598d0f7f8040267cfd6e97c2cb72df
+  metadata.gz: 463f96e4b9b3eabb8a6c5dacefbd633f4f6fcc2939bfb3a00a3caa432d877d58
+  data.tar.gz: aef09374d3530b62e1cea7143e11bf22ca64b98df2a6406b54e6377967489f0f
 SHA512:
-  metadata.gz: a7223b638c4ba32d08624d6e81262e783790d05cf54f6cfdd13f1dbe7b830cfc2759aa90a76ce8da7939166eb987ae2313160a74384d86401dfcab8946824647
-  data.tar.gz: 075d7c1e54fd52e20ca534ff6e5daadddea714dadbf7fc6fa0ec194414af7e6093c01f0af012f834c33da0fa2d3c41a1f7a4c4029bf4e9a29909e8bc643e13d3
+  metadata.gz: bde512434820f464b4f9a1d26c9bb1f1c9fd81b9ddd03e63b5ffc4d9190775d836c3587ec8498c195c1264eadc49d393e31590b1a503925c0b1efba2afa93648
+  data.tar.gz: 1e9df974dec701a0bed99262473313dfa18c65aa9e197e5c9d0e0337d4854f65c7444b96c5087c43247d9729625904ed648325ed194aa527d0ec969d511f744e

data/lib/sinatra/contrib/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module Contrib
-    VERSION = '3.1.0'
+    VERSION = '4.0.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/cookies.rb

@@ -60,7 +60,7 @@ module Sinatra
       attr_reader :options
 
       def initialize(app)
-        @response_string = nil
+        @response_array  = nil
         @response_hash   = {}
         @response        = app.response
         @request         = app.request
@@ -309,12 +309,12 @@ module Sinatra
       end
 
       def parse_response
-        string = @response['Set-Cookie']
-        return if @response_string == string
+        cookies_from_response = Array(@response['Set-Cookie'])
+        return if @response_array == cookies_from_response
 
         hash = {}
 
-        string.each_line do |line|
+        cookies_from_response.each do |line|
           key, value = line.split(';', 2).first.to_s.split('=', 2)
           next if key.nil?
 
@@ -328,7 +328,7 @@ module Sinatra
         end
 
         @response_hash.replace hash
-        @response_string = string
+        @response_array = cookies_from_response
       end
 
       def request_cookies

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/link_header.rb

@@ -89,10 +89,10 @@ module Sinatra
       link          = (response['Link'] ||= '')
 
       urls.map do |url|
-        link << ",\n" unless link.empty?
+        link << "," unless link.empty?
         link << (http_pattern % url)
         html_pattern % url
-      end.join "\n"
+      end.join
     end
 
     ##
@@ -117,10 +117,10 @@ module Sinatra
       yield if block_given?
       return '' unless response.include? 'Link'
 
-      response['Link'].split(",\n").map do |line|
+      response['Link'].split(",").map do |line|
         url, *opts = line.split(';').map(&:strip)
         "<link href=\"#{url[1..-2]}\" #{opts.join ' '} />"
-      end.join "\n"
+      end.join
     end
 
     def self.registered(_base)

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

@@ -35,25 +35,11 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
     'rubygems_mfa_required' => 'true'
   }
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.8'
 
-  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 'sass-embedded', '~> 1.54'
-  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.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2024-01-19 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.1.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -80,188 +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: sass-embedded
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.54'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.54'
-- !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: []
@@ -283,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
@@ -304,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
@@ -312,15 +131,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
-signing_key:
+rubygems_version: 3.5.3
+signing_key: 
 specification_version: 4
 summary: Collection of useful Sinatra extensions.
 test_files: []