innate 2009.05 → 2009.06

data/spec/innate/modes.rb

@@ -0,0 +1,61 @@
+require 'spec/helper'
+
+class SpecModeDummy
+  Innate.node '/'
+
+  def index
+    'Hello, World!'
+  end
+
+  def random
+    rand.to_s
+  end
+end
+
+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'}
+      last_response.body.
+        should == 'Hello, World!'
+    end
+
+    should 'handle HEAD requests by omitting body' do
+      head('/').status.
+        should == 200
+      last_response.headers.
+        should == {'Content-Length' => '13', 'Content-Type' => 'text/html'}
+      last_response.body.
+        should == ''
+    end
+  end
+
+  describe 'live' do
+    behaves_like :rack_test
+    Innate.options.mode = :live
+
+    should 'handle GET request' do
+      get('/').status.
+        should == 200
+      last_response.headers.
+        should == {'Content-Length' => '13', 'Content-Type' => 'text/html'}
+      last_response.body.
+        should == 'Hello, World!'
+    end
+
+    should 'handle HEAD requests by omitting body' do
+      head('/').status.
+        should == 200
+      last_response.headers.
+        should == {'Content-Length' => '13', 'Content-Type' => 'text/html'}
+      last_response.body.
+        should == ''
+    end
+  end
+end

data/spec/innate/node/node.rb

@@ -77,7 +77,7 @@ class SpecNodeAliasView < SpecNodeProvideTemplate
 end
 
 describe 'Innate::Node' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'respond with 404 if no action was found' do
     got = Innate::Mock.get('/does_not_exist')

data/spec/innate/node/wrap_action_call.rb

@@ -38,7 +38,7 @@ end
 
 
 describe 'Node#wrap_action_call' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'executes our wrapper' do
     SPEC_WRAP_LOG.clear

data/spec/innate/options.rb

@@ -106,7 +106,11 @@ describe Options do
     require 'pp'
     p = PP.new
     @options.pretty_print(p)
-    p.output.should =~ /:value=>:mom/
+    lines = p.output.split(/\n/)
+    lines.find_all{|l|
+      /:doc/ === l &&
+      /:value/ === l
+    }.size.should > 3
   end
 
   should 'trigger block when option is changed' do

data/spec/innate/provides.rb

@@ -49,7 +49,7 @@ end
 
 describe 'Content representation' do
   describe 'without template' do
-    behaves_like :mock, :assert_wish
+    behaves_like :rack_test, :assert_wish
 
     it 'provides yaml for an object' do
       assert_wish('/object.yaml', {'intro' => 'Hello, World!'}.to_yaml, 'text/yaml')
@@ -69,7 +69,7 @@ describe 'Content representation' do
   end
 
   describe 'with templates' do
-    behaves_like :mock, :assert_wish
+    behaves_like :rack_test, :assert_wish
 
     it 'defaults to <name>.html.<engine>' do
       body = '<ul><li>starbucks</li><li>apollo</li><li>athena</li></ul>'

data/spec/innate/request.rb

@@ -44,11 +44,13 @@ describe Innate::Request do
   end
 
   should 'provide #subset' do
-    params = {'a' => 'b', 'c' => 'd', 'e' => 'f'}
-    env = { 'rack.request.form_hash' => params }
-    req = request(env)
+    require 'stringio'
 
-    req.params.should == params
+    query = {'a' => 'b', 'c' => 'd', 'e' => 'f'}
+    params = StringIO.new(Rack::Utils.build_query(query))
+    req = request('rack.request.form_hash' => params, 'rack.input' => params)
+
+    req.params.should == query
     req.subset(:a).should == {'a' => 'b'}
     req.subset(:a, :c).should == {'a' => 'b', 'c' => 'd'}
   end

data/spec/innate/session.rb

@@ -29,7 +29,7 @@ class SpecSession
 end
 
 describe Innate::Session do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'initiate session as needed' do
     get '/'
@@ -51,4 +51,8 @@ describe Innate::Session do
       get('/decrement').body.should == n.to_s
     end
   end
+
+  should 'expose sid method' do
+    Innate::Current.session.sid.should.not.be.empty
+  end
 end

data/tasks/{gem_installer.rake → gem_setup.rake}

@@ -1,14 +1,17 @@
-task :gem_installer do
-  class GemInstaller
+task :gem_setup do
+  class GemSetup
     def initialize(options = {}, &block)
       @gems = []
-      @options = options
+      @options = options.dup
+      @verbose = @options.delete(:verbose)
 
       run(&block)
     end
 
     def run(&block)
-      instance_eval(&block) if block_given?
+      return unless block_given?
+      instance_eval(&block)
+      setup
     end
 
     def gem(name, version = nil, options = {})
@@ -21,6 +24,16 @@ task :gem_installer do
       @gems << [name, options]
     end
 
+    # all gems defined, let's try to load/install them
+    def setup
+      require 'rubygems'
+      require 'rubygems/dependency_installer'
+
+      @gems.each do |name, options|
+        setup_gem(name, options)
+      end
+    end
+
     def setup_gemspec(gemspec)
       gemspec.dependencies.each do |dependency|
         dependency.version_requirements.as_list.each do |version|
