manveru-innate 2009.02.06 → 2009.02.21

data/lib/innate/options.rb

@@ -3,10 +3,10 @@ require 'innate/options/dsl'
 module Innate
   @options = Options.new(:innate)
 
-  def self.options; @options end
+  # attr_accessor is faster
+  class << self; attr_accessor :options; end
 
   # 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",
       :host, "0.0.0.0", :short => :H
@@ -32,9 +32,15 @@ module Innate
     o "Keep state in Thread or Fiber, fall back to Thread if Fiber not available",
       :state, :Fiber
 
+    o "Indicates which default middleware to use, (:dev|:live)",
+      :mode, :dev
+
+    trigger(:mode){|v| Innate.setup_middleware(true) }
+
     sub :log do
       o "Array of parameters for Logger.new, default to stderr for CGI",
         :params, [$stderr]
+
       o "Use ANSI colors for logging, nil does auto-detection by checking for #tty?",
         :color, nil
     end
@@ -47,6 +53,7 @@ module Innate
     sub :env do
       o "Hostname of this machine",
         :host, ENV['HOSTNAME'] # FIXME: cross-platform
+
       o "Username executing the application",
         :user, ENV['USER'] # FIXME: cross-platform
     end
@@ -54,23 +61,38 @@ module Innate
     sub :app do
       o "Unique identifier for this application",
         :name, 'pristine'
+
       o "Root directory containing the application",
         :root, File.dirname($0)
+
       o "Root directory for view templates, relative to app subdir",
         :view, '/view'
+
       o "Root directory for layout templates, relative to app subdir",
         :layout, '/layout'
+
+      o "Prefix of this application",
+        :prefix, '/'
+
+      o "Root directory for static public files",
+        :public, '/public'
+
+      trigger(:public){|v| Innate.middleware_recompile }
     end
 
     sub :session do
       o "Key for the session cookie",
         :key, 'innate.sid'
+
       o "Domain the cookie relates to, unspecified if false",
         :domain, false
+
       o "Path the cookie relates to",
         :path, '/'
+
       o "Use secure cookie",
         :secure, false
+
       o "Time of cookie expiration",
         :expires, Time.at(2147483647)
     end
@@ -86,6 +108,9 @@ module Innate
     sub :action do
       o "wish => Action#method",
         :wish, {'json' => :as_json, 'html' => :as_html, 'yaml' => :as_yaml}
+
+      o "Create actions that have no method associated",
+        :needs_method, false
     end
   end
 end

data/lib/innate/options/dsl.rb

@@ -71,21 +71,28 @@ module Innate
 
     # Store an option in the Options instance.
     #
-    # +doc+   should be a String describing the purpose of this option
-    # +key+   should be a Symbol used to access
-    # +value+ may be any object
-    # +other+ optional Hash that may contain meta-data and should not have :doc
-    #         or :value keys
-    def o(doc, key, value, other = {})
-      @hash[key.to_sym] = other.merge(:doc => doc, :value => value)
+    # @param [#to_s]   doc   describing the purpose of this option
+    # @param [#to_sym] key   used to access
+    # @param [Object]  value may be anything
+    # @param [Hash]    other optional Hash containing meta-data
+    #                        :doc, :value keys will be ignored
+    def o(doc, key, value, other = {}, &block)
+      trigger = block || other[:trigger]
+      convert = {:doc => doc.to_s, :value => value, :trigger => trigger}
+      @hash[key.to_sym] = other.merge(convert)
     end
 
     # To avoid lookup on the parent, we can set a default to the internal Hash.
-    # Parameters as in #o, but without the +key+.
+    # Parameters as in {Options#o}, but without the +key+.
     def default(doc, value, other = {})
       @hash.default = other.merge(:doc => doc, :value => value)
     end
 
+    # Add a block that will be called when a new value is set.
+    def trigger(key, &block)
+      @hash[key.to_sym][:trigger] = block
+    end
+
     # Try to retrieve the corresponding Hash for the passed keys, will try to
     # retrieve the key from a parent if no match is found on the current
     # instance. If multiple keys are passed it will try to find a matching
