rad_core 0.0.13 → 0.0.14

data/spec/environment/environment_spec.rb

@@ -1,65 +1,38 @@
-require 'environment/spec_helper'
+require 'spec_helper'
 
-require 'rad/environment'
 require 'rad/spec/environment'
 
 describe "Environment basic spec" do
   with_load_path "#{spec_dir}/path1", "#{spec_dir}/path2"
-      
-  inject env: :environment
-
-  before :all do        
+  
+  before :all do
     @path1, @path2 = "#{spec_dir}/path1", "#{spec_dir}/path2"
   end
   
   describe 'files' do    
-    with_environment
-    
     it "find_files?" do
-      env.file_exist?('/some_folder/some_file').should be_true
-      env.file_exist?('/file1').should be_true
+      environment.file_exist?('/some_folder/some_file').should be_true
+      environment.file_exist?('/file1').should be_true
     end
-  
+    
     it "find_file" do
-      lambda{env.find_file('/some_folder/some_file')}.should raise_error(/Found multiple files/)
-      env.find_file('/file1').should == "#{@path1}/file1"
-      lambda{env.find_file('file1')}.should raise_error(AssertionError)
+      lambda{environment.find_file('/some_folder/some_file')}.should raise_error(/Found multiple files/)
+      environment.find_file('/file1').should == "#{@path1}/file1"
+      lambda{environment.find_file('file1')}.should raise_error(AssertionError)
     end
-  
+    
     it "find_files" do
-      env.find_files('/some_folder/some_file').sort.should == ["#{@path1}/some_folder/some_file", "#{@path2}/some_folder/some_file"]
+      environment.find_files('/some_folder/some_file').sort.should == ["#{@path1}/some_folder/some_file", "#{@path2}/some_folder/some_file"]
     end
-  
+    
     it "find_files_by_pattern" do
-      env.find_files_by_pattern('/*/some_file').sort.should == ["#{@path1}/some_folder/some_file", "#{@path2}/some_folder/some_file"]
+      environment.find_files_by_pattern('/*/some_file').sort.should == ["#{@path1}/some_folder/some_file", "#{@path2}/some_folder/some_file"]
     end
   end
   
   describe 'config' do
-    with_environment
-
     it "smoke test" do
-      config
-    end
-  end
-  
-  describe "spec should be isolated (via swap_metadata)" do
-    describe "first spec" do
-      with_environment
-    
-      before :all do
-        rad.register(:spec_component)
-      end
-      
-      it "check" do
-        Micon.metadata.should include(:spec_component)
-      end
-    end
-    
-    describe "second spec" do
-      it "check" do
-        Micon.metadata.should_not include(:spec_component)
-      end
+      rad.config
     end
   end
 end

data/spec/environment/logger_spec.rb

@@ -1,19 +1,10 @@
-require 'environment/spec_helper'
+require 'spec_helper'
 
-require 'rad/environment'
+require 'rad'
+require 'rad/spec/environment'
 
 describe "Environment basic spec" do
-  before :all do
-    rad.clear
-    ::SILENCE_LOGGER = true
-  end
-  
-  after :all do    
-    rad.clear
-    remove_constants :SILENCE_LOGGER
-  end
-  
   it "logger should work before Rad initialized" do
-    rad[:logger].should_not be_nil
+    rad.logger.should_not be_nil
   end
 end

data/spec/environment/minimal_app_spec/app.rb

@@ -1 +1 @@
-rad[:config].environment = :test
+rad.mode = :test, true

data/spec/environment/minimal_app_spec.rb

@@ -1,25 +1,23 @@
-require 'environment/spec_helper'
+require 'spec_helper'
 
-require 'rad/environment'
+require 'rad'
 
-describe "Environment basic spec" do    
-  inject env: :environment
+describe "Minimal App" do    
+  # inject env: :environment
+
+  # with_micon
   
   before :all do
     load "#{spec_dir}/app.rb"
   end
   
-  after :all do
-    rad.clear
-  end
-  
   it "core components" do
-    rad[:logger].should_not be_nil
-    rad[:environment].should_not be_nil
-    rad[:config].should_not be_nil
+    rad.logger.should_not be_nil
+    rad.environment.should_not be_nil
+    rad.config.should_not be_nil
   end
   
-  it "application runtime_dir" do
-    env.config.runtime_dir?.should be_false
-  end
+  # it "application runtime_path" do
+  #   environment.config.runtime_path?.should be_false
+  # end
 end

data/spec/environment/standard_app_spec/app/lib/app/init.rb

@@ -1,3 +1,3 @@
-SpecResult << "init"
+$spec_result << "init"
 
 load 'plugin_a/init.rb'

