isomorfeus-iodine 0.7.50 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f6d52427fb6c73c781981a09b9217b557e2da7c676578d7c726c375f8f49919
-  data.tar.gz: 24b2b507bb66405986b947085fcc6ac65d921fb3e7775ffb00ea82909cfc74fb
+  metadata.gz: 5d50f8965211cbcbbd9ea83e2caf5bbe9bb2c82699fcf9f70d401ccfe436af4c
+  data.tar.gz: e5703c8ea79c04d5389d115e62da6bebc1c28357868fd2df47207500a7a48325
 SHA512:
-  metadata.gz: '059aafd0ed382cc2b7446532d83a19121e19e61c8c9590bf372d074149aee2765426452c488020a2b55720fc63fbf050cc4314e26398495945957d55b9328a8c'
-  data.tar.gz: e0e74b28d8f2c193271aa8a610298f003913e0214870ca2dd20d4c87a7358da04bd63015204788eabbe84215f4c89582f85f2d1bb4504773e8b46776d744ae3b
+  metadata.gz: 7b4245d04c37d3fe90dd1d88fec0aa7ecba5ce2e7b52066a2c9a8608dbc6a8d1be60b61f9c941fcf00014fd6206ff63229976a42d614262cedae5abf6c440521
+  data.tar.gz: e38cca54a7203adbab3d82a60e994e265f1f53e0effd1209e7b680bd042d31495e8640eba6e3f4d65322efd173262e8ffca674180b1b5fa8e329241458985fb8

data/exe/iodine

@@ -3,208 +3,9 @@
 IODINE_PARSE_CLI = true
 require 'iodine'
 
-# Load Rack if available (assume it will be used).
-#
-# Remember, code costs memory. Duplicating the Rack::Builder module and functions can be avoided.
-begin
-  require 'rack'
-  module Iodine
-    module Base
-      module Rack
-        Builder = ::Rack::Builder
-      end
-    end
-  end
-rescue LoadError
-  module Iodine
-    module Base
-      module Rack
-        # The Rack::Builder code is used when Rack isn't available.
-        #
-        # The code was copied (with minor adjustments) from the Rack source code and is licensed under the MIT license.
-        # Copyright (C) 2007-2019 Leah Neukirchen <http://leahneukirchen.org/infopage.html>
-        #
-        # ====
-        #
-        # Rack::Builder implements a small DSL to iteratively construct Rack
-        # applications.
-        #
-        # Example:
-        #
-        #  require 'rack/lobster'
-        #  app = Rack::Builder.new do
-        #    use Rack::CommonLogger
-        #    use Rack::ShowExceptions
-        #    map "/lobster" do
-        #      use Rack::Lint
-        #      run Rack::Lobster.new
-        #    end
-        #  end
-        #
-        #  run app
-        #
-        # Or
-        #
-        #  app = Rack::Builder.app do
-        #    use Rack::CommonLogger
-        #    run lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['OK']] }
-        #  end
-        #
-        #  run app
-        #
-        # +use+ adds middleware to the stack, +run+ dispatches to an application.
-        # You can use +map+ to construct a Rack::URLMap in a convenient way.
-        class Builder
-          # https://stackoverflow.com/questions/2223882/whats-the-difference-between-utf-8-and-utf-8-without-bom
-          UTF_8_BOM = '\xef\xbb\xbf'
-
-          def self.parse_file(config, opts = Hash.new)
-            if config =~ /\.ru$/
-              return self.load_file(config, opts)
-            else
-              require config
-              app = Object.const_get(::File.basename(config, '.rb').split('_').map(&:capitalize).join(''))
-              return app, {}
-            end
-          end
+# Load Rack if available (assume it will be used)
 
