manveru-innate 2009.04 → 2009.04.01

data/spec/innate/helper/redirect.rb

@@ -20,7 +20,7 @@ class SpecRedirectHelper
   end
 
   def redirect_referer_action
-    redirect_referer(r(:noop))
+    redirect_referer
   end
 
   def no_actual_redirect
@@ -69,92 +69,77 @@ describe Innate::Helper::Redirect do
   end
 
   should 'redirect' do
-    get("#@uri/redirection")
-
-    last_response.status.should == 302
-    last_response.headers['Location'].should == "#@uri/index"
-    last_response.headers['Content-Type'].should == "text/html"
+    got = get("#@uri/redirection")
+    got.status.should == 302
+    got.headers['Location'].should == "#@uri/index"
+    got.headers['Content-Type'].should == "text/html"
   end
 
   should 'redirect twice' do
-    get("#@uri/double_redirection")
-
-    last_response.status.should == 302
-    last_response.headers['Location'].should == "#@uri/redirection"
-    last_response.headers['Content-Type'].should == "text/html"
+    got = get("#@uri/double_redirection")
+    got.status.should == 302
+    got.headers['Location'].should == "#@uri/redirection"
+    got.headers['Content-Type'].should == "text/html"
   end
 
   should 'redirect to referer' do
-    header 'HTTP_REFERER', '/index'
-    get("#@uri/redirect_referer_action")
-
-    last_response.status.should == 302
-    last_response.headers['Location'].should == "#@uri/index"
-    last_response.headers['Content-Type'].should == "text/html"
-  end
-
-  should 'redirect to fallback if referrer is identical' do
-    header 'HTTP_REFERER', "#@uri/redirect_referer_action"
-    get("#@uri/redirect_referer_action")
-
-    last_response.status.should == 302
-    last_response.headers['Location'].should == "#@uri/noop"
-    last_response.headers['Content-Type'].should == "text/html"
+    got = get("#@uri/redirect_referer_action", 'HTTP_REFERER' => '/noop')
+    got.status.should == 302
+    got.headers['Location'].should == "#@uri/noop"
+    got.headers['Content-Type'].should == "text/html"
+    got = get("#@uri/redirect_referer_action", 'HTTP_REFERER' => "#@uri/redirect_referer_action")
+    got.status.should == 302
+    got.headers['Location'].should == "#@uri/"
+    got.headers['Content-Type'].should == "text/html"
   end
 
   should 'use #r' do
-    get("#@uri/redirect_method")
-
-    last_response.status.should == 302
-    last_response.headers['Location'].should == "#@uri/noop"
-    last_response.headers['Content-Type'].should == "text/html"
+    got = get("#@uri/redirect_method")
+    got.status.should == 302
+    got.headers['Location'].should == "#@uri/noop"
+    got.headers['Content-Type'].should == "text/html"
   end
 
   should 'work with absolute uris' do
-    get("#@uri/absolute_redirect")
-
-    last_response.status.should == 302
-    last_response.headers['Location'].should == "#@uri/noop"
-    last_response.headers['Content-Type'].should == "text/html"
+    got = get("#@uri/absolute_redirect")
+    got.status.should == 302
+    got.headers['Location'].should == "#@uri/noop"
+    got.headers['Content-Type'].should == "text/html"
   end
 
   should 'support #respond' do
-    get("#@uri/loop")
-
-    last_response.status.should == 200
-    last_response.body.should == 'no loop'
+    got = get("#@uri/loop")
+    got.status.should == 200
+    got.body.should == 'no loop'
   end
 
   should 'support #respond with status' do
-    get("#@uri/respond_with_status")
-
-    last_response.status.should == 404
-    last_response.body.should == 'not found'
+    got = get("#@uri/respond_with_status")
+    got.status.should == 404
+    got.body.should == 'not found'
   end
 
   should 'support #respond!' do
