sinatra-contrib 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d991b914291bb371442ba8031c64548acd0ed2f
-  data.tar.gz: 87caaefbed03e5ad9b760fe37e9a855dd7b2f728
+  metadata.gz: 8a3837b4e5796761383a09064e40f682862a48a9
+  data.tar.gz: c0e347a6f786ca317d0c42d62d20e72dfffe46b6
 SHA512:
-  metadata.gz: 187c5077d865228cef464aab890399b53c2c9f299b0c91710f64d74342307ddefcb0c20e03cf72cedd831243535d199b327cb92245345cf6e5dff7a0caaa897d
-  data.tar.gz: 021b1a649f15e0eb78a92fe70b9a88e771103e6b4736baf62ba2da088b14c1dcc1fc87448b18e9c3dbf06c7dc2d44fb2a0f9d3f06cfbde7562dacef5502ce138
+  metadata.gz: 0eed9a63680ab183eb8b2ed3161eed6b38280c668196a9052225e86ebea07b2af4aaa3c9c6a5cb87ada74146b30f4efee7eca66815cd2f5f1c8ee63e611ec192
+  data.tar.gz: e5a2555a09268cb5c1c96dd023ad764c1758da22e01751cdc40adc1c14ee42df05306375bec6606131d512ab795d1fc656d6e6e3c2b591b5999ae14397c5c3fb

data/LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2008-2011 Nicolas Sanguinetti, entp.com, Konstantin Haase
+Copyright (c) 2008-2017 Nicolas Sanguinetti, entp.com, Konstantin Haase
+Copyright (c) 2015-2017 Zachary Scott
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/sinatra/decompile.rb

@@ -0,0 +1,5 @@
+warn "Sinatra::Decompile is deprecated without replacement."
+
+def warn(message)
+  super "#{caller.first[/^[^:]:\d+:/]} warning: #{message}"
+end

data/lib/sinatra/runner.rb

