manveru-innate 2009.02.21 → 2009.02.25

data/innate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "innate"
-  s.version = "2009.02.21"
+  s.version = "2009.02.25"
 
   s.summary = "Powerful web-framework wrapper for Rack."
   s.description = "Simple, straight-forward, base for web-frameworks."
@@ -20,17 +20,19 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "example/app/retro_games.rb",
+    "example/app/todo/layout/default.erb",
+    "example/app/todo/spec/todo.rb",
+    "example/app/todo/start.rb",
+    "example/app/todo/view/index.erb",
     "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.html.erb",
     "example/app/whywiki_erb/view/index.html.erb",
     "example/custom_middleware.rb",
-    "example/error_handling.rb",
     "example/hello.rb",
     "example/howto_spec.rb",
     "example/link.rb",
-    "example/providing_hash.rb",
     "example/session.rb",
     "innate.gemspec",
     "lib/innate.rb",
@@ -67,7 +69,6 @@ Gem::Specification.new do |s|
     "lib/innate/route.rb",
     "lib/innate/session.rb",
     "lib/innate/session/flash.rb",
-    "lib/innate/setup.rb",
     "lib/innate/spec.rb",
     "lib/innate/state.rb",
     "lib/innate/state/accessor.rb",
@@ -83,6 +84,7 @@ Gem::Specification.new do |s|
     "lib/rack/reloader.rb",
     "spec/example/hello.rb",
     "spec/example/link.rb",
+    "spec/example/session.rb",
     "spec/helper.rb",
     "spec/innate/action/layout.rb",
     "spec/innate/action/layout/file_layout.erb",
@@ -110,6 +112,7 @@ Gem::Specification.new do |s|
     "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/options.rb",
     "spec/innate/parameter.rb",

data/lib/innate/action.rb

@@ -3,12 +3,14 @@ module Innate
                      :wish, :options, :variables, :value, :view_value, :name ]
 
   class Action < Struct.new(*ACTION_MEMBERS)
+    # Holds the default values for merging in {Action::create}
     DEFAULT = {:options => {}, :variables => {}, :params => []}
 
     # Create a new Action instance.
     #
     # @param [Hash, #to_hash] hash used to seed new Action instance
     # @return [Action] action with the given defaults from hash
+    # @api stable
     # @author manveru
     def self.create(hash = {})
       new(*DEFAULT.merge(hash.to_hash).values_at(*ACTION_MEMBERS))
@@ -21,6 +23,7 @@ module Innate
     #
     # @return [String] The rendition of all nested calls
     # @see Action#render Node#action_found
+    # @api stable
     # @author manveru
     def call
       Current.actions << self
@@ -31,6 +34,7 @@ module Innate
 
     # @return [Binding] binding of the instance for this Action
     # @see Node#binding
+    # @api stable
     # @author manveru
     def binding
       instance.binding
@@ -43,6 +47,7 @@ module Innate
     # @param [Action #instance] from_action
     # @return [Action] from_action
     # @see Action#wrap_in_layout
+    # @api unstable
     # @author manveru
     def sync_variables(from_action)
       instance = from_action.instance
@@ -132,12 +137,8 @@ module Innate
       way = File.basename(view).gsub!(/.*?#{wish}\./, '') if view
       way ||= node.provide[wish] || node.provide['html']
 
-      if way
-        # Rack::Mime.mime_type(".#{wish}", 'text/html')
-        View.get(way).render(self, string)
-      else
-        raise("No templating engine was found for %p" % way)
-      end
+      return View.render(way, self, string || view) if way
+      raise("No templating engine was found for %p" % way)
     end
 
     def wrap_in_layout
@@ -156,7 +157,7 @@ module Innate
       return nil, arg
     end
 
-    #Try to figure out a sane name for current action.
+    # Try to figure out a sane name for current action.
     def name
       File.basename((method || view).to_s).split('.').first
     end

data/lib/innate/adapter.rb

@@ -27,7 +27,7 @@ module Innate
       def start(app, options = Innate.options)
         adapter_name = options[:adapter].to_s.downcase
         config = { :Host => options[:host], :Port => options[:port] }
-        Log.debug "Innate uses #{adapter_name}"
+        Log.debug "Using #{adapter_name}"
 
         if respond_to?(method = "start_#{adapter_name}")
           send(method, app, config)

data/lib/innate/cache.rb

@@ -79,10 +79,19 @@ module Innate
       )
     end
 
+    # Add all caches from the options.
+    #
+    # @see Innate::setup_dependencies
+    # @api stable
+    # @return [Array] names of caches initialized
+    # @author manveru
     def self.setup
       Innate.options.cache.names.each{|name| add(name) }
     end
 
+    # Add accessors for cache
+    #
+    # @param [Cache] cache
     def self.register(cache)
       key = cache.name
       source = "def self.%s() @%s; end

data/lib/innate/core_compatibility/basic_object.rb

@@ -1,3 +1,4 @@
+# We define BasicObject for compatibility with 1.9 if it isn't there yet.
 class BasicObject
   # Remove all but these methods
   # NOTE: __id__ is not there in 1.9, but would give a warning in 1.8

