rad_core 0.2.6 → 0.2.7

data/spec/web/controller_routing_helper_spec.rb

@@ -2,83 +2,83 @@ require 'spec_helper'
 
 describe "UrlHelper" do
   isolate :conveyors, :router, before: :all
-  
+
   before :all do
     rad.web
-    
+
     class ControllerStub
       inherit Rad::ControllerRoutingHelper, Rad::ControllerMiscellaneousHelper
-    
+
       def url_for *args
         args.first
-      end    
+      end
     end
   end
-  
+
   after :all do
     remove_constants :ControllerStub
   end
-  
-  before do        
+
+  before do
     @c = ControllerStub.new
   end
-  
+
   def stub_workspace
     @response = Rad::Http::Response.new
     @params = Rad::Conveyors::Params.new
-    
-    @workspace = Object.new    
+
+    @workspace = Object.new
     @workspace.stub(:params).and_return(@params)
     @workspace.stub(:response).and_return(@response)
-    
+
     @c.stub(:workspace).and_return(@workspace)
   end
-  
+
   def within_request &block
     @response.body = catch(:halt){block.call}
   end
-  
+
   describe "redirect_to" do
     before do
       stub_workspace
     end
-    
-    it "html format" do      
+
+    it "html format" do
       @params.format = 'html'
-      
+
       within_request{@c.redirect_to('/some_book')}
       @response.status.should == 302
       @response.headers['Location'].should == "/some_book"
       @response.body.should =~ /You are being/
     end
-    
-    it "full url, special case (from error)" do      
+
+    it "full url, special case (from error)" do
       @params.format = 'html'
-      
+
       within_request{@c.redirect_to('http://localhost/some_book')}
       @response.status.should == 302
       @response.headers['Location'].should == "http://localhost/some_book"
       @response.body.should =~ /You are being/
     end
-        
+
     it "js format" do
       @params.format = 'js'
-      
+
       within_request{@c.redirect_to('/some_book')}
       @response.status.should == 200
       @response.headers['Location'].should be_blank
       @response.body_as_string.should == "window.location = '/some_book';"
     end
-  end 
-  
+  end
+
   describe "reload_page" do
     before do
       stub_workspace
     end
-    
-    it "basic" do            
+
+    it "basic" do
       @params.format = 'js'
-      
+
       within_request{@c.reload_page}
       @response.status.should == 200
       @response.body_as_string.should =~ /reload/

data/spec/web/flash_spec.rb

@@ -3,13 +3,13 @@ require 'html/spec_helper'
 
 describe "Flash" do
   with_prepare_params
-  
+
   isolate :conveyors, :router, before: :all
-  
+
   before :all do
     rad.mode = :development, true
     rad.web
-    
+
     class MockFlashContext < Rad::MockTemplateContext
       include Rad::Html::FlashHelper, Rad::ControllerRoutingHelper
 
@@ -23,7 +23,7 @@ describe "Flash" do
         block = workspace.check_flash.request
         catch :halt do
           block.call context if block
-        end      
+        end
         workspace.request_done = true
 
         next_processor.call
@@ -40,11 +40,11 @@ describe "Flash" do
 
         block = workspace.check_flash.after_request
         block.call workspace if block
-        workspace.after_request_done = true    
+        workspace.after_request_done = true
       end
     end
-    
-    
+
+
     rad.conveyors.web do |web|
       web.use Rad::Http::Processors::PrepareParams
       web.use FlashTestHelper
@@ -52,19 +52,19 @@ describe "Flash" do
       web.use FlashTestRenderCaller
     end
   end
-  
+
   after :all do
     rad.mode = :test, true
-    
+
     remove_constants %w(
       MockFlashContext
       FlashTestRenderCaller
       FlashTestHelper
     )
   end
-  
-  def check_flash opt            
-    workspace = nil 
+
+  def check_flash opt
+    workspace = nil
     result = rad.http.call(Rad::Http::Request.stub_environment, check_flash: opt.to_openobject) do |c|
       c.call
       workspace = rad.workspace
@@ -72,14 +72,14 @@ describe "Flash" do
 
     workspace.before_request_done.should be_true
     workspace.request_done.should be_true
-    workspace.after_request_done.should be_true    
+    workspace.after_request_done.should be_true
     workspace
   end
