innate 2010.07 → 2011.01

data/MANIFEST

@@ -1,3 +1,4 @@
+.gitignore
 AUTHORS
 CHANGELOG
 COPYING
@@ -40,7 +41,6 @@ lib/innate/helper/flash.rb
 lib/innate/helper/link.rb
 lib/innate/helper/redirect.rb
 lib/innate/helper/render.rb
-lib/innate/helper/send_file.rb
 lib/innate/log.rb
 lib/innate/log/color_formatter.rb
 lib/innate/log/hub.rb
@@ -87,7 +87,6 @@ spec/innate/helper/flash.rb
 spec/innate/helper/link.rb
 spec/innate/helper/redirect.rb
 spec/innate/helper/render.rb
-spec/innate/helper/send_file.rb
 spec/innate/helper/view/aspect_hello.xhtml
 spec/innate/helper/view/locals.xhtml
 spec/innate/helper/view/loop.xhtml

data/README.md

@@ -115,7 +115,7 @@ And another example, using Node with a normal server:
 Installing Innate from git is highly recommended, since it gives you easy
 access to alternate branches, bugfixes, and new features.
 
-    git clone git://github.com/manveru/innate.git
+    git clone git://github.com/Ramaze/innate.git
 
 Do not forget to add the innate/lib directory to your `RUBYLIB` environment
 variable.
@@ -127,15 +127,11 @@ your shell:
 
 ### Via gem install
 
-#### From Github
-
-    gem install manveru-innate --source=http://gems.github.com
-
-#### From Rubyforge
-
-Not yet, and not sure when I'll get around to do this, feel free to ask if you
-want to maintain the project at rubyforge.
+    gem install innate
 
+### Direct download
+  
+Download the latest tarball from [here](http://github.com/Ramaze/innate/tarball/master).
 
 ## Concepts
 

data/innate.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2010.07"
+  s.version = "2011.01"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2010-07-12}
+  s.date = %q{2011-01-26}
   s.description = %q{Simple, straight-forward base for web-frameworks.}
   s.email = %q{m.fellinger@gmail.com}
-  s.files = ["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/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/helper/send_file.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.rb", "lib/innate/middleware_compiler.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/send_file.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"]
+  s.files = [".gitignore", "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/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/middleware_compiler.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"]
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{innate}

data/lib/innate/helper.rb

@@ -77,7 +77,7 @@ module Innate
         :exts, %w[rb so bundle]
 
       o "Default helpers, added on inclusion of the Helper module",
-        :default, [:aspect, :cgi, :flash, :link, :render, :redirect, :send_file]
+        :default, [:aspect, :cgi, :flash, :link, :render, :redirect]
     end
 
     EXTS = %w[rb so bundle]
@@ -152,7 +152,7 @@ module Innate
     # helper :foo_bar # => FooBar
     # helper :foo # => Foo
     def get(name)
-      module_name = /^#{name.to_s.dup.delete('_')}$/i
+      module_name = /^#{name.to_s.dup.delete('_')}(?:helper)?$/i
 
       options.namespaces.each do |namespace|
         found = namespace.constants.grep(module_name).first

data/lib/innate/session.rb

@@ -38,6 +38,8 @@ module Innate
         :ttl, (60 * 60 * 24 * 30) # 30 days
       o "Length of generated Session ID (only applies when using SecureRandom)",
         :sid_length, 64
+      o "cookie cannot be accessed through client side script (http://www.owasp.org/index.php/HttpOnly)",
+        :httponly, false
 
       trigger(:expires){|value|
         self.ttl = value - Time.now.to_i
@@ -50,6 +52,7 @@ module Innate
     def initialize(request, response)
       @request, @response = request, response
       @cookie_set = false
+      @force_new_cookie = false
       @cache_sid = nil
       @flash = Flash.new(self)
     end
@@ -89,6 +92,13 @@ module Innate
       @sid ||= cookie || generate_sid
     end
 
+    def resid!
+      cache_sid
+      cache.delete(sid)
+      @sid = generate_sid
+      @force_new_cookie = true
+    end
+    
     private
 
     def cache_sid
@@ -104,15 +114,21 @@ module Innate
     end
 
     def set_cookie(response)
-      return if @cookie_set || cookie
-
+      return if @cookie_set || (!@force_new_cookie && cookie)
+      
       @cookie_set = true
       response.set_cookie(options.key, cookie_value)
+      @force_new_cookie = false
     end
 
     def cookie_value
       o = options
-      cookie = {:domain => o.domain, :path => o.path, :secure => o.secure}
+      cookie = {
+        :domain => o.domain,
+        :path => o.path,
+        :secure => o.secure,
+        :httponly => o.httponly
+      }
       cookie[:expires] = (Time.now + o.ttl) if o.ttl
       cookie.merge!(:value => sid)
     end

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2010.07"
+  VERSION = "2011.01"
 end

data/spec/innate/helper.rb

@@ -16,6 +16,12 @@ module Innate
         ':('
       end
     end
+
+    module FooBarHelper
+      def self.baz
+        "baz"
+      end
+    end
   end
 end
 
@@ -60,7 +66,7 @@ describe Innate::Helper::Link do
   should 'construct link from ::a' do
     FNL.a(:index).should == '<a href="/foo/index">index</a>'
     FNL.a('index', :index, :x => :y).should == '<a href="/foo/index?x=y">index</a>'
-    FNL.a('duh/bar', 'duh/bar', :x => :y).should == '<a href="/foo/duh/bar?x=y">duh/bar</a>'
+    FNL.a('duh/bar', 'duh/bar', :x => :y).should == "<a href=\"/foo/duh/bar?x=y\">duh&#x2F;bar</a>"
     FNL.a('foo', :/, :x => :y).should == '<a href="/foo/?x=y">foo</a>'
   end
 
@@ -83,4 +89,9 @@ describe Innate::Helper::Link do
     }.should.raise(LoadError).
       message.should == "Helper foo not found"
   end
