innate 2010.04 → 2010.06.18

data/Rakefile

@@ -10,7 +10,7 @@ PROJECT_README = 'README.md'
 PROJECT_VERSION = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
 
 DEPENDENCIES = {
-  'rack' => {:version => '= 1.1.0'},
+  'rack' => {:version => '>= 1.1.0'},
 }
 
 DEVELOPMENT_DEPENDENCIES = {

data/innate.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2010.04"
+  s.version = "2010.06.18"
 
   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-04-04}
+  s.date = %q{2010-06-18}
   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/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"]
@@ -21,20 +21,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["= 1.1.0"])
+      s.add_runtime_dependency(%q<rack>, [">= 1.1.0"])
+      s.add_development_dependency(%q<json>, ["~> 1.2.0"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.3"])
-      s.add_development_dependency(%q<json>, ["~> 1.2.0"])
     else
-      s.add_dependency(%q<rack>, ["= 1.1.0"])
+      s.add_dependency(%q<rack>, [">= 1.1.0"])
+      s.add_dependency(%q<json>, ["~> 1.2.0"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
       s.add_dependency(%q<rack-test>, [">= 0.5.3"])
-      s.add_dependency(%q<json>, ["~> 1.2.0"])
     end
   else
-    s.add_dependency(%q<rack>, ["= 1.1.0"])
+    s.add_dependency(%q<rack>, [">= 1.1.0"])
+    s.add_dependency(%q<json>, ["~> 1.2.0"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
     s.add_dependency(%q<rack-test>, [">= 0.5.3"])
-    s.add_dependency(%q<json>, ["~> 1.2.0"])
   end
 end

data/lib/innate/adapter.rb

@@ -63,9 +63,6 @@ module Innate
         :BindAddress => config[:Host],
         :Port => config[:Port],
         :Logger => Log,
-        :AccessLog => [
-          [Log, ::WEBrick::AccessLog::COMMON_LOG_FORMAT],
-          [Log, ::WEBrick::AccessLog::REFERER_LOG_FORMAT]]
       }
 
       handler.run(app, config)

data/lib/innate/helper/render.rb

@@ -75,8 +75,9 @@ module Innate
         end
       end
 
-      # Renders an action view, doesn't execute any methods and won't wrap it
-      # into a layout.
+      # Renders an action view and does not execute any methods.
+      # The rendered view will not be wrapped in a layout and instead 
+      # will use the layout of the current action.
       # You can further tweak the action to be rendered by passing a block.
       #
       # @example usage

data/lib/innate/version.rb

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

data/lib/innate/view/etanni.rb

@@ -2,8 +2,11 @@ module Innate
   module View
     module Etanni
       def self.call(action, string)
-        etanni = View.compile(string){|str| Innate::Etanni.new(str) }
-        html = etanni.result(action.binding, (action.view || action.method))
+        etanni = View.compile(string) do |str|
+          filename = action.view || action.method
+          Innate::Etanni.new(str, filename)
+        end
+        html = etanni.result(action.instance)
         return html, Response.mime_type
       end
     end
@@ -11,24 +14,26 @@ module Innate
 
   class Etanni
     SEPARATOR = "E69t116A65n110N78i105S83e101P80a97R82a97T84o111R82"
-    START = "\n_out_ << <<#{SEPARATOR}.chomp!\n"
+    CHOMP = "<<#{SEPARATOR}.chomp!"
+    START = "\n_out_ << #{CHOMP}\n"
     STOP = "\n#{SEPARATOR}\n"
     REPLACEMENT = "#{STOP}\\1#{START}"
 
-    def initialize(template)
+    def initialize(template, filename = '<Etanni>')
       @template = template
+      @filename = filename
       compile
     end
 
-    def compile
-      temp = @template.dup
-      temp.strip!
+    def compile(filename = @filename)
+      temp = @template.strip
       temp.gsub!(/<\?r\s+(.*?)\s+\?>/m, REPLACEMENT)
-      @compiled = "_out_ = [<<#{SEPARATOR}.chomp!]\n#{temp}#{STOP}_out_"
+      @compiled = eval("lambda{ _out_ = [#{CHOMP}]\n#{temp}#{STOP}_out_.join }",
+        nil, @filename)
     end
 
-    def result(binding, filename = '<Etanni>')
-      eval(@compiled, binding, filename).join
+    def result(instance, filename = @filename)
+      instance.instance_eval(&@compiled)
     end
   end
 end

data/spec/innate/etanni.rb

@@ -4,20 +4,24 @@ 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!'
+    etanni.result(self).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}"
+    etanni = Etanni.new('Hello #{@name}')
+    @name = "\n#{Etanni::SEPARATOR}\n"
+    etanni.result(self).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
+    lambda{
+      etanni = Etanni.new("Hello \n#{Etanni::SEPARATOR}\n")
+      etanni.result(self)
+    }.should.raise NameError
 
-    etanni = Etanni.new("<h1>Hello \n#{Etanni::SEPARATOR}\n</h1>")
-    lambda{ etanni.result(binding) }.should.raise SyntaxError
+    lambda{
+      etanni = Etanni.new("<h1>Hello \n#{Etanni::SEPARATOR}\n</h1>")
+      etanni.result(self)
+    }.should.raise SyntaxError
   end
 end

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: innate
 version: !ruby/object:Gem::Version 
+  hash: 16115
   prerelease: false
   segments: 
   - 2010
-  - 4
-  version: "2010.04"
+  - 6
+  - 18
+  version: 2010.06.18
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -13,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +09:00
+date: 2010-06-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -31,45 +35,51 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: bacon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        - 5
-        - 3
-        version: 0.5.3
+        version: 1.1.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rack-test
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
-        - 1
-        - 2
         - 0
-        version: 1.2.0
+        - 5
+        - 3
+        version: 0.5.3
   type: :development
   version_requirements: *id004
 description: Simple, straight-forward base for web-frameworks.
@@ -224,16 +234,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3