-  
+
   it "flash should be extracted from session if there's any" do
     check_flash(
-      before_request: lambda{|workspace|        
-        workspace.params.format = 'html'        
+      before_request: lambda{|workspace|
+        workspace.params.format = 'html'
         workspace.request.session['flash'] = {info: 'Ok'}.to_json
       },
       request: lambda{|context|
@@ -89,7 +89,7 @@ describe "Flash" do
         workspace.request.session['flash'].should be_nil
       }
     )
-    
+
     check_flash(
       before_request: lambda{|workspace|
         workspace.params.format = 'html'
@@ -99,7 +99,7 @@ describe "Flash" do
       }
     )
   end
-  
+
   it "flash should be seen in the same request" do
     check_flash(
       before_request: lambda{|workspace|
@@ -114,7 +114,7 @@ describe "Flash" do
       }
     )
   end
-    
+
   it "flash with :redirect should be saved for next request in session" do
     check_flash(
       before_request: lambda{|workspace|
@@ -131,12 +131,12 @@ describe "Flash" do
       }
     )
   end
-  
+
   it "AJAX ('js' format) flash should be displayed in the same request" do
     check_flash(
       before_request: lambda{|workspace|
         workspace.params.format = 'js'
-      },    
+      },
       request: lambda{|context|
         context.flash.info = "Ok"
         context.flash.info.should == "Ok"
@@ -146,12 +146,12 @@ describe "Flash" do
       }
     )
   end
-  
+
   it "flash with AJAX redirect ('js' format) should be saved for next request in session" do
     check_flash(
       before_request: lambda{|workspace|
         workspace.params.format = 'js'
-      },      
+      },
       request: lambda{|context|
         context.flash.info = "Ok"
         context.flash.info.should == "Ok"
@@ -163,7 +163,7 @@ describe "Flash" do
       }
     )
   end