-          def self.load_file(path, options = Hash.new)
-            cfgfile = ::File.read(path)
-            cfgfile.slice!(/\A#{UTF_8_BOM}/) if cfgfile.encoding == Encoding::UTF_8
-
-            cfgfile.sub!(/^__END__\n.*\Z/m, '')
-            app = new_from_string cfgfile, path
-
-            return app, options
-          end
-
-          def self.new_from_string(builder_script, file = "(rackup)")
-            eval "Iodine::Base::Rack::Builder.new {\n" + builder_script + "\n}.to_app",
-              TOPLEVEL_BINDING, file, 0
-          end
-
-          def initialize(default_app = nil, &block)
-            @use, @map, @run, @warmup, @freeze_app = [], nil, default_app, nil, false
-            instance_eval(&block) if block_given?
-          end
-
-          def self.app(default_app = nil, &block)
-            self.new(default_app, &block).to_app
-          end
-
-          # Specifies middleware to use in a stack.
-          #
-          #   class Middleware
-          #     def initialize(app)
-          #       @app = app
-          #     end
-          #
-          #     def call(env)
-          #       env["rack.some_header"] = "setting an example"
-          #       @app.call(env)
-          #     end
-          #   end
-          #
-          #   use Middleware
-          #   run lambda { |env| [200, { "Content-Type" => "text/plain" }, ["OK"]] }
-          #
-          # All requests through to this application will first be processed by the middleware class.
-          # The +call+ method in this example sets an additional environment key which then can be
-          # referenced in the application if required.
-          def use(middleware, *args, &block)
-            if @map
-              mapping, @map = @map, nil
-              @use << proc { |app| generate_map(app, mapping) }
-            end
-            @use << proc { |app| middleware.new(app, *args, &block) }
-          end
-
-          # Takes an argument that is an object that responds to #call and returns a Rack response.
-          # The simplest form of this is a lambda object:
-          #
-          #   run lambda { |env| [200, { "Content-Type" => "text/plain" }, ["OK"]] }
-          #
-          # However this could also be a class:
-          #
-          #   class Heartbeat
-          #     def self.call(env)
-          #      [200, { "Content-Type" => "text/plain" }, ["OK"]]
-          #     end
-          #   end
-          #
-          #   run Heartbeat
-          def run(app)
-            @run = app
-          end
-
-          # Takes a lambda or block that is used to warm-up the application.
-          #
-          #   warmup do |app|
-          #     client = Rack::MockRequest.new(app)
-          #     client.get('/')
-          #   end
-          #
-          #   use SomeMiddleware
-          #   run MyApp
-          def warmup(prc = nil, &block)
-            @warmup = prc || block
-          end
-
-          # Creates a route within the application.
-          #
-          #   Rack::Builder.app do
-          #     map '/' do
-          #       run Heartbeat
-          #     end
-          #   end
-          #
-          # The +use+ method can also be used here to specify middleware to run under a specific path:
-          #
-          #   Rack::Builder.app do
-          #     map '/' do
-          #       use Middleware
-          #       run Heartbeat
-          #     end
-          #   end
-          #
-          # This example includes a piece of middleware which will run before requests hit +Heartbeat+.
-          #
-          def map(path, &block)
-            @map ||= {}
-            @map[path] = block
-          end
-
-          # Freeze the app (set using run) and all middleware instances when building the application
-          # in to_app.
-          def freeze_app
-            @freeze_app = true
-          end
-
-          def to_app
-            app = @map ? generate_map(@run, @map) : @run
-            fail "missing run or map statement" unless app
-            app.freeze if @freeze_app
-            app = @use.reverse.inject(app) { |a, e| e[a].tap { |x| x.freeze if @freeze_app } }
-            @warmup.call(app) if @warmup
-            app
-          end
-
-          def call(env)
-            to_app.call(env)
-          end
-
-          private
-
-          def generate_map(default_app, mapping)
-            mapped = default_app ? { '/' => default_app } : {}
-            mapping.each { |r, b| mapped[r] = self.class.new(default_app, &b).to_app }
-            URLMap.new(mapped)
-          end
-        end
-      end
-    end
-  end
-end
+require 'rack'
 
 module Iodine
   # The Iodine::Base namespace is reserved for internal use and is NOT part of the public API.
@@ -214,37 +15,23 @@ module Iodine
 
       def self.try_file filename
         return nil unless File.exist? filename
-        return Iodine::Base::Rack::Builder.parse_file filename
+        ::Rack::Builder.parse_file filename
       end
 
-      def self.get_app_opts
-        app, opt = nil, nil
+      def self.get_app
+        app = nil
         filename = Iodine::DEFAULT_SETTINGS[:filename_]
         if filename
-          app, opt = try_file filename
-          app, opt = try_file "#{filename}.ru" unless opt
-          unless opt
+          app = try_file filename
+          app = try_file "#{filename}.ru" unless app
+          unless app
             puts "* Couldn't find #{filename}\n  testing for config.ru\n"
-            app, opt = try_file "config.ru"
+            app = try_file "config.ru"
           end
         else
-          app, opt = try_file "config.ru";
-        end
-
-        unless opt
-          puts "WARNING: Ruby application not found#{ filename ? " - missing both #{filename} and config.ru" : " - missing config.ru"}."
-          if Iodine::DEFAULT_SETTINGS[:public]
-            puts "         Running only static file service."
-            opt = Hash.new
-            app = Proc.new { [404, {}, "Not Found!"] }
-          else
-            puts "\nERROR: Couldn't run Ruby application, check command line arguments."
-            ARGV << "-?"
-            Iodine::Base::CLI.parse
-            exit(0);
-          end
+          app = try_file "config.ru";
         end
-        return app, opt
+        app
       end
 
       def self.perform_warmup(app)
@@ -256,7 +43,7 @@ module Iodine
             rescue StandardError => _e
             end
           end
-          Iodine::Base::Rack::Builder.new(app) do |r|
+          ::Rack::Builder.new(app) do |r|
             r.warmup do |a|
               client = ::Rack::MockRequest.new(a)
               client.get('/')
@@ -266,9 +53,9 @@ module Iodine
       end
 
       def self.call
-        app, opt = get_app_opts
+        app = get_app
         perform_warmup(app) if Iodine::DEFAULT_SETTINGS[:warmup_]
-        Iodine::Rack.run(app, opt)
+        Iodine::Rack.run(app)
       end
     end
   end

data/isomorfeus-iodine.gemspec

@@ -34,6 +34,8 @@ Gem::Specification.new do |spec|
   spec.requirements << 'TLS requires OpenSSL >= 1.1.0.'
   spec.requirements << 'Or Windows with Ruby >= 3.0.0 build with MingW and MingW as compiler.'
 
+  spec.add_dependency 'rackup', '~> 0.2.2'
+  spec.add_dependency 'rack', '~> 3.0.0'
   spec.add_development_dependency 'rake', '~> 13.0', '< 14.0'
   spec.add_development_dependency 'minitest', '>=5', '< 6.0'
   spec.add_development_dependency 'rspec', '>=3.9.0', '< 4.0'

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.50'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/lib/rack/handler/iodine.rb

@@ -27,7 +27,9 @@ end
 ENV['RACK_HANDLER'] ||= 'iodine'
 
 begin
-  ::Rack::Handler.register('iodine', 'Iodine::Rack') if defined?(::Rack::Handler)
-  ::Rack::Handler.register('Iodine', 'Iodine::Rack') if defined?(::Rack::Handler)
+  if defined?(::Rackup::Handler)
+    ::Rackup::Handler.register('iodine', Iodine::Rack)
+    ::Rackup::Handler.register('Iodine', Iodine::Rack)
+  end
 rescue StandardError
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.50
+  version: 0.8.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +275,7 @@ metadata:
   github_repo: ssh://github.com/isomorfeus/gems
   source_code_uri: https://github.com/isomorfeus/isomorfeus-iodine
 post_install_message: |-
-  Thank you for installing Iodine 0.7.50.
+  Thank you for installing Iodine 0.8.0.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations) to Bo, see https://github.com/boazsegev/iodine
 rdoc_options: []
 require_paths: