manveru-innate 2009.04.01 → 2009.04.08

data/lib/innate/spec.rb

@@ -57,11 +57,8 @@ shared :multipart do
     data << "--#{boundary}--"
     body = data.join("\r\n")
 
-    type = "multipart/form-data; boundary=#{boundary}"
-    length = body.respond_to?(:bytesize) ? body.bytesize : body.size
-
-    { 'CONTENT_TYPE' => type,
-      'CONTENT_LENGTH' => length.to_s,
-      :input => StringIO.new(body) }
+    { 'CONTENT_TYPE'   => "multipart/form-data; boundary=#{boundary}",
+      'CONTENT_LENGTH' => Rack::Utils.bytesize(body).to_s,
+        :input           => StringIO.new(body) }
   end
 end

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.04.01"
+  VERSION = "2009.04.08"
 end

data/lib/innate/view/erb.rb

@@ -4,7 +4,7 @@ module Innate
   module View
     module ERB
       def self.call(action, string)
-        erb = ::ERB.new(string.to_str, nil, '%<>')
+        erb = ::ERB.new(string.to_s, nil, '%<>')
         erb.filename = (action.view || action.method).to_s
         html = erb.result(action.binding)
 

data/lib/innate/view/etanni.rb

@@ -2,7 +2,7 @@ module Innate
   module View
     module Etanni
       def self.call(action, string)
-        template = Innate::Etanni.new(string.to_str)
+        template = Innate::Etanni.new(string.to_s)
         html = template.result(action.binding, (action.view || action.method))
         return html, 'text/html'
       end
@@ -18,7 +18,7 @@ module Innate
     def compile
       temp = @template.dup
       start_heredoc = "T" << Digest::SHA1.hexdigest(temp)
