manveru-innate 2009.02.25 → 2009.03.24

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manveru-innate
 version: !ruby/object:Gem::Version 
-  version: 2009.02.25
+  version: 2009.03.24
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.9.1
     version: 
 description: Simple, straight-forward, base for web-frameworks.
 email: m.fellinger@gmail.com
@@ -50,6 +50,7 @@ files:
 - example/hello.rb
 - example/howto_spec.rb
 - example/link.rb
+- example/provides.rb
 - example/session.rb
 - innate.gemspec
 - lib/innate.rb
@@ -77,10 +78,12 @@ files:
 - 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
@@ -97,8 +100,6 @@ files:
 - lib/innate/view.rb
 - lib/innate/view/erb.rb
 - lib/innate/view/none.rb
-- lib/rack/middleware_compiler.rb
-- lib/rack/reloader.rb
 - spec/example/hello.rb
 - spec/example/link.rb
 - spec/example/session.rb
@@ -125,17 +126,25 @@ files:
 - spec/innate/helper/view/partial.erb
 - spec/innate/helper/view/recursive.erb
 - spec/innate/mock.rb
-- spec/innate/node.rb
-- spec/innate/node/another_layout/another_layout.erb
-- spec/innate/node/bar.html
-- spec/innate/node/foo.html.erb
-- spec/innate/node/only_view.html
-- spec/innate/node/with_layout.erb
+- spec/innate/node/mapping.rb
+- spec/innate/node/node.rb
+- spec/innate/node/resolve.rb
+- spec/innate/node/view/another_layout/another_layout.erb
+- spec/innate/node/view/bar.erb
+- spec/innate/node/view/foo.html.erb
+- spec/innate/node/view/only_view.erb
+- spec/innate/node/view/with_layout.erb
+- spec/innate/node/wrap_action_call.rb
 - spec/innate/options.rb
 - spec/innate/parameter.rb
+- spec/innate/provides.rb
+- spec/innate/provides/list.html.erb
+- spec/innate/provides/list.txt.erb
 - spec/innate/request.rb
 - spec/innate/route.rb
 - spec/innate/session.rb
+- spec/innate/state/fiber.rb
+- spec/innate/state/thread.rb
 - spec/innate/traited.rb
 has_rdoc: true
 homepage: http://github.com/manveru/innate

data/lib/rack/reloader.rb

@@ -1,192 +0,0 @@
-#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
-
-require 'pathname'
-
-module Rack
-
-  # High performant source reloader
-  #
-  # This class acts as Rack middleware.
-  #
-  # It does not depend on Ramaze itself, but you might have to adjust the
-  # Reloader::Hooks module or include your own module to override the hooks.
-  # You also might have to set the Log constant.
-  #
-  # What makes it especially suited for use in a production environment is that
-  # any file will only be checked once and there will only be made one system
-  # call stat(2).
-  #
-  # Please note that this will not reload files in the background, it does so
-  # only when actively called
-  # In case of Ramaze it is performing a check/reload cycle at the start of
-  # every request, but also respects a cool down time, during which nothing will
-  # be done.
-  #
-  # After every reload the OPTIONS hash will be checked for changed options and
-  # assigned to the instance, so you may change options during the lifetime of
-  # your application.
-  #
-  # A number of hooks will be executed during the reload cycle, see
-  # Ramaze::ReloaderHooks for more information.
-
-  class Reloader
-    OPTIONS = {
-      # At most check every n seconds
-      # nil/false will never trigger the reload cycle
-      # 0 will cycle on every call
-      :cooldown => 2,
-
-      # Compiled files cannot be reloaded during runtime
-      :ignore => /\.so$/,
-
-      # Run cycle in a Thread.exclusive, by default no threads are used.
-      :thread => false,
-
-      # If you assign a block here it will be instance_evaled instead of
-      # calling cycle. This allows you to use for example EventMachine for
-      # well performing asynchronous cycling.
-      :control => nil, # lambda{ cycle },
-    }
-
-
-    # Dirty! keep track of this in an instance :(
-    # Find out how to reasonably cache racks builder
-    @@last ||= Time.now
-    @@cache ||= {}
-    @@mtimes ||= {}
-
-    def initialize(app)
-      @app = app
-      options_reload
-    end
-
-    def options_reload
-      @cooldown, @ignore, @control, @thread =
-        OPTIONS.values_at(:cooldown, :ignore, :control, :thread)
-    end
-
-    def call(env)
-      options_reload
-
-      if @cooldown and Time.now > @@last + @cooldown
-        if @control
-          instance_eval(&@control)
-        elsif @thread
-          Thread.exclusive{ cycle }
-        else
-          cycle
-        end
-
-        @@last = Time.now
-      end
-
-      @app.call(env)
-    end
-
-    def cycle
-      before_cycle
-
-      rotation do |file, stat|
-        if mtime = stat.mtime
-          if mtime > (@@mtimes[file] ||= mtime)
-            safe_load(file, mtime)
-          end
-        else
-          @@cache.delete(file)
-        end
-      end
-
-      after_cycle
-    end
-
-    # A safe Kernel::load, issuing the hooks depending on the results
-    def safe_load(file, mtime)
-      before_safe_load(file)
-      load(file)
-      after_safe_load_succeed(file)
-    rescue Object => ex
-      puts ex
-      after_safe_load_failed(file, ex)
-    ensure
-      @@mtimes[file] = mtime
-    end
-
-    def rotation
-      files = [$0, *$LOADED_FEATURES].uniq
-      paths = ['./', *$LOAD_PATH].uniq
-
-      files.each do |file|
-        next if file =~ @ignore
-        path, stat = figure_path(file, paths)
-
-        if path and stat
-          @@cache[file] = path
-          yield(path, stat)
-        else
-          # Mostly harmless
-        end
-      end
-    end
-
-    def figure_path(file, paths)
-      if cached = @@cache[file]
-        stat = ::File.stat(cached)
-        return cached, stat if stat.file?
-      elsif Pathname.new(file).absolute?
-        stat = ::File.stat(file)
-        return file, stat if stat.file? # do directories really end up in $" ?
-      end
-
-      paths.each do |possible_path|
-        path = ::File.join(possible_path, file)
-
-        begin
-          stat = ::File.stat(path)
-          return path, stat if stat.file?
-        rescue Errno::ENOENT, Errno::ENOTDIR
-        end
-      end
-
-      return nil
-    rescue Errno::ENOENT => ex
-      @@cache.delete(file)
-      retry
-    end
-
-    # Holds hooks that are called before and after #cycle and #safe_load
-    module Hooks
-      # Overwrite to add actions before the reload rotation is started.
-      def before_cycle
-      end
-
-      # Overwrite to add actions after the reload rotation has ended.
-      def after_cycle
-      end
-
-      # Overwrite to add actions before a file is Kernel::load-ed
-      def before_safe_load(file)
-        puts "reload #{file}" # Log.debug("reload #{file}")
-      end
-
-      # Overwrite to add actions after a file is Kernel::load-ed successfully,
-      # by default we clean the Cache for compiled templates and resolved actions.
-      def after_safe_load_succeed(file)
-        after_safe_load(file)
-      end
-
-      # Overwrite to add custom hook in addition to default Cache cleaning
-      def after_safe_load(file)
-      end
-
-      # Overwrite to add actions after a file is Kernel::load-ed unsuccessfully,
-      # by default we output an error-message with the exception.
-      def after_safe_load_failed(file, error)
-        puts error # Log.error(error)
-      end
-    end
-
-    include Hooks
-
-  end
-end