+
+  should 'allow helper to be suffixed with "helper"' do
+    Innate::HelpersHelper.get(:foo_bar).baz.should == "baz"
+    Innate::HelpersHelper.get(:foo_bar_helper).baz.should == "baz"
+  end
 end

data/spec/innate/session.rb

@@ -26,6 +26,11 @@ class SpecSession
   def reset
     session.clear
   end
+
+  def resid
+    session.resid!
+  end
+  
 end
 
 describe Innate::Session do
@@ -51,7 +56,39 @@ describe Innate::Session do
       get('/decrement').body.should == n.to_s
     end
   end
+  
+  
+  should 'set a session cookie that can be changed with #resid!' do
+    clear_cookies
+    get '/init'
+    
+    last_response['Set-Cookie'].should.not == nil
+    old_set_cookie = last_response['Set-Cookie']
+    sid = Innate::Current.session.sid
+    get '/increment'
+    get '/view'
+    last_response.body.should == '1'
+    
+    get '/resid'
+    last_response['Set-Cookie'].should.not == nil
+    new_sid = Innate::Current.session.sid
+    new_sid.should.not == sid
 
+    get '/view'
+    last_response.body.should == '1'
+    last_response['Set-Cookie'].should == nil
+    Innate::Current.session.sid.should == new_sid
+
+    # We need to verify that the old session ID has been invalidated.
+    # The session data must be moved, not copied, on #resid!.
+    clear_cookies
+    set_cookie(old_set_cookie)
+    get '/view'
+    last_response.body.should == ''
+    
+  end
+  
+  
   should 'expose sid method' do
     Innate::Current.session.sid.should.not.be.empty
   end

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: innate
 version: !ruby/object:Gem::Version 
-  hash: 8045
   prerelease: false
   segments: 
-  - 2010
-  - 7
-  version: "2010.07"
+  - 2011
+  - 1
+  version: "2011.01"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +09:00
+date: 2011-01-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +24,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 5
@@ -73,7 +69,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -90,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - AUTHORS
 - CHANGELOG
 - COPYING
@@ -132,7 +128,6 @@ files:
 - lib/innate/helper/link.rb
 - lib/innate/helper/redirect.rb
 - lib/innate/helper/render.rb
-- lib/innate/helper/send_file.rb
 - lib/innate/log.rb
 - lib/innate/log/color_formatter.rb
 - lib/innate/log/hub.rb
@@ -179,7 +174,6 @@ files:
 - spec/innate/helper/link.rb
 - spec/innate/helper/redirect.rb
 - spec/innate/helper/render.rb
-- spec/innate/helper/send_file.rb
 - spec/innate/helper/view/aspect_hello.xhtml
 - spec/innate/helper/view/locals.xhtml
 - spec/innate/helper/view/loop.xhtml
@@ -237,7 +231,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -246,7 +239,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3

data/lib/innate/helper/send_file.rb

@@ -1,26 +0,0 @@
-module Innate
-  module Helper
-    module SendFile
-      # Not optimally performing but convenient way to send files by their
-      # filename.
-      #
-      # I think we should remove this from the default helpers and move it into
-      # Ramaze, the functionality is almost never used, the naming is ambigous,
-      # and it doesn't use the send_file capabilities of frontend servers.
-      #
-      # So for now, I'll mark it for deprecation
-      def send_file(filename, content_type = nil, content_disposition = nil)
-        content_type ||= Rack::Mime.mime_type(::File.extname(filename))
-        content_disposition ||= File.basename(filename)
-
-        response.body = ::File.readlines(filename, 'rb')
-        response['Content-Length'] = ::File.size(filename).to_s
-        response['Content-Type'] = content_type
-        response['Content-Disposition'] = content_disposition
-        response.status = 200
-
-        throw(:respond, response)
-      end
-    end
-  end
-end

data/spec/innate/helper/send_file.rb

@@ -1,21 +0,0 @@
-require File.expand_path('../../../helper', __FILE__)
-
-class SpecSendFile
-  include Innate::Node
-  map '/'
-
-  def this
-    send_file(__FILE__)
-  end
-end
-
-describe Innate::Helper::SendFile do
-  should 'send __FILE__' do
-    got = Innate::Mock.get('/this')
-
-    got.body.should == File.read(__FILE__)
-    got.status.should == 200
-    got['Content-Length'].should == File.size(__FILE__).to_s
-    got['Content-Type'].should == 'text/x-script.ruby'
-  end
-end