innate 2011.12 → 2012.03

data/Rakefile

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

data/innate.gemspec

@@ -2,35 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name = "innate"
-  s.version = "2011.12"
+  s.version = "2012.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 = "2011-12-28"
+  s.date = "2012-03-07"
   s.description = "Simple, straight-forward base for web-frameworks."
   s.email = "m.fellinger@gmail.com"
   s.files = [".gems", ".gitignore", ".load_gemset", ".rvmrc", ".travis.yml", "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/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/rack_file_wrapper.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/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"]
   s.homepage = "http://github.com/manveru/innate"
   s.require_paths = ["lib"]
   s.rubyforge_project = "innate"
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Powerful web-framework wrapper for Rack."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["~> 1.4.0"])
-      s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<rack>, ["~> 1.4.1"])
       s.add_development_dependency(%q<rack-test>, [">= 0.6.1"])
+      s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
     else
-      s.add_dependency(%q<rack>, ["~> 1.4.0"])
-      s.add_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_dependency(%q<rack>, ["~> 1.4.1"])
       s.add_dependency(%q<rack-test>, [">= 0.6.1"])
+      s.add_dependency(%q<bacon>, [">= 1.1.0"])
     end
   else
-    s.add_dependency(%q<rack>, ["~> 1.4.0"])
-    s.add_dependency(%q<bacon>, [">= 1.1.0"])
+    s.add_dependency(%q<rack>, ["~> 1.4.1"])
     s.add_dependency(%q<rack-test>, [">= 0.6.1"])
+    s.add_dependency(%q<bacon>, [">= 1.1.0"])
   end
 end

data/lib/innate/cache.rb

@@ -102,11 +102,10 @@ module Innate
     # @param [Cache] cache
     def self.register(cache)
       key = cache.name.to_s
-      source = "def self.#{key}() @#{key}; end
-                def self.#{key}=(o) @#{key} = o; end"
-      self.class_eval(source, __FILE__, __LINE__)
+      return if respond_to?(key) && respond_to?("#{key}=")
+      (class << self; self; end).send(:attr_accessor, key)
 
-      self.send("#{key}=", cache)
+      send("#{key}=", cache)
     end
 
     def self.add(*names)

data/lib/innate/helper/link.rb

@@ -52,7 +52,7 @@ module Innate
       # This method is mostly here in case you include this helper elsewhere
       # and don't want (or can't) type SomeNode.r all the time.
       #
-      # The usage is identical with {route}.
+      # The usage is identical with {Innate::Helper::Link#route}.
       #
       # @param [#to_s] name
       # @return [URI] to the location

data/lib/innate/helper/render.rb

@@ -134,7 +134,7 @@ module Innate
       # @api internal
       # @author manveru
       def render_custom(action_name, variables = {})
-        unless action = resolve(action_name.to_s)
+        unless action = resolve(action_name.to_s, :needs_method => false)
           raise(ArgumentError, "No Action %p on #{self}" % [action_name])
         end
 

data/lib/innate/log/color_formatter.rb

@@ -3,14 +3,14 @@ class Logger
   #
   # The basic mapping of ANSI colors is as follows:
   #
-  #     | reset | bold | dark | underline | blink | negative
-  # MOD |     0 |    1 |    2 |         4 |     5 |        7
+  #         | reset | bold | dark | underline | blink | negative
+  #     MOD |     0 |    1 |    2 |         4 |     5 |        7
   #
-  #    | black | red | green | yellow | blue | magenta | cyan | white
-  # FG |    30 |  31 |    32 |     33 |   34 |      35 |   36 |    37
-  # BG |    40 |  41 |    42 |     43 |   44 |      45 |   46 |    47
+  #        | black | red | green | yellow | blue | magenta | cyan | white
+  #     FG |    30 |  31 |    32 |     33 |   34 |      35 |   36 |    37
+  #     BG |    40 |  41 |    42 |     43 |   44 |      45 |   46 |    47
   #