data/spec/environment/standard_app_spec/plugin_a/lib/plugin_a/init.rb

@@ -1 +1 @@
-SpecResult << "plugin_a"
+$spec_result << "plugin_a"

data/spec/environment/standard_app_spec.rb

@@ -1,15 +1,9 @@
-require 'environment/spec_helper'
+require 'spec_helper'
 
-require 'rad/environment'
+require 'rad'
 require 'rad/spec/environment'
 
 describe "Environment basic spec" do    
-  before :each do    
-    SpecResult.clear    
-  end
-  
-  inject environment: :environment
-  
   the_spec_dir = with_tmp_spec_dir
   
   with_load_path(
@@ -18,31 +12,29 @@ describe "Environment basic spec" do
     "#{the_spec_dir}/app/lib"
   )
   
-  with_environment runtime_dir: the_spec_dir  
+  before do
+    rad.runtime_path = the_spec_dir, true
+    $spec_result = []
+  end
   
-  before :all do
-    Env = Rad::Environment    
-    ::SpecResult = []    
-  end  
+  after :all do
+    rad.delete_all :custom_component
+  end
   
-  before :each do
+  before do
     load "app/init.rb"
   end  
   
-  after :all do
-    remove_constants %w(SpecResult)
-  end  
-  
   it "core components" do
-    rad[:logger].should_not be_nil
-    rad[:environment].should_not be_nil
-    rad[:config].should_not be_nil
+    rad.logger.should_not be_nil
+    rad.environment.should_not be_nil
+    rad.config.should_not be_nil
   end
   
   it "loading order" do
-    rad[:environment]
-    rad.register :custom_component
-    rad[:custom_component]
-    SpecResult.should == %w(init plugin_a)
+    rad.environment
+    rad.register(:custom_component){true}
+    rad.custom_component
+    $spec_result.should == %w(init plugin_a)
   end
 end

data/spec/html/basic_html_helper_spec.rb

@@ -1,10 +1,13 @@
 require 'html/spec_helper'
 
-require 'rad/spec/xhtml'
-
 describe "BasicHtmlHelper" do
-  before :each do        
+  before do            
     @t = Rad::MockTemplateContext.new
+    @t.class_eval do 
+      def url_for *args
+        args.join(' ')
+      end
+    end
   end
         
   it "tag" do
@@ -13,7 +16,7 @@ describe "BasicHtmlHelper" do
     @t.buffer.should == %(<div class="hidden">content</div>)
   end
   
-  it "stylesheet_link_tag" do
+  it "stylesheet_link_tag"  do
     @t.stylesheet_link_tag('/public/js/app.css').should == %(<link href="/public/js/app.css" media="screen" rel="stylesheet" type="text/css"></link>)
   end
   

data/spec/html/form_helper_spec.rb

@@ -1,11 +1,11 @@
 require 'html/spec_helper'
 
 describe "FormHelper" do
-  class MockFormHelperContext < Rad::MockTemplateContext
-    include Rad::FormHelper
-  end
-  
-  before :each do
+  before do
+    class MockFormHelperContext < Rad::MockTemplateContext
+      include Rad::Html::FormHelper
+    end
+    
     @t = MockFormHelperContext.new
   end
   

data/spec/html/javascript_helper_spec.rb

@@ -1,11 +1,15 @@
 require 'html/spec_helper'
 
 describe "BasicHtmlHelper" do
-  class MockJavascriptHelperContext < Rad::MockTemplateContext
-    inherit Rad::JavascriptHelper
-  end
-  
-  before :each do        
+  before do        
+    class MockJavascriptHelperContext < Rad::MockTemplateContext
+      inherit Rad::Html::JavascriptHelper
+      
+      def url_for *args
+        args.join(' ')
+      end
+    end
+    
     @t = MockJavascriptHelperContext.new
   end
         

data/spec/html/model_helper_spec.rb

@@ -1,11 +1,11 @@
 require 'html/spec_helper'
 
 describe "ModelHelper" do
-  class MockModelHelperContext < Rad::MockTemplateContext
-    inherit Rad::FormHelper
-  end
-  
-  before :each do
+  before do
+    class MockModelHelperContext < Rad::MockTemplateContext
+      inherit Rad::Html::FormHelper
+    end
+    
     @t = MockModelHelperContext.new
   end
   
@@ -68,9 +68,12 @@ describe "ModelHelper" do
     } }
     doc = @t.buffer.to_xhtml
     
+    # checkbox is special case, we are using it with <input type='hidden' .../> tag.
+    doc.css("*[type='hidden']").first.should_be_fuzzy_equal_to name: "book[available]", value: '0'
     doc.css("*[type='checkbox']").first.should_be_fuzzy_equal_to name: "book[available]", value: '1'