@@ -114,10 +121,10 @@ module Innate
     # Assign new :value to the value hash on the current instance.
     #
     # TODO: allow arbitrary assignments
-
     def []=(key, value)
       if ns = @hash[key.to_sym]
         ns[:value] = value
+        ns[:trigger].call(value) if ns[:trigger].respond_to?(:call)
       else
         raise(ArgumentError, "No key for %p exists" % [key])
       end

data/lib/innate/request.rb

@@ -84,7 +84,7 @@ module Innate
     # which you pass the keys.
     # Valid keys are objects that respond to :to_s
     #
-    # Example:
+    # @usage
     #   request.params
     #   # => {'name' => 'jason', 'age' => '45', 'job' => 'lumberjack'}
     #   request.subset('name')
@@ -108,15 +108,50 @@ module Innate
       URI("#{scheme}://#{host}#{path}")
     end
 
-    # Try to find out which languages the client would like to have.
+    # 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"]
-
-    def accept_language
-      env['HTTP_ACCEPT_LANGUAGE'].to_s.split(/(?:,|;q=[\d.,]+)/)
+    #
+    # 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)

data/lib/innate/route.rb

@@ -99,11 +99,13 @@ module Innate
     ROUTES = []
   end
 
-  def self.Route(key, value = nil, &block)
-    Route[key] = value || block
-  end
+  module SingletonMethods
+    def Route(key, value = nil, &block)
+      Route[key] = value || block
+    end
 
-  def self.Rewrite(key, value = nil, &block)
-    Rewrite[key] = value || block
+    def Rewrite(key, value = nil, &block)
+      Rewrite[key] = value || block
+    end
   end
 end

data/lib/innate/session.rb

@@ -48,7 +48,8 @@ module Innate
       return if @cache_sid.empty?
 
       flash.rotate!
-      cache[sid] = cache_sid
+      ttl = (Time.at(cookie_value[:expires]) - Time.now).to_i
+      cache.store(sid, cache_sid, :ttl => ttl)
       set_cookie(response)
     end
 

data/lib/innate/spec.rb

@@ -1,7 +1,7 @@
 require 'bacon'
 
 Bacon.summary_on_exit
-Bacon.extend(Bacon::TestUnitOutput)
+# Bacon.extend(Bacon::TestUnitOutput)
 
 innate = File.expand_path(File.join(File.dirname(__FILE__), '../innate'))
 require(innate) unless defined?(Innate)

data/lib/innate/state/fiber.rb

@@ -17,10 +17,9 @@ module Innate
   class Fiber < ::Fiber
     attr_accessor :state
 
-    def self.new(*args)
-      instance = super
-      instance.state = {}
-      instance
+    def initialize(*args)
+      super
+      @state = {}
     end
 
     def [](key)

data/lib/innate/traited.rb

@@ -1,13 +1,18 @@
 module Innate
   module Traited
-    TRAITS = Hash.new{|h,k| h[k] = {}}
+    TRAITS = {}
 
     def self.included(into)
       into.extend(self)
     end
 
     def trait(hash = nil)
-      hash ? TRAITS[self].update(hash) : TRAITS[self]
+      if hash
+        TRAITS[self] ||= {}
+        TRAITS[self].merge!(hash)
+      else
+        TRAITS[self] || {}
+      end
     end
 
     def ancestral_trait

data/lib/innate/version.rb

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

data/lib/innate/view.rb

@@ -12,7 +12,7 @@ module Innate
 
     def get(engine_or_ext)
       return unless engine_or_ext
-      eoe = engine_or_ext.to_s
+      eoe = Array[*engine_or_ext].first.to_s
 
       if klass = TEMP[eoe]
         return klass

data/lib/rack/middleware_compiler.rb

@@ -34,14 +34,21 @@ module Rack
 
     # Default application for Innate
     def innate
+      public_root = ::File.join(Innate.options.app.root.to_s,
+                                Innate.options.app.public.to_s)
       cascade(
-        Rack::File.new('public'),
+        Rack::File.new(public_root),
         Innate::Current.new(Innate::Route.new, Innate::Rewrite.new))
     end
 
     def static(path)
       require 'rack/contrib'