-  # The output is done by: "\e[#{mod};#{fg};#{bg}m#{string}\e[0m"
+  # The output is done by: ``\e[#{mod};#{fg};#{bg}m#{string}\e[0m``.
   # The suffix is to reset the terminal to the original state again.
   class ColorFormatter < Formatter
     LEVEL_COLOR = {

data/lib/innate/middleware_compiler.rb

@@ -32,7 +32,7 @@ module Innate
     end
 
     def cascade(*apps)
-      @app = Rack::Cascade.new(apps)
+      @app = Rack::Cascade.new(apps, [404, 405])
     end
 
     # Default application for Innate

data/lib/innate/node.rb

@@ -13,7 +13,7 @@ module Innate
   # scheme.
   #
   # This makes dispatching more fun, avoids a lot of processing that is done by
-  # {Rack} anyway and lets you tailor your application down to the last action
+  # Rack anyway and lets you tailor your application down to the last action
   # exactly the way you want without worrying about side-effects to other
   # {Node}s.
   #
@@ -269,7 +269,7 @@ module Innate
     end
 
     # Let's try to find some valid action for given +path+.
-    # Otherwise we dispatch to {action_missing}.
+    # Otherwise we dispatch to {Innate::Node#action_missing}.
     #
     # @param [String] path from env['PATH_INFO']
     #
@@ -356,16 +356,18 @@ module Innate
     # html.
     #
     # @param [String] path
+    # @param [Hash] options
     #
     # @return [nil, Action]
     #
     # @api external
     # @see Node::find_provide Node::update_method_arities Node::find_action
     # @author manveru
-    def resolve(path)
+    def resolve(path, options = {})
       name, wish, engine = find_provide(path)
       node = (respond_to?(:ancestors) && respond_to?(:new)) ? self : self.class
-      action = Action.create(:node => node, :wish => wish, :engine => engine, :path => path)
+      action = Action.create(:node => node, :wish => wish, :engine => engine, :path => path, :options => options)
+      action.options.key?(:needs_method) || action.options[:needs_method] = node.needs_method?
 
       if content_type = node.ancestral_trait["#{wish}_content_type"]
         action.options = {:content_type => content_type}
@@ -376,7 +378,8 @@ module Innate
       node.fill_action(action, name)
     end
 
-    # Resolve possible provides for the given +path+ from {provides}.
+    # Resolve possible provides for the given +path+ from
+    # {Innate::Node#provides}.
     #
     # @param [String] path
     #
@@ -414,7 +417,7 @@ module Innate
     #      Action#wish Action#merge!
     # @author manveru
     def fill_action(action, given_name)
-      needs_method = self.needs_method?
+      needs_method = action.options[:needs_method]
       wish = action.wish
 
       patterns_for(given_name) do |name, params|
@@ -558,8 +561,8 @@ module Innate
 
     # Try to find the best template for the given basename and wish.
     #
-    # This method is mostly here for symetry with {to_layout} and to allow you
-    # overriding the template lookup easily.
+    # This method is mostly here for symetry with {Innate::Node#to_layout} and
+    # to allow you overriding the template lookup easily.
     #
     # @param [#to_s] action_name
     # @param [#to_s] wish
@@ -650,7 +653,7 @@ module Innate
     # Define a layout to use on this Node.
     #
     # A Node can only have one layout, although the template being chosen can
-    # depend on {provides}.
+    # depend on {Innate::Node#provides}.
     #
     # @example
     #   layout :foo
@@ -991,7 +994,8 @@ module Innate
       ancestral_trait[:needs_method]
     end
 
-    # This will return true if the only provides set are by {Node::included}.
+    # This will return true if the only provides set are by
+    # {Innate::Node.included}.
     #
     # The reasoning behind this is to determine whether the user has touched
     # the provides at all, in which case we will not override the provides in

data/lib/innate/traited.rb

@@ -47,21 +47,23 @@ module Innate
     # Builds a trait from all the ancestors, closer ancestors overwrite distant
     # ancestors
     #
-    # class Foo
-    #   include Innate::Traited
-    #   trait :one => :eins, :first => :erstes
-    # end
+    # @example
+    #  class Foo
+    #    include Innate::Traited
+    #    trait :one => :eins, :first => :erstes
+    #  end
     #
-    # class Bar < Foo
-    #   trait :two => :zwei
-    # end
+    #  class Bar < Foo
+    #    trait :two => :zwei
+    #  end
     #
-    # class Foobar < Bar
-    #   trait :three => :drei, :first => :overwritten
-    # end
+    #  class Foobar < Bar
+    #    trait :three => :drei, :first => :overwritten
+    #  end
     #
-    # Foobar.ancestral_trait
-    # # => {:three => :drei, :two => :zwei, :one => :eins, :first => :overwritten}
+    #  Foobar.ancestral_trait # => {
+    #    :three => :drei, :two => :zwei, :one => :eins, :first => :overwritten
+    #  }
     def ancestral_trait
       klass = self.kind_of?(Module) ? self : self.class
       ANCESTRAL_TRAITS[klass] ||=

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2011.12"
+  VERSION = "2012.03"
 end

data/spec/innate/helper/render.rb

@@ -96,6 +96,21 @@ class SpecHelperRenderFile
   end
 end
 
+class SpecHelperRenderNeedsMethodView
+  Innate.node '/render_needs_method_view'
+  map_views '/'
+  layout :layout
+  trait :needs_method => true
+
+  def layout
+    '{ #{@content} }'
+  end
+
+  def without_method_or_layout
+    render_view(:num, :n => 42)
+  end
+end
+
 describe Innate::Helper::Render do
   describe '#render_full' do
     behaves_like :rack_test
@@ -139,6 +154,10 @@ describe Innate::Helper::Render do
     it 'renders action without calling the method or applying layout' do
       get('/render_view/without_method_or_layout').body.should == '{ 42 }'
     end
+
+    it 'renders action even when needs_method is true' do
+      get('/render_needs_method_view/without_method_or_layout').body.should == '{ 42 }'
+    end
   end
 
   describe 'misc functionality' do

metadata

@@ -1,55 +1,78 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: innate
-version: !ruby/object:Gem::Version
-  version: '2011.12'
+version: !ruby/object:Gem::Version 
+  hash: 8061
   prerelease: 
+  segments: 
+  - 2012
+  - 3
+  version: "2012.03"
 platform: ruby
-authors:
+authors: 
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &16472440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
-  version_requirements: *16472440
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: &16472000 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bacon
   prerelease: false
-  version_requirements: *16472000
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &16471480 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   type: :development
-  prerelease: false
-  version_requirements: *16471480
+  version_requirements: *id003
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gems
 - .gitignore
 - .load_gemset
@@ -189,26 +212,38 @@ files:
 - tasks/ycov.rake
 homepage: http://github.com/manveru/innate
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: innate
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Powerful web-framework wrapper for Rack.
 test_files: []
+