innate 2011.10 → 2011.12

data/.gems

@@ -1,5 +1,4 @@
 # .gems generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator
 bacon -v1.1.0
-rack -v1.3.5
-rack -v1.3.4
+rack -v1.4.0
 rack-test -v0.6.1

data/.rvmrc

@@ -1,3 +1,2 @@
-rvm_gemset_create_on_use_flag=1
-rvm use --create 1.9.3@innate
+rvm --install --create use 1.9.3@innate
 [[ -s .gems ]] && rvm gemset import .gems

data/.travis.yml

@@ -1,19 +1,19 @@
 script: 'RUBYOPT=-rubygems rake bacon'
 before_script:
-  - "./.load_gemset"
+  - test -s "$HOME/.rvm/scripts/rvm" && source "$HOME/.rvm/scripts/rvm"
+  - test -s .gems && rvm gemset import .gems
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
-  - rbx-2.0
+  - ruby-head
+  - rbx-18mode
+  - rbx-19mode
   - ree
   - jruby
-
 notifications:
   email:
     - mf@rubyists.com
-
 branches:
   only:
     - master

data/AUTHORS

@@ -1,7 +1,7 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   799 Michael Fellinger <m.fellinger@gmail.com>
+   804 Michael Fellinger <m.fellinger@gmail.com>
     31 Tadahiko Uehara <kikofx@gmail.com>
      9 Lee Jarvis <injekt.me@gmail.com>
      8 Pistos <gitsomegrace.5.pistos@geoshell.com>
@@ -10,6 +10,7 @@ Following persons have contributed to innate.
      4 Zoxc <zoxc32@gmail.com>
      3 Antti Tuomi <antti.tuomi@tkk.fi>
      3 Lin Jen-Shin <godfat@godfat.org>
+     3 Yorick Peterse <yorickpeterse@gmail.com>
      2 Andreas Karlsson <andreas@proxel.se>
      2 Arnaud Meuret <arnaud@meuret.name>
      2 injekt <ljjarvis@gmail.com>
@@ -19,4 +20,3 @@ Following persons have contributed to innate.
      1 Jérémy Zurcher <jeremy@asynk.ch>
      1 ravage <ravage@fragmentized.net>
      1 Sam Carr <samcarr@gmail.com>
-     1 Yorick Peterse <yorickpeterse@gmail.com>

data/CHANGELOG

