rad_core 0.0.13 → 0.0.14

data/spec/controller/error_handling_spec.rb

@@ -1,44 +1,40 @@
-require "controller/spec_helper"
+require "spec_helper"
 
 describe "Error handling" do
-  with_environment
   with_view_path "#{spec_dir}/views"
   
-  before :all do    
-    AbstractController = Rad::AbstractController    
-    
-    rad.before :environment do
-      rad.config.test_error_template = rad.config.development_error_template!
-    end
+  isolate :conveyors
   
-    rad.after :environment do
-      rad.conveyors.web do |web|
-        web.use Rad::Processors::ControllerErrorHandling
-        web.use Rad::Processors::ControllerCaller
-      end 
+  before do
+    rad.controller.stub!(:test_error_template).and_return(rad.controller.development_error_template)
+    
+    rad.conveyors.web do |web|
+      web.use Rad::Controller::Processors::ControllerErrorHandling
+      web.use Rad::Controller::Processors::ControllerCaller
     end
   end
-  
+
+  before :all do
+    rad.controller
+  end  
   after :all do
     remove_constants %w(
       DisplayErrorWithFormat
-      DiferrentErrorHandlingSpec
-      AbstractController
+      DiferrentErrorHandlingSpec      
       ErrorInRedirectSpec
     )
   end
   
   it "should correctly display error messages in :development (with correct format)" do
     class ::DisplayErrorWithFormat
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       
       def method
         raise params.error 
       end
     end
     
-    config.environment = :development
-    silence_logger!
+    rad.mode = :development, true
     
     error = StandardError.new('some error')
     
@@ -63,7 +59,7 @@ describe "Error handling" do
     # after error will be catched and no error message will be displayed
     
     class ::ErrorInRedirectSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
 
       def a
         response.headers['Location'] = '/'
@@ -71,8 +67,7 @@ describe "Error handling" do
       end        
     end
     
-    config.environment = :development
-    silence_logger!
+    rad.mode = :development, true
     
     ccall(ErrorInRedirectSpec, :a, format: 'html')
     response.headers['Location'].should be_nil
@@ -81,7 +76,7 @@ describe "Error handling" do
   describe "should be different in :test, :development and :production" do
     before :all do
       class ::DiferrentErrorHandlingSpec
-        inherit AbstractController
+        inherit Rad::Controller::Abstract
   
         def a; end  
         def b
@@ -94,8 +89,7 @@ describe "Error handling" do
     it "in :production errors shouldn't be shown to user"
     
     it "in development errors should be catched" do
-      config.environment = :development
-      silence_logger!
+      rad.mode = :development, true
       
       # with view
       ccall(DiferrentErrorHandlingSpec, :a).should == 'a'
@@ -106,8 +100,8 @@ describe "Error handling" do
     end
   
     it "should not catch errors in :test environment" do
-      config.environment = :test
-    
+      rad.mode = :test, true
+
       # with render
       ccall(DiferrentErrorHandlingSpec, :a).should == 'a'    
       lambda{ccall(DiferrentErrorHandlingSpec, :b)}.should raise_error(/some error/)

data/spec/controller/{controller_helper_spec.rb → helper_spec.rb}

@@ -1,26 +1,20 @@
-require "controller/spec_helper"
+require "spec_helper"
 
-describe "AbstractController" do
-  with_environment
-  with_abstract_controller_spec
+describe "Abstract" do
   with_view_path "#{spec_dir}/views"
-  
-  before :all do
-    AbstractController = Rad::AbstractController  
-  end
+  with_abstract_controller  
   
   after :all do
     remove_constants %w(
       SomeHelperSpec
       HelperSpec
-      HelperMethodSpec
-      AbstractController
+      HelperMethodSpec      
     )
   end
   
   it "helper_method" do
     class ::HelperMethodSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       
       def some_controller_method
         "some controller value (rendered in cotext of #{self.class})"
@@ -41,13 +35,13 @@ describe "AbstractController" do
     end
     
     class ::HelperSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       
       helper SomeHelperSpec
       
       def action; end
     end
     
-    ccall(HelperSpec, :action).should == "some wighet (rendered in context of HelperSpec::HelperSpecControllerContext)"
+    ccall(HelperSpec, :action).should == "some wighet (rendered in context of HelperSpec::HelperSpecContext)"
   end  
 end

