innate 2012.03 → 2012.12

data/lib/innate/lru_hash.rb

@@ -0,0 +1,113 @@
+module Innate
+  # A Hash-alike LRU cache that provides fine-grained control over content
+  # restrictions.
+  #
+  # It allows you to set:
+  # * a maximum number of elements
+  # * the maximum amount of memory used for all elements
+  # * the allowed memory-size per element
+  # * time to live
+  #
+  # Differences to the original implementation include:
+  # * The Cache is now a Struct for speed
+  #
+  # Copyright (C) 2002  Yoshinori K. Okuji <okuji@enbug.org>
+  # Copyright (c) 2009  Michael Fellinger  <manveru@rubyists.com>
+  #
+  # You may redistribute it and/or modify it under the same terms as Ruby.
+  class LRUHash < Struct.new(:max_count, :expiration,
+                              :hook, :objs, :list, :hits, :misses)
+    CacheObject = Struct.new(:content, :size, :atime)
+
+    # On 1.8 we raise IndexError, on 1.9 we raise KeyError
+    KeyError = Module.const_defined?(:KeyError) ? KeyError : IndexError
+
+    include Enumerable
+
+    def initialize(options = {}, &hook)
+      self.max_count  = options[:max_count]
+      self.expiration = options[:expiration]
+
+      avoid_insane_options
+
+      self.hook = hook
+
+      self.objs = {}
+      self.list = []
+
+      self.hits = self.misses = 0
+    end
+
+    def delete(key)
+      return unless objs.key?(key)
+      obj = objs[key]
+
+      hook.call(key, obj.content) if hook
+      objs.delete key
+
+      list.delete_if{|list_key| key == list_key }
+
+      obj.content
+    end
+
+    def clear
+      objs.each{|key, obj| hook.call(key, obj) } if hook
+      objs.clear
+      list.clear
+    end
+    alias invalidate_all clear
+
+    def expire
+      return unless expiration
+      now = Time.now.to_i
+
+      list.each_with_index do |key, index|
+        break unless (objs[key].atime + expiration) <= now
+        delete key
+      end
+    end
+
+    def [](key)
+      expire
+
+      unless objs.key?(key)
+        self.misses += 1
+        return
+      end
+
+      obj = objs[key]
+      obj.atime = Time.now.to_i
+
+      list.delete_if{|list_key| key == list_key }
+      list << key
+
+      self.hits += 1
+      obj.content
+    end
+
+    def []=(key, obj)
+      expire
+
+      delete key if objs.key?(key)
+
+      delete list.first if max_count && max_count == list.size
+
+      objs[key] = CacheObject.new(obj, size, Time.now.to_i)
+      list << key
+
+      obj
+    end
+
+    private
+
+    # Sanity checks.
+    def avoid_insane_options
+      if max_count && max_count <= 0
+        raise ArgumentError, "invalid max_count `#{max_count}'"
+      end
+      if expiration && expiration <= 0
+        raise ArgumentError, "invalid expiration `#{expiration}'"
+      end
+    end
+  end
+end

data/lib/innate/node.rb

@@ -50,6 +50,7 @@ module Innate
     trait :fast_mappings  => false
 
     # @see wrap_action_call
+    trait :action_cache   => LRUHash.new
     trait :wrap           => SortedSet.new
     trait :provide_set    => false
     trait :needs_method   => false
@@ -209,6 +210,11 @@ module Innate
     # @see View::get Node#provides
     # @author manveru
     #
+    # @note
+    #  If you specify a block when calling this method you'll have to take care
+    #  of rendering views and the like yourself. If you merely want to set a
+    #  extension and content type you can omit the block.
+    #
     # @todo
     #   The comment of this method may be too short for the effects it has on
     #   the rest of Innate, if you feel something is missing please let me
@@ -279,7 +285,7 @@ module Innate
     # @see Node#resolve Node#action_found Node#action_missing
     # @author manveru
     def try_resolve(path)
-      action = resolve(path)
+      action = ancestral_trait[:action_cache][[self, path]] ||= resolve(path)
       action ? action_found(action) : action_missing(path)
     end
 
@@ -370,7 +376,7 @@ module Innate
       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}
+        action.options[:content_type] = content_type
       end
 
       node.update_method_arities
@@ -408,8 +414,6 @@ module Innate
     # of the client.
     #
     # @param [String] given_name the name extracted from REQUEST_PATH
-    # @param [String] wish
-    #
     # @return [Action, nil]
     #
     # @api internal
@@ -666,7 +670,8 @@ module Innate
     #     wish == 'html'
     #   end
     #
-    # @param [String, #to_s] name basename without extension of the layout to use
+    # @param [String, #to_s] layout_name basename without extension of the
+    #  layout to use
     # @param [Proc, #call] block called on every dispatch if no name given
     #
     # @return [Proc, String] The assigned name or block