@@ -31,36 +44,31 @@ task :gem_installer do
       setup
     end
 
-    def setup
-      require 'rubygems'
-      require 'rubygems/dependency_installer'
+    # first try to activate, install and try to activate again if activation
+    # fails the first time
+    def setup_gem(name, options)
+      version = [options[:version]].compact
+      lib_name = options[:lib] || name
 
-      @gems.each do |name, options|
-        setup_gem(name, options)
-      end
-    end
+      log "activating #{name}"
 
-    def setup_gem(name, options, try_install = true)
-      print "activating #{name} ... "
-      Gem.activate(name, *[options[:version]].compact)
-      require(options[:lib] || name)
-      puts "success."
-    rescue LoadError => error
-      puts error
-      install_gem(name, options) if try_install
-      setup_gem(name, options, try_install = false)
+      Gem.activate(name, *version)
+    rescue LoadError
+      install_gem(name, options)
+      Gem.activate(name, *version)
     end
 
+    # tell rubygems to install a gem
     def install_gem(name, options)
       installer = Gem::DependencyInstaller.new(options)
 
       temp_argv(options[:extconf]) do
-        print "Installing #{name} ... "
+        log "Installing #{name}"
         installer.install(name, options[:version])
-        puts "done."
       end
     end
 
+    # prepare ARGV for rubygems installer
     def temp_argv(extconf)
       if extconf ||= @options[:extconf]
         old_argv = ARGV.clone
@@ -72,5 +80,20 @@ task :gem_installer do
     ensure
       ARGV.replace(old_argv) if extconf
     end
+
+    private
+
+    def log(msg)
+      return unless @verbose
+
+      if defined?(Log)
+        Log.info(msg)
+      else
+        puts(msg)
+      end
+    end
+
+    def rubyforge; 'http://gems.rubyforge.org/' end
+    def github; 'http://gems.github.com/' end
   end
 end

data/tasks/release.rake

@@ -29,7 +29,8 @@ INSTRUCTIONS
 To publish to rubyforge do following:
 
 rubyforge login
-rubyforge add_release #{name} '#{version}' pkg/#{name}-#{version}.gem
+rubyforge add_release #{name} #{name} '#{version}' pkg/#{name}-#{version}.gem
+
 
 After you have done these steps, see:
 
@@ -41,8 +42,9 @@ INSTRUCTIONS
   desc 'Display instructions to add archives after release:rubyforge'
   task :rubyforge_archives do
     puts "Adding archives for distro packagers is:", ""
+    name, version = GEMSPEC.name, GEMSPEC.version
 
-    Dir["pkg/#{name}-#{version}.{gz,zip}"].each do |file|
+    Dir["pkg/#{name}-#{version}.{tgz,zip}"].each do |file|
       puts "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
     end
 

data/tasks/setup.rake

@@ -1,28 +1,6 @@
-# Currently, Innate is not usable without Rack from the master branch head.
-# Also, our specs now depend on the latest rack-test.
-#
-# In order to make setup simpler for folks, I'll put up some gemspecs on github
-# and use their automatic building to provide development versions of these
-# libraries as gems for easier deployment.
-#
-# Once the libraries are officially released in a usable state I'll switch
-# dependencies to the official ones again.
-#
-# Please note that this makes running in environments that enforce their own
-# Rack (like jruby-rack) still quite difficult, but should allow for easier
-# development.
-#
-# Please be patient.
-
-desc 'install dependencies'
-task :setup do
-  GemInstaller.new do
-    gem 'bacon', '>= 1.0'
-    gem 'json', '~> 1.1.3'
-
-    gem 'manveru-rack-test', '> 0.1.0', :lib => 'rack-test'
-    gem 'manveru-rack', '>= 0.9.9', :lib => 'rack'
-
-    setup
+desc 'install dependencies from gemspec'
+task :setup => [:gem_setup] do
+  GemSetup.new :verbose => true do
+    setup_gemspec GEMSPEC
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: innate
 version: !ruby/object:Gem::Version 
-  version: "2009.05"
+  version: "2009.06"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 +09:00
+date: 2009-06-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,36 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
 executables: []
@@ -89,6 +119,7 @@ files:
 - 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
@@ -126,6 +157,7 @@ files:
 - 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
@@ -148,9 +180,8 @@ files:
 - tasks/bacon.rake
 - tasks/changelog.rake
 - tasks/gem.rake
-- tasks/gem_installer.rake
+- tasks/gem_setup.rake
 - tasks/grancher.rake
-- tasks/install_dependencies.rake
 - tasks/manifest.rake
 - tasks/rcov.rake
 - tasks/release.rake
@@ -181,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: innate
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: Powerful web-framework wrapper for Rack.

data/tasks/install_dependencies.rake

@@ -1,4 +0,0 @@
-desc 'install dependencies from gemspec'
-task :install_dependencies => [:gem_installer] do
-  GemInstaller.new{ setup_gemspec(GEMSPEC) }
-end