innate 2010.01 → 2010.03

data/AUTHORS

@@ -1,7 +1,7 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   749 Michael Fellinger <m.fellinger@gmail.com>
+   754 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,23 @@
+[4fa40fc | 2010-03-08 13:53:00 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2010.03
+
+[c48a647 | 2010-02-03 07:59:05 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add a spec for Etanni
+
+[baa0dd8 | 2010-01-17 06:57:44 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * clarify precedence
+
+[c9fa60f | 2010-01-06 07:14:40 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Set correct header in referrer spec
+
+[59f03da | 2010-01-06 07:10:22 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix request spec for new rack behaviour
+
 [82cd8d9 | 2010-01-06 06:53:24 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2010.01

data/MANIFEST

@@ -79,6 +79,7 @@ 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

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'] || Date.today.strftime('%Y.%m.%d')
+PROJECT_VERSION = ENV['VERSION'].dup || Date.today.strftime('%Y.%m.%d')
 
 DEPENDENCIES = {
   'rack' => {:version => '= 1.1.0'},

data/innate.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2010.01"
+  s.version = "2010.03"
 
   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-01-06}
+  s.date = %q{2010-03-08}
   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/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/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}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Powerful web-framework wrapper for Rack.}
 
   if s.respond_to? :specification_version then

data/lib/innate/node.rb

@@ -422,7 +422,7 @@ module Innate
 
         next unless method if needs_method
         next unless method if params.any?
-        next unless (view = find_view(name, wish)) or method
+        next unless (view = find_view(name, wish)) || method
 
         params.map!{|param| Rack::Utils.unescape(param) }
 

data/lib/innate/version.rb

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

data/lib/innate/view/etanni.rb

@@ -30,5 +30,5 @@ module Innate
     def result(binding, filename = '<Etanni>')
       eval(@compiled, binding, filename).join
     end
- end
+  end
 end

data/spec/innate/etanni.rb

@@ -0,0 +1,23 @@
+require File.expand_path('../../helper', __FILE__)
+require 'innate/view/etanni'
+
+describe Etanni = Innate::Etanni do
+  it 'renders a simple template' do
+    etanni = Etanni.new('Hello, World!')
+    etanni.result(binding).should == 'Hello, World!'
+  end
+
+  it 'allows use of Etanni::SEPARATOR inside interplated code' do
+    etanni = Etanni.new('Hello #{name}')
+    name = "\n#{Etanni::SEPARATOR}\n"
+    etanni.result(binding).should == "Hello #{name}"
+  end
+
+  it 'fails with SyntaxError or NameError when the SEPARATOR is used inside a template' do
+    etanni = Etanni.new("Hello \n#{Etanni::SEPARATOR}\n")
+    lambda{ etanni.result(binding) }.should.raise NameError
+
+    etanni = Etanni.new("<h1>Hello \n#{Etanni::SEPARATOR}\n</h1>")
+    lambda{ etanni.result(binding) }.should.raise SyntaxError
+  end
+end

data/spec/innate/helper/redirect.rb

@@ -90,7 +90,7 @@ describe Innate::Helper::Redirect do
   end
 
   should 'redirect to referer' do
-    header 'REFERER', "#@uri/index"
+    header 'HTTP_REFERER', "#@uri/index"
     get("#@uri/redirect_referer_action")
 
     last_response.status.should == 302
@@ -99,7 +99,7 @@ describe Innate::Helper::Redirect do
   end
 
   should 'redirect to fallback if referrer is identical' do
-    header 'REFERER', "#@uri/redirect_referer_action"
+    header 'HTTP_REFERER', "#@uri/redirect_referer_action"
     get("#@uri/redirect_referer_action")
 
     last_response.status.should == 302

data/spec/innate/request.rb

@@ -48,7 +48,10 @@ describe Innate::Request do
 
     query = {'a' => 'b', 'c' => 'd', 'e' => 'f'}
     params = StringIO.new(Rack::Utils.build_query(query))
-    req = request('rack.request.form_hash' => params, 'rack.input' => params)
+    req = request(
+      'QUERY_STRING' => params.string,
+      'rack.input' => params
+    )
 
     req.params.should == query
     req.subset(:a).should == {'a' => 'b'}

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: innate
 version: !ruby/object:Gem::Version 
-  version: "2010.01"
+  prerelease: false
+  segments: 
+  - 2010
+  - 3
+  version: "2010.03"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,49 +13,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +09:00
+date: 2010-03-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
 executables: []
@@ -142,6 +162,7 @@ files:
 - 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
@@ -205,18 +226,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: innate
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Powerful web-framework wrapper for Rack.