manveru-innate 2009.03.24 → 2009.04

data/lib/innate/node.rb

@@ -28,7 +28,8 @@ module Innate
   module Node
     include Traited
 
-    DEFAULT_HELPERS = %w[aspect cgi flash link partial redirect send_file]
+    attr_reader :method_arities, :layout_templates, :view_templates
+
     NODE_LIST = Set.new
 
     # These traits are inherited into ancestors, changing a trait in an
@@ -56,14 +57,12 @@ module Innate
     # Upon inclusion we make ourselves comfortable.
     def self.included(into)
       into.__send__(:include, Helper)
-      into.helper(*DEFAULT_HELPERS)
-
       into.extend(Trinity, self)
 
       NODE_LIST << into
 
       return if into.provide_set?
-      into.provide(:html, :ERB)
+      into.provide(:html, :engine => :Etanni)
       into.trait(:provide_set => false)
     end
 
@@ -364,14 +363,16 @@ module Innate
     # @author manveru
     def resolve(path)
       name, wish, engine = find_provide(path)
-      action = Action.create(:node => self, :wish => wish, :engine => engine)
+      node = (respond_to?(:ancestors) && respond_to?(:new)) ? self : self.class
+      action = Action.create(:node => node, :wish => wish, :engine => engine, :path => path)
 
-      if content_type = ancestral_trait["#{wish}_content_type"]
+      if content_type = node.ancestral_trait["#{wish}_content_type"]
         action.options = {:content_type => content_type}
       end
 
-      update_method_arities
-      fill_action(action, name)
+      node.update_method_arities
+      node.update_template_mappings
+      node.fill_action(action, name)
     end
 
     # Resolve possible provides for the given +path+ from {provides}.
@@ -422,6 +423,8 @@ module Innate
         next unless method if params.any?
         next unless (view = find_view(name, wish)) or method
 
+        params.map!{|param| Rack::Utils.unescape(param) }
+
         action.merge!(:method => method, :view => view, :params => params,
                       :layout => find_layout(name, wish))
       end
@@ -534,12 +537,10 @@ module Innate
       @method_arities
     end
 
-    attr_reader :method_arities
-
     # Try to find the best template for the given basename and wish and respect
     # aliased views.
     #
-    # @param [#to_s] file
+    # @param [#to_s] action_name
     # @param [#to_s] wish
     #
     # @return [String, nil] depending whether a template could be found
@@ -547,11 +548,11 @@ module Innate
     # @api external
     # @see Node#to_template Node#find_aliased_view
     # @author manveru
-    def find_view(file, wish)
-      aliased = find_aliased_view(file, wish)
+    def find_view(action_name, wish)
+      aliased = find_aliased_view(action_name, wish)
       return aliased if aliased
 
-      to_view(file, wish)
+      to_view(action_name, wish)
     end
 
     # Try to find the best template for the given basename and wish.
@@ -559,7 +560,7 @@ module Innate
     # This method is mostly here for symetry with {to_layout} and to allow you
     # overriding the template lookup easily.
     #
-    # @param [#to_s] file
+    # @param [#to_s] action_name
     # @param [#to_s] wish
     #
     # @return [String, nil] depending whether a template could be found
@@ -568,9 +569,9 @@ module Innate
     # @see {Node#find_view} {Node#to_template} {Node#root_mappings}
     #      {Node#view_mappings} {Node#to_template}
     # @author manveru
-    def to_view(file, wish)
-      path = root_mappings.concat(view_mappings) << file
-      to_template(path, wish)
+    def to_view(action_name, wish)
+      return unless files = view_templates[wish.to_s]
+      files[action_name.to_s]
     end
 
     # Aliasing one view from another.
@@ -608,9 +609,9 @@ module Innate
       trait[:alias_view][to.to_s] = node ? [from.to_s, node] : from.to_s
     end
 
-    # Resolve one level of aliasing for the given +file+ and +wish+.
+    # Resolve one level of aliasing for the given +action_name+ and +wish+.
     #
-    # @param [String] file
+    # @param [String] action_name
     # @param [String] wish
     #
     # @return [nil, String] the absolute path to the aliased template or nil
@@ -618,18 +619,21 @@ module Innate
     # @api internal
     # @see Node::alias_view Node::find_view
     # @author manveru