@@ -0,0 +1,155 @@
+require 'open-uri'
+require 'net/http'
+require 'timeout'
+
+# NOTE: This feature is experimental, and missing tests!
+#
+# Helps you spinning up and shutting down your own sinatra app. This is especially helpful for running
+# real network tests against a sinatra backend.
+#
+# The backend server could look like the following (in test/server.rb).
+#
+#   require "sinatra"
+#
+#   get "/" do
+#     "Cheers from test server"
+#   end
+#
+#   get "/ping" do
+#     "1"
+#   end
+#
+# Note that you need to implement a ping action for internal use.
+#
+# Next, you need to write your runner.
+#
+#   require 'sinatra/runner'
+#
+#   class Runner < Sinatra::Runner
+#     def app_file
+#       File.expand_path("../server.rb", __FILE__)
+#     end
+#   end
+#
+# Override Runner#app_file, #command, #port, #protocol and #ping_path for customization.
+#
+# **Don't forget to override #app_file specific to your application!**
+#
+# Whereever you need this test backend, here's how you manage it. The following example assumes you
+# have a test in your app that needs to be run against your test backend.
+#
+#   runner = ServerRunner.new
+#   runner.run
+#
+#   # ..tests against localhost:4567 here..
+#
+#   runner.kill
+#
+# For an example, check https://github.com/apotonick/roar/blob/master/test/integration/runner.rb
+module Sinatra
+  class Runner
+    def app_file
+      File.expand_path("../server.rb", __FILE__)
+    end
+
+    def run
+      @pipe     = start
+      @started  = Time.now
+      warn "#{server} up and running on port #{port}" if ping
+    end
+
+    def kill
+      return unless pipe
+      Process.kill("KILL", pipe.pid)
+    rescue NotImplementedError
+      system "kill -9 #{pipe.pid}"
+    rescue Errno::ESRCH
+    end
+
+    def get(url)
+      Timeout.timeout(1) { get_url("#{protocol}://127.0.0.1:#{port}#{url}") }
+    end
+
+    def get_stream(url = "/stream", &block)
+      Net::HTTP.start '127.0.0.1', port do |http|
+        request = Net::HTTP::Get.new url
+        http.request request do |response|
+          response.read_body(&block)
+        end
+      end
+    end
+
+    def get_response(url)
+      Net::HTTP.start '127.0.0.1', port do |http|
+        request = Net::HTTP::Get.new url
+        http.request request do |response|
+          response
+        end
+      end
+    end
+
+    def log
+      @log ||= ""
+      loop { @log <<  pipe.read_nonblock(1) }
+    rescue Exception
+      @log
+    end
+
+  private
+    attr_accessor :pipe
+
+    def start
+      IO.popen(command)
+    end
+
+    def command # to be overwritten
+      "bundle exec ruby #{app_file} -p #{port} -e production"
+    end
+
+    def ping(timeout=30)
+      loop do
+        return if alive?
+        if Time.now - @started > timeout
+          $stderr.puts command, log
+          fail "timeout"
+        else
+          sleep 0.1
+        end
+      end
+    end
+
+    def alive?
+      3.times { get(ping_path) }
+      true
+    rescue Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, SystemCallError, OpenURI::HTTPError, Timeout::Error
+      false
+    end
+
+    def ping_path # to be overwritten
+      '/ping'
+    end
+
+    def port # to be overwritten
+      4567
+    end
+
+    def protocol
+      "http"
+    end
+
+    def get_url(url)
+      uri = URI.parse(url)
+
+      return uri.read unless protocol == "https"
+      get_https_url(uri)
+    end
+
+    def get_https_url(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl      = true
+      http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Get.new(uri.request_uri)
+      http.request(request).body
+    end
+  end
+end

data/lib/sinatra/webdav.rb

@@ -0,0 +1,93 @@
+require 'sinatra/base'
+
+module Sinatra
+
+  # = Sinatra::WebDAV
+  #
+  # This extensions provides WebDAV verbs, as defined by RFC 4918
+  # (https://tools.ietf.org/html/rfc4918). To use this in your app,
+  # just +register+ it:
+  #
+  #   require 'sinatra/base'
+  #   require 'sinatra/webdav'
+  #
+  #   class Application < Sinatra::Base
+  #     register Sinatra::WebDAV
+  #
+  #     # Now you can use any WebDAV verb:
+  #     propfind '/2014/january/21' do
+  #       'I have a lunch at 9 PM'
+  #     end
+  #   end
+  #
+  # You can use it in classic application just by requring the extension:
+  #
+  #   require 'sinatra'
+  #   require 'sinatra/webdav'
+  #
+  #   mkcol '/2015' do
+  #     'You started 2015!'
+  #   end
+  #
+  module WebDAV
+    def self.registered(_)
+      Sinatra::Request.include WebDAV::Request
+    end
+
+    module Request
+      def self.included(base)
+        base.class_eval do
+          alias _safe? safe?
+          alias _idempotent? idempotent?
+
+          def safe?
+            _safe? or propfind?
+          end
+
+          def idempotent?
+            _idempotent? or propfind? or move? or unlock? # or lock?
+          end
+        end
+      end
+
+      def propfind?
+        request_method == 'PROPFIND'
+      end
+
+      def proppatch?
+        request_method == 'PROPPATCH'
+      end
+
+      def mkcol?
+        request_method == 'MKCOL'
+      end
+
+      def copy?
+        request_method == 'COPY'
+      end
+
+      def move?
+        request_method == 'MOVE'
+      end
+
+      #def lock?
+      #  request_method == 'LOCK'
+      #end
+
+      def unlock?
+        request_method == 'UNLOCK'
+      end
+    end
+
+    def propfind(path, opts = {}, &bk)  route 'PROPFIND',  path, opts, &bk end
+    def proppatch(path, opts = {}, &bk) route 'PROPPATCH', path, opts, &bk end
+    def mkcol(path, opts = {}, &bk)     route 'MKCOL',     path, opts, &bk end
+    def copy(path, opts = {}, &bk)      route 'COPY',      path, opts, &bk end
+    def move(path, opts = {}, &bk)      route 'MOVE',      path, opts, &bk end
+    #def lock(path, opts = {}, &bk)      route 'LOCK',      path, opts, &bk end
+    def unlock(path, opts = {}, &bk)    route 'UNLOCK',    path, opts, &bk end
+  end
+
+  register WebDAV
+  Delegator.delegate :propfind, :proppatch, :mkcol, :copy, :move, :unlock # :lock
+end

data/sinatra-contrib.gemspec

@@ -7,211 +7,17 @@ Gem::Specification.new do |s|
   s.name        = "sinatra-contrib"
   s.version     = Sinatra::VERSION
   s.description = "Collection of useful Sinatra extensions"
-  s.homepage    = "http://github.com/sinatra/sinatra-contrib"
+  s.homepage    = "http://github.com/sinatra/sinatra/tree/master/sinatra-contrib"
   s.license     = "MIT"
   s.summary     = s.description
-
-  # generated from git shortlog -sn
-  s.authors = [
-    "Konstantin Haase",
-    "Zachary Scott",
-    "Gabriel Andretta",
-    "Trevor Bramble",
-    "Katrina Owen",
-    "Ashley Williams",
-    "Nicolas Sanguinetti",
-    "Hrvoje Šimić",
-    "Masahiro Fujiwara",
-    "Rafael Magana",
-    "Vipul A M",
-    "ashley williams",
-    "Jack Chu",
-    "Sumeet Singh",
-    "Ilya Shindyapin",
-    "lest",
-    "Jake Worth",
-    "Kashyap",
-    "Matt Lyon",
-    "Matthew Conway",
-    "Meck",
-    "Michi Huber",
-    "Nic Benders",
-    "Patricio Mac Adden",
-    "Reed Lipman",
-    "Samy Dindane",
-    "Sergey Nartimov",
-    "Thibaut Sacreste",
-    "Uchio KONDO",
-    "Will Bailey",
-    "mono",
-    "Adrian Pacała",
-    "undr",
-    "Aish",
-    "Alexey Chernenkov",
-    "Andrew Crump",
-    "Anton Davydov",
-    "Bo Jeanes",
-    "David Asabina",
-    "Eliot Shepard",
-    "Eric Marden",
-    "Gray Manley",
-    "Guillaume Bouteille",
-    "Jamie Hodge",
-    "Julie Ng",
-    "Koichi Sasada",
-    "Kyle Lacy",
-    "Lars Vonk",
-    "Martin Frost",
-    "Mathieu Allaire"
-  ]
-
-  # generated from git shortlog -sne
-  s.email = [
-    "konstantin.mailinglists@googlemail.com",
-    "ohhgabriel@gmail.com",
-    "inbox@trevorbramble.com",
-    "e@zzak.io",
-    "zachary@zacharyscott.net",
-    "katrina.owen@gmail.com",
-    "ashley@bocoup.com",
-    "contacto@nicolassanguinetti.info",
-    "shime.ferovac@gmail.com",
-    "raf.magana@gmail.com",
-    "m-fujiwara@axsh.net",
-    "vipulnsward@gmail.com",
-    "konstantin.haase@gmail.com",
-    "jack@jackchu.com",
-    "ashley666ashley@gmail.com",
-    "ilya@shindyapin.com",
-    "just.lest@gmail.com",
-    "kashyap.kmbc@gmail.com",
-    "ortuna@gmail.com",
-    "tbramble@chef.io",
-    "jworth@prevailhs.com",
-    "mail@zzak.io",
-    "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",
-    "mono@mono0x.net",
-    "altpacala@gmail.com",
-    "undr@yandex.ru",
-    "aisha.fenton@visfleet.com",
-    "laise@pisem.net",
-    "andrew.crump@ieee.org",
-    "antondavydov.o@gmail.com",
-    "me@bjeanes.com",
-    "david@supr.nu",
-    "eshepard@slower.net",
-    "eric.marden@gmail.com",
-    "g.manley@tukaiz.com",
-    "duffman@via.ecp.fr",
-    "jamiehodge@me.com",
-    "uxjulie@gmail.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"
-  ]
-
-  # generated from git ls-files
-  s.files = [
+  s.authors     = ["https://github.com/sinatra/sinatra/graphs/contributors"]
+  s.email       = "sinatrarb@googlegroups.com"
+  s.files       = Dir["lib/**/*.rb"] + [
     "LICENSE",
     "README.md",
     "Rakefile",
     "ideas.md",
-    "lib/sinatra/capture.rb",
-    "lib/sinatra/config_file.rb",
-    "lib/sinatra/content_for.rb",
-    "lib/sinatra/contrib.rb",
-    "lib/sinatra/contrib/all.rb",
-    "lib/sinatra/contrib/setup.rb",
-    "lib/sinatra/contrib/version.rb",
-    "lib/sinatra/cookies.rb",
-    "lib/sinatra/custom_logger.rb",
-    "lib/sinatra/engine_tracking.rb",
-    "lib/sinatra/extension.rb",
-    "lib/sinatra/json.rb",
-    "lib/sinatra/link_header.rb",
-    "lib/sinatra/multi_route.rb",
-    "lib/sinatra/namespace.rb",
-    "lib/sinatra/reloader.rb",
-    "lib/sinatra/respond_with.rb",
-    "lib/sinatra/streaming.rb",
-    "lib/sinatra/required_params.rb",
-    "lib/sinatra/test_helpers.rb",
-    "sinatra-contrib.gemspec",
-    "spec/capture_spec.rb",
-    "spec/config_file/key_value.yml",
-    "spec/config_file/key_value.yml.erb",
-    "spec/config_file/key_value_override.yml",
-    "spec/config_file/missing_env.yml",
-    "spec/config_file/with_envs.yml",
-    "spec/config_file/with_nested_envs.yml",
-    "spec/config_file_spec.rb",
-    "spec/content_for/different_key.erb",
-    "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",
-    "spec/content_for/layout.slim",
-    "spec/content_for/multiple_blocks.erb",
-    "spec/content_for/multiple_blocks.erubis",
-    "spec/content_for/multiple_blocks.haml",
-    "spec/content_for/multiple_blocks.slim",
-    "spec/content_for/multiple_yields.erb",
-    "spec/content_for/multiple_yields.erubis",
-    "spec/content_for/multiple_yields.haml",
-    "spec/content_for/multiple_yields.slim",
-    "spec/content_for/passes_values.erb",
-    "spec/content_for/passes_values.erubis",
-    "spec/content_for/passes_values.haml",
-    "spec/content_for/passes_values.slim",
-    "spec/content_for/same_key.erb",
-    "spec/content_for/same_key.erubis",
-    "spec/content_for/same_key.haml",
-    "spec/content_for/same_key.slim",
-    "spec/content_for/takes_values.erb",
-    "spec/content_for/takes_values.erubis",
-    "spec/content_for/takes_values.haml",
-    "spec/content_for/takes_values.slim",
-    "spec/content_for_spec.rb",
-    "spec/cookies_spec.rb",
-    "spec/custom_logger_spec.rb",
-    "spec/extension_spec.rb",
-    "spec/json_spec.rb",
-    "spec/link_header_spec.rb",
-    "spec/multi_route_spec.rb",
-    "spec/namespace/foo.erb",
-    "spec/namespace/nested/foo.erb",
-    "spec/namespace_spec.rb",
-    "spec/okjson.rb",
-    "spec/reloader/app.rb.erb",
-    "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",
-    "spec/spec_helper.rb",
-    "spec/streaming_spec.rb",
-    "spec/required_params_spec.rb",
+    "sinatra-contrib.gemspec"
   ]
 
   s.required_ruby_version = '>= 2.2.0'