manveru-innate 2009.06 → 2009.06.12

Sign up to get free protection for your applications and to get access to all the features.
data/AUTHORS CHANGED
@@ -1,7 +1,7 @@
1
1
  Following persons have contributed to innate.
2
2
  (Sorted by number of submitted patches, then alphabetically)
3
3
 
4
- 712 Michael Fellinger <m.fellinger@gmail.com>
4
+ 715 Michael Fellinger <m.fellinger@gmail.com>
5
5
  31 Tadahiko Uehara <kikofx@gmail.com>
6
6
  8 Pistos <gitsomegrace.5.pistos@geoshell.com>
7
7
  5 Ryan Grove <ryan@wonko.com>
data/CHANGELOG CHANGED
@@ -1,3 +1,15 @@
1
+ [e92a8b3 | 2009-06-11 15:41:35 UTC] Michael Fellinger <m.fellinger@gmail.com>
2
+
3
+ * Make sure that instance-variables set in the view template can be used in the layout
4
+
5
+ [84ce0d8 | 2009-06-03 11:09:09 UTC] Michael Fellinger <m.fellinger@gmail.com>
6
+
7
+ * Fix the bacon task dependency
8
+
9
+ [46de89c | 2009-06-02 11:50:26 UTC] Michael Fellinger <m.fellinger@gmail.com>
10
+
11
+ * Version 2009.06
12
+
1
13
  [e05a004 | 2009-06-02 11:49:17 UTC] Michael Fellinger <m.fellinger@gmail.com>
2
14
 
3
15
  * Use rubygems development-dependencies, improve rake setup
data/innate.gemspec CHANGED
@@ -2,23 +2,24 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{innate}
5
- s.version = "2009.06"
5
+ s.version = "2009.06.12"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Michael 'manveru' Fellinger"]
9
- s.date = %q{2009-06-02}
9
+ s.date = %q{2009-06-12}
10
10
  s.description = %q{Simple, straight-forward base for web-frameworks.}
11
11
  s.email = %q{m.fellinger@gmail.com}
12
12
  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"]
13
+ s.has_rdoc = true
13
14
  s.homepage = %q{http://github.com/manveru/innate}
14
15
  s.require_paths = ["lib"]
15
16
  s.rubyforge_project = %q{innate}
16
- s.rubygems_version = %q{1.3.3}
17
+ s.rubygems_version = %q{1.3.1}
17
18
  s.summary = %q{Powerful web-framework wrapper for Rack.}
18
19
 
19
20
  if s.respond_to? :specification_version then
20
21
  current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
21
- s.specification_version = 3
22
+ s.specification_version = 2
22
23
 
23
24
  if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
24
25
  s.add_runtime_dependency(%q<rack>, ["~> 1.0.0"])
data/lib/innate/action.rb CHANGED
@@ -103,6 +103,7 @@ module Innate
103
103
  action.view_value = nil
104
104
  action.sync_variables(self)
105
105
  body, content_type = yield
106
+ action.sync_variables(self)
106
107
  action.variables[:content] = body
107
108
  return action.call, content_type
108
109
  end
@@ -1,3 +1,3 @@
1
1
  module Innate
2
- VERSION = "2009.06"
2
+ VERSION = "2009.06.12"
3
3
  end
@@ -74,6 +74,19 @@ class SpecActionLayoutMulti < SpecActionLayout
74
74
  end
75
75
  end
76
76
 
77
+ class SpecIVFromView < SpecActionLayout
78
+ Innate.node('/iv', self)
79
+ layout :multiply
80
+
81
+ def index
82
+ '#{ @a = 1 }'
83
+ end
84
+
85
+ def multiply
86
+ '#{@content} #{ @a * 2 } #{ @a * 3 }'
87
+ end
88
+ end
89
+
77
90
  describe 'Innate::Action#layout' do
78
91
  behaves_like :rack_test
79
92
 
@@ -101,4 +114,8 @@ describe 'Innate::Action#layout' do
101
114
  get('/multi/second').body.strip.should == '<p>Multi Layout Second</p>'
102
115
  get('/multi/without').body.strip.should == 'Without wrapper'
103
116
  end
117
+
118
+ it 'uses layout only for specific actions' do
119
+ get('/iv').body.strip.should == '1 2 3'
120
+ end
104
121
  end
data/tasks/bacon.rake CHANGED
@@ -1,5 +1,5 @@
1
1
  desc 'Run all bacon specs with pretty output'
2
- task :bacon => :install_dependencies do
2
+ task :bacon => :setup do
3
3
  require 'open3'
4
4
  require 'scanf'
5
5
  require 'matrix'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: manveru-innate
3
3
  version: !ruby/object:Gem::Version
4
- version: "2009.06"
4
+ version: 2009.06.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-06-02 00:00:00 -07:00
12
+ date: 2009-06-12 00:00:00 -07:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -188,7 +188,7 @@ files:
188
188
  - tasks/reversion.rake
189
189
  - tasks/setup.rake
190
190
  - tasks/ycov.rake
191
- has_rdoc: false
191
+ has_rdoc: true
192
192
  homepage: http://github.com/manveru/innate
193
193
  post_install_message:
194
194
  rdoc_options: []
@@ -212,7 +212,7 @@ requirements: []
212
212
  rubyforge_project: innate
213
213
  rubygems_version: 1.2.0
214
214
  signing_key:
215
- specification_version: 3
215
+ specification_version: 2
216
216
  summary: Powerful web-framework wrapper for Rack.
217
217
  test_files: []
218
218