data/lib/innate/helper.rb

@@ -174,11 +174,11 @@ module Innate
     # Figure out files that might have the helper we ask for and then require
     # the first we find, if any.
     def try_require(name)
-      if found = Dir[glob(name)].first
-        require File.expand_path(found)
-      else
-        raise LoadError, "Helper #{name} not found"
-      end
+      found = Dir[glob(name)].first
+      require(File.expand_path(found))
+    rescue Exception => exception
+      Log.error(exception)
+      raise LoadError, "Helper #{name} not found"
     end
 
     # Return a nice list of filenames in correct locations with correct

data/lib/innate/node.rb

@@ -28,35 +28,35 @@ module Innate
   #     Those methods, and all other methods occurring in the ancestors after
   #     {Innate::Node} will not be considered valid action methods and will be
   #     ignored.
-  #   * This also means that {method_missing} will not see any of the requests
+  #   * This also means that method_missing will not see any of the requests
   #     coming in.
   #   * If you want an action to act as a catch-all, use `def index(*args)`.
 
   module Node
     include Traited
 
-    HELPERS = [:aspect, :cgi, :flash, :link, :partial, :redirect, :send_file]
-    LIST = Set.new
+    DEFAULT_HELPERS = %w[aspect cgi flash link partial redirect send_file]
+    NODE_LIST = Set.new
 
     trait(:layout => nil, :alias_view => {}, :provide => {},
-          :method_arities => {}, :wrap => [:aspect_wrap])
+          :method_arities => {}, :wrap => [:aspect_wrap], :provide_set => false)
 
     # Upon inclusion we make ourselves comfortable.
-    def self.included(obj)
-      obj.__send__(:include, Helper)
-      obj.helper(*HELPERS)
+    def self.included(into)
+      into.__send__(:include, Helper)
+      into.helper(*DEFAULT_HELPERS)
 
-      obj.extend(Trinity, self)
+      into.extend(Trinity, self)
 
-      LIST << obj
+      NODE_LIST << into
 
-      return if obj.provide.any?
-      # provide .html with no interpolation
-      obj.provide(:html => :erb, :yaml => :yaml, :json => :json)
+      return if into.ancestral_trait[:provide_set]
+      into.provide(:html => :erb, :yaml => :yaml, :json => :json)
+      into.trait(:provide_set => false)
     end
 
     def self.setup
-      LIST.each{|node| Innate.map(node.mapping, node) }
+      NODE_LIST.each{|node| Innate.map(node.mapping, node) }
       Log.debug("Mapped Nodes: %p" % DynaMap::MAP)
     end
 
@@ -64,7 +64,7 @@ module Innate
     def mapping
       mapped = Innate.to(self)
       return mapped if mapped
-      return '/' if Innate::Node::LIST.size == 1
+      return '/' if NODE_LIST.size == 1
       "/" << self.name.gsub(/\B[A-Z][^A-Z]/, '_\&').downcase
     end
 
@@ -131,7 +131,7 @@ module Innate
 
       hash = {}
       formats.each{|pr, as| hash[pr.to_s] = Array[*as].map{|a| a.to_s } }
-      trait(:provide => hash)
+      trait(:provide => hash, :provide_set => true)
 
       ancestral_trait[:provide]
     end
@@ -282,6 +282,7 @@ module Innate
 
         next unless view or method
         next unless method if needs_method
+        next unless method if params.any?
 
         layout = find_layout(name, wish)
         params ||= []
@@ -548,8 +549,8 @@ module Innate
     # @author manveru
     def wrap_action_call(action, &block)
       wrap = ancestral_trait[:wrap]
-
-      head, tail = wrap[0], wrap[1..-1].reverse
+      head, *tail = wrap
+      tail.reverse!
       combined = tail.inject(block){|s,v| lambda{ __send__(v, action, &s) } }
       __send__(head, action, &combined)
     end

data/lib/innate/options.rb

@@ -8,7 +8,7 @@ module Innate
 
   # This has to speak for itself.
   options.dsl do
-    o "IP address or hostname that Ramaze will respond to - 0.0.0.0 for all",
+    o "IP address or hostname that we respond to - 0.0.0.0 for all",
       :host, "0.0.0.0", :short => :H
 
     o "Port for the server",
@@ -35,7 +35,7 @@ module Innate
     o "Indicates which default middleware to use, (:dev|:live)",
       :mode, :dev
 
-    trigger(:mode){|v| Innate.setup_middleware(true) }
+    trigger(:mode){|v| Innate.middleware_recompile(v) }
 
     sub :log do
       o "Array of parameters for Logger.new, default to stderr for CGI",

data/lib/innate/spec.rb

@@ -8,10 +8,11 @@ require(innate) unless defined?(Innate)
 
 module Innate
   # minimal middleware, no exception handling
-  middleware(:innate){|m| m.innate }
+  middleware(:spec){|m| m.innate }
 
-  # skip merging of options
+  # skip starting adapter
   options.started = true
+  options.mode = :spec
 end
 
 # Shortcut to use persistent cookies via Innate::Mock::Session
