innate 2009.06 → 2009.06.12

data/AUTHORS

@@ -1,7 +1,7 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   713 Michael Fellinger <m.fellinger@gmail.com>
+   716 Michael Fellinger <m.fellinger@gmail.com>
     31 Tadahiko Uehara <kikofx@gmail.com>
      8 Pistos <gitsomegrace.5.pistos@geoshell.com>
      5 Ryan Grove <ryan@wonko.com>

data/CHANGELOG

@@ -1,3 +1,15 @@
+[7f41b89 | 2009-06-12 12:54:32 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.06.12
+
+[e92a8b3 | 2009-06-11 15:41:35 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make sure that instance-variables set in the view template can be used in the layout
+
+[84ce0d8 | 2009-06-03 11:09:09 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix the bacon task dependency
+
 [46de89c | 2009-06-02 11:50:26 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2009.06

data/innate.gemspec

@@ -2,23 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2009.06"
+  s.version = "2009.06.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2009-06-02}
+  s.date = %q{2009-06-12}
   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/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/foo.html.xhtml", "spec/innate/node/view/only_view.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.has_rdoc = true
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{innate}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Powerful web-framework wrapper for Rack.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.0.0"])

data/lib/innate/action.rb

@@ -103,6 +103,7 @@ module Innate
       action.view_value = nil
       action.sync_variables(self)
       body, content_type = yield
+      action.sync_variables(self)
       action.variables[:content] = body
       return action.call, content_type
     end

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.06"
+  VERSION = "2009.06.12"
 end

data/spec/innate/action/layout.rb

@@ -74,6 +74,19 @@ class SpecActionLayoutMulti < SpecActionLayout
   end
 end
 
+class SpecIVFromView < SpecActionLayout
+  Innate.node('/iv', self)
+  layout :multiply
+
+  def index
+    '#{ @a = 1 }'
+  end
+
+  def multiply
+    '#{@content} #{ @a * 2 } #{ @a * 3 }'
+  end
+end
+
 describe 'Innate::Action#layout' do
   behaves_like :rack_test
 
@@ -101,4 +114,8 @@ describe 'Innate::Action#layout' do
     get('/multi/second').body.strip.should == '<p>Multi Layout Second</p>'
     get('/multi/without').body.strip.should == 'Without wrapper'
   end
+
+  it 'uses layout only for specific actions' do
+    get('/iv').body.strip.should == '1 2 3'
+  end
 end

data/tasks/bacon.rake

@@ -1,5 +1,5 @@
 desc 'Run all bacon specs with pretty output'
-task :bacon => :install_dependencies do
+task :bacon => :setup do
   require 'open3'
   require 'scanf'
   require 'matrix'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: innate
 version: !ruby/object:Gem::Version 
-  version: "2009.06"
+  version: 2009.06.12
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 +09:00
+date: 2009-06-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -190,8 +190,6 @@ files:
 - tasks/ycov.rake
 has_rdoc: true
 homepage: http://github.com/manveru/innate
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -212,9 +210,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: innate
-rubygems_version: 1.3.3
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Powerful web-framework wrapper for Rack.
 test_files: []