@@ -1,3 +1,62 @@
+[d8a1da4 | 2011-12-28 05:06:07 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2011.12
+
+[13f9372 | 2011-12-28 04:54:29 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * less obfuscation ftw
+
+[10cf300 | 2011-12-28 04:54:09 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * minor cleanup around specs
+
+[7f61483 | 2011-12-28 04:53:40 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update to Rack 1.4.0
+
+[575e900 | 2011-12-08 17:05:04 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update travis config
+
+[037f35a | 2011-11-06 12:18:30 UTC] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Revert "AOP calls can now be stacked."
+
+    This reverts commit 3ceb18dae7b774ab9b21cba6538b217ba35d5e21.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[3ceb18d | 2011-11-06 11:30:51 UTC] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * AOP calls can now be stacked.
+
+    This means that calling methods such as before_all() or before() multiple times
+    in the same controller will no longer in these calls overwriting previously
+    defined ones. A short example of this is the following:
+    
+        class Posts
+          Innate.node('/posts')
+          helper :aspect
+    
+          NUMBERS = []
+    
+          before_all do
+            NUMBERS << 10
+          end
+    
+          before_all do
+            NUMBERS << 20
+          end
+    
+          def index
+            return NUMBERS
+          end
+        end
+    
+    Visiting /posts would result in "[10, 20]" being displayed in the browser.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
 [7ad5d81 | 2011-10-23 17:19:58 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2011.10

data/MANIFEST

@@ -54,6 +54,7 @@ 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

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rake'
 require 'rake/clean'
 require 'rubygems/package_task'
 require 'time'
@@ -10,7 +9,7 @@ PROJECT_README = 'README.md'
 PROJECT_VERSION = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
 
 DEPENDENCIES = {
-  'rack' => {:version => '>= 1.1.0'},
+  'rack' => {:version => '~> 1.4.0'},
 }
 
 DEVELOPMENT_DEPENDENCIES = {

data/innate.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "innate"
-  s.version = "2011.10"
+  s.version = "2011.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = "2011-10-23"
+  s.date = "2011-12-28"
   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/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.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/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/rack_file_wrapper.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 = "http://github.com/manveru/innate"
   s.require_paths = ["lib"]
   s.rubyforge_project = "innate"
@@ -20,16 +20,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<rack>, ["~> 1.4.0"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
       s.add_development_dependency(%q<rack-test>, [">= 0.6.1"])
     else
-      s.add_dependency(%q<rack>, [">= 1.1.0"])
+      s.add_dependency(%q<rack>, ["~> 1.4.0"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
       s.add_dependency(%q<rack-test>, [">= 0.6.1"])
     end
   else
-    s.add_dependency(%q<rack>, [">= 1.1.0"])
+    s.add_dependency(%q<rack>, ["~> 1.4.0"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
     s.add_dependency(%q<rack-test>, [">= 0.6.1"])
   end

data/lib/innate.rb

@@ -53,6 +53,7 @@ module Innate
   require 'innate/session'
   require 'innate/session/flash'
   require 'innate/route'
+  require 'innate/rack_file_wrapper'
 
   extend Trinity
 

data/lib/innate/cache.rb

@@ -101,9 +101,9 @@ module Innate
     #
     # @param [Cache] cache
     def self.register(cache)
-      key = cache.name
-      source = "def self.%s() @%s; end
-                def self.%s=(o) @%s = o; end" % [key, key, key, key]
+      key = cache.name.to_s
+      source = "def self.#{key}() @#{key}; end
+                def self.#{key}=(o) @#{key} = o; end"
       self.class_eval(source, __FILE__, __LINE__)
 
       self.send("#{key}=", cache)

data/lib/innate/middleware_compiler.rb

@@ -41,7 +41,7 @@ module Innate
 
       joined = roots.map{|root| publics.map{|public| ::File.join(root, public)}}
 
-      apps = joined.flatten.map{|public_root| Rack::File.new(public_root) }
+      apps = joined.flatten.map{|public_root| RackFileWrapper.new(public_root) }
       apps << Current.new(Route.new(app), Rewrite.new(app))
 
       cascade(*apps)

data/lib/innate/rack_file_wrapper.rb

@@ -0,0 +1,24 @@
+module Innate
+  class RackFileWrapper
+    def initialize(root, cache_control = nil)
+      @file = Rack::File.new(root, cache_control)
+    end
+
+    def call(env)
+      status, header, body = @file.call(env)
+
+      if status == 403
+        unless Rack::File::ALLOWED_VERBS.include?(env['REQUEST_METHOD'])
+          body = "File not Found: #{Rack::Utils.unescape(env['PATH_INFO'])}\n"
+          return 404, {
+            'Content-Type' => 'text/plain',
+            'Content-Length' => body.size,
+            'X-Cascade' => 'pass',
+          }, [body]
+        end
+      end
+
+      return status, header, body
+    end
+  end
+end

data/lib/innate/spec/bacon.rb

@@ -1,5 +1,3 @@
-begin; require 'rubygems'; rescue LoadError; end
-
 require 'bacon'
 require 'rack/test'
 require File.expand_path('../../', __FILE__) unless defined?(Innate)

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2011.10"
+  VERSION = "2011.12"
 end

data/spec/example/app/retro_games.rb

@@ -15,7 +15,9 @@ describe 'Retro-games app' do
   end
 
   it 'allows you to add another game' do
-    post '/create', :name => 'Street Fighter II'
+    response = post('/create', :name => 'Street Fighter II')
+    response.status.should == 302
+
     follow_redirect!
     last_response.should =~ /0 => Street Fighter II/
   end

data/tasks/bacon.rake

@@ -21,7 +21,7 @@ task :bacon do
   specs.each_with_index do |spec, idx|
     print(left_format % [idx + 1, specs_size, spec])
 
-    Open3.popen3(FileUtils::RUBY, spec) do |sin, sout, serr|
+    Open3.popen3(FileUtils::RUBY, '-w', spec) do |sin, sout, serr|
       out = sout.read.strip
       err = serr.read.strip
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: innate
 version: !ruby/object:Gem::Version
-  version: '2011.10'
+  version: '2011.12'
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-23 00:00:00.000000000 Z
+date: 2011-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &8662480 !ruby/object:Gem::Requirement
+  requirement: &16472440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *8662480
+  version_requirements: *16472440
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &8661860 !ruby/object:Gem::Requirement
+  requirement: &16472000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *8661860
+  version_requirements: *16472000
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &8661300 !ruby/object:Gem::Requirement
+  requirement: &16471480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *8661300
+  version_requirements: *16471480
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
 executables: []
@@ -106,6 +106,7 @@ files:
 - 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