-  
+
   it "multiple messages with non-AJAX request" do
     check_flash(
       before_request: lambda{|workspace|
@@ -172,14 +172,14 @@ describe "Flash" do
       request: lambda{|context|
         context.flash.error = "Error"
         context.flash.error.should == "Error"
-        
+
         context.flash.info.should == 'Ok'
       },
       after_request: lambda{|workspace|
         workspace.request.session['flash'].should be_nil
       }
     )
-    
+
     check_flash(
       before_request: lambda{|workspace|
         workspace.params.format = 'js'
@@ -190,7 +190,7 @@ describe "Flash" do
         context.flash.error.should == "Error"
         context.redirect_to '/'
         context.flash.error.should be_nil
-        
+
         context.flash.info.should == 'Ok'
       },
       after_request: lambda{|workspace|
@@ -198,17 +198,17 @@ describe "Flash" do
       }
     )
   end
-  
+
   it "multiple messages with AJAX request" do
     check_flash(
       before_request: lambda{|workspace|
         workspace.params.format = 'js'
-        workspace.request.session['flash'] = {info: 'Ok'}.to_json                
+        workspace.request.session['flash'] = {info: 'Ok'}.to_json
       },
       request: lambda{|context|
         context.flash.error = "Error"
         context.flash.error.should == "Error"
-        
+
         context.flash.info.should == 'Ok'
       },
       after_request: lambda{|workspace|
@@ -216,5 +216,5 @@ describe "Flash" do
       }
     )
   end
-  
+
 end

data/spec/web/protect_from_forgery_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
 
-describe "Forgery protection" do        
+describe "Forgery protection" do
   with_prepare_params
-    
+
   isolate :conveyors, :router, before: :all
 
   before :all do
     rad.web
-    
+
     class ForgerySpecHelper < Rad::Conveyors::Processor
       def call
         block = workspace.check_forgery.before_request
@@ -18,34 +18,34 @@ describe "Forgery protection" do
 
         block = workspace.check_forgery.after_request
         block.call workspace if block
-        workspace.after_request_done = true    
+        workspace.after_request_done = true
       end
-    end        
+    end
 
     class ::TheController
       inherit Rad::Controller::Http
-      
+
       protect_from_forgery_without_test only: :protected_method
-      
+
       def protected_method
         render inline: 'protected result'
       end
-      
+
       def method_without_protection
         render inline: 'result'
       end
-      
+
       def dumb_method; end
     end
   end
-  
-  after :all do    
+
+  after :all do
     remove_constants %w(TheController ForgerySpecHelper)
   end
-  
+
   before do
     rad.http.stub(:session).and_return({'key' => 'session_id'})
-    
+
     rad.delete :conveyors
     rad.conveyors.web do |web|
       web.use Rad::Http::Processors::PrepareParams
@@ -55,24 +55,24 @@ describe "Forgery protection" do
       web.use Rad::Controller::Processors::ControllerCaller
     end
   end
-  
-  def check_forgery opt    
-    workspace = nil 
-    
+
+  def check_forgery opt
+    workspace = nil
+
     result = rad.http.call(Rad::Http::Request.stub_environment, check_forgery: opt.to_openobject) do |c|
       c.call
       workspace = rad[:workspace]
     end
-        
+
     workspace.before_request_done.should be_true
     workspace.after_request_done.should be_true
     workspace
   end
-  
+
   it "should set :authenticity_token only for :get and 'html' request" do
     check_forgery(
       before_request: lambda{|workspace|
-        workspace.env['REQUEST_METHOD'] = 'GET'        
+        workspace.env['REQUEST_METHOD'] = 'GET'
         workspace.env['CONTENT_TYPE'] = 'text/html'
         workspace.class = TheController
         workspace.method_name = :dumb_method
@@ -81,11 +81,11 @@ describe "Forgery protection" do
         workspace.request.session['authenticity_token'].should_not be_blank
       }
     )
-    
+
     # post
     check_forgery(
-      before_request: lambda{|workspace|        
-        workspace.env['REQUEST_METHOD'] = 'POST'        
+      before_request: lambda{|workspace|
+        workspace.env['REQUEST_METHOD'] = 'POST'
         workspace.env['CONTENT_TYPE'] = 'text/html'
         workspace.class = TheController
         workspace.method_name = :dumb_method
@@ -95,88 +95,88 @@ describe "Forgery protection" do
       }
     )
   end
-  
+
   it "should check any non :get request with browser's formats for :authenticity_token" do
     lambda{
       check_forgery(
-        before_request: lambda{|workspace|        
-          workspace.env['REQUEST_METHOD'] = 'POST'        
+        before_request: lambda{|workspace|
+          workspace.env['REQUEST_METHOD'] = 'POST'
           workspace.env['CONTENT_TYPE'] = 'text/html'
           workspace.class = TheController
-          workspace.method_name = 'protected_method'
+          workspace.method_name = :protected_method
         }
       )
     }.should raise_error(/invalid authenticity token/)
   end
-    
+
   it "should pass request with correct authenticity_token" do
     check_forgery(
       before_request: lambda{|workspace|
-        workspace.env['REQUEST_METHOD'] = 'POST'        
+        workspace.env['REQUEST_METHOD'] = 'POST'
         workspace.env['CONTENT_TYPE'] = 'text/html'
         workspace.request.session['authenticity_token'] = 'secure token'
         workspace.params['authenticity_token'] = 'secure token'
         workspace.class = TheController
-        workspace.method_name = 'protected_method'
+        workspace.method_name = :protected_method
       },
       after_request: lambda{|workspace|
         workspace.content.should == "protected result"
       }
     )
   end
-    
+
   it "should not check request with non-browser content type" do
     check_forgery(
       before_request: lambda{|workspace|
-        workspace.env['REQUEST_METHOD'] = 'POST'        
+        workspace.env['REQUEST_METHOD'] = 'POST'
         workspace.env['CONTENT_TYPE'] = 'non-browser-format'
         workspace.class = TheController
-        workspace.method_name = 'protected_method'
+        workspace.method_name = :protected_method
       },
       after_request: lambda{|workspace|
         workspace.content.should == "protected result"
       }
     )
   end
-    
+
   # it "should not check request with non-browser format" do
   #   check_forgery(
   #     before_request: lambda{|workspace|
-  #       workspace.env['REQUEST_METHOD'] = 'POST'        
+  #       workspace.env['REQUEST_METHOD'] = 'POST'
   #       workspace.env['CONTENT_TYPE'] = 'text/html'
   #       workspace.params['format'] = 'json'
   #       workspace.class = TheController
-  #       workspace.method_name = 'protected_method'
+  #       workspace.method_name = :protected_method
   #     },
   #     after_request: lambda{|workspace|
   #       workspace.content.should == "protected result"
   #     }
   #   )
   # end
-  
+
   it "should not protect non protected methods" do
     check_forgery(
-      before_request: lambda{|workspace|        
-        workspace.env['REQUEST_METHOD'] = 'POST'        
+      before_request: lambda{|workspace|
+        workspace.env['REQUEST_METHOD'] = 'POST'
         workspace.env['CONTENT_TYPE'] = 'text/html'
         workspace.class = TheController
-        workspace.method_name = 'method_without_protection'
+        workspace.method_name = :method_without_protection
       },
       after_request: lambda{|workspace|
         workspace.content.should == "result"
       }
-    )    
+    )
   end
-  
+
   # it "OUTDATED should use :session_authenticity_token from params (for flash support)" do
   #   check_forgery(
   #     before_request: lambda{|workspace|
-  #       workspace.env['REQUEST_METHOD'] = 'POST'        
+  #       workspace.env['REQUEST_METHOD'] = 'POST'
   #       workspace.params.format = 'text/html'
   #       # workspace.params['session_authenticity_token'] = 'secure token'
   #       workspace.params['authenticity_token'] = 'secure token'
   #       workspace.class = TheController
-  #       workspace.method_name = 'protected_method'
+  #       workspace.method_name = :protected_method
   #     },
   #     after_request: lambda{|workspace|
   #       workspace.content.should == "protected result"