innate 2013.02.21 → 2023.01.06

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 4d2355b1a19d85209ed8acbafbf477b31bc804b793d9de0f677a83c4d92a8e17
+  data.tar.gz: fb39b388cfce21a80fc3ad379b8915d9642a44ee31d6e3beffa27583322edc48
+SHA512:
+  metadata.gz: 19c747ca8d094441e416ffb09da46c8c6ade409e71be70c65564cdbbf09d4a121560d4cabeede86fb99370276f6e4a83c4de7208eaadaeda203957865cd4a596
+  data.tar.gz: 2dd8608564ae9e6cc0b48ed4ea8dd8ff2898bd853a02ef2ef862aec9e35e0899bb2d9d262e62b0dcf22dcb53b223aebc59eaac02a3d0952f3ade3645d4bf5756

data/AUTHORS

@@ -1,11 +1,12 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   821 Michael Fellinger <m.fellinger@gmail.com>
+   825 Michael Fellinger <m.fellinger@gmail.com>
     31 Tadahiko Uehara <kikofx@gmail.com>
     21 Yorick Peterse <yorickpeterse@gmail.com>
      9 Lee Jarvis <injekt.me@gmail.com>
      8 Pistos <gitsomegrace.5.pistos@geoshell.com>
+     6 Michael Faughn <michael.faughn@nist.gov>
      5 injekt <injekt.me@gmail.com>
      5 Ryan Grove <ryan@wonko.com>
      4 Zoxc <zoxc32@gmail.com>
@@ -14,9 +15,12 @@ Following persons have contributed to innate.
      2 Andreas Karlsson <andreas@proxel.se>
      2 Arnaud Meuret <arnaud@meuret.name>
      2 injekt <ljjarvis@gmail.com>
+     2 Michael J. Welch, Ph.D <mjwelchphd@ekgreaders.com>
      2 TJ Vanderpoel <bougy.man@gmail.com>
      2 YorickPeterse <yorickpeterse@gmail.com>
      1 crab <crabtw@gmail.com>
      1 Jérémy Zurcher <jeremy@asynk.ch>
+     1 Michael Fellinger <github@manveru.dev>
+     1 Patrik Rak <patrik@raxoft.cz>
      1 ravage <ravage@fragmentized.net>
      1 Sam Carr <samcarr@gmail.com>

data/CHANGELOG