+    
     doc.css("*[type='file']").first.should_be_fuzzy_equal_to name: "book[title]"
-    doc.css("*[type='hidden']").first.should_be_fuzzy_equal_to name: "book[title]", value: 'Super Hero'
+    doc.css("*[type='hidden']").last.should_be_fuzzy_equal_to name: "book[title]", value: 'Super Hero'
     doc.css("*[type='password']").first.should_be_fuzzy_equal_to name: "book[title]"
     doc.css("*[type='radio']").first.should_be_fuzzy_equal_to name: "book[available]", value: '1'
     doc.css("*[type='submit']").first.should_be_fuzzy_equal_to value: 'Ok'

data/spec/html/scoped_params_spec.rb

@@ -2,9 +2,9 @@ require 'html/spec_helper'
 
 describe "ScopedParams" do
   it "basic" do    
-    workspace = Rad::Workspace.new.update(params: {"book[title]" => "Super Hero"})
+    workspace = Rad::Conveyors::Workspace.new.update(params: {"book[title]" => "Super Hero"})
     
-    @processor = Rad::Processors::ScopedParams.new(lambda{})
+    @processor = Rad::Html::Processors::ScopedParams.new(lambda{})
     @processor.stub(:workspace).and_return(workspace)
     @processor.call
 

data/spec/html/spec_helper.rb

@@ -1,28 +1,20 @@
-require 'rspec_ext'
+require 'spec_helper'
+require 'rad/spec/xhtml'
 
-require 'rad/html'
+class Rad::MockTemplateContext
+  inherit Rad::Html::BasicHtmlHelper
+  
+  inject workspace: :workspace
 
-module Rad
-  class MockTemplateContext
-    inject config: :config, workspace: :workspace
-    
-    attr_accessor :output, :capture, :buffer
+  attr_accessor :output, :capture, :buffer
 
-    def capture &block
-      block.call
-    end
-      
-    def concat value = nil
-      @buffer ||= ""
-      @buffer << value
-      nil
-    end
-    
-    inherit Rad::BasicHtmlHelper
-    # include BasicHtmlHelper, FlashHelper, FormHelper, JavascriptHelper, UrlHelper
+  def capture &block
+    block.call
   end
-end
-
-
-require 'rad/spec/environment'
-require 'rad/spec/xhtml'
+  
+  def concat value = nil
+    @buffer ||= ""
+    @buffer << value
+    nil
+  end      
+end

data/spec/http/http_spec.rb

@@ -1,46 +1,25 @@
-require 'http/spec_helper'
+require 'spec_helper'
 
-describe "HTTP basics" do
-  inject environment: :environment, conveyors: :conveyors
+describe "Http basics" do
+  with_prepare_params
+  inject environment: :environment, conveyors: :conveyors    
   
-  the_spec_dir = with_tmp_spec_dir
-  with_environment environment: :development, runtime_dir: "#{the_spec_dir}/app/runtime"
+  isolate :conveyors
   
-  with_load_path(
-    "#{the_spec_dir}/app/lib",
-    "#{the_spec_dir}/plugin_a/lib",
-    "#{the_spec_dir}/plugin_b/lib",
-  )
-    
-  before :all do    
-    rad.after :environment do      
-      rad.conveyors.web do |web|
-        web.use Rad::Processors::HttpWriter
-        web.use Rad::Processors::PrepareParams
-        web.use Rad::Processors::EvaluateFormat
-      end
+  before do
+    rad.conveyors.web do |web|
+      web.use Rad::Http::Processors::HttpWriter
+      web.use Rad::Http::Processors::PrepareParams
+      web.use Rad::Http::Processors::EvaluateFormat
     end
   end
-  
-  after :all do
-    remove_constants %w(PrepareParamsStub)
-  end
-  
-  before :each do
-    load "app/init.rb"
-  end
-  
-  it "public symlink" do
-    rad[:environment]
-    rad.config.environment.should == 'development'
-    File.should exist("#{spec_dir}/app/runtime/public/plugin_b")
-  end
-  
+    
   it "http call" do    
     workspace = nil
-    Rad::HTTPAdapter.call Rad::HTTPAdapter.mock_environment do |c|
+
+    rad.http.call rad.http.mock_environment do |c|      
       c.call
-      workspace = rad[:workspace]
+      workspace = rad.workspace
     end
     # .should == [200, {"Content-Type" => "text/html"}, ""]      
     

data/spec/http/micelaneous_spec.rb

@@ -1,8 +1,8 @@
-require 'http/spec_helper'
+require 'spec_helper'
 
