manveru-innate 2009.04 → 2009.04.01

data/lib/innate/options.rb

@@ -2,7 +2,7 @@ module Innate
   # this has to be run after a couple of other files have been required
 
   options.dsl do
-    o "Innate::start will not start an adapter if true",
+    o "Indicate that calls Innate::start will be ignored",
       :started, false
 
     o "Will send ::setup to each element during Innate::start",

data/lib/innate/request.rb

@@ -71,7 +71,7 @@ module Innate
     # Both +value+ and the elements of +keys+ will be turned into String by #to_s.
     def [](value, *keys)
       return super(value) if keys.empty?
-      [value, *keys].map{|key| super(key) }
+      [value, *keys].map{|k| super(k) }
     end
 
     # the full request URI provided by Rack::Request
@@ -94,8 +94,8 @@ module Innate
     #   # => {'name' => 'jason', 'job' => 'lumberjack'}
 
     def subset(*keys)
-      keys = keys.map{|key| key.to_s }
-      params.reject{|key, value| not keys.include?(key) }
+      keys = keys.map{|k| k.to_s }
+      params.reject{|k,v| not keys.include?(k) }
     end
 
     # Try to figure out the domain we are running on, this might work for some
@@ -137,5 +137,25 @@ module Innate
     rescue ArgumentError => ex
       raise ArgumentError, ex unless ex.message == 'invalid address'
     end
+
+    REQUEST_STRING_FORMAT = "#<%s params=%p cookies=%p env=%p>"
+
+    def to_s
+      REQUEST_STRING_FORMAT % [self.class, params, cookies, http_variables]
+    end
+    alias inspect to_s
+
+    # Pretty prints current action with parameters, cookies and enviroment
+    # variables.
+    def pretty_print(pp)
+      pp.object_group(self){
+        group = { 'params' => params, 'cookies' => cookies, 'env' => http_vars }
+        group.each do |name, hash|
+          pp.breakable
+          pp.text " @#{name}="
+          pp.nest(name.size + 3){ pp.pp_hash(hash) }
+        end
+      }
+    end
   end
 end

data/lib/innate/response.rb

@@ -1,4 +1,9 @@
 module Innate
+
+  # In order to reset the body contents we also need to reset the length set by
+  # Response#write - until I can submit a patch to Rack and the next release we
+  # just do this.
+
   class Response < Rack::Response
     include Optioned
 
@@ -7,6 +12,8 @@ module Innate
         :headers, {'Content-Type' => 'text/html'}
     end
 
+    attr_accessor :length
+
     def reset
       self.status = 200
       self.header.delete('Content-Type')

data/lib/innate/session.rb

@@ -62,7 +62,8 @@ module Innate
     end
 
     def flush(response = @response)
-      return if !@cache_sid or @cache_sid.empty?
+      return unless @cache_sid
+      return if @cache_sid.empty?
 
       flash.rotate!
       ttl = (Time.at(cookie_value[:expires]) - Time.now).to_i

data/lib/innate/spec.rb

@@ -1,10 +1,10 @@
-begin; require 'rubygems'; rescue LoadError; end
-
 require 'bacon'
-require 'rack/test'
-require(File.expand_path("#{__FILE__}/../")) unless defined?(Innate)
 
 Bacon.summary_on_exit
+# Bacon.extend(Bacon::TestUnitOutput)
+
+innate = File.expand_path(File.join(File.dirname(__FILE__), '../innate'))
+require(innate) unless defined?(Innate)
 
 module Innate
   # minimal middleware, no exception handling
@@ -15,9 +15,53 @@ module Innate
   options.mode = :spec
 end
 
+# Shortcut to use persistent cookies via Innate::Mock::Session
+#
+# Usage:
+#
+#   describe 'something' do
+#     behaves_like :session
+#
+#     should 'get some stuff' do
+#       session do |mock|
+#         mock.get('/')
+#       end
+#     end
+#   end
+shared :session do
+  Innate.setup_dependencies
+
+  def session(&block)
+    Innate::Mock.session(&block)
+  end
+end
+
 shared :mock do
   Innate.setup_dependencies
