manveru-innate 2009.04.01 → 2009.04.08

data/tasks/bacon.rake

@@ -2,48 +2,65 @@ 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
-  total = specs.size
+  specs_size = specs.size
   len = specs.map{|s| s.size }.sort.last
-  tt = ta = tf = te = 0
+  total_tests = total_assertions = total_failures = total_errors = 0
+  totals = Vector[0, 0, 0, 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, total, spec])
+    print(left_format % [idx + 1, specs_size, spec])
 
     Open3.popen3(RUBY, spec) do |sin, sout, serr|
-      out = sout.read
-      err = serr.read
+      out = sout.read.strip
+      err = serr.read.strip
 
-      ran = false
+      # this is conventional, see spec/innate/state/fiber.rb for usage
+      if out =~ /^Bacon::Error: (needed .*)/
+        puts(yellow % ("%6s %s" % ['', $1]))
+      else
+        total = nil
 
-      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
+        out.each_line do |line|
+          scanned = line.scanf(spec_format)
 
-        if tests == 0 || failures + errors > 0
-          puts((red % spec_format) % all)
-          puts out
-          puts err
-        else
-          puts((green % "%6d passed") % tests)
+          next unless scanned.size == 4
+
+          total = Vector[*scanned]
+          break
         end
 
-        break
-      end
+        if total
+          totals += total
+          tests, assertions, failures, errors = total_array = total.to_a
 
-      puts(yellow % "       skipped") unless ran
+          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
+        else
+          some_failed = true
+          puts(red % "       failed")
+          puts out unless out.empty?
+          puts err unless err.empty?
+        end
+      end
     end
   end
 
-  puts(spec_format % [tt, ta, tf, te])
+  total_color = some_failed ? red : green
+  puts(total_color % (spec_format % totals.to_a))
   exit 1 if some_failed
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manveru-innate
 version: !ruby/object:Gem::Version 
-  version: 2009.04.01
+  version: 2009.04.08
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,39 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -07:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "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.3
-    version: 
+dependencies: []
+
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
 executables: []
@@ -64,8 +35,8 @@ files:
 - 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.html.erb
-- example/app/whywiki_erb/view/index.html.erb
+- 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
@@ -92,8 +63,8 @@ files:
 - lib/innate/helper/cgi.rb
 - lib/innate/helper/flash.rb
 - lib/innate/helper/link.rb
-- lib/innate/helper/partial.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
@@ -126,7 +97,7 @@ files:
 - spec/example/session.rb
 - spec/helper.rb
 - spec/innate/action/layout.rb
-- spec/innate/action/layout/file_layout.erb
+- spec/innate/action/layout/file_layout.xhtml
 - spec/innate/cache/common.rb
 - spec/innate/cache/marshal.rb
 - spec/innate/cache/memory.rb
@@ -137,30 +108,30 @@ files:
 - spec/innate/helper/cgi.rb
 - spec/innate/helper/flash.rb
 - spec/innate/helper/link.rb
-- spec/innate/helper/partial.rb
 - spec/innate/helper/redirect.rb
+- spec/innate/helper/render.rb
 - spec/innate/helper/send_file.rb
-- spec/innate/helper/view/aspect_hello.erb
-- spec/innate/helper/view/locals.erb
-- spec/innate/helper/view/loop.erb
-- spec/innate/helper/view/num.erb
-- spec/innate/helper/view/partial.erb
-- spec/innate/helper/view/recursive.erb
+- 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/node/mapping.rb
 - spec/innate/node/node.rb
 - spec/innate/node/resolve.rb
-- spec/innate/node/view/another_layout/another_layout.erb
-- spec/innate/node/view/bar.erb
-- spec/innate/node/view/foo.html.erb
-- spec/innate/node/view/only_view.erb
-- spec/innate/node/view/with_layout.erb
+- 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.erb
-- spec/innate/provides/list.txt.erb
+- spec/innate/provides/list.html.xhtml
+- spec/innate/provides/list.txt.xhtml
 - spec/innate/request.rb
 - spec/innate/route.rb
 - spec/innate/session.rb

data/lib/innate/helper/partial.rb