-      Rack::ConditionalGet.new(Rack::ETag.new(Rack::File.new(path)))
+      Rack::ETag.new(Rack::ConditionalGet.new(Rack::File.new(path)))
+    end
+
+    def directory(path)
+      require 'rack/contrib'
+      Rack::ETag.new(Rack::ConditionalGet.new(Rack::Directory.new(path)))
     end
 
     def call(env)
@@ -54,7 +61,10 @@ module Rack
     end
 
     def compile
-      return self if compiled?
+      compiled? ? self : compile!
+    end
+
+    def compile!
       @compiled = @middlewares.inject(@app){|a,e| e.new(a) }
       self
     end

data/spec/innate/action/layout.rb

@@ -0,0 +1,104 @@
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'spec/helper'
+
+Innate.options.app.root = File.dirname(__FILE__)
+
+class SpecActionLayoutMethod
+  Innate.node('/from_method', self)
+  layout('method_layout')
+
+  def method_layout
+    "<pre><%= @content %></pre>"
+  end
+
+  def index
+    'Method Layout'
+  end
+
+  def foo
+    "bar"
+  end
+end
+
+class SpecActionLayoutFile
+  Innate.node('/from_file', self)
+  layout('file_layout')
+
+  def index
+    "File Layout"
+  end
+end
+
+class SpecActionLayoutSpecific
+  Innate.node('/specific', self)
+  layout('file_layout'){|name, wish| name == 'index' }
+
+  def index
+    'Specific Layout'
+  end
+
+  def without
+    "Without wrapper"
+  end
+end
+
+class SpecActionLayoutDeny
+  Innate.node('/deny', self)
+  layout('file_layout'){|name, wish| name != 'without' }
+
+  def index
+    "Deny Layout"
+  end
+
+  def without
+    "Without wrapper"
+  end
+end
+
+class SpecActionLayoutMulti
+  Innate.node('/multi', self)
+  layout('file_layout'){|name, wish| name =~ /index|second/ }
+
+  def index
+    "Multi Layout Index"
+  end
+
+  def second
+    "Multi Layout Second"
+  end
+
+  def without
+    "Without wrapper"
+  end
+end
+
+describe 'Innate::Action#layout' do
+  behaves_like :mock
+
+  it 'uses a layout method' do
+    get('/from_method').body.should == '<pre>Method Layout</pre>'
+    get('/from_method/foo').body.should == '<pre>bar</pre>'
+  end
+
+  it 'uses a layout file' do
+    get('/from_file').body.strip.should == '<p>File Layout</p>'
+  end
+
+  it 'denies layout to some actions' do
+    get('/deny').body.strip.should == '<p>Deny Layout</p>'
+    get('/deny/without').body.strip.should == 'Without wrapper'
+  end
+
+  it 'uses layout only for specific action' do
+    get('/specific').body.strip.should == '<p>Specific Layout</p>'
+    get('/specific/without').body.strip.should == 'Without wrapper'
+  end
+
+  it 'uses layout only for specific actions' do
+    get('/multi').body.strip.should == '<p>Multi Layout Index</p>'
+    get('/multi/second').body.strip.should == '<p>Multi Layout Second</p>'
+    get('/multi/without').body.strip.should == 'Without wrapper'
+  end
+end

data/spec/innate/action/layout/file_layout.erb

@@ -0,0 +1 @@
+<p><%= @content %></p>

data/spec/innate/cache/common.rb

@@ -19,14 +19,16 @@ describe $common_cache_class do
   end
 
   should 'delete' do
-    cache.delete(:hello).should == @hello
+    cache.delete(:hello)
     cache.fetch(:hello).should == nil
   end
 
   should 'delete two key/value pairs at once' do
     cache.store(:hello, @hello).should == @hello
     cache.store(:innate, 'innate').should == 'innate'
-    cache.delete(:hello, :innate).should == [@hello, 'innate']
+    cache.delete(:hello, :innate)
+    cache.fetch(:hello).should == nil
+    cache.fetch(:innate).should == nil
   end
 
   should 'store with ttl' do