-  extend Rack::Test::Methods
 
-  def app; Innate.middleware; end
+  def get(*args) Innate::Mock.get(*args) end
+  def post(*args) Innate::Mock.post(*args) end
+  def put(*args) Innate::Mock.put(*args) end
+  def delete(*args) Innate::Mock.delete(*args) end
+end
+
+shared :multipart do
+  def multipart(hash)
+    boundary = 'MuLtIpArT56789'
+    data = []
+    hash.each do |key, value|
+      data << "--#{boundary}"
+      data << %(Content-Disposition: form-data; name="#{key}")
+      data << '' << value
+    end
+    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) }
+  end
 end

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.04"
+  VERSION = "2009.04.01"
 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_s, nil, '%<>')
+        erb = ::ERB.new(string.to_str, 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_s)
+        template = Innate::Etanni.new(string.to_str)
         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}.chomp\n", "\n#{start_heredoc}\n"
+      start_heredoc, end_heredoc = "\n<<#{start_heredoc}\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.to_s, 'text/html'
+        return string, 'text/html'
       end
     end
   end

data/spec/example/session.rb

@@ -2,21 +2,27 @@ require 'spec/helper'
 require 'example/session'
 
 describe 'example/session' do
-  behaves_like :mock
+  behaves_like :session
 
   it 'starts at 0' do
-    get('/').body.should =~ /Value is: 0/
+    session do |mock|
+      mock.get('/').should =~ /Value is: 0/
+    end
   end
 
   it 'increments the counter' do
-    get('/increment').body.should =~ /Value is: 1/
-    get('/increment').body.should =~ /Value is: 2/
-    get('/increment').body.should =~ /Value is: 3/
+    session do |mock|
+      mock.get('/increment').should =~ /Value is: 1/
+      mock.get('/increment').should =~ /Value is: 2/
+      mock.get('/increment').should =~ /Value is: 3/
+    end
   end
 
   it 'decrements the counter' do
-    get('/decrement').body.should =~ /Value is: 2/
-    get('/decrement').body.should =~ /Value is: 1/
-    get('/decrement').body.should =~ /Value is: 0/
+    session do |mock|
+      mock.get('/decrement').should =~ /Value is: -1/
+      mock.get('/decrement').should =~ /Value is: -2/
+      mock.get('/decrement').should =~ /Value is: -3/
+    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.erb

@@ -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
 
-  it 'executes before aspect' do
+  should 'execute before aspect' do
     $aspect_spec_before = 0
     get('/with_before').body.should == '42'
     $aspect_spec_before.should == 42
   end
 
-  it 'executes after asepct' do
+  should 'execute after asepct' do
     $aspect_spec_after = 0
     get('/with_after').body.should == '2'
     $aspect_spec_after.should == 42
   end
 
-  it 'executes wrap aspects' do
+  should 'execute wrap aspects' do
     $aspect_spec_wrap = 0
     get('/with_wrap').body.should == '22'
     $aspect_spec_wrap == 42
   end
 
-  it 'calls before_all and after_all' do
+  should '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
 
-  it 'makes instance variables in blocks available to view/method' do
+  should '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!"
+    get('/without_method/aspect_hello').body.should == "Hello World!\n"
   end
 end

data/spec/innate/helper/flash.rb

@@ -57,62 +57,81 @@ class SpecFlashSub < SpecFlash
 end
 
 describe Innate::Helper::Flash do
-  behaves_like :mock
+  behaves_like :session
 
   should 'set and forget flash twice' do
-    get('/welcome').body.should == 'Welcome manveru'
-    get('/bye').body.should == 'Bye manveru'
-    get('/bye').body.should == 'Bye'
+    session do |mock|
+      mock.get('/welcome').body.should == 'Welcome manveru'
+      mock.get('/bye').body.should == 'Bye manveru'
+      mock.get('/bye').body.should == 'Bye '
 