@@ -805,7 +810,7 @@ module Innate
 
     def update_view_mappings
       if ancestral_trait[:fast_mappings]
-        return @view_templates if instance_variable_defined?(:@view_templates)
+        return @view_templates if @view_templates
       end
 
       paths = possible_paths_for(view_mappings)
@@ -814,7 +819,7 @@ module Innate
 
     def update_layout_mappings
       if ancestral_trait[:fast_mappings]
-        return @layout_templates if instance_variable_defined?(:@layout_templates)
+        return @layout_templates if @layout_templates
       end
 
       paths = possible_paths_for(layout_mappings)
@@ -854,7 +859,7 @@ module Innate
     # Answer with an array of possible paths in order of significance for
     # template lookup of the given +mappings+.
     #
-    # @param [#map] An array two Arrays of inner and outer directories.
+    # @param [#map] mappings An array two Arrays of inner and outer directories.
     #
     # @return [Array]
     # @see update_view_mappings update_layout_mappings update_template_mappings

data/lib/innate/options.rb

@@ -6,14 +6,11 @@ module Innate
       :started, false
 
     o "Will send ::setup to each element during Innate::start",
-      :setup, [Innate::Cache, Innate::Node]
+      :setup, [Innate, Innate::Cache, Innate::Node]
 
     o "Trap this signal to issue shutdown, nil/false to disable trap",
       :trap, 'SIGINT'
 
-    o "The compiler for middleware",
-      :middleware_compiler, Innate::MiddlewareCompiler
-
     o "Indicates which default middleware to use, (:dev|:live)",
       :mode, :dev
 
@@ -32,6 +29,6 @@ module Innate
     o "Prefix used to create relative links",
       :prefix, '/'
 
-    trigger(:mode){|value| Innate.middleware_recompile(value) }
+    trigger(:mode){|value| Innate.recompile_middleware(value) }
   end
 end

data/lib/innate/spec/bacon.rb

@@ -4,18 +4,16 @@ require File.expand_path('../../', __FILE__) unless defined?(Innate)
 
 Bacon.summary_on_exit
 
-module Innate
-  # minimal middleware, no exception handling
-  middleware(:spec){|mw| mw.innate }
+ENV['RACK_ENV'] = 'TEST'
 
-  # skip starting adapter
-  options.started = true
-  options.mode = :spec
-end
+Innate.middleware(:spec) { run Innate.core }
+
+Innate.options.started = true
+Innate.options.mode    = :spec
 
 shared :rack_test do
   Innate.setup_dependencies
   extend Rack::Test::Methods
 
-  def app; Innate.middleware; end
+  def app; Innate; end
 end

data/lib/innate/version.rb

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

data/lib/innate/view/erb.rb

@@ -6,8 +6,7 @@ module Innate
       def self.call(action, string)
         erb = View.compile(string){|str| ::ERB.new(str, nil, '%<>') }
         erb.filename = (action.view || action.method).to_s
-        html = erb.result(action.binding)
-        return html, Response.mime_type
+        erb.result(action.binding)
       end
     end
   end

data/lib/innate/view/etanni.rb

@@ -6,8 +6,7 @@ module Innate
           filename = action.view || action.method
           Innate::Etanni.new(str, filename)
         end
-        html = etanni.result(action.instance)
-        return html, Response.mime_type
+        etanni.result(action.instance)
       end
     end
   end

data/spec/innate/helper/flash.rb

@@ -103,7 +103,7 @@ describe Innate::Helper::Flash do
 
   should 'inspect combined' do
     get('/welcome')
-    get('/inspect').body.should == {:name => 'manveru', :yes => :yeah}.inspect
+    eval(get('/inspect').body).should == {:name => 'manveru', :yes => :yeah}
   end
 
   should 'iterate over combined' do

metadata

@@ -1,78 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: innate
-version: !ruby/object:Gem::Version 
-  hash: 8061
+version: !ruby/object:Gem::Version
+  version: '2012.12'
   prerelease: 
-  segments: 
-  - 2012
-  - 3
-  version: "2012.03"
 platform: ruby
-authors: 
+authors:
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
   name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gems
 - .gitignore
 - .load_gemset
@@ -112,6 +104,7 @@ files:
 - lib/innate/cache/memory.rb
 - lib/innate/cache/yaml.rb
 - lib/innate/current.rb
+- lib/innate/default_middleware.rb
 - lib/innate/dynamap.rb
 - lib/innate/helper.rb
 - lib/innate/helper/aspect.rb
@@ -123,13 +116,12 @@ files:
 - lib/innate/log.rb
 - lib/innate/log/color_formatter.rb
 - lib/innate/log/hub.rb
-- lib/innate/middleware_compiler.rb
+- lib/innate/lru_hash.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
@@ -212,38 +204,26 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: innate
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Powerful web-framework wrapper for Rack.
 test_files: []
-