manveru-innate 2009.04 → 2009.04.01

data/CHANGELOG

@@ -1,261 +1,3 @@
-[0ec2012 | Thu Apr 23 06:21:17 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Allow deletion of mapped apps in DynaMap
-
-[cbedd9c | Thu Apr 23 05:04:04 UTC 2009] Ryan Grove <ryan@wonko.com>
-
-  * Add path and full_path to Innate::Action
-
-    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
-
-[b9a0d4b | Mon Apr 20 05:12:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Make the u and h aliases for the CGI helper module_functions too
-
-[b68aad4 | Mon Apr 20 05:12:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Allow further modification of the Action in the render_* methods via block
-
-[dca3531 | Sun Apr 19 23:38:06 UTC 2009] Ryan Grove <ryan@wonko.com>
-
-  * Preserve response headers when redirecting. Closes #1
-
-    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
-
-[d465ca3 | Sat Apr 18 02:46:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Version 2009.04.18
-
-[987c5d7 | Sat Apr 18 02:44:26 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Update the release tasks
-
-[f927c9d | Fri Apr 17 11:51:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Add Content-Disposition support to send_file
-
-[888318c | Fri Apr 17 10:43:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Better English in render_custom error
-
-[15078e6 | Wed Apr 15 16:49:04 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Add comment about planned deprecation of SendFile helper's default status
-
-[4b487aa | Wed Apr 15 16:48:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Remove the length from Response, Rack provides that
-
-[1634391 | Wed Apr 15 11:02:11 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Don't camel-case the helper module name, simply remove underscores, we do case-insensitive lookup anyway
-
-[f97e8d7 | Wed Apr 15 10:58:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Remove core_extensions, we don't need String#each or BasicObject anymore
-
-[0b33546 | Wed Apr 15 09:16:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Action may be invalid if the node requires a method and view
-
-[39dd843 | Wed Apr 15 09:15:30 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Escape non-hash arguments to Helper::Link#route (ryan grove)
-
-[22ee4df | Wed Apr 15 07:25:02 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Raise if the Render helper cannot obtain an Action
-
-[e229299 | Mon Apr 13 12:48:05 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Allow Action#call even if we are outside Current#wrap
-
-[b6e9558 | Mon Apr 13 04:37:42 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Remove Action#exts member and use better terms
-
-[46d2a5e | Sun Apr 12 05:03:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * FileBased caches have access to @filename now
-
-[f84f18f | Sun Apr 12 05:03:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Set a PROJECT_README for some rake tasks
-
-[8920482 | Sun Apr 12 05:03:21 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Improvment and spec for provide example
-
-[a892dea | Sun Apr 12 05:02:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Minor improvment and spec for retro games example
-
-[b3aeb97 | Fri Apr 10 12:30:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Allow overriding of middleware mode for specs
-
-[7d65255 | Fri Apr 10 12:07:15 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Compact code
-
-[cde9366 | Fri Apr 10 10:51:03 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Simplify specs and make them pass using rack-test
-
-[f4c9572 | Fri Apr 10 10:50:34 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Don't forget to specify an app for rack-test
-
-[41b1955 | Fri Apr 10 10:17:42 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Remove spec for render_template
-
-[a3b73ca | Fri Apr 10 10:17:27 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Add `rake setup` task to comply to convention. I will put up the corresponding gems ASAP
-
-[c648bf7 | Fri Apr 10 10:16:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Switch to using rack-test for our specs, needs rack-test from the master branch head
-
-[5c08e25 | Thu Apr 09 17:52:28 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Use ContentLength middleware
-
-[0dc50d4 | Thu Apr 09 16:10:51 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Fix template caching... was using html instead of the wish the glob was for
-
-[622bbe3 | Thu Apr 09 16:01:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Fix example apps
-
-[6e9e843 | Tue Apr 07 09:56:56 UTC 2009] Sam Carr <samcarr@gmail.com>
-
-  * Minor tidy-ups to fix comments, add missing requires, add comments etc.
-
-    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
-
-[8f9af98 | Tue Apr 07 18:42:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Set default interval for reloader to 2 seconds
-
-[9f7e749 | Tue Apr 07 18:42:14 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Never assign $0, bad mojo
-
-[281501e | Tue Apr 07 17:53:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Don't assign a directory to $0
-
-[8a2ddc7 | Tue Apr 07 17:16:37 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Version 2009.04.08
-
-[89ab244 | Tue Apr 07 16:17:07 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * bring the retro_games example up to date
-
-[c1b6939 | Tue Apr 07 14:30:14 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Fix typo in howto_spec example
-
-[c1f7bb8 | Tue Apr 07 12:24:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Improve Helper::CGI, don't accept more than one argument per method
-
-[c01a0ce | Tue Apr 07 02:07:28 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Warn if action is invalid
-
-[d749887 | Tue Apr 07 02:07:01 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Remove Helper::Render#render_template
-
-[fba39b5 | Mon Apr 06 03:26:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Remove specs for Helper::Partial
-
-[98bc6f7 | Mon Apr 06 03:25:52 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Add more specs and refine Helper::Render
-
-[616b5aa | Mon Apr 06 03:03:21 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Provide direct access to Helper::Render methods through extension
-
-[696f85d | Mon Apr 06 02:58:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Make Helper::Render#render_template work and add specs
-
-[b0fcf13 | Sun Apr 05 23:51:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Adding Helper::Render, this should be able to cover all our rendering needs
-
-[ea02bbe | Sun Apr 05 23:49:52 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Remove Helper::Partial, to be replaced by Helper::Render
-
-[52c9943 | Sun Apr 05 23:47:01 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * just fix some annoying things
-
-[cd45648 | Sun Apr 05 23:46:17 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Refactor Helper to use HelpersHelper.options
-
-[4a1b7f6 | Sun Apr 05 14:25:43 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * remove some more methods from Request, they depend on a method in ramaze
-
-[6e0b421 | Sun Apr 05 09:22:19 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Make multipart building a bit more compact
-
-[2f17bf6 | Sun Apr 05 14:23:45 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Make some variables more 'communicative', as reek puts it
-
-[348e179 | Sat Apr 04 06:37:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Caching for template locations finally working, this should reduce the disk IO through globbing considerably, even if it is still updating the locations for every request
-
-[8555277 | Sat Apr 04 06:27:54 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Better bacon task
-
-[110243b | Fri Apr 03 12:08:41 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Experimental templating path caching
-
-[258d7c9 | Fri Apr 03 13:01:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Use Etanni engine for specs and most examples
-
-[2bf8941 | Fri Apr 03 12:59:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Comment out gemspec dependencies until rack is released
-
-[57078ac | Fri Apr 03 12:58:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Remove the extra newlines introduced with Etanni
-
-[51b4797 | Fri Apr 03 12:58:03 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Relax views by using #to_s instead of #to_str
-
-[d8475d3 | Fri Apr 03 09:48:49 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Don't carry over view_value into layout actions
-
-[8e2788f | Thu Apr 02 03:50:52 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Fix view and layout mapping if there are multiple view_mappings
-
-[8e93e87 | Tue Mar 31 16:35:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
-
-  * Version 2009.04.01
-
 [1a7242b | Tue Mar 31 16:32:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * Optional is called Optioned now, watch out

data/MANIFEST

@@ -4,15 +4,15 @@ MANIFEST
 README.md
 Rakefile
 example/app/retro_games.rb
-example/app/todo/layout/default.xhtml
+example/app/todo/layout/default.erb
 example/app/todo/spec/todo.rb
 example/app/todo/start.rb
-example/app/todo/view/index.xhtml
+example/app/todo/view/index.erb
 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/app/whywiki_erb/view/edit.html.erb
+example/app/whywiki_erb/view/index.html.erb
 example/custom_middleware.rb
 example/hello.rb
 example/howto_spec.rb
@@ -30,6 +30,8 @@ lib/innate/cache/file_based.rb
 lib/innate/cache/marshal.rb
 lib/innate/cache/memory.rb
 lib/innate/cache/yaml.rb
+lib/innate/core_compatibility/basic_object.rb
+lib/innate/core_compatibility/string.rb
 lib/innate/current.rb
 lib/innate/dynamap.rb
 lib/innate/helper.rb
@@ -37,8 +39,8 @@ lib/innate/helper/aspect.rb
 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
@@ -66,14 +68,12 @@ 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/action/layout/file_layout.erb
 spec/innate/cache/common.rb
 spec/innate/cache/marshal.rb
 spec/innate/cache/memory.rb
@@ -84,30 +84,30 @@ spec/innate/helper/aspect.rb
 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.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/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/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.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/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/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/provides/list.html.erb
+spec/innate/provides/list.txt.erb
 spec/innate/request.rb
 spec/innate/route.rb
 spec/innate/session.rb
@@ -124,4 +124,3 @@ tasks/manifest.rake
 tasks/rcov.rake
 tasks/release.rake
 tasks/reversion.rake
-tasks/setup.rake

data/README.md

@@ -67,7 +67,7 @@ encourages everybody to build on top of it whatever they want.
 * No clutter in your application directory structure, scales from a single file
   upwards
 * Seamless integration with Rack middleware
-* No patching of ruby core or stdlib.
+* No patching[4] of ruby core or stdlib.
 * Direct access to the current Request, Response, and Session from anywhere via
   Trinity
 * Works out of the box with ERB the templating engine.
@@ -77,6 +77,7 @@ encourages everybody to build on top of it whatever they want.
 [1]: What you may think of as Controller.
 [2]: This includes: Ruby 1.8, Ruby 1.9.1, JRuby, Rubinius
 [3]: Fiber is available on 1.9 only at this point.
+[4]: However, we add String#each if it isn't there to be compatible with Rack.
 
 ## Usage
 
@@ -448,6 +449,13 @@ authorization, etc.
 
 Innate abandons the snippets, keeping your core clean.
 
+Two things that we need are (currently) String#each, because Rack relies on it,
+and BasicObject as superclass for the Option class. They are only applied on
+demand.
+
+These are in the directory called core_extensions, to make it very, very clear
+what we are doing and how we are doing it.
+
 Ramaze has still a lot of these snippets and will continue to, although I will
 constantly strive to reduce them slowly.
 

data/Rakefile

@@ -4,9 +4,10 @@ require 'rake/gempackagetask'
 require 'time'
 require 'date'
 
-PROJECT_SPECS = FileList['spec/{innate,example}/**/*.rb'].exclude('common.rb')
+specs =  Dir['spec/{innate,example}/**/*.rb']
+specs -= Dir['spec/innate/cache/common.rb']
+PROJECT_SPECS = specs
 PROJECT_MODULE = 'Innate'
-PROJECT_README = 'README.md'
 
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = 'innate'
@@ -21,10 +22,9 @@ GEMSPEC = Gem::Specification.new{|s|
   s.has_rdoc     = true
   s.require_path = 'lib'
 
-  # s.add_runtime_dependency('rack', '>= 0.9.1') # lies!
-  # s.add_development_dependency('bacon', '>= 1.0')
-  # s.add_development_dependency('json', '~> 1.1.3')
-  # s.add_development_dependency('rack-test', '>= 0.1.0')
+  s.add_runtime_dependency('rack', '>= 0.9.1') # lies!
+  s.add_development_dependency('bacon', '>= 1.0')
+  s.add_development_dependency('json', '~> 1.1.3')
 }
 
 Dir['tasks/*.rake'].each{|f| import(f) }

data/example/app/retro_games.rb

@@ -25,36 +25,36 @@ class Games
   end
 
   def vote(name)
-    STORE[name] += 1
+    STORE[url_decode(name)] += 1
 
     redirect_referrer
   end
 
   TEMPLATE = <<-'T'.strip
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
   <head>
     <title>Top Retro Games</title>
   </head>
   <body>
     <h1>Vote on your favorite Retro Game</h1>
-    <form action="#{ r(:create) }" method="post">
+    <form action="<%= r :create %>" method="post">
       <input type="text" name="name" />
       <input type="submit" value="Add" />
     </form>
     <ol>
-      <?r STORE.each do |name, votes| ?>
+      <% STORE.each do |name, votes| %>
         <li>
-          #{ a("Vote", r(:vote, u(name))) }
-          #{ h "%5d => %s" % [votes, name] }
+          <%= Games.a("Vote", "/vote/#{u name}") %>
+          <%= "%5d => %s" % [votes, name] %>
         </li>
-      <?r end ?>
+      <% end %>
     </ol>
   </body>
 </html>
   T
+
 end
 
 Innate.start