-    def find_aliased_view(file, wish)
-      aliased_file, aliased_node = ancestral_trait[:alias_view][file]
+    def find_aliased_view(action_name, wish)
+      aliased_name, aliased_node = ancestral_trait[:alias_view][action_name]
+      return unless aliased_name
+
       aliased_node ||= self
-      aliased_node.find_view(aliased_file, wish) if aliased_file
+      aliased_node.update_view_mappings
+      aliased_node.find_view(aliased_name, wish)
     end
 
-    # Find the best matching file for the layout, if any.
+    # Find the best matching action_name for the layout, if any.
     #
     # This is mostly an abstract method that you might find handy if you want
     # to do vastly different layout lookup.
     #
-    # @param [String] file
+    # @param [String] action_name
     # @param [String] wish
     #
     # @return [nil, String] the absolute path to the template or nil
@@ -637,9 +641,9 @@ module Innate
     # @api external
     # @see {Node#to_template} {Node#root_mappings} {Node#layout_mappings}
     # @author manveru
-    def to_layout(file, wish)
-      path = root_mappings.concat(layout_mappings) << file
-      to_template(path, wish)
+    def to_layout(action_name, wish)
+      return unless files = layout_templates[wish.to_s]
+      files[action_name.to_s]
     end
 
     # Define a layout to use on this Node.
@@ -724,11 +728,11 @@ module Innate
       result = nil
 
       atoms.size.downto(0) do |len|
-        action = atoms[0...len].join('__')
+        action_name = atoms[0...len].join('__')
         params = atoms[len..-1]
-        action = 'index' if action.empty? and params != ['index']
+        action_name = 'index' if action_name.empty? and params != ['index']
 
-        return result if result = yield(action, params)
+        return result if result = yield(action_name, params)
       end
 
       return nil
@@ -778,31 +782,57 @@ module Innate
     #      Node#path_glob Node#ext_glob
     # @author manveru
     def to_template(path, wish)
-      return unless exts = ext_glob(wish)
-      glob = "#{path_glob(*path)}.#{exts}"
-      found = Dir[glob].uniq
+      to_view(path, wish) || to_layout(path, wish)
+    end
 
-      count = found.size
-      Log.warn("%d views found for %p" % [count, glob]) if count > 1
+    def update_template_mappings
+      update_view_mappings
+      update_layout_mappings
+    end
 
-      found.first
+    def update_view_mappings
+      paths = possible_paths_for(view_mappings)
+      @view_templates = update_mapping_shared(paths)
     end
 