-    get('/welcome').body.should == 'Welcome manveru'
-    get('/bye').body.should == 'Bye manveru'
-    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 '
+    end
   end
 
   should 'work over multiple nodes' do
-    get('/welcome').body.should == 'Welcome manveru'
-    get('/sub/bye').body.should == 'Bye manveru'
-    get('/sub/bye').body.should == 'Bye'
+    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 '
 
-    get('/sub/welcome').body.should == 'Welcome manveru'
-    get('/bye').body.should == 'Bye manveru'
-    get('/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 '
+    end
   end
 
   should 'check if flash is empty' do
-    get('/welcome').body.should == 'Welcome manveru'
-    get('/check_empty').body.should == 'false'
-    get('/check_empty').body.should == 'true'
+    session do |mock|
+      mock.get('/welcome').body.should == 'Welcome manveru'
+      mock.get('/check_empty').body.should == 'false'
+      mock.get('/check_empty').body.should == 'true'
+    end
   end
 
   should 'set and delete key within one request' do
-    get('/set_delete_key').body.should == ''
+    session do |mock|
+      mock.get('/set_delete_key').body.should == ''
+    end
   end
 
   should 'set and delete key over two request' do
-    get('/welcome').body.should == 'Welcome manveru'
-    get('/delete_key').body.should == 'Bye'
+    session do |mock|
+      mock.get('/welcome').body.should == 'Welcome manveru'
+      mock.get('/delete_key').body.should == 'Bye '
+    end
   end
 
   should 'merge with hash' do
-    get('/merge').body.should == {:name => 'feagliir'}.inspect
-    get('/bye').body.should == 'Bye'
+    session do |mock|
+      mock.get('/merge').body.should == {:name => 'feagliir'}.inspect
+      mock.get('/bye').body.should == 'Bye '
+    end
   end
 
   should 'merge! with hash' do
-    get('/merge!').body.should == {:name => 'feagliir'}.inspect
-    get('/bye').body.should == 'Bye feagliir'
+    session do |mock|
+      mock.get('/merge!').body.should == {:name => 'feagliir'}.inspect
+      mock.get('/bye').body.should == 'Bye feagliir'
+    end
   end
 
   should 'inspect combined' do
-    get('/welcome')
-    get('/inspect').body.should == {:name => 'manveru', :yes => :yeah}.inspect
+    session do |mock|
+      mock.get('/welcome')
+      mock.get('/inspect').body.
+        should == {:name => 'manveru', :yes => :yeah}.inspect
+    end
   end
 
   should 'iterate over combined' do
-    get('/welcome')
+    session do |mock|
+      mock.get('/welcome')
 
-    hash = {:yes => :yeah, :name => 'manveru'}
-    Hash[*eval(get('/iterate').body).flatten].should == hash
+      hash = {:yes => :yeah, :name => 'manveru'}
+      Hash[*eval(mock.get('/iterate').body).flatten].should == hash
+    end
   end
 end

data/spec/innate/helper/link.rb

@@ -56,14 +56,6 @@ describe Innate::Helper::Link do
       Two.route(:foo, :bar).should == URI('/two/foo/bar')
     end
 
-    should 'respond with URI for node with path /foo/bar+baz' do
-      One.route('/foo/bar+baz').should == URI('/foo/bar+baz')
-      One.route(:foo, 'bar baz').should == URI('/foo/bar+baz')
-
-      Two.route('/foo/bar+baz').should == URI('/two/foo/bar+baz')
-      Two.route(:foo, 'bar baz').should == URI('/two/foo/bar+baz')
-    end
-
     should 'respond with URI for node with GET params' do
       One.route('/', :a => :b).should == URI('/?a=b')
 

data/spec/innate/helper/partial.rb

@@ -0,0 +1,101 @@
+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