@@ -1,93 +0,0 @@
-#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
-
-module Innate
-  module Helper
-
-    # = Helper::Partial
-    #
-    # === Example Usage
-    #
-    #   class MyController
-    #     def index
-    #     end
-    #
-    #     def list
-    #       plain = request['plain']
-    #       "Hello World from List!  Plain List == #{plain}"
-    #     end
-    #   end
-    #
-    #
-    #   <html>
-    #     <head><title>Partial Render Index</title></head>
-    #     <body>
-    #       #{render_partial(Rs(:list), 'plain' => true)}
-    #     </body>
-    #   </html>
-    module Partial
-      module_function
-
-      # Renders a url 'inline'.
-      #
-      # +url+      normal URL, like you'd use for redirecting.
-      # +options+  optional, will be used as request parameters.
-      #
-      # Issues a mock request to the given +url+ with +options+ turned into
-      # query arguments.
-      def render_partial(url, options = {})
-        uri = URI(url)
-        query = options # Innate::Current.request.params.merge(options)
-        uri.query = Rack::Utils.build_query(query)
-
-        body = nil
-
-        Innate::Mock.session do |session|
-          cookie = Innate::Current.session.cookie
-          session.cookie = cookie
-          body = session.get(uri.to_s, options).body
-        end
-
-        body
-      end
-
-      # Render the template file in view_root of the
-      # current controller.
-      #
-      # TODO:
-      # * Doesn't work for absolute paths, but there are no specs for that yet.
-      # * the local variable hack isn't working because innate allocates a new
-      #   binding.
-      #   For now one can simply use instance variables, which I prefer anyway.
-      #
-      # the local binding hack:
-      #
-      #   variables.each do |key, value|
-      #     value = "ObjectSpace._id2ref(#{value.object_id})"
-      #     eval "#{key} = #{value}", action.binding
-      #   end
-
-      def render_template(path, variables = {})
-        path = path.to_s
-
-        ext = File.extname(path)
-        basename = File.basename(path, ext)
-
-        action = Innate::Current.action.dup
-        action.layout    = nil
-        action.view      = action.node.find_view(basename, 'html')
-        action.method    = action.node.find_method(basename, action.params)
-
-        action.variables = action.variables.merge(variables)
-        action.sync_variables(action)
-
-        return action.call if action.valid?
-        raise(ArgumentError, "cannot render %p" % path)
-      end
-
-      def render_action(method, *params)
-        render_partial(r(method), *params)
-      end
-    end
-  end
-end

data/spec/innate/action/layout/file_layout.erb

@@ -1 +0,0 @@
-<p><%= @content %></p>

data/spec/innate/helper/partial.rb

@@ -1,101 +0,0 @@
-require 'spec/helper'
-
-class SpecHelperPartial
-  Innate.node '/'
-  map_views '/'
-
-  def index
-    '<html><head><title><%= render_partial("/title") %></title></head></html>'
-  end
-
-  def title
-    "Title"
-  end
-
-  def with_params
-    '<html><head><title><%= render_partial("/message", :msg => "hello") %></title></head></html>'
-  end
-
-  def message
-    "Message: #{request[:msg]}"
-  end
-
-  def without_ext
-    render_template('partial')
-  end
-
-  def with_real_ext
-    render_template('partial.erb')
-  end
-
-  def with_needed_ext
-    render_template('partial.html')
-  end
-
-  def composed
-    @here = 'there'
-    'From Action | ' << render_template("partial")
-  end
-
-  def recursive
-    @n ||= 1
-  end
-
-  def with_variable
-    here = 'there'
-    render_template("partial", :here => here)
-  end
-end
-
-class SpecHelperPartialWithLayout < SpecHelperPartial
-  Innate.node '/with_layout'
-  layout('layout')
-
-  def layout
-    '<h1>with layout</h1><%= @content %>'
-  end
-end
-
-describe Innate::Helper::Partial do
-  behaves_like :mock
-
-  should 'render partials' do
-    get('/').body.should == '<html><head><title>Title</title></head></html>'
-  end
-
-  should 'render partials with params' do
-    get('/with_params').body.should == '<html><head><title>Message: hello</title></head></html>'
-  end
-
-  should 'be able to render a template in the current scope' do
-    get('/composed').body.strip.should == "From Action | From Partial there"
-  end
-
-  should 'not require file extension' do
-    get('/without_ext').body.should == "From Partial \n"
-  end
-
-  it "the real extension will just be stripped" do
-    got = get('/with_real_ext').body.should == "From Partial \n"
-  end
-
-  it "works with the content representation instead" do
-    get('/with_needed_ext').body.should == "From Partial \n"
-  end
-
-  should 'render_template in a loop' do
-    get('/loop').body.gsub(/\s/,'').should == '12345'
-  end
-
-  should 'work recursively' do
-    get('/recursive').body.gsub(/\s/,'').should == '{1{2{3{44}4}3}2}'
-  end
-
-  should 'render template with layout' do
-    get('/with_layout/without_ext').body.should == "<h1>with layout</h1>From Partial \n"
-  end
-
-  it 'makes passed variables available in the template as instance variables' do
-    get('/with_variable').body.should == "From Partial there\n"
-  end
-end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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