-    get("#@uri/destructive_respond")
-
-    last_response.status.should == 200
-    last_response.body.should == 'destructive'
+    got = get("#@uri/destructive_respond")
+    got.status.should == 200
+    got.body.should == 'destructive'
   end
 
   should 'redirect without modifying the target' do
-    get("#@uri/redirect_unmodified")
-
-    last_response.status.should == 302
-    last_response.headers['Location'].should == '/noop'
+    got = get("#@uri/redirect_unmodified")
+    got.status.should == 302
+    got.headers['Location'].should == '/noop'
   end
 
   should 'catch redirection' do
-    get("#@uri/no_actual_redirect")
-    last_response.status.should == 200
-    last_response.body.should == 'no actual redirect'
+    got = get("#@uri/no_actual_redirect")
+    got.status.should == 200
+    got.body.should == 'no actual redirect'
   end
 
   should 'catch double redirect' do
-    get("#@uri/no_actual_double_redirect")
-    last_response.status.should == 200
-    last_response.body.should == 'no actual double redirect'
+    got = get("#@uri/no_actual_double_redirect")
+    got.status.should == 200
+    got.body.should == 'no actual double redirect'
   end
 end

data/spec/innate/helper/view/aspect_hello.erb

@@ -0,0 +1 @@
+<%= @foo %> <%= @bar %>!

data/spec/innate/helper/view/locals.erb

@@ -0,0 +1 @@
+<%= say %>, <%= to %>!

data/spec/innate/helper/view/loop.erb

@@ -0,0 +1,4 @@
+<% (1..5).each do |n| %>
+  <% @n = n %>
+  <%= render_template('num') %>
+<% end %>

data/spec/innate/helper/view/num.erb

@@ -0,0 +1 @@
+<%= @n %>

data/spec/innate/helper/view/partial.erb

@@ -0,0 +1 @@
+From Partial <%= @here %>

data/spec/innate/helper/view/recursive.erb

@@ -0,0 +1,8 @@
+{
+  <%= @n %>
+  <% if @n < 4 %>
+    <% @n += 1 %>
+    <%= render_template('recursive') %>
+  <% end %>
+  <%= @n %>
+}

data/spec/innate/node/node.rb

@@ -4,6 +4,8 @@ Innate.options.merge!(:views => 'view', :layouts => 'view')
 
 class SpecNode
   Innate.node('/')
+  provide(:html, :ERB)
+  provide(:erb, :None)
 
   def foo; end
   def bar; end
@@ -16,18 +18,24 @@ end
 class SpecNodeProvide
   Innate.node('/provide')
 
+  provide(:html, :ERB)
+  provide(:erb, :None)
+
   def foo
-    '#{21 * 2}'
+    '<%= 21 * 2 %>'
   end
 
   def bar
-    '#{84 / 2}'
+    '<%= 84 / 2 %>'
   end
 end
 
 class SpecNodeProvideTemplate
   Innate.node('/provide_template')
 
+  provide :html, :ERB
+  provide :erb, :None
+
   map_views '/'
 end
 
@@ -56,7 +64,7 @@ class SpecNodeWithLayoutMethod < SpecNodeProvide
   layout 'layout_method'
 
   def layout_method
-    '<div class="content">#{@content}</div>'
+    '<div class="content"><%= @content %></div>'
   end
 end
 
@@ -88,14 +96,14 @@ describe 'Innate::Node' do
   should 'wrap with layout' do
     got = Innate::Mock.get('/layout/bar')
     got.status.should == 200
-    got.body.should == %(<div class="content">42</div>)
+    got.body.should == %(<div class="content">42</div>\n)
     got['Content-Type'].should == 'text/html'
   end
 
   should 'find layout with view_root' do
     got = Innate::Mock.get('/another_layout/bar')
     got.status.should == 200
-    got.body.should == %(<div class="content">\n  42\n</div>)
+    got.body.should == %(<div class="content">\n  42\n</div>\n)
     got['Content-Type'].should == 'text/html'
   end
 

data/spec/innate/node/view/another_layout/{another_layout.xhtml → another_layout.erb}

@@ -1,3 +1,3 @@
 <div class="content">
