manveru-innate 2009.06.12 → 2009.07

data/AUTHORS

@@ -1,7 +1,7 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   715 Michael Fellinger <m.fellinger@gmail.com>
+   721 Michael Fellinger <m.fellinger@gmail.com>
     31 Tadahiko Uehara <kikofx@gmail.com>
      8 Pistos <gitsomegrace.5.pistos@geoshell.com>
      5 Ryan Grove <ryan@wonko.com>

data/CHANGELOG

@@ -1,3 +1,30 @@
+[3ed8553 | 2009-07-19 03:01:48 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update dependencies
+
+[4e09c15 | 2009-07-06 10:12:43 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Implement an OpenSSL fallback for Session IDs
+
+    Comes into play in case SecureRandom cannot be found.
+    This should cover 99% of all < 1.8.7 installs.
+
+[cf9cdce | 2009-07-02 08:05:45 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * More intelligent gem_setup to handle cases where a library can be found via require but ain't a gem
+
+[337f092 | 2009-07-02 08:05:02 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use absolute paths for spec requires
+
+[7a475b9 | 2009-06-14 14:14:47 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Require rubygems >= 1.3.1
+
+[7f41b89 | 2009-06-12 12:54:32 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.06.12
+
 [e92a8b3 | 2009-06-11 15:41:35 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Make sure that instance-variables set in the view template can be used in the layout

data/Rakefile

@@ -9,6 +9,16 @@ PROJECT_MODULE = 'Innate'
 PROJECT_README = 'README.md'
 PROJECT_VERSION = ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')
 
+DEPENDENCIES = {
+  'rack' => {:version => '~> 1.0.0'},
+}
+
+DEVELOPMENT_DEPENDENCIES = {
+  'bacon'     => {:version => '>= 1.1.0'},
+  'json'      => {:version => '~> 1.1.7'},
+  'rack-test' => {:version => '>= 0.4.0', :lib => 'rack/test'}
+}
+
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = 'innate'
   s.author       = "Michael 'manveru' Fellinger"
@@ -22,14 +32,16 @@ GEMSPEC = Gem::Specification.new{|s|
   s.has_rdoc     = true
   s.require_path = 'lib'
   s.rubyforge_project = "innate"
+  s.required_rubygems_version = '>= 1.3.1'
+}
 
-  s.add_dependency('rack', '~> 1.0.0')
+DEPENDENCIES.each do |name, options|
+  GEMSPEC.add_dependency(name, options[:version])
+end
 
-  # rip those out if they cause you trouble
-  s.add_development_dependency('bacon',     '>= 1.1.0')
-  s.add_development_dependency('json',      '~> 1.1.6')
-  s.add_development_dependency('rack-test', '>= 0.3.0')
-}
+DEVELOPMENT_DEPENDENCIES.each do |name, options|
+  GEMSPEC.add_development_dependency(name, options[:version])
+end
 
 Dir['tasks/*.rake'].each{|f| import(f) }
 

data/innate.gemspec

@@ -2,40 +2,39 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2009.06.12"
+  s.version = "2009.07"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2009-06-12}
+  s.date = %q{2009-07-19}
   s.description = %q{Simple, straight-forward base for web-frameworks.}
   s.email = %q{m.fellinger@gmail.com}
   s.files = ["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/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/helper/send_file.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.rb", "lib/innate/middleware_compiler.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/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/send_file.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/foo.html.xhtml", "spec/innate/node/view/only_view.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/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.has_rdoc = true
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{innate}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Powerful web-framework wrapper for Rack.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.0.0"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_development_dependency(%q<json>, ["~> 1.1.6"])
-      s.add_development_dependency(%q<rack-test>, [">= 0.3.0"])
+      s.add_development_dependency(%q<json>, ["~> 1.1.7"])
+      s.add_development_dependency(%q<rack-test>, [">= 0.4.0"])
     else
       s.add_dependency(%q<rack>, ["~> 1.0.0"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_dependency(%q<json>, ["~> 1.1.6"])
-      s.add_dependency(%q<rack-test>, [">= 0.3.0"])
+      s.add_dependency(%q<json>, ["~> 1.1.7"])
+      s.add_dependency(%q<rack-test>, [">= 0.4.0"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.0.0"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
-    s.add_dependency(%q<json>, ["~> 1.1.6"])
-    s.add_dependency(%q<rack-test>, [">= 0.3.0"])
+    s.add_dependency(%q<json>, ["~> 1.1.7"])
+    s.add_dependency(%q<rack-test>, [">= 0.4.0"])
   end
 end

data/lib/innate/session.rb

@@ -36,6 +36,8 @@ module Innate
         :expires, nil
       o "Time to live for session cookies and cache, nil/false will prevent setting",
         :ttl, (60 * 60 * 24 * 30) # 30 days
+      o "Length of generated Session ID (only applies when using SecureRandom)",
+        :sid_length, 64
 
       trigger(:expires){|v|
         self.ttl = v - Time.now.to_i
@@ -122,8 +124,32 @@ module Innate
 
     begin
       require 'securerandom'
-      def sid_algorithm; SecureRandom.hex(32); end
+
+      # Using SecureRandom, optional length.
+      # SecureRandom is available since Ruby 1.8.7.
+      # For Ruby versions earlier than that, you can require the uuidtools gem,
+      # which has a drop-in replacement for SecureRandom.
+      def sid_algorithm; SecureRandom.hex(options.sid_length); end
+    rescue LoadError
+      require 'openssl'
+
+      # Using OpenSSL::Random for generation, this is comparable in performance
+      # with stdlib SecureRandom and also allows for optional length, it should
+      # have the same behaviour as the SecureRandom::hex method of the
+      # uuidtools gem.
+      def sid_algorithm
+        OpenSSL::Random.random_bytes(options.sid_length / 2).unpack('H*')[0]
+      end
     rescue LoadError
+      warn "Falling back to low-entropy Session ID generation"
+      warn "Avoid this by upgrading Ruby, installing OpenSSL, or UUIDTools"
+
+      # Digest::SHA2::hexdigest produces a string of length 64, although
+      # collisions are not very likely, the entropy is still very low and
+      # length is not optional.
+      #
+      # Replacing it with OS-provided random data would take a lot of code and
+      # won't be as cross-platform as Ruby.
       def sid_algorithm
         entropy = [ srand, rand, Time.now.to_f, rand, $$, rand, object_id ]
         Digest::SHA2.hexdigest(entropy.join)

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.06.12"
+  VERSION = "2009.07"
 end

data/spec/example/app/retro_games.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'example/app/retro_games'
+require File.expand_path('../../../helper', __FILE__)
+require File.expand_path('../../../../example/app/retro_games', __FILE__)
 
 describe 'Retro-games app' do
   behaves_like :rack_test

data/spec/example/hello.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'example/hello'
+require File.expand_path('../../helper', __FILE__)
+require File.expand_path('../../../example/hello', __FILE__)
 
 describe 'example/hello' do
   behaves_like :rack_test

data/spec/example/link.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'example/link'
+require File.expand_path('../../helper', __FILE__)
+require File.expand_path('../../../example/link', __FILE__)
 
 describe 'example/link' do
   behaves_like :rack_test

data/spec/example/provides.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'example/provides'
+require File.expand_path('../../helper', __FILE__)
+require File.expand_path('../../../example/provides', __FILE__)
 
 describe 'examples/provide' do
   behaves_like :rack_test

data/spec/example/session.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'example/session'
+require File.expand_path('../../helper', __FILE__)
+require File.expand_path('../../../example/session', __FILE__)
 
 describe 'example/session' do
   behaves_like :rack_test

data/spec/helper.rb

@@ -4,7 +4,7 @@ if caller_line = caller.grep(%r!spec/innate/!).first
   $0 = caller_file
 end
 
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/innate'))
+require File.expand_path('../../lib/innate', __FILE__)
 require 'innate/spec'
 
 Innate.options.roots = [caller_root] if caller_root

data/spec/innate/action/layout.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 class SpecActionLayout
   include Innate::Node

data/spec/innate/cache/common.rb

@@ -1,5 +1,3 @@
-require 'spec/helper'
-
 Innate::Cache.options.names = [:one, :two]
 Innate::Cache.options.one = $common_cache_class
 Innate::Cache.options.two = $common_cache_class

data/spec/innate/cache/marshal.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 $common_cache_class = Innate::Cache::Marshal
 
-require 'spec/innate/cache/common'
+require File.expand_path('../../../innate/cache/common', __FILE__)

data/spec/innate/cache/memory.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 $common_cache_class = Innate::Cache::Memory
 
-require 'spec/innate/cache/common'
+require File.expand_path('../../../innate/cache/common', __FILE__)

data/spec/innate/cache/yaml.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 $common_cache_class = Innate::Cache::YAML
 
-require 'spec/innate/cache/common'
+require File.expand_path('../../../innate/cache/common', __FILE__)

data/spec/innate/dynamap.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 describe Innate::DynaMap do
   @app = lambda{|env| [200, {}, ['pass']] }

data/spec/innate/helper.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 require 'innate/helper'
 
 module Innate

data/spec/innate/helper/aspect.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 class AspectSpec
   Innate.node('/', self).provide(:html, :None)

data/spec/innate/helper/cgi.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 require 'innate/helper/cgi'
 
 describe "url encode" do

data/spec/innate/helper/flash.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 class SpecFlash
   include Innate::Node

data/spec/innate/helper/link.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 class One
   include Innate::Node

data/spec/innate/helper/redirect.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 class SpecRedirectHelper
   Innate.node '/'

data/spec/innate/helper/render.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 class SpecHelperRenderFull
   Innate.node '/render_full'

data/spec/innate/helper/send_file.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 class SpecSendFile
   include Innate::Node

data/spec/innate/mock.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 class SpecMock
   include Innate::Node

data/spec/innate/modes.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 class SpecModeDummy
   Innate.node '/'

data/spec/innate/node/mapping.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 describe 'Node::generate_mapping' do
   def gen(const)

data/spec/innate/node/node.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 Innate.options.merge!(:views => 'view', :layouts => 'view')
 

data/spec/innate/node/resolve.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 class SpecNodeResolve
   Innate.node('/')

data/spec/innate/node/wrap_action_call.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 SPEC_WRAP_LOG = []
 

data/spec/innate/options.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 Options = Innate::Options
 

data/spec/innate/parameter.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 class SpecParameter
   include Innate::Node

data/spec/innate/provides.rb

@@ -1,10 +1,6 @@
-begin
-  require 'json'
-rescue LoadError
-  exit
-end
+require File.expand_path('../../helper', __FILE__)
 
-require 'spec/helper'
+require 'json'
 require 'yaml'
 
 Innate.options.merge!(:views => 'provides', :layouts => 'provides')

data/spec/innate/request.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 describe Innate::Request do
   def request(env = {})

data/spec/innate/route.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 class SpecRouter
   Innate.node('/').provide(:html, :None)

data/spec/innate/session.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 class SpecSession
   Innate.node('/').provide(:html, :None)

data/spec/innate/traited.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 class Animal
   include Innate::Traited

data/tasks/gem_setup.rake

@@ -44,8 +44,10 @@ task :gem_setup do
       setup
     end
 
-    # first try to activate, install and try to activate again if activation
-    # fails the first time
+    # First try to activate.
+    # If activation fails, try to install and activate again.
+    # 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
@@ -53,9 +55,10 @@ task :gem_setup do
       log "activating #{name}"
 
       Gem.activate(name, *version)
-    rescue LoadError
+    rescue Gem::LoadError
+      log "activating #{name} failed, try to install"
+
       install_gem(name, options)
-      Gem.activate(name, *version)
     end
 
     # tell rubygems to install a gem
@@ -63,9 +66,19 @@ task :gem_setup do
       installer = Gem::DependencyInstaller.new(options)
 
       temp_argv(options[:extconf]) do
-        log "Installing #{name}"
+        log "installing #{name}"
         installer.install(name, options[: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"
     end
 
     # prepare ARGV for rubygems installer

data/tasks/setup.rake

@@ -1,6 +1,12 @@
 desc 'install dependencies from gemspec'
 task :setup => [:gem_setup] do
-  GemSetup.new :verbose => true do
-    setup_gemspec GEMSPEC
+  GemSetup.new :verbose => false do
+    DEPENDENCIES.each do |name, options|
+      gem(name, options)
+    end
+
+    DEVELOPMENT_DEPENDENCIES.each do |name, options|
+      gem(name, options)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manveru-innate
 version: !ruby/object:Gem::Version 
-  version: 2009.06.12
+  version: "2009.07"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -07:00
+date: 2009-07-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: 1.1.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
     version: 
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
@@ -188,7 +188,7 @@ files:
 - tasks/reversion.rake
 - tasks/setup.rake
 - tasks/ycov.rake
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/manveru/innate
 post_install_message: 
 rdoc_options: []
@@ -205,14 +205,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
 rubyforge_project: innate
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Powerful web-framework wrapper for Rack.
 test_files: []