data/spec/controller/{http_controller_spec.rb → http_spec.rb}

@@ -1,23 +1,17 @@
-require "controller/spec_helper"
+require "spec_helper"
 
-describe "HttpController" do
-  with_environment
-  with_http
+describe "Http" do
+  isolate :conveyors
   
-  before :all do
-    HttpController = Rad::HttpController
-    
-    rad.after :environment do
-      rad.conveyors.web do |web|
-        web.use Rad::Processors::HttpWriter
-        web.use Rad::Processors::ControllerCaller
-      end
+  before do
+    rad.conveyors.web do |web|
+      web.use Rad::Http::Processors::HttpWriter
+      web.use Rad::Controller::Processors::ControllerCaller
     end
   end
-  
+
   after :all do
-    remove_constants %w(
-      HttpController
+    remove_constants %w(      
       ContentTypeSpec
       StatusSpec
       StatusShortcutsSpec
@@ -26,11 +20,11 @@ describe "HttpController" do
       ForbidGetSpec
     )
   end
-    
+  
   describe 'render' do
     it "should take :content_type option" do
       class ::ContentTypeSpec
-        inherit HttpController
+        inherit Rad::Controller::Http
         
         def action
           render inline: "some content", content_type: Mime.js
@@ -43,7 +37,7 @@ describe "HttpController" do
     
     it "should take :status option" do
       class ::StatusSpec
-        inherit HttpController
+        inherit Rad::Controller::Http
         
         def action
           render inline: "some content", status: 220
@@ -56,7 +50,7 @@ describe "HttpController" do
     
     it "should take shortcuts to status codes" do
       class ::StatusShortcutsSpec
-        inherit HttpController
+        inherit Rad::Controller::Http
         
         def ok
           render :ok
@@ -76,7 +70,7 @@ describe "HttpController" do
 
     it "should take :location option" do
       class ::LocationSpec
-        inherit HttpController
+        inherit Rad::Controller::Http
         
         def action
           render location: "/"
@@ -101,8 +95,8 @@ describe "HttpController" do
   
   it "should specify request method" do
     class ::RequestMethod
-      inherit HttpController
-      def action
+      inherit Rad::Controller::Http
+      def action               
         workspace.request.post?.should == true
       end
     end
@@ -113,7 +107,7 @@ describe "HttpController" do
   
   it "should protect methods from GET request" do
     class ::ForbidGetSpec
-      inherit HttpController
+      inherit Rad::Controller::Http
       allow_get_for :get_action
       
       def get_action; end

data/spec/controller/render_spec/views/relative_spec/a/form.erb

@@ -0,0 +1 @@
+form a

data/spec/controller/render_spec/views/relative_spec/a/show.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/spec/controller/render_spec/views/relative_spec/b/form.erb

@@ -0,0 +1 @@
+form b

data/spec/controller/{controller_render_spec.rb → render_spec.rb}

@@ -1,13 +1,8 @@
-require "controller/spec_helper"
+require "spec_helper"
 
 describe "Controller render" do
-  with_environment
-  with_abstract_controller_spec
   with_view_path "#{spec_dir}/views"
-  
-  before :all do
-    AbstractController = Rad::AbstractController
-  end
+  with_abstract_controller  
   
   after :all do
     remove_constants %w(
@@ -21,17 +16,17 @@ describe "Controller render" do
       AlreadyRenderedSpec
       SpecialFormatSpec
       AnotherActionSpec
-      InlineRenderSpec
-      AbstractController
+      InlineRenderSpec      
       InlineWithLayoutSpec
       MultipleActions
+      RelativeSpec
     )
   end
     
   describe 'layout' do  
     it "should use :except and :only in layout" do
       class ::LayoutFiltersSpec
-        inherit AbstractController
+        inherit Rad::Controller::Abstract
         layout '/layouts/app', only: :action_with_layout
         
         def action_with_layout; end
@@ -44,7 +39,7 @@ describe "Controller render" do
     
     it "should apply formats to layout" do
       class LayoutSpec
-        inherit AbstractController
+        inherit Rad::Controller::Abstract
         layout '/layouts/app'
       
         def action; end      
@@ -56,7 +51,7 @@ describe "Controller render" do
       
     it "should take layout: false or layout: '/another_layout'" do
       class AnotherLayout
-        inherit AbstractController
+        inherit Rad::Controller::Abstract
         layout '/layout/app'
         
         def action; end
@@ -77,7 +72,7 @@ describe "Controller render" do
     
     it "should take into account :layout when rendering template" do
       class ::ExplicitRenderSpec
-        inherit AbstractController
+        inherit Rad::Controller::Abstract
         layout '/layouts/app'
         
         def with_layout
@@ -96,7 +91,7 @@ describe "Controller render" do
   
   it "should render template inside of controller" do
     class ::RenderInsideOfControllerSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
 
       def some_action
         render '/some_template'
@@ -108,16 +103,16 @@ describe "Controller render" do
   
   it "should not allow to render partials as actions" do
     class ::ForbidPartialAsActionSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       def action; end
     end
 
-    lambda{ccall ForbidPartialAsActionSpec, :action}.should raise_error(/No template/)
+    ccall(ForbidPartialAsActionSpec, :action).should == ''
   end
   
   it "should render view with right format" do
     class FormatSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       def action; end
     end
 
@@ -125,16 +120,16 @@ describe "Controller render" do
     ccall(FormatSpec, :action, format: 'js').should == "js format"
   end
   
-  it "should be able to use Template.render for different purposes (mail for example)" do
-    Rad::Template.render("/standalone", locals: {a: 'a'}).should == 'standalone usage, a'
+  it "should be able to use rad.template.render for different purposes (mail for example)" do
+    rad.template.render("/standalone", locals: {a: 'a'}).should == 'standalone usage, a'
   end
   
   it "should not rener if already rendered in controller" do
     class ::AlreadyRenderedSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
 
       def action
-        render '/AlreadyRenderedSpec/custom_template'
+        render '/already_rendered_spec/custom_template'
       end
     end
 
@@ -143,7 +138,7 @@ describe "Controller render" do
   
   it "should handle serialization obj ('xml', 'json')" do
     class ::SpecialFormatSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       
       def json_action
         render json: {a: "b"}
@@ -163,7 +158,7 @@ describe "Controller render" do
   
   it "should render another action via action: :action_name" do
     class ::AnotherActionSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
   
       def another_action; end
       
@@ -177,7 +172,7 @@ describe "Controller render" do
     
   it "should take :inline option" do
     class ::InlineRenderSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       
       def action
         render inline: "content"
@@ -189,7 +184,7 @@ describe "Controller render" do
   
   it ":inline option should render without layout" do
     class ::InlineWithLayoutSpec
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       
       layout '/layouts/app'
       
@@ -203,7 +198,7 @@ describe "Controller render" do
   
   it "should render correct action inside of special 'actions.xxx' template file" do
     class ::MultipleActions
-      inherit AbstractController
+      inherit Rad::Controller::Abstract
       
       def increase; end
       def decrease; end
@@ -212,6 +207,21 @@ describe "Controller render" do
     
     ccall(MultipleActions, :increase).should == "plus\n"
     ccall(MultipleActions, :decrease).should == "minus\n"
-    ccall(MultipleActions, :action_without_template).should == ""
+    ccall(MultipleActions, :action_without_template).should == ''
+  end
+  
+  it "relative templates should be searched as: CurrentClass -> SuperClass -> SameDir" do
+    module ::RelativeSpec
+      class A
+        inherit Rad::Controller::Abstract
+        
+        def show; end
+      end
+    
+      class B < A
+      end
+    end
+    
+    ccall(RelativeSpec::B, :show).should == 'form b'
   end
 end

data/spec/{conveyor/conveyor_spec.rb → conveyors/conveyors_spec.rb}

@@ -1,17 +1,39 @@
-require "conveyor/spec_helper"
+require "spec_helper"
 
 describe "Conveyor" do
   inject conveyors: :conveyors
   
-  with_environment environment: :development
-  
   def call_conveyor
     r = conveyors.web.call(result: [])
     r.result
   end
   
+  after :all do
+    remove_constants %w(
+      SmokeTestASpec
+      SmokeTestBSpec
+      CommonCaseASpec
+      CommonCaseBSpec
+      NotCatchedErrorSpec
+      ErrorInAfterBlockASpec
+      ErrorInAfterBlockBSpec
+      ErrorBubblingASpec
+      ErrorBubblingBSpec
+    )
+  end
+  
+  isolate :conveyors
+  
+  before :all do
+    rad.mode = :development, true
+  end
+  
+  after :all do
+    rad.mode = :test, true
+  end
+  
   it "smoke test" do
-    class SmokeTestASpec < Rad::Processor      
+    class SmokeTestASpec < Rad::Conveyors::Processor      
       def call
         workspace.result << :a_before          
         next_processor.call
@@ -19,11 +41,11 @@ describe "Conveyor" do
       end
     end
 
-    class SmokeTestBSpec < Rad::Processor      
+    class SmokeTestBSpec < Rad::Conveyors::Processor      
       def call      
-        rad[:workspace].result << :b_before      
+        rad.workspace.result << :b_before      
         next_processor.call
-        rad[:workspace].result << :b_after
+        rad.workspace.result << :b_after
       end
     end
     
@@ -34,7 +56,7 @@ describe "Conveyor" do
   
   describe "error handling" do
     it "common case" do
-      class CommonCaseASpec < Rad::Processor
+      class CommonCaseASpec < Rad::Conveyors::Processor
         def call
           workspace.result << :a_before
               
@@ -46,7 +68,7 @@ describe "Conveyor" do
         end
       end    
   
-      class CommonCaseBSpec < Rad::Processor
+      class CommonCaseBSpec < Rad::Conveyors::Processor
         def call
           workspace.result << :b_before
           raise 'error before'
@@ -59,7 +81,7 @@ describe "Conveyor" do
     end
   
     it "should raise error if not catched" do
-      class NotCatchedErrorSpec < Rad::Processor
+      class NotCatchedErrorSpec < Rad::Conveyors::Processor
         def call
           workspace.result << :before
           raise 'error before'
@@ -71,7 +93,7 @@ describe "Conveyor" do
     end
   
     it "in after block" do
-      class ErrorInAfterBlockASpec < Rad::Processor
+      class ErrorInAfterBlockASpec < Rad::Conveyors::Processor
         def call
           workspace.result << :a_before
   
@@ -84,7 +106,7 @@ describe "Conveyor" do
       end    
   
   
-      class ErrorInAfterBlockBSpec < Rad::Processor
+      class ErrorInAfterBlockBSpec < Rad::Conveyors::Processor
         def call
           workspace.result << :b_before
           next_processor.call
@@ -99,7 +121,7 @@ describe "Conveyor" do
     end
   
     it "bubbling (from error)" do
-      class ErrorBubblingASpec < Rad::Processor
+      class ErrorBubblingASpec < Rad::Conveyors::Processor
         def call
           begin
             next_processor.call
@@ -109,7 +131,7 @@ describe "Conveyor" do
         end
       end
       
-      class ErrorBubblingBSpec < Rad::Processor
+      class ErrorBubblingBSpec < Rad::Conveyors::Processor
         def call
           raise 'error'
         end

data/spec/environment/config_spec.rb

@@ -1,30 +1,22 @@
-require 'environment/spec_helper'
+require 'spec_helper'
 
-require 'rad/environment'
+require 'rad'
 require 'rad/spec/environment'
 
-describe 'config' do  
-  before :each do 
-    @c = Rad::Config.new
-    @c.environment = 'development'
-    @c.key = 'value'
-    @c.key2 = 'value2'
+describe 'Config' do  
+  before do
+    rad.mode = :development, true
+    @c = Rad::Config.new key: 'value', key2: 'value2'    
   end
+  after{rad.mode = :test, true}
     
-  it "should merge with existing config" do    
-    @c.key2!.should == 'value2'
+  it "clone" do
+    c = Rad::Config.new a: {b: :c}
     
-    @c.merge_config! "#{spec_dir}/config.yml"
-    @c.key!.should == 'value'
-    @c.key2!.should == 'another_value'
-  end
-  
-  it "should merge hashes (with the following order: config.default <= config <= config.environment)" do   
-    @c.merge_config! "#{spec_dir}/config.yml"    
+    c2 = c.clone    
+    c.a.delete :b
+    c.delete :a
     
-    @c.user_service.default_key("invalid").should == 'default_value'
-    @c.user_service.key("invalid").should == 'value'
-    @c.user_service.test_key("invalid").should == 'test_value'
-    @c.user_service.name.should == 'test_name'
+    c2.a[:b].should == :c
   end
 end