-  #{@content}
+  <%= @content %>
 </div>

data/spec/innate/node/view/foo.html.erb

@@ -0,0 +1 @@
+<% 10.times do |n| %><%= n %><% end %>

data/spec/innate/node/view/with_layout.erb

@@ -0,0 +1 @@
+<div class="content"><%= @content %></div>

data/spec/innate/provides.rb

@@ -12,7 +12,7 @@ Innate.options.merge!(:views => 'provides', :layouts => 'provides')
 class SpecNodeProvides
   Innate.node '/'
 
-  provide(:html, :engine => :None)
+  provide(:html, :None)
   provide(:yaml, :type => 'text/yaml'){|a,s| s.to_yaml }
   provide(:json, :type => 'application/json'){|a,s| s.to_json }
 
@@ -31,7 +31,7 @@ class SpecNodeProvidesTemplates
 
   provide(:yaml, :type => 'text/yaml'){|a,s| s.to_yaml }
   provide(:json, :type => 'application/json'){|a,s| s.to_json }
-  provide(:txt, :engine => :Etanni, :type => 'text/plain')
+  provide(:txt, :engine => :ERB, :type => 'text/plain')
 
   def list
     @users = %w[starbucks apollo athena]

data/spec/innate/provides/list.html.erb

@@ -0,0 +1 @@
+<ul><% @users.each do |user| %><li><%= user %></li><% end %></ul>

data/spec/innate/provides/list.txt.erb

@@ -0,0 +1 @@
+<% @users.each do |user| %><%= "#{user}\n" %><% end %>

data/spec/innate/session.rb

@@ -29,26 +29,27 @@ class SpecSession
 end
 
 describe Innate::Session do
-  behaves_like :mock
+  behaves_like :session
 
   should 'initiate session as needed' do
-    get '/'
-    last_response.body.should == 'No session here'
-    last_response['Set-Cookie'].should == nil
+    session do |mock|
+      response = mock.get('/')
+      response.body.should == 'No session here'
+      response['Set-Cookie'].should == nil
 
-    get('/init')
-    last_response.body.should == '0'
+      mock.get('/init').body.should == '0'
 
-    1.upto(10) do |n|
-      get('/increment').body.should == n.to_s
-    end
+      1.upto(10) do |n|
+        mock.get('/increment').body.should == n.to_s
+      end
 
-    get('/reset')
-    get('/view').body.should == ''
-    get('/init').body.should == '0'
+      mock.get('/reset')
+      mock.get('/view').body.should == ''
+      mock.get('/init').body.should == '0'
 
-    -1.downto(-10) do |n|
-      get('/decrement').body.should == n.to_s
+      -1.downto(-10) do |n|
+        mock.get('/decrement').body.should == n.to_s
+      end
     end
   end
 end

data/spec/innate/state/fiber.rb

@@ -1,13 +1,12 @@
-require 'spec/helper'
+begin
+  require 'fiber'
+rescue LoadError
+  exit
+end
 
-describe 'Innate::State::Fiber' do
-  begin
-    require 'fiber'
-  rescue LoadError
-    it('needs fiber'){ should.flunk('needed fiber') }
-    exit
-  end
+require 'spec/helper'
 
+describe Innate::State::Fiber do
   F = Innate::State::Fiber
 
   it 'sets value in current thread with #[]=' do

data/tasks/bacon.rake

@@ -2,65 +2,48 @@ desc 'Run all bacon specs with pretty output'
 task :bacon => :install_dependencies do
   require 'open3'
   require 'scanf'
-  require 'matrix'
 
   specs = PROJECT_SPECS
 
   some_failed = false
-  specs_size = specs.size
+  total = specs.size
   len = specs.map{|s| s.size }.sort.last
-  total_tests = total_assertions = total_failures = total_errors = 0
-  totals = Vector[0, 0, 0, 0]
+  tt = ta = tf = te = 0
 
   red, yellow, green = "\e[31m%s\e[0m", "\e[33m%s\e[0m", "\e[32m%s\e[0m"
   left_format = "%4d/%d: %-#{len + 11}s"
   spec_format = "%d specifications (%d requirements), %d failures, %d errors"
 
   specs.each_with_index do |spec, idx|