-    # Produce a glob that can be processed by Dir::[] matching the possible
-    # paths to the given +elements+.
-    #
-    # The +elements+ are an Array that may be nested one level, take care to
-    # splat if you try to pass an existing Array.
-    #
-    # @return [String] glob matching possible paths to the given +elements+
-    #
-    # @api internal
-    # @see Node#to_template
-    # @author manveru
-    def path_glob(*elements)
-      File.join(elements.map{|element|
-        "{%s}" % [*element].map{|e| e.to_s.gsub('__', '/') }.join(',')
-      }).gsub(/\/\{\/?\}\//, '/')
+    def update_layout_mappings
+      paths = possible_paths_for(layout_mappings)
+      @layout_templates = update_mapping_shared(paths)
+    end
+
+    def update_mapping_shared(paths)
+      mapping = {}
+
+      provides.each do |wish_key, engine|
+        wish = wish_key[/(.*)_handler/, 1]
+        ext_glob = ext_glob(wish)
+
+        paths.reverse_each do |path|
+          ::Dir.glob(::File.join(path, "/**/*.#{ext_glob}")) do |file|
+            case file.sub(path, '').gsub('/', '__')
+            when /^(.*)\.(.*)\.(.*)$/
+              action_name, wish_ext, engine_ext = $1, $2, $3
+            when /^(.*)\.(.*)$/
+              action_name, wish_ext, engine_ext = $1, wish, $2
+            end
+
+            mapping[wish_ext] ||= {}
+            mapping[wish_ext][action_name] = file
+          end
+        end
+      end
+
+      return mapping
+    end
+
+    def possible_paths_for(mappings)
+      root_mappings.map{|root_mapping|
+        mappings.first.map{|outer_mapping|
+          mappings.last.map{|inner_mapping|
+            File.join(root_mapping, outer_mapping, inner_mapping, '/')
+          }
+        }
+      }.flatten
     end
 
     # Produce a glob that can be processed by Dir::[] matching the extensions
@@ -839,7 +869,7 @@ module Innate
     # @api external
     # @author manveru
     def root_mappings
-      [*options.roots].dup
+      [*options.roots].flatten
     end
 
     # Set the paths for lookup below the Innate.options.views paths.
@@ -870,7 +900,7 @@ module Innate
       paths = [*ancestral_trait[:views]]
       paths = [mapping] if paths.empty?
 
-      [*options.views] + paths
+      [[*options.views].flatten, [*paths].flatten]
     end
 
     # Set the paths for lookup below the Innate.options.layouts paths.
@@ -901,7 +931,7 @@ module Innate
       paths = [*ancestral_trait[:layouts]]
       paths = [mapping] if paths.empty?
 
-      [*options.layouts] + paths
+      [[*options.layouts].flatten, [*paths].flatten]
     end
 
     def options

data/lib/innate/options/dsl.rb

@@ -178,7 +178,7 @@ module Innate
   end
 
   # extend your class with this
-  module Optional
+  module Optioned
     def self.included(into)
       into.extend(SingletonMethods)
 

data/lib/innate/options.rb

@@ -2,7 +2,7 @@ module Innate
   # this has to be run after a couple of other files have been required
 
   options.dsl do
-    o "Indicate that calls Innate::start will be ignored",
+    o "Innate::start will not start an adapter if true",
       :started, false
 
     o "Will send ::setup to each element during Innate::start",

data/lib/innate/request.rb

@@ -71,7 +71,7 @@ module Innate
     # Both +value+ and the elements of +keys+ will be turned into String by #to_s.
     def [](value, *keys)
       return super(value) if keys.empty?
-      [value, *keys].map{|k| super(k) }
+      [value, *keys].map{|key| super(key) }
     end
 
     # the full request URI provided by Rack::Request
@@ -94,8 +94,8 @@ module Innate
     #   # => {'name' => 'jason', 'job' => 'lumberjack'}
 
     def subset(*keys)
-      keys = keys.map{|k| k.to_s }
-      params.reject{|k,v| not keys.include?(k) }
+      keys = keys.map{|key| key.to_s }
+      params.reject{|key, value| not keys.include?(key) }
     end
 
     # Try to figure out the domain we are running on, this might work for some
@@ -122,50 +122,6 @@ module Innate
       uri
     end
 
-    # Try to find out which languages the client would like to have and sort
-    # them by weight, (most wanted first).
-    #
-    # Returns and array of locales from env['HTTP_ACCEPT_LANGUAGE].
-    # e.g. ["fi", "en", "ja", "fr", "de", "es", "it", "nl", "sv"]
-    #
-    # Usage:
-    #
-    #   request.accept_language
-    #   # => ['en-us', 'en', 'de-at', 'de']
-    #
-    # @param [String #to_s] string the value of HTTP_ACCEPT_LANGUAGE
-    # @return [Array] list of locales
-    # @see Request#accept_language_with_weight
-    # @author manveru
-    def accept_language(string = env['HTTP_ACCEPT_LANGUAGE'])
-      return [] unless string
-
-      accept_language_with_weight(string).map{|lang, weight| lang }
-    end
-    alias locales accept_language
-
-    # Transform the HTTP_ACCEPT_LANGUAGE header into an Array with:
-    #
-    #   [[lang, weight], [lang, weight], ...]
-    #
-    # This algorithm was taken and improved from the locales library.
-    #
-    # Usage:
-    #
-    #   request.accept_language_with_weight
-    #   # => [["en-us", 1.0], ["en", 0.8], ["de-at", 0.5], ["de", 0.3]]
-    #
-    # @param [String #to_s] string the value of HTTP_ACCEPT_LANGUAGE
-    # @return [Array] array of [lang, weight] arrays
-    # @see Request#accept_language
-    # @author manveru
-    def accept_language_with_weight(string = env['HTTP_ACCEPT_LANGUAGE'])
-      string.to_s.gsub(/\s+/, '').split(',').
-            map{|chunk|        chunk.split(';q=', 2) }.
-            map{|lang, weight| [lang, weight ? weight.to_f : 1.0] }.
-        sort_by{|lang, weight| -weight }
-    end
-
     ipv4 = %w[ 127.0.0.1/32 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 169.254.0.0/16 ]
     ipv6 = %w[ fc00::/7 fe80::/10 fec0::/10 ::1 ]
     LOCAL = (ipv4 + ipv6).map{|a| IPAddr.new(a)} unless defined?(LOCAL)
@@ -181,34 +137,5 @@ module Innate
     rescue ArgumentError => ex
       raise ArgumentError, ex unless ex.message == 'invalid address'
     end
-
-    INTERESTING_HTTP_VARIABLES =
-      (/USER|HOST|REQUEST|REMOTE|FORWARD|REFER|PATH|QUERY|VERSION|KEEP|CACHE/)
-
-    # Interesting HTTP variables from env
-    def http_variables
-      env.reject{|key, value| key.to_s !~ INTERESTING_HTTP_VARIABLES }
-    end
-    alias http_vars http_variables
-
-    REQUEST_STRING_FORMAT = "#<%s params=%p cookies=%p env=%p>"
-
-    def to_s
-      REQUEST_STRING_FORMAT % [self.class, params, cookies, http_variables]
-    end
-    alias inspect to_s
-
-    # Pretty prints current action with parameters, cookies and enviroment
-    # variables.
-    def pretty_print(pp)
-      pp.object_group(self){
-        group = { 'params' => params, 'cookies' => cookies, 'env' => http_vars }
-        group.each do |name, hash|
-          pp.breakable
-          pp.text " @#{name}="
-          pp.nest(name.size + 3){ pp.pp_hash(hash) }
-        end
-      }
-    end
   end
 end

data/lib/innate/response.rb

@@ -1,19 +1,12 @@
 module Innate
-
-  # In order to reset the body contents we also need to reset the length set by
-  # Response#write - until I can submit a patch to Rack and the next release we
-  # just do this.
-
   class Response < Rack::Response
-    include Optional
+    include Optioned
 
     options.dsl do
       o "Default headers, will not override headers already set",
         :headers, {'Content-Type' => 'text/html'}
     end
 
-    attr_accessor :length
-
     def reset
       self.status = 200
       self.header.delete('Content-Type')

data/lib/innate/session.rb

@@ -16,7 +16,7 @@ module Innate
   # Hopefully we all have 64bit systems by then.
 
   class Session
-    include Optional
+    include Optioned
 
     options.dsl do
       o "Key for the session cookie",
@@ -62,8 +62,7 @@ module Innate
     end
 
     def flush(response = @response)
-      return unless @cache_sid
-      return if @cache_sid.empty?
+      return if !@cache_sid or @cache_sid.empty?
 
       flash.rotate!
       ttl = (Time.at(cookie_value[:expires]) - Time.now).to_i

data/lib/innate/spec.rb

@@ -1,10 +1,10 @@
+begin; require 'rubygems'; rescue LoadError; end
+
 require 'bacon'
+require 'rack/test'
+require(File.expand_path("#{__FILE__}/../")) unless defined?(Innate)
 
 Bacon.summary_on_exit
-# Bacon.extend(Bacon::TestUnitOutput)
-
-innate = File.expand_path(File.join(File.dirname(__FILE__), '../innate'))
-require(innate) unless defined?(Innate)
 
 module Innate
   # minimal middleware, no exception handling
@@ -15,53 +15,9 @@ module Innate
   options.mode = :spec
 end
 
-# Shortcut to use persistent cookies via Innate::Mock::Session
-#
-# Usage:
-#
-#   describe 'something' do
-#     behaves_like :session
-#
-#     should 'get some stuff' do
-#       session do |mock|
-#         mock.get('/')
-#       end
-#     end
-#   end
-shared :session do
-  Innate.setup_dependencies
-
-  def session(&block)
-    Innate::Mock.session(&block)
-  end
-end
-
 shared :mock do
   Innate.setup_dependencies
+  extend Rack::Test::Methods
 
-  def get(*args) Innate::Mock.get(*args) end
-  def post(*args) Innate::Mock.post(*args) end
-  def put(*args) Innate::Mock.put(*args) end
-  def delete(*args) Innate::Mock.delete(*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
+  def app; Innate.middleware; end
 end

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.03.24"
+  VERSION = "2009.04"
 end

data/lib/innate/view/erb.rb

@@ -4,11 +4,7 @@ module Innate
   module View
     module ERB
       def self.call(action, string)
-        return unless string.respond_to?(:to_str)
-
-        action.copy_variables
-
-        erb = ::ERB.new(string.to_str, nil, '%<>')
+        erb = ::ERB.new(string.to_s, nil, '%<>')
         erb.filename = (action.view || action.method).to_s
         html = erb.result(action.binding)
 

data/lib/innate/view/etanni.rb

@@ -0,0 +1,36 @@
+module Innate
+  module View
+    module Etanni
+      def self.call(action, string)
+        template = Innate::Etanni.new(string.to_s)
+        html = template.result(action.binding, (action.view || action.method))
+        return html, 'text/html'
+      end
+    end
+  end
+
+  class Etanni
+    def initialize(template)
+      @template = template
+      compile
+    end
+
+    def compile
+      temp = @template.dup
+      start_heredoc = "T" << Digest::SHA1.hexdigest(temp)
+      start_heredoc, end_heredoc = "\n<<#{start_heredoc}.chomp\n", "\n#{start_heredoc}\n"
+      bufadd = "_out_ << "
+
+      temp.gsub!(/<\?r\s+(.*?)\s+\?>/m,
+            "#{end_heredoc} \\1; #{bufadd} #{start_heredoc}")
+
+      @compiled = "_out_ = ''
+      #{bufadd} #{start_heredoc} #{temp} #{end_heredoc}
+      _out_"
+    end
+
+    def result(binding, filename = '<Etanni>')
+      eval(@compiled, binding, filename).to_s.strip
+    end
+  end
+end

data/lib/innate/view/none.rb

@@ -2,7 +2,7 @@ module Innate
   module View
     module None
       def self.call(action, string)
-        return string, 'text/html'
+        return string.to_s, 'text/html'
       end
     end
   end

data/lib/innate/view.rb

@@ -14,16 +14,13 @@ module Innate
     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
-
-      if klass = TEMP[eoe]
+    def get(engine)
+      if klass = TEMP[engine]
         return klass
-      elsif klass = ENGINE[eoe]
-        TEMP[eoe] = obtain(klass)
+      elsif klass = ENGINE[engine]
+        TEMP[engine] = obtain(klass)
       else
-        TEMP[eoe] = obtain(eoe, View)
+        TEMP[engine] = obtain(engine, View)
       end
     end
 
@@ -33,7 +30,7 @@ module Innate
     # No mutex is used in Fiber environment, see Innate::State and subclasses.
     def obtain(klass, root = Object)
       STATE.sync do
-        klass.scan(/\w+/){|part| root = root.const_get(part) }
+        klass.to_s.scan(/\w+/){|part| root = root.const_get(part) }
         root
       end
     end
@@ -43,20 +40,21 @@ module Innate
     # +name+ : the class name of the templating engine wrapper
     # +exts+ : any number of arguments will be turned into strings via #to_s
     #          that indicate which filename-extensions the templates may have.
-
     def register(klass, *exts)
       exts.each do |ext|
         ext = ext.to_s
-        k = ENGINE[ext]
-        Log.warn("overwriting %p which is set to %p already" % [ext, k]) if k
+        engine = ENGINE[ext]
+        Log.warn("overwriting %p, was set to %p" % [ext, engine]) if engine
         ENGINE[ext] = klass
       end
     end
 
-    autoload :None, 'innate/view/none'
-    autoload :ERB, 'innate/view/erb'
+    autoload :None,   'innate/view/none'
+    autoload :ERB,    'innate/view/erb'
+    autoload :Etanni, 'innate/view/etanni'
 
-    register 'Innate::View::None', :css, :html, :htm
-    register 'Innate::View::ERB', :erb
+    register 'Innate::View::None',   :css, :html, :htm
+    register 'Innate::View::ERB',    :erb
+    register 'Innate::View::Etanni', :xhtml
   end
 end