manveru-innate 2009.04.08 → 2009.04.18

data/lib/innate/cache/file_based.rb

@@ -3,6 +3,8 @@ module Innate
 
     # Used by caches that serialize their contents to the filesystem.
     module FileBased
+      attr_reader :filename
+
       def cache_setup(*args)
         @prefix = args.compact.join('-')
 

data/lib/innate/helper.rb

@@ -152,10 +152,10 @@ module Innate
     # helper :foo_bar # => FooBar
     # helper :foo # => Foo
     def get(name)
-      name = name.to_s.split('_').map{|e| e.capitalize}.join
+      module_name = /^#{name.to_s.dup.delete('_')}$/i
 
       options.namespaces.each do |namespace|
-        found = namespace.constants.grep(/^#{name}$/i).first
+        found = namespace.constants.grep(module_name).first
         return namespace.const_get(found) if found
       end
 

data/lib/innate/helper/link.rb

@@ -28,12 +28,12 @@ module Innate
         hashes, names = args.partition{|arg| arg.respond_to?(:merge!) }
         hashes.each{|to_merge| hash.merge!(to_merge) }
 
+        escape = Rack::Utils.method(:escape)
         location = route_location(self)
-        front = Array[location, name, *names].join('/').squeeze('/')
+        front = Array[location, name, *names.map{|n| escape[n]}].join('/').squeeze('/')
 
         return URI(front) if hash.empty?
 
-        escape = Rack::Utils.method(:escape)
         query = hash.map{|k, v| "#{escape[k]}=#{escape[v]}" }.join(';')
         URI("#{front}?#{query}")
       end

data/lib/innate/helper/render.rb

@@ -61,7 +61,9 @@ module Innate
       end
 
       def render_custom(action_name, variables = {})
-        action = resolve(action_name.to_s)
+        unless action = resolve(action_name.to_s)
+          raise(ArgumentError, "No Action %p on #{self}" % action_name)
+        end
 
         action.sync_variables(self.action)
         action.instance = action.node.new

data/lib/innate/helper/send_file.rb

@@ -3,12 +3,20 @@ module Innate
     module SendFile
       # Not optimally performing but convenient way to send files by their
       # filename.
-      def send_file(filename, content_type = nil)
+      #
+      # I think we should remove this from the default helpers and move it into
+      # Ramaze, the functionality is almost never used, the naming is ambigous,
+      # and it doesn't use the send_file capabilities of frontend servers.
+      #
+      # So for now, I'll mark it for deprecation
+      def send_file(filename, content_type = nil, content_disposition = nil)
         content_type ||= Rack::Mime.mime_type(::File.extname(filename))
+        content_disposition ||= File.basename(filename)
 
         response.body = ::File.readlines(filename, 'rb')
         response['Content-Length'] = ::File.size(filename).to_s
         response['Content-Type'] = content_type
+        response['Content-Disposition'] = content_disposition
         response.status = 200
 
         throw(:respond, response)

data/lib/innate/node.rb

@@ -813,9 +813,7 @@ module Innate
             when /^(.*)\.(.*)\.(.*)$/
               action_name, wish_ext, engine_ext = $1, $2, $3
             when /^(.*)\.(.*)$/
-              action_name, wish_ext, engine_ext = $1, 'html', $2
-            when /.*/
-              p $1
+              action_name, wish_ext, engine_ext = $1, wish, $2
             end
 
             mapping[wish_ext] ||= {}

data/lib/innate/response.rb

@@ -1,9 +1,4 @@
 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
 
@@ -12,8 +7,6 @@ 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,8 +62,7 @@ module Innate
     end
 
     def flush(response = @response)
-      return unless @cache_sid
-      return if @cache_sid.empty?
+      return if !@cache_sid or @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,50 +15,9 @@ 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 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")
-
-    { 'CONTENT_TYPE'   => "multipart/form-data; boundary=#{boundary}",
-      'CONTENT_LENGTH' => Rack::Utils.bytesize(body).to_s,
-        :input           => StringIO.new(body) }
-  end
+  def app; Innate.middleware; end
 end

data/lib/innate/version.rb

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

data/spec/example/app/retro_games.rb

@@ -0,0 +1,30 @@
+require 'spec/helper'
+require 'example/app/retro_games'
+
+describe 'Retro-games app' do
+  behaves_like :mock
+
+  it 'lists the first game' do
+    get '/'
+    last_response.should =~ /1 => Pacman/
+  end
+
+  it 'has a form to add another game' do
+    get '/'
+    last_response.should =~ /<form/
+  end
+
+  it 'allows you to add another game' do
+    post '/create', :name => 'Street Fighter II'
+    follow_redirect!
+    last_response.should =~ /0 =&gt; Street Fighter II/
+  end
+
+  it 'allows you to vote for a game' do
+    get '/vote/Street+Fighter+II'
+    follow_redirect!
+    last_response.should =~ /1 =&gt; Street Fighter II/
+  end
+
+  FileUtils.rm_f('games.yaml')
+end

data/spec/example/provides.rb

@@ -0,0 +1,16 @@
+require 'spec/helper'
+require 'example/provides'
+
+describe 'examples/provide' do
+  behaves_like :mock
+
+  it 'provides YAML representation' do
+    get '/list.yaml'
+    last_response.body.should == ARTICLES.to_yaml
+    last_response['Content-Type'].should == 'text/yaml'
+
+    get '/list'
+    last_response.body.should == ''
+    last_response['Content-Type'].should == 'text/html'
+  end
+end

data/spec/example/session.rb

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

data/spec/innate/helper/flash.rb

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

data/spec/innate/helper/link.rb

@@ -56,6 +56,14 @@ 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/redirect.rb

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