-    print(left_format % [idx + 1, specs_size, spec])
+    print(left_format % [idx + 1, total, spec])
 
     Open3.popen3(RUBY, spec) do |sin, sout, serr|
-      out = sout.read.strip
-      err = serr.read.strip
+      out = sout.read
+      err = serr.read
 
-      # this is conventional, see spec/innate/state/fiber.rb for usage
-      if out =~ /^Bacon::Error: (needed .*)/
-        puts(yellow % ("%6s %s" % ['', $1]))
-      else
-        total = nil
+      ran = false
 
-        out.each_line do |line|
-          scanned = line.scanf(spec_format)
+      out.each_line do |line|
+        tests, assertions, failures, errors = all = line.scanf(spec_format)
+        next unless all.any?
+        ran = true
+        tt += tests; ta += assertions; tf += failures; te += errors
 
-          next unless scanned.size == 4
-
-          total = Vector[*scanned]
-          break
-        end
-
-        if total
-          totals += total
-          tests, assertions, failures, errors = total_array = total.to_a
-
-          if tests > 0 && failures + errors == 0
-            puts((green % "%6d passed") % tests)
-          else
-            some_failed = true
-            puts(red % "       failed")
-            puts out unless out.empty?
-            puts err unless err.empty?
-          end
+        if tests == 0 || failures + errors > 0
+          puts((red % spec_format) % all)
+          puts out
+          puts err
         else
-          some_failed = true
-          puts(red % "       failed")
-          puts out unless out.empty?
-          puts err unless err.empty?
+          puts((green % "%6d passed") % tests)
         end
+
+        break
       end
+
+      puts(yellow % "       skipped") unless ran
     end
   end
 
-  total_color = some_failed ? red : green
-  puts(total_color % (spec_format % totals.to_a))
+  puts(spec_format % [tt, ta, tf, te])
   exit 1 if some_failed
 end

data/tasks/install_dependencies.rake

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

data/tasks/release.rake

@@ -1,51 +1,12 @@
-namespace :release do
-  task :all => [:release_github, :release_rubyforge]
+desc 'publish to github'
+task :release => [:reversion, :gemspec] do
+  name, version = GEMSPEC.name, GEMSPEC.version
 
-  desc 'Display instructions to release on github'
-  task :github => [:reversion, :gemspec] do
-    name, version = GEMSPEC.name, GEMSPEC.version
+  sh("git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb")
 
-    puts <<INSTRUCTIONS
-First add the relevant files:
-
-git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb
-
-Then commit them, tag the commit, and push:
-
-git commit -m 'Version #{version}'
-git tag -a -m '#{version}' '#{version}'
-git push
-
-INSTRUCTIONS
-
-  end
-
-  # TODO: Not tested
-  desc 'Display instructions to release on rubyforge'
-  task :rubyforge => [:reversion, :gemspec, :package] do
-    name, version = GEMSPEC.name, GEMSPEC.version
-
-    puts <<INSTRUCTIONS
-To publish to rubyforge do following:
-
-rubyforge login
-rubyforge add_release #{name} '#{version}' pkg/#{name}-#{version}.gem
-
-After you have done these steps, see:
-
-rake release:rubyforge_archives
-
-INSTRUCTIONS
-  end
-
-  desc 'Display instructions to add archives after release:rubyforge'
-  task :rubyforge_archives do
-    puts "Adding archives for distro packagers is:", ""
-
-    Dir["pkg/#{name}-#{version}.{gz,zip}"].each do |file|
-      puts "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
-    end
-
-    puts
-  end
+  puts "I added the relevant files, you can now run:", ''
+  puts "git commit -m 'Version #{version}'"
+  puts "git tag -a -m '#{version}' '#{version}'"
+  puts "git push"
+  puts
 end