-describe "HTTP basics" do
+describe "Http basics" do
   it "response should accept string status messages" do
-    response = Rad::Response.new
+    response = Rad::Http::Response.new
     
     response.status = :error
     response.status.should == 500

data/spec/{mail → mailer}/mail_controller_spec.rb

@@ -1,19 +1,17 @@
-require "mail/spec_helper"
+require "spec_helper"
 
-describe "MailController" do
-  with_environment
-  with_mail
+describe "MailerController" do
   with_view_path "#{spec_dir}/views"
   
-  before :all do
-    MailController = Rad::MailController
-  end
+  isolate :conveyors
+  
+  before{load 'rad/profiles/mailer.rb'}
   
   after :all do
-    remove_constants %w(
-      MailController
+    remove_constants %w(      
       ExplicitBodySpec
       BodyTemplateSpec
+      CopyParamsSpec
     )
   end
   
@@ -24,7 +22,7 @@ describe "MailController" do
   describe "building letter" do
     it "shouldn't render view if body explicitly specified" do    
       class ::ExplicitBodySpec
-        inherit MailController
+        inherit Rad::Mailer::MailerController
       
         def signup model
           @from, @to, @subject = model.from, model.to, model.subject
@@ -38,7 +36,7 @@ describe "MailController" do
     
     it "should use template for body" do
       class ::BodyTemplateSpec
-        inherit MailController
+        inherit Rad::Mailer::MailerController
       
         def signup model, name
           @name = name
@@ -49,10 +47,36 @@ describe "MailController" do
       letter = BodyTemplateSpec.signup(common_letter, "Ben")
       letter.to_h.to_openobject.should == common_letter.merge(body: 'Hello Ben, signup notification.')
     end
+    
+    it "should copy workspace variables from current :cycle (from error, all checks important, don't delete anything!)" do    
+      class ::CopyParamsSpec
+        inherit Rad::Mailer::MailerController
+      
+        def signup model
+          @from, @to, @subject = model.from, model.to, model.subject
+          @body = "language: #{params.l}, key: #{workspace.key}, space: #{rad.space}"
+        end
+      end
+      
+      rad.register :space, scope: :cycle
+      
+      letter = nil
+      rad.activate :cycle, {} do
+        rad.space = 'space'
+        w = rad.workspace = Rad::Conveyors::Workspace.new
+        w.key = 'value'
+        w.params = Rad::Conveyors::Params.new
+        w.params.l = 'ru'
+    
+        letter = CopyParamsSpec.signup(common_letter)
+      end
+            
+      letter.to_h.to_openobject.should == common_letter.merge(body: 'language: ru, key: value, space: space')
+    end
   end
   
   it "delivering" do
-    letter = Rad::Letter.new common_letter.merge(body: "some text")
+    letter = Rad::Mailer::Letter.new common_letter.merge(body: "some text")
     letter.deliver
     letter.deliver
     

data/spec/mailer/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rspec_ext'
+
+require 'rad/profiles/mailer'
+
+require 'rad/spec'

data/spec/remote/remote_spec.rb

@@ -1,12 +1,28 @@
-require 'remote/spec_helper'
+require 'spec_helper'
 
 describe "Remote Basic" do
-  with_environment
-  with_remote_spec
+  isolate :conveyors
+  
+  before do
+    rad.conveyors.services do |ss|
+      ss.use Rad::Remote::Processors::RemoteCaller, :content
+    end
+  end
+  
+  old_mode = rad.mode
+  after :all do
+    remove_constants %w(
+      BasicSpec
+      JsonErrorSpec
+      UnregisteredReturnValueSpec
+    )
+    
+    rad.mode = old_mode, true
+  end
   
   it "basic" do
     class BasicSpec
-      inherit Rad::Remote
+      inherit Rad::Remote::RemoteController
       
       def call
         {result: 'some result'}
@@ -31,15 +47,14 @@ describe "Remote Basic" do
   describe "error handling should behave different in :production, :development and :test modes" do
     it "error in :development mode" do    
       class JsonErrorSpec
-        inherit Rad::Remote
+        inherit Rad::Remote::RemoteController
       
         def call_with_error
           raise 'some error'
         end
       end
     
-      config.environment = :development
-      silence_logger!
+      rad.mode = :development, true
     
       workspace = rcall JsonErrorSpec, 'call_with_error', format: 'json'
     
@@ -61,7 +76,7 @@ describe "Remote Basic" do
   
   it "should not allow unregistered object types be used as return value" do
     class UnregisteredReturnValueSpec
-      inherit Rad::Remote
+      inherit Rad::Remote::RemoteController
       
       def call
         Object.new