innate 2010.03 → 2010.04

data/AUTHORS

@@ -1,9 +1,10 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   754 Michael Fellinger <m.fellinger@gmail.com>
+   760 Michael Fellinger <m.fellinger@gmail.com>
     31 Tadahiko Uehara <kikofx@gmail.com>
      8 Pistos <gitsomegrace.5.pistos@geoshell.com>
+     5 injekt <injekt.me@gmail.com>
      5 Ryan Grove <ryan@wonko.com>
      3 Lin Jen-Shin <godfat@godfat.org>
      2 Andreas Karlsson <andreas@proxel.se>
@@ -11,6 +12,7 @@ Following persons have contributed to innate.
      2 Arnaud Meuret <arnaud@meuret.name>
      2 TJ Vanderpoel <bougy.man@gmail.com>
      2 Zoxc <zoxc32@gmail.com>
+     1 crab <crabtw@gmail.com>
      1 Jérémy Zurcher <jeremy@asynk.ch>
      1 ravage <ravage@fragmentized.net>
      1 Sam Carr <samcarr@gmail.com>

data/CHANGELOG

@@ -1,3 +1,54 @@
+[b796644 | 2010-04-04 00:56:06 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2010.04
+
+[1aeacca | 2010-04-03 14:45:46 UTC] injekt <injekt.me@gmail.com>
+
+  * fixed redirect spec
+
+[0a71ec2 | 2010-04-03 14:42:52 UTC] injekt <injekt.me@gmail.com>
+
+  * fixed redirect spec
+
+[6eedc76 | 2010-03-29 14:07:51 UTC] injekt <injekt.me@gmail.com>
+
+  * minor fixes to README
+
+[b5787a4 | 2010-03-29 08:31:03 UTC] injekt <injekt.me@gmail.com>
+
+  * Added support for case-insensitive View lookups
+
+    Removed case sensitive restriction when using Controller::engine
+    for View lookup; :haml is as good as :Haml
+
+[edc00df | 2010-03-27 14:55:07 UTC] injekt <injekt.me@gmail.com>
+
+  * fixed doc for flash helper (depreciated method)
+
+[2e4bdbd | 2010-03-24 06:18:35 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add spec for how to pass arguments to provide actions
+
+[d09ff45 | 2010-03-18 16:37:27 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix some issues, don't split Content-Type at all
+
+[abe842c | 2010-03-18 16:33:41 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make sure ; doesn't break Content-Type
+
+[acce333 | 2010-03-18 03:26:03 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * The Response Content-Type option should influence default mime type
+
+[7ad4de7 | 2010-03-11 04:44:42 UTC] crab <crabtw@gmail.com>
+
+  * use Innate.options.prefix as redirect fallback
+
+[e13e2b2 | 2010-03-09 01:48:06 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix .dup in Rakefile
+
 [4fa40fc | 2010-03-08 13:53:00 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2010.03

data/MANIFEST

@@ -115,6 +115,7 @@ spec/innate/provides.rb
 spec/innate/provides/list.html.xhtml
 spec/innate/provides/list.txt.xhtml
 spec/innate/request.rb
+spec/innate/response.rb
 spec/innate/route.rb
 spec/innate/session.rb
 spec/innate/traited.rb

data/README.md

@@ -470,7 +470,7 @@ there is no need to keep this around.
 
 ### Contrib
 
-Ramaze got quite some things in contrib, some of them used widely, others not at
+Ramaze has some things in contrib, some of them used widely, others not at
 all.
 
 I'm still going through these, putting what is suitable for a wider audience
@@ -507,8 +507,8 @@ Ruby stdlib.
 
 ### Templating
 
-The basic functionality for templating is provided by Innate, it only provides a
-`None` and `ERB` templating engine. The other engines are in Ramaze.
+The basic functionality for templating is provided by Innate, it only provides the
+`None`, `Etanni` and `ERB` templating engines. The other engines are in Ramaze.
 
 #### Ezamar
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'date'
 PROJECT_SPECS = FileList['spec/{innate,example}/**/*.rb'].exclude('common.rb')
 PROJECT_MODULE = 'Innate'
 PROJECT_README = 'README.md'
-PROJECT_VERSION = ENV['VERSION'].dup || Date.today.strftime('%Y.%m.%d')
+PROJECT_VERSION = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
 
 DEPENDENCIES = {
   'rack' => {:version => '= 1.1.0'},

data/innate.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2010.03"
+  s.version = "2010.04"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-04-04}
   s.description = %q{Simple, straight-forward base for web-frameworks.}
   s.email = %q{m.fellinger@gmail.com}
-  s.files = ["AUTHORS", "CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.xhtml", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.xhtml", "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.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "lib/innate/cache/memory.rb", "lib/innate/cache/yaml.rb", "lib/innate/current.rb", "lib/innate/dynamap.rb", "lib/innate/helper.rb", "lib/innate/helper/aspect.rb", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.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", "lib/innate/log/hub.rb", "lib/innate/middleware_compiler.rb", "lib/innate/mock.rb", "lib/innate/node.rb", "lib/innate/options.rb", "lib/innate/options/dsl.rb", "lib/innate/options/stub.rb", "lib/innate/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/spec/bacon.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/app/retro_games.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/provides.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/etanni.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/send_file.rb", "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/modes.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/cat2/cat22.xhtml", "spec/innate/node/view/cat3/cat33.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/sub/baz.xhtml", "spec/innate/node/view/sub/foo/baz.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.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/traited.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
+  s.files = ["AUTHORS", "CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.xhtml", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.xhtml", "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.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "lib/innate/cache/memory.rb", "lib/innate/cache/yaml.rb", "lib/innate/current.rb", "lib/innate/dynamap.rb", "lib/innate/helper.rb", "lib/innate/helper/aspect.rb", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.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", "lib/innate/log/hub.rb", "lib/innate/middleware_compiler.rb", "lib/innate/mock.rb", "lib/innate/node.rb", "lib/innate/options.rb", "lib/innate/options/dsl.rb", "lib/innate/options/stub.rb", "lib/innate/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/spec/bacon.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/app/retro_games.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/provides.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/etanni.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/send_file.rb", "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/modes.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/cat2/cat22.xhtml", "spec/innate/node/view/cat3/cat33.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/sub/baz.xhtml", "spec/innate/node/view/sub/foo/baz.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.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/response.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/traited.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{innate}

data/lib/innate/helper/flash.rb

@@ -19,7 +19,7 @@ module Innate
     # On the first request, for example on registering:
     #
     #   flash[:error] = "You should reconsider your username, it's taken already"
-    #   redirect R(self, :register)
+    #   redirect r(:register)
     #
     # This is the request from the redirect:
     #

data/lib/innate/helper/redirect.rb

@@ -4,14 +4,14 @@ module Innate
       def respond(body, status = 200, header = {})
         response.write body
         response.status = status
-        header['Content-Type'] ||= 'text/html'
+        header['Content-Type'] ||= Response.mime_type
         header.each{|key, value| response[key] = value }
 
         throw(:respond, response)
       end
 
       def respond!(body, status = 200, header = {})
-        header['Content-Type'] ||= 'text/html'
+        header['Content-Type'] ||= Response.mime_type
         throw(:respond, Response.new(body, status, header))
       end
 
@@ -70,7 +70,7 @@ module Innate
           "<a href='#{target}'>#{h target}</a>!"
       end
 
-      def redirect_referrer(fallback = '/')
+      def redirect_referrer(fallback = Innate.options.prefix)
         if (referer = request.env['HTTP_REFERER']) && (url = request.url)
           referer_uri, request_uri = URI(referer), URI(url)
 

data/lib/innate/response.rb

@@ -7,6 +7,10 @@ module Innate
         :headers, {'Content-Type' => 'text/html'}
     end
 
+    def self.mime_type
+      options[:headers]['Content-Type'] || 'text/html'
+    end
+
     def reset
       self.status = 200
       self.header.delete('Content-Type')

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2010.03"
+  VERSION = "2010.04"
 end

data/lib/innate/view/erb.rb

@@ -7,7 +7,7 @@ module Innate
         erb = View.compile(string){|str| ::ERB.new(str, nil, '%<>') }
         erb.filename = (action.view || action.method).to_s
         html = erb.result(action.binding)
-        return html, 'text/html'
+        return html, Response.mime_type
       end
     end
   end

data/lib/innate/view/etanni.rb

@@ -4,7 +4,7 @@ module Innate
       def self.call(action, string)
         etanni = View.compile(string){|str| Innate::Etanni.new(str) }
         html = etanni.result(action.binding, (action.view || action.method))
-        return html, 'text/html'
+        return html, Response.mime_type
       end
     end
   end

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.to_s, Response.mime_type
       end
     end
   end

data/lib/innate/view.rb

@@ -50,8 +50,12 @@ module Innate
     # No mutex is used in Fiber environment, see Innate::State and subclasses.
     def obtain(klass, root = Object)
       Innate.sync do
-        klass.to_s.scan(/\w+/){|part| root = root.const_get(part) }
-        return root
+        view_name = /^#{klass.to_s.downcase.dup.delete('_')}$/i
+        if view = View.constants.grep(view_name).first
+          root.const_get(view)
+        else
+          raise(NameError, "View #{klass} not found")
+        end
       end
     end
 

data/spec/innate/helper/redirect.rb

@@ -20,6 +20,10 @@ class SpecRedirectHelper
   end
 
   def redirect_referer_action
+    redirect_referer
+  end
+  
+  def redirect_referer_with_fallback
     redirect_referer(r(:noop))
   end
 
@@ -90,17 +94,17 @@ describe Innate::Helper::Redirect do
   end
 
   should 'redirect to referer' do
-    header 'HTTP_REFERER', "#@uri/index"
+    header 'REFERER', "#@uri/noop"
     get("#@uri/redirect_referer_action")
 
     last_response.status.should == 302
-    last_response.headers['Location'].should == "#@uri/index"
+    last_response.headers['Location'].should == "#@uri/noop"
     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")
+    header 'REFERER', "#@uri/redirect_referer_with_fallback"
+    get("#@uri/redirect_referer_with_fallback")
 
     last_response.status.should == 302
     last_response.headers['Location'].should == "#@uri/noop"

data/spec/innate/provides.rb

@@ -19,6 +19,10 @@ class SpecNodeProvides
   def string
     'Just 42'
   end
+
+  def args(*args)
+    args
+  end
 end
 
 class SpecNodeProvidesTemplates
@@ -62,6 +66,12 @@ describe 'Content representation' do
     it 'defaults to html presentation' do
       assert_wish('/string', 'Just 42', 'text/html')
     end
+
+    it 'takes arguments with <name>/arg1/arg2.json' do
+      assert_wish('/args', '[]', 'text/html')
+      assert_wish('/args.json', '[]', 'application/json')
+      assert_wish('/args/a/b/c.json', '["a","b","c"]', 'application/json')
+    end
   end
 
   describe 'with templates' do

data/spec/innate/response.rb

@@ -0,0 +1,32 @@
+require File.expand_path('../../helper', __FILE__)
+
+class SpecResponse
+  Innate.node '/'
+
+  def index
+    "some text"
+  end
+end
+
+describe Innate::Response do
+  describe 'Content-Type' do
+    behaves_like :rack_test
+
+    it 'responds with text/html by default' do
+      got = get('/')
+      got['Content-Type'].should == 'text/html'
+    end
+
+    it 'changes when option is changed' do
+      Innate::Response.options.headers['Content-Type'] = 'text/plain'
+      got = get('/')
+      got['Content-Type'].should == 'text/plain'
+    end
+
+    it 'is ok with extended value' do
+      Innate::Response.options.headers['Content-Type'] = 'text/plain; charset=utf-8'
+      got = get('/')
+      got['Content-Type'].should == 'text/plain; charset=utf-8'
+    end
+  end
+end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2010
-  - 3
-  version: "2010.03"
+  - 4
+  version: "2010.04"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 +09:00
+date: 2010-04-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -198,6 +198,7 @@ files:
 - spec/innate/provides/list.html.xhtml
 - spec/innate/provides/list.txt.xhtml
 - spec/innate/request.rb
+- spec/innate/response.rb
 - spec/innate/route.rb
 - spec/innate/session.rb
 - spec/innate/traited.rb