innate 2012.12 → 2013.02

data/.travis.yml

@@ -6,10 +6,11 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - jruby-18mode
+  - jruby-19mode
   - rbx-18mode
-  - ree
-  - jruby
+  - rbx-19mode
+  - ruby-head
 notifications:
   email:
     - mf@rubyists.com

data/AUTHORS

@@ -1,9 +1,9 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   814 Michael Fellinger <m.fellinger@gmail.com>
+   819 Michael Fellinger <m.fellinger@gmail.com>
     31 Tadahiko Uehara <kikofx@gmail.com>
-    16 Yorick Peterse <yorickpeterse@gmail.com>
+    21 Yorick Peterse <yorickpeterse@gmail.com>
      9 Lee Jarvis <injekt.me@gmail.com>
      8 Pistos <gitsomegrace.5.pistos@geoshell.com>
      5 injekt <injekt.me@gmail.com>

data/CHANGELOG

@@ -1,3 +1,97 @@
+[1a2ee39 | 2013-02-07 00:10:01 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2013.02
+
+[64ca67a | 2013-01-29 23:34:26 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * don't do CI for REE, it's not supported anymore, add rbx and jruby 1.9
+
+[079975c | 2013-01-29 21:57:39 UTC] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Preserve values when calling render_full.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[a90d3f9 | 2013-01-29 21:53:16 UTC] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Fix for generting URLs using anchor().
+
+    Instead of always appending "?" to the URL the anchor() method should only do
+    so when there actually is a query string.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[d2aeb7f | 2013-01-29 21:17:08 UTC] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Caching of provides and method arities.
+
+    Caching of a controller's provide handlers as well as the method arities can
+    lead to a nice performance boost of around 300 transactions/second using the
+    following benchmark:
+    
+        require 'innate'
+    
+        Innate.middleware :live do
+          run Innate.core
+        end
+    
+        Innate::Log.level   = Logger::ERROR
+        Innate.options.mode = :live
+        ENV['RACK_ENV']     = 'none'
+    
+        class MainController
+          Innate.node('/', self)
+    
+          def index
+            return 'index'
+          end
+        end
+    
+        [:fast_mappings, :cache_provides, :cache_method_arities].each do |key|
+          MainController.ancestral_trait[key] = true
+        end
+    
+        Innate.start(:adapter => :thin)
+    
+    Benchmarking this was done by running `siege -c 10 -t 5s -b HOST` and would
+    initially result in around 1700 trans/sec. When using this commit this sits
+    between 2000/2100 trans/sec.
+    
+    To prevent any potential issues the caching of provides and method aritites is
+    disabled by default.
+    
+    See Github issue #7 for more information.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[06dd4c5 | 2013-01-29 18:25:49 UTC] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Revert action caching.
+
+    Instead of caching the entire action instance (which is modified further down
+    the chain) various parts that make up this process will be cached instead
+    (where possible).
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[32440b0 | 2013-01-15 18:38:41 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * prevent memory leak from action caching
+
+[040d084 | 2013-01-15 18:37:19 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * clean up LRUHash a bit
+
+[a136a72 | 2013-01-14 20:06:22 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * build middleware only once
+
+[8aea7cb | 2013-01-14 18:31:37 UTC] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Only compile middleware for the current mode.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
 [1da947d | 2012-12-07 21:25:01 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2012.12

data/innate.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "innate"
-  s.version = "2012.12"
+  s.version = "2013.02"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = "2012-12-07"
+  s.date = "2013-02-07"
   s.description = "Simple, straight-forward base for web-frameworks."
   s.email = "m.fellinger@gmail.com"
   s.files = [".gems", ".gitignore", ".load_gemset", ".rvmrc", ".travis.yml", "AUTHORS", "CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.xhtml", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.xhtml", "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.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "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", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.rb", "lib/innate/helper/redirect.rb", "lib/innate/helper/render.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.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/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/spec/bacon.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/app/retro_games.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/provides.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/etanni.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/view/aspect_hello.xhtml", "spec/innate/helper/view/locals.xhtml", "spec/innate/helper/view/loop.xhtml", "spec/innate/helper/view/num.xhtml", "spec/innate/helper/view/partial.xhtml", "spec/innate/helper/view/recursive.xhtml", "spec/innate/mock.rb", "spec/innate/modes.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/cat2/cat22.xhtml", "spec/innate/node/view/cat3/cat33.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/sub/baz.xhtml", "spec/innate/node/view/sub/foo/baz.xhtml", "spec/innate/node/view/with_layout.xhtml", "spec/innate/node/wrap_action_call.rb", "spec/innate/options.rb", "spec/innate/parameter.rb", "spec/innate/provides.rb", "spec/innate/provides/list.html.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/response.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/traited.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]

data/lib/innate.rb

@@ -194,8 +194,8 @@ module Innate
     def recompile_middleware(mode = options[:mode])
       mode = mode.to_sym
 
-      if MIDDLEWARE[mode]
-        Innate.app = Rack::Builder.new(&MIDDLEWARE[mode])
+      if MIDDLEWARE[mode] and options[:mode] == mode
+        Innate.app = Rack::Builder.new(&MIDDLEWARE[mode]).to_app
       end
     end
 
@@ -238,7 +238,7 @@ module Innate
     def middleware(mode, &block)
       MIDDLEWARE[mode.to_sym] = block
 
-      recompile_middleware
+      recompile_middleware(mode)
     end
 
     # @example Innate can be started by:

data/lib/innate/helper/aspect.rb

@@ -48,7 +48,11 @@ module Innate
       # Consider objects that have Aspect included
       def self.ancestral_aop(from)
         aop = {}
-        from.ancestors.reverse.map { |anc| aop.merge!(AOP[anc]) if anc < Aspect }
+
+        from.ancestors.reverse.each do |anc|
+          aop.merge!(AOP[anc]) if anc < Aspect
+        end
+
         aop
       end
 

data/lib/innate/helper/link.rb

@@ -80,9 +80,9 @@ module Innate
         when URI
           href = first.to_s
         when /^\w+:\/\//
-          uri = URI(first)
-          uri.query = Rack::Utils.escape_html(uri.query)
-          href = uri.to_s
+          uri       = URI(first)
+          uri.query = Rack::Utils.escape_html(uri.query) if uri.query
+          href      = uri.to_s
         else
           href = args.empty? ? r(text) : r(*args)
         end

data/lib/innate/helper/render.rb

@@ -31,8 +31,9 @@ module Innate
       # @see Mock.session
       # @author manveru
       def render_full(path, query = {})
-        uri = URI(path.to_s)
+        uri       = URI(path.to_s)
         uri.query = Rack::Utils.build_query(query)
+        saved     = request, response, session, actions
 
         if cookie = request.env['HTTP_COOKIE']
           Mock.session do |mock|
@@ -42,6 +43,8 @@ module Innate
         else
           Mock.get(uri.to_s).body
         end
+      ensure
+        self.request, self.response, self.session, self.actions = saved
       end
 
       # Renders an action without any layout.
@@ -76,7 +79,7 @@ module Innate
       end
 
       # Renders an action view and does not execute any methods.
-      # The rendered view will not be wrapped in a layout and instead 
+      # The rendered view will not be wrapped in a layout and instead
       # will use the layout of the current action.
       # You can further tweak the action to be rendered by passing a block.
       #

data/lib/innate/lru_hash.rb

@@ -15,8 +15,7 @@ module Innate
   # 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)
+  class LRUHash < Struct.new(:max_count, :expiration, :hook, :objs, :list)
     CacheObject = Struct.new(:content, :size, :atime)
 
     # On 1.8 we raise IndexError, on 1.9 we raise KeyError
@@ -25,17 +24,11 @@ module Innate
     include Enumerable
 
     def initialize(options = {}, &hook)
-      self.max_count  = options[:max_count]
+      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)
@@ -70,10 +63,7 @@ module Innate
     def [](key)
       expire
 
-      unless objs.key?(key)
-        self.misses += 1
-        return
-      end
+      return unless objs.key?(key)
 
       obj = objs[key]
       obj.atime = Time.now.to_i
@@ -81,7 +71,6 @@ module Innate
       list.delete_if{|list_key| key == list_key }
       list << key
 
-      self.hits += 1
       obj.content
     end
 
@@ -97,17 +86,5 @@ module Innate
 
       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

@@ -49,8 +49,14 @@ module Innate
     trait :provide        => {}
     trait :fast_mappings  => false
 
+    # Caching related traits.
+    trait :cache_provides => false
+    trait :provides_cache => LRUHash.new(:max_count => 100)
+
+    trait :cache_method_arities => false
+    trait :method_arity_cache   => LRUHash.new(:max_count => 100)
+
     # @see wrap_action_call
-    trait :action_cache   => LRUHash.new
     trait :wrap           => SortedSet.new
     trait :provide_set    => false
     trait :needs_method   => false
@@ -235,8 +241,26 @@ module Innate
       trait("#{format}_content_type" => content_type) if content_type
     end
 
+    ##
+    # Returns the list of provide handlers. This list is cached after the first
+    # call to this method.
+    #
+    # @return [Hash]
+    #
     def provides
-      ancestral_trait.reject{|key, value| key !~ /_handler$/ }
+      if ancestral_trait[:cache_provides]
+        return ancestral_trait[:provides_cache][self] ||= provide_handlers
+      else
+        return provide_handlers
+      end
+    end
+
+    ##
+    # @see Innate::Node#provides
+    # @return [Hash]
+    #
+    def provide_handlers
+      ancestral_trait.reject { |key, value| key !~ /_handler$/ }
     end
 
     # This makes the Node a valid application for Rack.
@@ -285,7 +309,7 @@ module Innate
     # @see Node#resolve Node#action_found Node#action_missing
     # @author manveru
     def try_resolve(path)
-      action = ancestral_trait[:action_cache][[self, path]] ||= resolve(path)
+      action = resolve(path)
       action ? action_found(action) : action_missing(path)
     end
 
@@ -372,8 +396,18 @@ module Innate
     def resolve(path, options = {})
       name, wish, engine = find_provide(path)
       node = (respond_to?(:ancestors) && respond_to?(:new)) ? self : self.class
-      action = Action.create(:node => node, :wish => wish, :engine => engine, :path => path, :options => options)
-      action.options.key?(:needs_method) || action.options[:needs_method] = node.needs_method?
+
+      action = Action.create(
+        :node    => node,
+        :wish    => wish,
+        :engine  => engine,
+        :path    => path,
+        :options => options
+      )
+
+      if !action.options.key?(:needs_method)
+        action.options[:needs_method] = node.needs_method?
+      end
 
       if content_type = node.ancestral_trait["#{wish}_content_type"]
         action.options[:content_type] = content_type
@@ -531,6 +565,11 @@ module Innate
     # @see Node#resolve
     # @return [Hash] mapping the name of the methods to their arity
     def update_method_arities
+      if ancestral_trait[:cache_method_arities] \
+      and ancestral_trait[:method_arity_cache][self]
+        return ancestral_trait[:method_arity_cache][self]
+      end
+
       @method_arities = {}
 
       exposed = ancestors & Helper::EXPOSE.to_a
@@ -542,6 +581,10 @@ module Innate
         end
       end
 
+      if ancestral_trait[:cache_method_arities]
+        ancestral_trait[:method_arity_cache][self] = @method_arities
+      end
+
       @method_arities
     end
 

data/lib/innate/version.rb

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

data/spec/innate/helper/aspect.rb

@@ -37,6 +37,25 @@ class AspectDerivedWithLayout < AspectAllSpec
   end
 end
 
+class AspectBeforeAllCache
+  Innate.node('/cached', self)
+  layout :layout
+
+  def self.numbers
+    @numbers ||= []
+  end
+
+  before_all do
+    self.class.numbers << 10
+  end
+
+  def index; end
+
+  def layout
+    return '#{@content}'
+  end
+end
+
 class AspecNoMethodSpec
   Innate.node('/without_method', self)
   include Innate::Node
@@ -96,4 +115,11 @@ describe Innate::Helper::Aspect do
     $aspect_spec_before_all.should == 84
     $aspect_spec_after_all.should == 80
   end
+
+  it 'should not cache aspect blocks' do
+    get('/cached')
+    get('/cached')
+
+    AspectBeforeAllCache.numbers.should == [10, 10]
+  end
 end

data/spec/innate/helper/link.rb

@@ -110,6 +110,10 @@ describe Innate::Helper::Link do
       One.anchor('<blink> & <a>', :foo).
         should == '<a href="/foo">&lt;blink&gt; &amp; &lt;a&gt;</a>'
     end
+
+    should 'not append a ? when there is no query string' do
+      One.anchor('http://google.com').include?('?').should == false
+    end
   end
 
   describe 'combining #anchor and #route' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: innate
 version: !ruby/object:Gem::Version
-  version: '2012.12'
+  version: '2013.02'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack