rack-golem 0.0.3 → 0.0.4

data/README.md

@@ -18,7 +18,7 @@ Install with:
 Config.ru is one of his names, so say it in a Rackup file.
 
     require 'db' # Loads ORM models and all
-    require 'go' # Our controller (I don not like that word really)
+    require 'go' # Our controller (I do not like that word really)
     use Rack::ContentLength
     use Rack::Session::Cookies
     run Go
@@ -42,7 +42,7 @@ And the winner is:
 	    def index(*args)
 	      # When no public method is found
 	      # Of course you don't have to declare one and it is gonna use Controller#not_found instead
-	      # But if it is declared, keep in mind it's a catch-all so make it deal with args
+	      # Still can have arguments
 	      @articles = Post.all
 	      erb :index
 	    end
@@ -66,6 +66,14 @@ And the winner is:
 	      Email.alert('Too many people are looking for porn here') if args.includes?("porn")
 	      super(args)
 	    end
+	    
+	    def error(err, *args)
+	      # Again this one is defined by Golem and only shows up when RACK_ENV is not `nil` or `dev` or `development`
+	      # Default only prints "ERROR"
+	      # Here we're going to send the error message
+	      # One would rarely show that to the end user but this is just a demo
+	      err.message
+	    end
 
 	    after do
 	      Spy.analyse.send_info_to([:government, :facebook, :google, :james_bond])

data/lib/rack/golem.rb

@@ -19,7 +19,7 @@ module Rack::Golem
         @path_atoms = @r.path_info.split('/').find_all{|s| s!=''}
         @action, *@action_arguments = @path_atoms
         unless public_methods.include?(@action)||(@action&&public_methods.include?(@action.to_sym))
-          if public_methods.include?('index')||public_methods.include?(:index)
+          if public_methods.include?('index')||public_methods.include?(:index) # For different RUBY_VERSION(s)
             @action, @action_arguments = 'index', @path_atoms
           else
             @action, @action_arguments = 'not_found', @path_atoms
@@ -28,7 +28,13 @@ module Rack::Golem
         
         instance_eval(&self.class.before_block) unless self.class.before_block.nil?
         
-        @res.write(self.__send__(@action,*@action_arguments))
+        begin
+          @res.write(self.__send__(@action,*@action_arguments))
+        rescue ArgumentError => e
+          failed_method = e.backtrace[0][/`.*'$/][1..-2]
+          raise unless failed_method==@action
+          @res.write(self.__send__('not_found', @path_atoms))
+        end
         
         instance_eval(&self.class.after_block) unless self.class.after_block.nil?
       }
@@ -36,19 +42,36 @@ module Rack::Golem
   end
   
   module InstanceMethods
+    
+    DEV_ENV = [nil,'development','dev']
+    
     def initialize(app=nil); @app = app; end
     def call(env); dup.call!(env); end
+    
     def call!(env)
       @r = ::Rack::Request.new(env)
       @res = ::Rack::Response.new
-      instance_eval(&self.class.dispatcher_block)
+      @session = env['rack.session'] || {}
+      begin
+        instance_eval(&self.class.dispatcher_block)
+      rescue => e
+        raise if DEV_ENV.include?(ENV['RACK_ENV'])
+        @res.write(self.__send__('error', e, @path_atoms))
+      end
       @res.status==404&&!@app.nil? ? @app.call(env) : @res.finish
     end
+    
     def not_found(*args)
       @res.status = 404
       @res.headers['X-Cascade']='pass'
-      "Not Found: #{@r.path_info}"
+      "NOT FOUND: #{@r.path_info}"
+    end
+    
+    def error(e, *args)
+      @res.status = 500
+      "ERROR"
     end
+    
     def erb(template)
       @@tilt_cache ||= {}
       if @@tilt_cache.has_key?(template)

data/rack-golem.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'rack-golem'
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.platform = Gem::Platform::RUBY
   s.summary = "A Controller middleware that is euh... basic"
   s.description = "A Controller middleware that is euh... basic. I would say it is a sort of Ramaze for kids"
@@ -9,6 +9,6 @@ Gem::Specification.new do |s|
   s.author = "Mickael Riga"
   s.email = "mig@campbellhay.com"
   s.homepage = "http://www.campbellhay.com"
-  s.add_dependency(%q<tilt>, ["~> 1.2.2"])
+  s.add_dependency(%q<tilt>, [">= 1.2.2"])
   s.add_development_dependency(%q<bacon>, "~> 1.1.0")
 end

data/test/spec_golem.rb

@@ -52,44 +52,108 @@ class Indexed
 end
 IndexedR = ::Rack::MockRequest.new(::Rack::Lint.new(Indexed.new))
 
+# ==================
+# = Simply indexed =
+# ==================
+
+class SimplyIndexed
+  include Rack::Golem
+  def index; 'index'; end
+  def will_fail; please_fail; end
+  private
+  def please_fail(num); 'ArgumentError baby'; end
+end
+SimplyIndexedR = ::Rack::MockRequest.new(::Rack::Lint.new(SimplyIndexed.new))
+SimplyIndexedUsedR = ::Rack::MockRequest.new(::Rack::Lint.new(SimplyIndexed.new(lambda{|env| [200,{},"#{3+nil}"]})))
+
+# =============
+# = Sessioned =
+# =============
+
+class Sessioned
+  include Rack::Golem
+  def set_val(val); @session[:val] = val; end
+  def get_val; @session[:val]; end
+end
+SessionedR = ::Rack::MockRequest.new(::Rack::Session::Cookie.new(::Rack::Lint.new(Sessioned.new)))
+
 # =========
 # = Specs =
 # =========
 
 describe "Golem" do
+  
   it "Should dispatch on a method with no arguments" do
     BasicR.get('/no_arg').body.should=='nothing'
   end
+  
   it "Should dispatch on a method with arguments" do
     BasicR.get('/with_args/a/b').body.should=='a+b'
   end
+  
   it "Should dispatch on a method with splat argument" do
     BasicR.get('/splat_arg/a/b/c/d').body.should=='a+b+c+d'
   end
+  
   it "Should not dispatch if the method is private or does not exist" do
     r = BasicR.get('/no_way')
     r.status.should==404
-    r.body.should=='Not Found: /no_way'
+    r.body.should=='NOT FOUND: /no_way'
     r = BasicR.get('/no')
     r.status.should==404
-    r.body.should=='Not Found: /no'
+    r.body.should=='NOT FOUND: /no'
   end
+  
   it "Should follow the rack stack if response is 404 and there are middlewares below" do
     r = BasicLobsterR.get("/no_way")
     r.status.should==200
   end
+  
   it "Should provide filters" do
     FilterR.get('/wrapped').body.should=="before+wrapped+after"
   end
+  
   it "Should provide arguments in filter when page is not_found" do
-    FilterR.get('/a/b/c/d').body.should=="a+b+c+dNot Found: /a/b/c/d+after"
+    FilterR.get('/a/b/c/d').body.should=="a+b+c+dNOT FOUND: /a/b/c/d+after"
   end
+  
   it "Should send everything to :index if it exists and there is no matching method for first arg" do
     IndexedR.get('/exist/a/b/c/d').body.should=='a+b+c+d'
     IndexedR.get('/a/b/c/d').body.should=='a+b+c+d'
     IndexedR.get('/').body.should==''
   end
+  
+  it "Should send not_found if there is an argument error on handlers" do
+    SimplyIndexedR.get('/').status.should==200
+    SimplyIndexedR.get('/unknown').status.should==404
+    SimplyIndexedR.get('/will_fail/useless').status.should==404
+    lambda{ SimplyIndexedR.get('/will_fail') }.should.raise(ArgumentError)
+  end
+  
+  it "Should handle errors without raising an exception unless in dev mode" do
+    lambda{ SimplyIndexedR.get('/will_fail') }.should.raise(ArgumentError)
+    ENV['RACK_ENV'] = 'development'
+    lambda{ SimplyIndexedR.get('/will_fail') }.should.raise(ArgumentError)
+    ENV['RACK_ENV'] = 'production'
+    res = SimplyIndexedR.get('/will_fail')
+    res.status.should==500
+    ENV['RACK_ENV'] = nil
+  end
+  
+  it "Should not use the error handler if the error occur further down the rack stack" do
+    ENV['RACK_ENV'] = 'production'
+    lambda{ SimplyIndexedUsedR.get('/not_found') }.should.raise(TypeError)
+    ENV['RACK_ENV'] = nil
+  end
+  
   it "Should set dispatch-specific variables correctly when defaulting to :index" do
     IndexedR.get('/a/b/c/d?switch=true').body.should=="action=index args=a,b,c,d a+b+c+d"
   end
+  
+  it "Should have a shortcut for session hash" do
+    res = SessionedR.get('/set_val/ichigo')
+    res_2 = SessionedR.get('/get_val', 'HTTP_COOKIE'=>res["Set-Cookie"])
+    res_2.body.should=='ichigo'
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-golem
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mickael Riga
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +01:00
-default_executable: 
+date: 2012-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -24,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -64,7 +63,6 @@ files:
 - lib/rack_golem.rb
 - rack-golem.gemspec
 - test/spec_golem.rb
-has_rdoc: true
 homepage: http://www.campbellhay.com
 licenses: []
 
@@ -94,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Controller middleware that is euh... basic