@@ -36,7 +37,27 @@ shared :session do
 end
 
 shared :mock do
-  def get(*args)
-    Innate::Mock.get(*args)
+  def get(*args) Innate::Mock.get(*args) end
+  def post(*args) Innate::Mock.post(*args) end
+end
+
+shared :multipart do
+  def multipart(hash)
+    boundary = 'MuLtIpArT56789'
+    data = []
+    hash.each do |key, value|
+      data << "--#{boundary}"
+      data << %(Content-Disposition: form-data; name="#{key}")
+      data << '' << value
+    end
+    data << "--#{boundary}--"
+    body = data.join("\r\n")
+
+    type = "multipart/form-data; boundary=#{boundary}"
+    length = body.respond_to?(:bytesize) ? body.bytesize : body.size
+
+    { 'CONTENT_TYPE' => type,
+      'CONTENT_LENGTH' => length.to_s,
+      :input => StringIO.new(body) }
   end
 end

data/lib/innate/state.rb

@@ -14,9 +14,17 @@ module Innate
     STATE = State::Thread.new
   end
 
-  # Log.debug("Innate keeps state with %p" % STATE.class)
-
-  def self.sync(&block)
-    STATE.sync(&block)
+  module SingletonMethods
+    # Use this method to achieve thread-safety for sensitive operations.
+    #
+    # This should be of most use when manipulating files to prevent other
+    # threads from doing the same, no other code will be scheduled during
+    # execution of this method.
+    #
+    # @param [Proc] block the things you want to execute
+    # @see State::Thread#sync State::Fiber#sync
+    def sync(&block)
+      STATE.sync(&block)
+    end
   end
 end

data/lib/innate/traited.rb

@@ -1,4 +1,29 @@
 module Innate
+  # Traited helps you doing configuration similar to class variables.
+  #
+  # It's built on a simple Hash, where keys are objects and the values the
+  # configuration.
+  # By using {Traited#ancestral_trait} you will get nicely inherited
+  # configuration, where keys later in the ancestors will take precedence.
+  #
+  # @usage
+  #   class Foo
+  #     include Innate::Traited
+  #     trait :hello => 'Hello'
+  #
+  #     def initialize
+  #       trait :hello => 'World!'
+  #     end
+  #
+  #     def show
+  #       [class_trait[:hello], trait[:hello], ancestral_trait[:hello]]
+  #     end
+  #   end
+  #
+  #   Foo.trait[:hello] # => "Hello"
+  #   foo = Foo.new
+  #   foo.trait[:hello] # => "World!"
+  #   foo.show          # => ["Hello", "World!", "World!"]
   module Traited
     TRAITS = {}
 
@@ -15,11 +40,38 @@ module Innate
       end
     end
 
+    # Builds a trait from all the ancestors, closer ancestors overwrite distant
+    # ancestors
+    #
+    # class Foo
+    #   include Innate::Traited
+    #   trait :one => :eins, :first => :erstes
+    # end
+    #
+    # class Bar < Foo
+    #   trait :two => :zwei
+    # end
+    #
+    # class Foobar < Bar
+    #   trait :three => :drei, :first => :overwritten
+    # end
+    #
+    # Foobar.ancestral_trait
+    # # => {:three => :drei, :two => :zwei, :one => :eins, :first => :overwritten}
     def ancestral_trait
+      result = {}
+
       ancs = respond_to?(:ancestors) ? ancestors : self.class.ancestors
-      ancs.reverse.inject({}){|s,v|
-        v.respond_to?(:trait) ? s.update(v.trait) : s
-      }.merge(trait)
+      ancs.reverse_each do |anc|
+        result.update(anc.trait) if anc.respond_to?(:trait)
+      end
+
+      result.merge!(trait)
+    end
+
+    # trait for self.class if we are an instance
+    def class_trait
+      respond_to?(:ancestors) ? trait : self.class.trait
     end
   end
 end

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.02.21"
+  VERSION = "2009.02.25"
 end

data/lib/innate/view/erb.rb

@@ -3,7 +3,7 @@ require 'erb'
 module Innate
   module View
     module ERB
-      def self.render(action, string = action.view)
+      def self.render(action, string)
         return unless string.respond_to?(:to_str)
 
         action.copy_variables

data/lib/innate/view/none.rb

@@ -1,8 +1,8 @@
 module Innate
   module View
     module None
-      def self.render(action, string = nil)
-        string || action.view
+      def self.render(action, string)
+        string
       end
     end
   end

data/lib/innate/view.rb

@@ -8,8 +8,11 @@ module Innate
 
     module_function
 
-    # Try to obtain given engine by its registered name.
+    def render(ext, action, string)
+      get(ext).render(action, string)
+    end
 
+    # Try to obtain given engine by its registered name.
     def get(engine_or_ext)
       return unless engine_or_ext
       eoe = Array[*engine_or_ext].first.to_s
@@ -27,7 +30,6 @@ module Innate
     # class will cause race conditions and one call may return the wrong class
     # on the first request (before TEMP is set).
     # No mutex is used in Fiber environment, see Innate::State and subclasses.
-
     def obtain(klass)
       STATE.sync do
         obj = Object