@@ -1,3 +1,47 @@
+[171f18d | 2023-01-05 11:40:11 UTC] Michael Faughn <michael.faughn@nist.gov>
+
+  * update gemspec to specify modern version of rack and rack-test and add rackup
+
+[e58eb0b | 2023-01-05 11:38:55 UTC] Michael Faughn <michael.faughn@nist.gov>
+
+  * Use Rackup::Handler instead of Rack::Handler.  Refactor registration of ebb handler registration into #start_ebb.  Not sure this code is covered by the tests but all tests are passing.
+
+[0e8a163 | 2023-01-05 11:11:37 UTC] Michael Faughn <michael.faughn@nist.gov>
+
+  * fix test to expect header keys to be downcase as that is what Rack sends now
+
+[a6158c2 | 2023-01-05 11:09:24 UTC] Michael Faughn <michael.faughn@nist.gov>
+
+  * Fix unless condition in rescue block of Request#local_net? to match any exception message that suggests an invalid address
+
+[15a50ff | 2023-01-05 11:06:44 UTC] Michael Faughn <michael.faughn@nist.gov>
+
+  * Change Rack::File to Rack::Files and Rack::Response#header to #headers to conform with rack ~> 3.0
+
+[972432e | 2023-01-05 11:03:20 UTC] Michael Faughn <michael.faughn@nist.gov>
+
+  * remove Gem::Specification#has_rdoc because it is deprecated and breaks things.
+
+[2da7803 | 2016-05-12 20:45:17 UTC] Michael J. Welch, Ph.D <mjwelchphd@ekgreaders.com>
+
+  * Update adapter.rb.
+
+    In lib/innate/adapter.rb#self.start_webrick, `:BindAddress => config[:Host]` should be `:Host => config[:Host]` because lib/rack/handler/webrick.rb#self.run looks for :Host, not :BindAddress. What this means is, if you're running Ramaze on a remote server, there is no :Host in the options (which returns nil), and so it defaults to localhost, then your browser won't see the site.
+
+[4989626 | 2015-10-28 17:16:46 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2015.10.28
+
+[105060c | 2015-10-28 17:15:55 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * update dependencies and gem setup
+
+[cde6b36 | 2013-10-16 14:59:44 UTC] Patrik Rak <patrik@raxoft.cz>
+
+  * Use correct session class in Current.setup.
+
+    Current.setup should honor the passed in arguments even for session.
+
 [866c9cd | 2013-02-21 12:21:46 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2013.02.21

data/Rakefile

@@ -9,12 +9,12 @@ PROJECT_README = 'README.md'
 PROJECT_VERSION = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
 
 DEPENDENCIES = {
-  'rack' => {:version => '~> 1.5.2'},
+  'rack' => {:version => '~> 3.0'},
 }
 
 DEVELOPMENT_DEPENDENCIES = {
   'bacon'     => {:version => '~> 1.2.0'},
-  'rack-test' => {:version => '~> 0.6.2', :lib => 'rack/test'}
+  'rack-test' => {:version => '~> 0.6.3', :lib => 'rack/test'}
 }
 
 GEMSPEC = Gem::Specification.new{|s|
@@ -27,10 +27,7 @@ GEMSPEC = Gem::Specification.new{|s|
   s.platform     = Gem::Platform::RUBY
   s.version      = PROJECT_VERSION
   s.files        = `git ls-files`.split("\n").sort
-  s.has_rdoc     = true
   s.require_path = 'lib'
-  s.rubyforge_project = "innate"
-  s.required_rubygems_version = '>= 1.3.1'
 }
 
 DEPENDENCIES.each do |name, options|

data/innate.gemspec

@@ -1,36 +1,32 @@
 # -*- encoding: utf-8 -*-
+# stub: innate 2023.01.06 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "innate"
-  s.version = "2013.02.21"
+  s.name = "innate".freeze
+  s.version = "2023.01.06"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = "2013-02-21"
-  s.description = "Simple, straight-forward base for web-frameworks."
-  s.email = "m.fellinger@gmail.com"
-  s.files = [".gems", ".gitignore", ".load_gemset", ".rvmrc", ".travis.yml", "AUTHORS", "CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.xhtml", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.xhtml", "example/app/whywiki_erb/layout/wiki.html.erb", "example/app/whywiki_erb/spec/wiki.rb", "example/app/whywiki_erb/start.rb", "example/app/whywiki_erb/view/edit.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "lib/innate/cache/memory.rb", "lib/innate/cache/yaml.rb", "lib/innate/current.rb", "lib/innate/default_middleware.rb", "lib/innate/dynamap.rb", "lib/innate/helper.rb", "lib/innate/helper/aspect.rb", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.rb", "lib/innate/helper/redirect.rb", "lib/innate/helper/render.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.rb", "lib/innate/lru_hash.rb", "lib/innate/mock.rb", "lib/innate/node.rb", "lib/innate/options.rb", "lib/innate/options/dsl.rb", "lib/innate/options/stub.rb", "lib/innate/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/spec/bacon.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/app/retro_games.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/provides.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/etanni.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/view/aspect_hello.xhtml", "spec/innate/helper/view/locals.xhtml", "spec/innate/helper/view/loop.xhtml", "spec/innate/helper/view/num.xhtml", "spec/innate/helper/view/partial.xhtml", "spec/innate/helper/view/recursive.xhtml", "spec/innate/mock.rb", "spec/innate/modes.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/cat2/cat22.xhtml", "spec/innate/node/view/cat3/cat33.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/sub/baz.xhtml", "spec/innate/node/view/sub/foo/baz.xhtml", "spec/innate/node/view/with_layout.xhtml", "spec/innate/node/wrap_action_call.rb", "spec/innate/options.rb", "spec/innate/parameter.rb", "spec/innate/provides.rb", "spec/innate/provides/list.html.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/response.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/traited.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
-  s.homepage = "http://github.com/manveru/innate"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "innate"
-  s.rubygems_version = "1.8.25"
-  s.summary = "Powerful web-framework wrapper for Rack."
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Michael 'manveru' Fellinger".freeze]
+  s.date = "2023-01-06"
+  s.description = "Simple, straight-forward base for web-frameworks.".freeze
+  s.email = "m.fellinger@gmail.com".freeze
+  s.files = [".gems".freeze, ".gitignore".freeze, ".load_gemset".freeze, ".rvmrc".freeze, ".travis.yml".freeze, "AUTHORS".freeze, "CHANGELOG".freeze, "COPYING".freeze, "MANIFEST".freeze, "README.md".freeze, "Rakefile".freeze, "example/app/retro_games.rb".freeze, "example/app/todo/layout/default.xhtml".freeze, "example/app/todo/spec/todo.rb".freeze, "example/app/todo/start.rb".freeze, "example/app/todo/view/index.xhtml".freeze, "example/app/whywiki_erb/layout/wiki.html.erb".freeze, "example/app/whywiki_erb/spec/wiki.rb".freeze, "example/app/whywiki_erb/start.rb".freeze, "example/app/whywiki_erb/view/edit.erb".freeze, "example/app/whywiki_erb/view/index.erb".freeze, "example/custom_middleware.rb".freeze, "example/hello.rb".freeze, "example/howto_spec.rb".freeze, "example/link.rb".freeze, "example/provides.rb".freeze, "example/session.rb".freeze, "innate.gemspec".freeze, "lib/innate.rb".freeze, "lib/innate/action.rb".freeze, "lib/innate/adapter.rb".freeze, "lib/innate/cache.rb".freeze, "lib/innate/cache/api.rb".freeze, "lib/innate/cache/drb.rb".freeze, "lib/innate/cache/file_based.rb".freeze, "lib/innate/cache/marshal.rb".freeze, "lib/innate/cache/memory.rb".freeze, "lib/innate/cache/yaml.rb".freeze, "lib/innate/current.rb".freeze, "lib/innate/default_middleware.rb".freeze, "lib/innate/dynamap.rb".freeze, "lib/innate/helper.rb".freeze, "lib/innate/helper/aspect.rb".freeze, "lib/innate/helper/cgi.rb".freeze, "lib/innate/helper/flash.rb".freeze, "lib/innate/helper/link.rb".freeze, "lib/innate/helper/redirect.rb".freeze, "lib/innate/helper/render.rb".freeze, "lib/innate/log.rb".freeze, "lib/innate/log/color_formatter.rb".freeze, "lib/innate/log/hub.rb".freeze, "lib/innate/lru_hash.rb".freeze, "lib/innate/mock.rb".freeze, "lib/innate/node.rb".freeze, "lib/innate/options.rb".freeze, "lib/innate/options/dsl.rb".freeze, "lib/innate/options/stub.rb".freeze, "lib/innate/request.rb".freeze, "lib/innate/response.rb".freeze, "lib/innate/route.rb".freeze, "lib/innate/session.rb".freeze, "lib/innate/session/flash.rb".freeze, "lib/innate/spec.rb".freeze, "lib/innate/spec/bacon.rb".freeze, "lib/innate/state.rb".freeze, "lib/innate/state/accessor.rb".freeze, "lib/innate/traited.rb".freeze, "lib/innate/trinity.rb".freeze, "lib/innate/version.rb".freeze, "lib/innate/view.rb".freeze, "lib/innate/view/erb.rb".freeze, "lib/innate/view/etanni.rb".freeze, "lib/innate/view/none.rb".freeze, "spec/example/app/retro_games.rb".freeze, "spec/example/hello.rb".freeze, "spec/example/link.rb".freeze, "spec/example/provides.rb".freeze, "spec/example/session.rb".freeze, "spec/helper.rb".freeze, "spec/innate/action/layout.rb".freeze, "spec/innate/action/layout/file_layout.xhtml".freeze, "spec/innate/cache/common.rb".freeze, "spec/innate/cache/marshal.rb".freeze, "spec/innate/cache/memory.rb".freeze, "spec/innate/cache/yaml.rb".freeze, "spec/innate/dynamap.rb".freeze, "spec/innate/etanni.rb".freeze, "spec/innate/helper.rb".freeze, "spec/innate/helper/aspect.rb".freeze, "spec/innate/helper/cgi.rb".freeze, "spec/innate/helper/flash.rb".freeze, "spec/innate/helper/link.rb".freeze, "spec/innate/helper/redirect.rb".freeze, "spec/innate/helper/render.rb".freeze, "spec/innate/helper/view/aspect_hello.xhtml".freeze, "spec/innate/helper/view/locals.xhtml".freeze, "spec/innate/helper/view/loop.xhtml".freeze, "spec/innate/helper/view/num.xhtml".freeze, "spec/innate/helper/view/partial.xhtml".freeze, "spec/innate/helper/view/recursive.xhtml".freeze, "spec/innate/mock.rb".freeze, "spec/innate/modes.rb".freeze, "spec/innate/node/mapping.rb".freeze, "spec/innate/node/node.rb".freeze, "spec/innate/node/resolve.rb".freeze, "spec/innate/node/view/another_layout/another_layout.xhtml".freeze, "spec/innate/node/view/bar.xhtml".freeze, "spec/innate/node/view/cat2/cat22.xhtml".freeze, "spec/innate/node/view/cat3/cat33.xhtml".freeze, "spec/innate/node/view/foo.html.xhtml".freeze, "spec/innate/node/view/only_view.xhtml".freeze, "spec/innate/node/view/sub/baz.xhtml".freeze, "spec/innate/node/view/sub/foo/baz.xhtml".freeze, "spec/innate/node/view/with_layout.xhtml".freeze, "spec/innate/node/wrap_action_call.rb".freeze, "spec/innate/options.rb".freeze, "spec/innate/parameter.rb".freeze, "spec/innate/provides.rb".freeze, "spec/innate/provides/list.html.xhtml".freeze, "spec/innate/provides/list.txt.xhtml".freeze, "spec/innate/request.rb".freeze, "spec/innate/response.rb".freeze, "spec/innate/route.rb".freeze, "spec/innate/session.rb".freeze, "spec/innate/traited.rb".freeze, "tasks/authors.rake".freeze, "tasks/bacon.rake".freeze, "tasks/changelog.rake".freeze, "tasks/gem.rake".freeze, "tasks/gem_setup.rake".freeze, "tasks/grancher.rake".freeze, "tasks/manifest.rake".freeze, "tasks/rcov.rake".freeze, "tasks/release.rake".freeze, "tasks/reversion.rake".freeze, "tasks/setup.rake".freeze, "tasks/ycov.rake".freeze]
+  s.homepage = "http://github.com/manveru/innate".freeze
+  s.rubygems_version = "3.3.20".freeze
+  s.summary = "Powerful web-framework wrapper for Rack.".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<bacon>, ["~> 1.2.0"])
-      s.add_development_dependency(%q<rack-test>, ["~> 0.6.2"])
-    else
-      s.add_dependency(%q<rack>, ["~> 1.5.2"])
-      s.add_dependency(%q<bacon>, ["~> 1.2.0"])
-      s.add_dependency(%q<rack-test>, ["~> 0.6.2"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<rack>.freeze, ["~> 1.6.4"])
+    s.add_development_dependency(%q<bacon>.freeze, ["~> 1.2.0"])
+    s.add_development_dependency(%q<rack-test>.freeze, ["~> 0.6.3"])
   else
-    s.add_dependency(%q<rack>, ["~> 1.5.2"])
-    s.add_dependency(%q<bacon>, ["~> 1.2.0"])
-    s.add_dependency(%q<rack-test>, ["~> 0.6.2"])
+    s.add_dependency(%q<rack>.freeze, ["~> 1.6.4"])
+    s.add_dependency(%q<bacon>.freeze, ["~> 1.2.0"])
+    s.add_dependency(%q<rack-test>.freeze, ["~> 0.6.3"])
   end
 end

data/lib/innate/adapter.rb

@@ -1,10 +1,4 @@
-# Rack doesn't ship with ebb handler, but it doesn't get picked up under some
-# circumstances, so we do that here.
-# Jruby Rack doesn't have the Handler::register method, so we have to check.
-if Rack::Handler.respond_to?(:register)
-  Rack::Handler.register('ebb', 'Rack::Handler::Ebb')
-end
-
+require 'rackup/handler'
 module Innate
 
   # Lightweight wrapper around Rack::Handler, will apply our options in a
@@ -44,7 +38,7 @@ module Innate
       if respond_to?(method = "start_#{handler}")
         send(method, app, config)
       else
-        Rack::Handler.get(handler).run(app, config)
+        Rackup::Handler.get(handler).run(app, config)
       end
     end
 
@@ -53,14 +47,21 @@ module Innate
     # rubygems and uses the C require directly.
     def self.start_ebb(app, config)
       require 'ebb'
-      Rack::Handler.get('ebb').run(app, config)
+      # Rack doesn't ship with ebb handler, but it doesn't get picked up under some
+      # circumstances, so we do that here.
+      # Jruby Rack doesn't have the Handler::register method, so we have to check.
+      # This has changed since Rack moved Handler to Rackup.  Not sure about JRuby
+      if Rackup::Handler.respond_to?(:register)
+        Rackup::Handler.register('ebb', 'Rackup::Handler::Ebb')
+      end
+      Rackup::Handler.get('ebb').run(app, config)
     end
 
     # We want webrick to use our logger.
     def self.start_webrick(app, config)
-      handler = Rack::Handler.get('webrick')
+      handler = Rackup::Handler.get('webrick')
       config = {
-        :BindAddress => config[:Host],
+        :Host => config[:Host],
         :Port => config[:Port],
         :Logger => Log,
       }
@@ -70,7 +71,7 @@ module Innate
 
     # Thin shouldn't give excessive output, especially not to $stdout
     def self.start_thin(app, config)
-      handler = Rack::Handler.get('thin')
+      handler = Rackup::Handler.get('thin')
       ::Thin::Logging.silent = true
       handler.run(app, config)
     end

data/lib/innate/current.rb

@@ -29,7 +29,7 @@ module Innate
       req = current[:request] = request.new(env)
       res = current[:response] = response.new
       current[:actions] = []
-      current[:session] = Session.new(req, res)
+      current[:session] = session.new(req, res)
     end
   end
 end

data/lib/innate/helper/redirect.rb

@@ -57,7 +57,7 @@ module Innate
       end
 
       def raw_redirect(target, options = {}, &block)
-        header = response.header.merge('Location' => target.to_s)
+        header = response.headers.merge('Location' => target.to_s)
         status = options[:status] || 302
         body   = options[:body] || redirect_body(target)
 

data/lib/innate/request.rb

@@ -135,7 +135,7 @@ module Innate
       addr = IPAddr.new(address)
       LOCAL.find{|range| range.include?(addr) }
     rescue ArgumentError => ex
-      raise ArgumentError, ex unless ex.message == 'invalid address'
+      raise ArgumentError, ex unless ex.message =~ /invalid address/
     end
   end
 end

data/lib/innate/response.rb

@@ -13,7 +13,7 @@ module Innate
 
     def reset
       self.status = 200
-      self.header.delete('Content-Type')
+      self.headers.delete('Content-Type')
       body.clear
       self.length = 0
       self

data/lib/innate/route.rb

@@ -5,7 +5,7 @@ module Innate
   #
   # This middleware should wrap Innate::DynaMap.
   #
-  # Please note that Rack::File is put before Route and Rewrite, that means
+  # Please note that Rack::Files is put before Route and Rewrite, that means
   # that you cannot apply routes to static files unless you add your own route
   # middleware before.
   #

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2013.02.21"
+  VERSION = "2023.01.06"
 end

data/lib/innate.rb

@@ -213,7 +213,7 @@ module Innate
       roots, publics = options[:roots], options[:publics]
 
       joined  = roots.map { |root| publics.map { |p| File.join(root, p) } }
-      joined  = joined.flatten.map { |p| Rack::File.new(p) }
+      joined  = joined.flatten.map { |p| Rack::Files.new(p) }
       current = Current.new(Route.new(DynaMap), Rewrite.new(DynaMap))
 
       return Rack::Cascade.new(joined << current, [404, 405])

data/spec/innate/modes.rb

@@ -16,12 +16,11 @@ describe 'Innate modes' do
   describe 'dev' do
     behaves_like :rack_test
     Innate.options.mode = :dev
-
     should 'handle GET request' do
       get('/').status.
         should == 200
       last_response.headers.
-        should == {'Content-Length' => '13', 'Content-Type' => 'text/html'}
+        should == {'content-length' => '13', 'content-type' => 'text/html'}
       last_response.body.
         should == 'Hello, World!'
     end
@@ -30,7 +29,7 @@ describe 'Innate modes' do
       head('/').status.
         should == 200
       last_response.headers.
-        should == {'Content-Length' => '13', 'Content-Type' => 'text/html'}
+        should == {'content-length' => '13', 'content-type' => 'text/html'}
       last_response.body.
         should == ''
     end
@@ -44,7 +43,7 @@ describe 'Innate modes' do
       get('/').status.
         should == 200
       last_response.headers.
-        should == {'Content-Length' => '13', 'Content-Type' => 'text/html'}
+        should == {'content-length' => '13', 'content-type' => 'text/html'}
       last_response.body.
         should == 'Hello, World!'
     end
@@ -53,7 +52,7 @@ describe 'Innate modes' do
       head('/').status.
         should == 200
       last_response.headers.
-        should == {'Content-Length' => '13', 'Content-Type' => 'text/html'}
+        should == {'content-length' => '13', 'content-type' => 'text/html'}
       last_response.body.
         should == ''
     end

data/tasks/gem_setup.rake

@@ -14,7 +14,7 @@ task :gem_setup do
       setup
     end
 
-    def gem(name, version = nil, options = {})
+    def use_gem(name, version = nil, options = {})
       if version.respond_to?(:merge!)
         options = version
       else
@@ -26,8 +26,7 @@ task :gem_setup do
 
     # all gems defined, let's try to load/install them
     def setup
-      require 'rubygems'
-      require 'rubygems/dependency_installer'
+      require 'rubygems/commands/install_command'
 
       @gems.each do |name, options|
         setup_gem(name, options)
@@ -37,7 +36,7 @@ task :gem_setup do
     def setup_gemspec(gemspec)
       gemspec.dependencies.each do |dependency|
         dependency.version_requirements.as_list.each do |version|
-          gem(dependency.name, version)
+          use_gem(dependency.name, version)
         end
       end
 
@@ -49,49 +48,41 @@ task :gem_setup do
     # If the second activation also fails, try to require as it may just as
     # well be in $LOAD_PATH.
     def setup_gem(name, options)
-      version = [options[:version]].compact
-      lib_name = options[:lib] || name
-
-      log "activating #{name}"
-
-      Gem.activate(name, *version)
-    rescue Gem::LoadError
-      log "activating #{name} failed, try to install"
-
-      install_gem(name, version, options)
+      try_require_gem(name, options)
+    rescue Exception
+      try_installing_gem(name, options)
     end
 
-    # tell rubygems to install a gem
-    def install_gem(name, version, options)
-      installer = Gem::DependencyInstaller.new(options)
-
-      temp_argv(options[:extconf]) do
-        log "installing #{name}"
-        installer.install(name, *version)
-      end
-
-      Gem.activate(name, *version)
-
-      log "install and final activation successful"
-    rescue Gem::GemNotFoundException => ex
-      log "installation failed: #{ex}, use normal require"
-
-      require(options[:lib] || name)
-
-      log "require successful, cannot verify version though"
+    def try_require_gem(name, options)
+      lib_name = options[:lib] || name
+      version = [options[:version]].compact
+      gem name, version[0]
+      require lib_name
     end
 
-    # prepare ARGV for rubygems installer
-    def temp_argv(extconf)
-      if extconf ||= @options[:extconf]
-        old_argv = ARGV.clone
-        ARGV.replace(extconf.split(' '))
-      end
-
-      yield
+    def try_installing_gem(name, options)
+      cmd = Gem::Commands::InstallCommand.new
+      version = [options[:version]].compact
 
-    ensure
-      ARGV.replace(old_argv) if extconf
+      if version.any?
+        version.each do |v|
+          cmd.handle_options(["--no-ri", "--no-rdoc", "--user-install", name, '--version', v])
+          Process.waitpid fork{
+            begin
+              cmd.execute
+            rescue Exception
+            end
+          }
+        end
+      else
+        cmd.handle_options(["--no-ri", "--no-rdoc", "--user-install", name])
+        Process.waitpid fork{
+          begin
+            cmd.execute
+          rescue Exception
+          end
+        }
+      end
     end
 
     private
@@ -106,7 +97,6 @@ task :gem_setup do
       end
     end
 
-    def rubyforge; 'http://gems.rubyforge.org/' end
     def github; 'http://gems.github.com/' end
   end
 end

data/tasks/setup.rake

@@ -2,11 +2,11 @@ desc 'install dependencies from gemspec'
 task :setup => [:gem_setup] do
   GemSetup.new :verbose => false do
     DEPENDENCIES.each do |name, options|
-      gem(name, options)
+      use_gem(name, options)
     end
 
     DEVELOPMENT_DEPENDENCIES.each do |name, options|
-      gem(name, options)
+      use_gem(name, options)
     end
   end
 end

metadata

@@ -1,75 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: innate
 version: !ruby/object:Gem::Version
-  version: 2013.02.21
-  prerelease: 
+  version: 2023.01.06
 platform: ruby
 authors:
 - Michael 'manveru' Fellinger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2023-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gems
-- .gitignore
-- .load_gemset
-- .rvmrc
-- .travis.yml
+- ".gems"
+- ".gitignore"
+- ".load_gemset"
+- ".rvmrc"
+- ".travis.yml"
 - AUTHORS
 - CHANGELOG
 - COPYING
@@ -204,26 +197,24 @@ files:
 - tasks/ycov.rake
 homepage: http://github.com/manveru/innate
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: innate
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubygems_version: 3.3.20
+signing_key:
+specification_version: 4
 summary: Powerful web-framework wrapper for Rack.
 test_files: []