-      start_heredoc, end_heredoc = "\n<<#{start_heredoc}\n", "\n#{start_heredoc}\n"
+      start_heredoc, end_heredoc = "\n<<#{start_heredoc}.chomp\n", "\n#{start_heredoc}\n"
       bufadd = "_out_ << "
 
       temp.gsub!(/<\?r\s+(.*?)\s+\?>/m,

data/lib/innate/view/none.rb

@@ -2,7 +2,7 @@ module Innate
   module View
     module None
       def self.call(action, string)
-        return string, 'text/html'
+        return string.to_s, 'text/html'
       end
     end
   end

data/spec/innate/action/layout.rb

@@ -13,7 +13,7 @@ class SpecActionLayoutMethod < SpecActionLayout
   layout('method_layout')
 
   def method_layout
-    "<pre><%= @content %></pre>"
+    '<pre>#{ @content }</pre>'
   end
 
   def index

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

@@ -0,0 +1 @@
+<p>#{ @content }</p>

data/spec/innate/helper/aspect.rb

@@ -38,25 +38,25 @@ end
 describe Innate::Helper::Aspect do
   behaves_like :mock
 
-  should 'execute before aspect' do
+  it 'executes before aspect' do
     $aspect_spec_before = 0
     get('/with_before').body.should == '42'
     $aspect_spec_before.should == 42
   end
 
-  should 'execute after asepct' do
+  it 'executes after asepct' do
     $aspect_spec_after = 0
     get('/with_after').body.should == '2'
     $aspect_spec_after.should == 42
   end
 
-  should 'execute wrap aspects' do
+  it 'executes wrap aspects' do
     $aspect_spec_wrap = 0
     get('/with_wrap').body.should == '22'
     $aspect_spec_wrap == 42
   end
 
-  should 'before_all and after_all' do
+  it 'calls before_all and after_all' do
     $aspect_spec_before_all = $aspect_spec_after_all = 0
     get('/all/before_first').body.should == '42'
     $aspect_spec_before_all.should == 42
@@ -66,10 +66,10 @@ describe Innate::Helper::Aspect do
     $aspect_spec_after_all.should == 80
   end
 
-  should 'instance variables in blocks available to view/method' do
+  it 'makes instance variables in blocks available to view/method' do
     get('/with_instance_var').body.should == 'Hello World'
     get('/all/with_instance_var_first').body.should == 'Hello World'
     get('/all/with_instance_var_second').body.should == 'Hello to the World'
-    get('/without_method/aspect_hello').body.should == "Hello World!\n"
+    get('/without_method/aspect_hello').body.should == "Hello World!"
   end
 end

data/spec/innate/helper/flash.rb

@@ -63,11 +63,11 @@ describe Innate::Helper::Flash do
     session do |mock|
       mock.get('/welcome').body.should == 'Welcome manveru'
       mock.get('/bye').body.should == 'Bye manveru'
-      mock.get('/bye').body.should == 'Bye '
+      mock.get('/bye').body.should == 'Bye'
 
       mock.get('/welcome').body.should == 'Welcome manveru'
       mock.get('/bye').body.should == 'Bye manveru'
-      mock.get('/bye').body.should == 'Bye '
+      mock.get('/bye').body.should == 'Bye'
     end
   end
 
@@ -75,11 +75,11 @@ describe Innate::Helper::Flash do
     session do |mock|
       mock.get('/welcome').body.should == 'Welcome manveru'
       mock.get('/sub/bye').body.should == 'Bye manveru'
-      mock.get('/sub/bye').body.should == 'Bye '
+      mock.get('/sub/bye').body.should == 'Bye'
 
       mock.get('/sub/welcome').body.should == 'Welcome manveru'
       mock.get('/bye').body.should == 'Bye manveru'
-      mock.get('/bye').body.should == 'Bye '
+      mock.get('/bye').body.should == 'Bye'
     end
   end
 
@@ -100,14 +100,14 @@ describe Innate::Helper::Flash do
   should 'set and delete key over two request' do
     session do |mock|
       mock.get('/welcome').body.should == 'Welcome manveru'
-      mock.get('/delete_key').body.should == 'Bye '
+      mock.get('/delete_key').body.should == 'Bye'
     end
   end
 
   should 'merge with hash' do
     session do |mock|
       mock.get('/merge').body.should == {:name => 'feagliir'}.inspect
-      mock.get('/bye').body.should == 'Bye '
+      mock.get('/bye').body.should == 'Bye'
     end
   end
 

data/spec/innate/helper/render.rb

@@ -0,0 +1,157 @@
+require 'spec/helper'
+
+class SpecHelperRenderFull
+  Innate.node '/render_full'
+
+  def foo
+    "foo: %p" % [request.params.sort]
+  end
+
+  def standard
+    render_full(r(:foo))
+  end
+
+  def with_query
+    render_full(r(:foo), 'a' => 'b')
+  end
+
+  def with_session
+    render_full(r(:get_session, :user))
+  end
+
+  def get_session(key)
+    session[key].inspect
+  end
+
+  def set_session(key, value)
+    session[key] = value
+  end
+end
+
+class SpecHelperRenderPartial
+  Innate.node '/render_partial'
+
+  layout :layout
+
+  def standard
+    'hello'
+  end
+
+  def layout
+    '{ #{@content} }'
+  end
+
+  def without_layout
+    render_partial(:standard)
+  end
+end
+
+class SpecHelperRenderView
+  Innate.node '/render_view'
+  map_views '/'
+
+  layout :layout
+
+  def standard
+    'hello'
+  end
+
+  def layout
+    '{ #{@content} }'
+  end
+
+  def without_method_or_layout
+    render_view(:num, :n => 42)
+  end
+end
+
+class SpecHelperRenderTemplate
+  Innate.node '/render_template'
+
+  def relative
+    render_template('spec/innate/helper/view/num.xhtml', :n => 42)
+  end
+
+  def absolute
+    path = File.join(File.dirname(__FILE__), 'view/num.xhtml')
+    render_template(path, :n => 42)
+  end
+end
+
+class SpecHelperRenderMisc
+  Innate.node '/misc'
+  map_views '/'
+
+  def recursive
+    @n ||= 1
+  end
+end
+
+describe Innate::Helper::Render do
+  describe '#render_full' do
+    behaves_like :mock, :session
+
+    it 'renders a full action' do
+      get('/render_full/standard').body.should == 'foo: []'
+    end
+
+    it 'renders full action with query parameters' do
+      get('/render_full/with_query').body.should == 'foo: [["a", "b"]]'
+    end
+
+    # this is an edge-case, we don't have a full session running if this is the
+    # first request from the client as Innate creates sessions only on demand
+    # at the end of the request/response cycle.
+    #
+    # So we have to make some request first, in this case we simply set some
+    # value in the session that we can get afterwards.
+
+    it 'renders full action inside a session' do
+      session do |mock|
+        mock.get('/render_full/set_session/user/manveru')
+        mock.get('/render_full/with_session').body.should == '"manveru"'
+      end
+    end
+  end
+
+  describe '#render_partial' do
+    behaves_like :mock
+
+    it 'renders action with layout' do
+      get('/render_partial/standard').body.should == '{ hello }'
+    end
+
+    it 'renders partial action without layout' do
+      get('/render_partial/without_layout').body.should == '{ hello }'
+    end
+  end
+
+  describe '#render_view' do
+    behaves_like :mock
+
+    it 'renders action without calling the method or applying layout' do
+      get('/render_view/without_method_or_layout').body.should == '{ 42 }'
+    end
+  end
+
+  describe '#render_template' do
+    behaves_like :mock
+
+    it 'renders action with the given template file' do
+      get('/render_template/relative').body.should == '42'
+      get('/render_template/absolute').body.should == '42'
+    end
+  end
+
+  describe 'misc functionality' do
+    behaves_like :mock
+
+    it 'can render_partial in a loop' do
+      get('/misc/loop').body.scan(/\d+/).should == %w[1 2 3 4 5]
+    end
+
+    it 'can recursively render_partial' do
+      get('/misc/recursive').body.scan(/\S/).join.should == '{1{2{3{44}3}2}1}'
+    end
+  end
+end

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

@@ -0,0 +1 @@
+#{@foo} #{@bar}!

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

@@ -0,0 +1 @@
+#{say}, #{to}!

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

@@ -0,0 +1,4 @@
+<?r (1..5).each do |n| ?>
+  <?r @n = n ?>
+  #{ render_partial('num') }
+<?r end ?>

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

@@ -0,0 +1 @@
+#{@n}

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

@@ -0,0 +1 @@
+From Partial #{@here}

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

@@ -0,0 +1,7 @@
+{
+  #{@n}
+  <?r if @n < 4 ?>
+    #{ render_partial(:recursive, :n => @n + 1) }
+  <?r end ?>
+  #{@n}
+}

data/spec/innate/node/node.rb

@@ -4,8 +4,6 @@ Innate.options.merge!(:views => 'view', :layouts => 'view')
 
 class SpecNode
   Innate.node('/')
-  provide(:html, :ERB)
-  provide(:erb, :None)
 
   def foo; end
   def bar; end
@@ -18,24 +16,18 @@ 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
 
@@ -64,7 +56,7 @@ class SpecNodeWithLayoutMethod < SpecNodeProvide
   layout 'layout_method'
 
   def layout_method
-    '<div class="content"><%= @content %></div>'
+    '<div class="content">#{@content}</div>'
   end
 end
 
@@ -96,14 +88,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>\n)
+    got.body.should == %(<div class="content">42</div>)
     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>\n)
+    got.body.should == %(<div class="content">\n  42\n</div>)
     got['Content-Type'].should == 'text/html'
   end
 

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

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

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

@@ -0,0 +1 @@
+<?r 10.times do |n| ?>#{n}<?r end ?>

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

@@ -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, :None)
+  provide(:html, :engine => :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 => :ERB, :type => 'text/plain')
+  provide(:txt, :engine => :Etanni, :type => 'text/plain')
 
   def list
     @users = %w[starbucks apollo athena]

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

@@ -0,0 +1 @@
+<ul><?r @users.each do |user| ?><li>#{user}</li><?r end ?></ul>

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

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

data/spec/innate/state/fiber.rb

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