data/spec/innate/node/with_layout.erb

@@ -1,3 +0,0 @@
-<div class="content">
-  <%= @content %>
-</div>

data/spec/innate/node.rb

@@ -1,224 +0,0 @@
-require 'spec/helper'
-
-Innate.options.app.root = File.dirname(__FILE__)
-Innate.options.app.view = ''
-Innate.options.app.layout = 'node'
-
-class SpecNode
-  Innate.node('/').provide(:html => :erb, :erb => :none)
-
-  def foo; end
-  def bar; end
-  def one(arg) end
-  def two(arg1, arg2) end
-  def more(*args) end
-  def default(arg = nil) end
-end
-
-class SpecNodeProvide
-  Innate.node('/provide').provide(:html => :erb, :erb => :none)
-
-  def foo
-    '<%= 21 * 2 %>'
-  end
-
-  def bar
-    '<%= 84 / 2 %>'
-  end
-end
-
-class SpecNodeProvideTemplate
-  Innate.node('/provide_template')
-  provide(:html => :erb, :erb => :none, :yaml => :yaml, :json => :json)
-
-  view_root 'node'
-end
-
-class SpecNodeSub < SpecNode
-  map '/sub'
-
-  def bar(arg) end
-end
-
-class SpecNodeWithLayout < SpecNodeProvide
-  layout 'with_layout'
-  map '/layout'
-end
-
-class SpecNodeWithLayoutView < SpecNodeProvide
-  view_root 'node/another_layout'
-  layout 'another_layout'
-  map '/another_layout'
-end
-
-class SpecNodeWithLayoutMethod < SpecNodeProvide
-  map '/layout_method'
-  layout 'layout_method'
-
-  def layout_method
-    '<div class="content"><%= @content %></div>'
-  end
-end
-
-class SpecNodeIndex
-  Innate.node('/spec_index')
-
-  def index
-    "I have no parameters"
-  end
-end
-
-class SpecNodeAliasView < SpecNodeProvideTemplate
-  map '/alias_view'
-  view_root 'node'
-
-  alias_view :aliased, :bar
-end
-
-describe 'Innate::Node' do
-  behaves_like :mock
-
-  def compare(url, hash)
-    result = SpecNode.resolve(url)
-    result.should.not.be.nil
-    hash.each do |key, value|
-      result[key.to_s].should == value
-    end
-  end
-
-  def assert_wish(url, body, content_type)
-    got = get(url)
-    got.body.strip.should == body
-    got.headers['Content-Type'].should == content_type
-  end
-
-  should 'resolve actions with methods' do
-    SpecNode.resolve('/').should.be.nil
-    SpecNode.resolve('/index').should.be.nil
-
-    compare '/foo', :method => 'foo', :params => []
-    SpecNode.resolve('/foo/one/two').should.be.nil
-
-    compare '/bar', :method => 'bar', :params => []
-    SpecNode.resolve('/bar/one').should.be.nil
-
-    SpecNode.resolve('/one').should.be.nil
-    compare '/one/1', :method => 'one', :params => ['1']
-    SpecNode.resolve('/one/1/2').should.be.nil
-    SpecNode.resolve('/one/1/2/3').should.be.nil
-
-    SpecNode.resolve('/two').should.be.nil
-    SpecNode.resolve('/two/1').should.be.nil
-    compare '/two/1/2', :method => 'two', :params => %w[1 2]
-    SpecNode.resolve('/two/1/2/3').should.be.nil
-
-    compare '/more', :method => 'more', :params => []
-    compare '/more/1', :method => 'more', :params => %w[1]
-    compare '/more/1/2', :method => 'more', :params => %w[1 2]
-    compare '/more/1/2/3', :method => 'more', :params => %w[1 2 3]
-
-    compare '/default', :method => 'default', :params => []
-    compare '/default/1', :method => 'default', :params => %w[1]
-
-    # NOTE: these are actually bound to fail when called, but we cannot
-    #       introspect enough to anticipate this failure
-    compare '/default/1/2', :method => 'default', :params => %w[1 2]
-    compare '/default/1/2/3', :method => 'default', :params => %w[1 2 3]
-  end
-
-  should 'inherit action methods from superclasses' do
-    SpecNodeSub.resolve('/foo').should.not.be.nil
-    SpecNodeSub.resolve('/foo/one/two').should.be.nil
-  end
-
-  should 'select correct method from subclasses' do
-    SpecNodeSub.resolve('/bar/one').should.not.be.nil
-    SpecNodeSub.resolve('/bar').should.be.nil
-  end
-
-  should 'provide html if no wish given' do
-    assert_wish('/provide/foo', '42', 'text/html')
-    assert_wish('/provide/bar', '42', 'text/html')
-  end
-
-  should 'provide html as wished' do
-    assert_wish('/provide/foo.html', '42', 'text/html')
-    assert_wish('/provide/bar.html', '42', 'text/html')
-  end
-
-  should 'provide erb as wished' do
-    assert_wish('/provide/foo.erb', "<%= 21 * 2 %>", 'text/html')
-    assert_wish('/provide/bar.erb', "<%= 84 / 2 %>", 'text/html')
-  end
-
-  should 'fulfill wish with templates' do
-    assert_wish('/provide_template/bar.html', "<h1>Hello, World!</h1>",
-                'text/html')
-    assert_wish('/provide_template/bar.erb', "<h1>Hello, World!</h1>",
-                'text/html')
-
-    expected = '0123456789'
-    assert_wish('/provide_template/foo.html', expected, 'text/html')
-    # assert_wish('/provide_template/foo.erb', expected, 'text/plain')
-  end
-
-  should 'respond with 404 if no action was found' do
-    got = Innate::Mock.get('/does_not_exist')
-    got.status.should == 404
-    got.body.should == 'No action found at: "/does_not_exist"'
-    got['Content-Type'].should == 'text/plain'
-  end
-
-  should 'respond with yaml' do
-    assert_wish('/provide_template/bar.yaml', "--- |\n<h1>Hello, World!</h1>",
-                'text/yaml')
-  end
-
-  should 'respond with json' do
-    assert_wish('/provide_template/bar.json', '"<h1>Hello, World!<\\/h1>\\n"',
-                'application/json')
-  end
-
-  should 'wrap with layout' do
-    got = Innate::Mock.get('/layout/bar')
-    got.status.should == 200
-    got.body.should == %(<div class="content">\n  42\n</div>\n)
-    got['Content-Type'].should == 'text/html'
-  end
-
-  should 'find layout with view_root' do
-    got = Innate::Mock.get('/another_layout/bar')
-    got.status.should == 200
-    got.body.should == %(<div class="content">\n  42\n</div>\n)
-    got['Content-Type'].should == 'text/html'
-  end
-
-  should 'find layout from method' do
-    got = Innate::Mock.get('/layout_method/bar')
-    got.status.should == 200
-    got.body.should == %(<div class="content">42</div>)
-    got['Content-Type'].should == 'text/html'
-  end
-
-  should 'not get an action with wrong parameters' do
-    got = Innate::Mock.get('/spec_index/bar')
-    got.status.should == 404
-    got.body.should == 'No action found at: "/bar"'
-  end
-
-  should 'get an action view if there is no method' do
-    got = Innate::Mock.get('/provide_template/only_view')
-    got.status.should == 200
-    got.body.strip.should == "Only template"
-  end
-
-  should 'not get an action view with params if there is no method' do
-    got = Innate::Mock.get('/provide_template/only_view/param')
-    got.status.should == 404
-    got.body.strip.should == 'No action found at: "/only_view/param"'
-  end
-
-  should 'use alias_view' do
-    assert_wish('/alias_view/aliased', "<h1>Hello, World!</h1>", 'text/html')
-  end
-end