rad_core 0.0.13 → 0.0.14

data/spec/{integration → web}/flash_spec.rb

@@ -1,61 +1,76 @@
+require 'spec_helper'
 require 'html/spec_helper'
-require 'integration/spec_helper'
 
 describe "Flash" do
-  with_environment environment: :development
+  with_prepare_params
   
-  class MockFlashContext < Rad::MockTemplateContext
-    include Rad::FlashHelper , Rad::ControllerRoutingHelper
+  isolate :conveyors, before: :all
+  
+  before :all do
+    rad.mode = :development, true
+    rad.web
+    rad.reset :conveyors
     
-    def url_for *args;
+    class MockFlashContext < Rad::MockTemplateContext
+      include Rad::Html::FlashHelper, Rad::ControllerRoutingHelper
+
+      def url_for *args;
+      end
     end
-  end
-  
-  class FlashTestRenderCaller < Rad::Processor
-    def call
-      context = MockFlashContext.new
-      block = workspace.check_flash.request
-      catch :halt_render do
-        block.call context if block
-      end      
-      workspace.request_done = true
-      
-      next_processor.call
+
+    class FlashTestRenderCaller < Rad::Conveyors::Processor
+      def call
+        context = MockFlashContext.new
+        block = workspace.check_flash.request
+        catch :halt do
+          block.call context if block
+        end      
+        workspace.request_done = true
+
+        next_processor.call
+      end
     end
-  end
-  
-  class FlashTestHelper < Rad::Processor
-    def call
-      block = workspace.check_flash.before_request
-      block.call workspace if block
-      workspace.before_request_done = true
+
+    class FlashTestHelper < Rad::Conveyors::Processor
+      def call
+        block = workspace.check_flash.before_request
+        block.call workspace if block
+        workspace.before_request_done = true
+
+        next_processor.call
+
+        block = workspace.check_flash.after_request
+        block.call workspace if block
+        workspace.after_request_done = true    
+      end
+    end
+    
     
-      next_processor.call
-      
-      block = workspace.check_flash.after_request
-      block.call workspace if block
-      workspace.after_request_done = true    
+    rad.conveyors.web do |web|
+      web.use Rad::Http::Processors::PrepareParams
+      web.use FlashTestHelper
+      web.use Rad::Html::Processors::PrepareFlash
+      web.use FlashTestRenderCaller
     end
   end
+  
+  after :all do
+    rad.mode = :test, true
     
-  before :all do    
-    rad.after :environment do      
-      rad.conveyors.web do |web|
-        web.use Rad::Processors::PrepareParams
-        web.use FlashTestHelper
-        web.use Rad::Processors::PrepareFlash
-        web.use FlashTestRenderCaller
-      end
-    end    
+    remove_constants %w(
+      MockFlashContext
+      FlashTestRenderCaller
+      FlashTestHelper
+    )
   end
   
   def check_flash opt            
     workspace = nil 
-    result = Rad::HTTPAdapter.call(Rad::HTTPAdapter.mock_environment, check_flash: opt.to_openobject) do |c|
+    result = rad.http.call(rad.http.mock_environment, check_flash: opt.to_openobject) do |c|
       c.call
-      workspace = rad[:workspace]
+      workspace = rad.workspace
     end
-    
+
     workspace.before_request_done.should be_true
     workspace.request_done.should be_true
     workspace.after_request_done.should be_true    
@@ -65,7 +80,7 @@ describe "Flash" do
   it "flash should be extracted from session if there's any" do
     check_flash(
       before_request: lambda{|workspace|        
-        workspace.params.format = 'html'
+        workspace.params.format = 'html'        
         workspace.request.session['flash'] = {info: 'Ok'}.to_json
       },
       request: lambda{|context|

data/spec/{integration → web}/spec_helper_spec.rb

@@ -1,15 +1,16 @@
-require "controller/spec_helper"
+require "spec_helper"
 
 describe "spec helper" do
-  with_environment
-  with_http
-  with_router
+  isolate :router, :conveyors
   
-  before :all do
+  before do
+    rad.web
+    rad.reset :conveyors
+    
     load 'rad/profiles/web.rb'
     
     class ::Planes
-      inherit Rad::HttpController
+      inherit Rad::Controller::Http
       
       def fly
         render inline: 'all right'
@@ -20,7 +21,7 @@ describe "spec helper" do
   after :all do
     remove_constants :Planes
   end
-    
+      
   describe 'wcall' do
     it "basic usage" do
       wcall(Planes, :fly).should =~ /all right/
@@ -45,10 +46,10 @@ describe "spec helper" do
   end
   
   describe "routes" do
-    before :each do
+    before do
       router = rad[:router]
-      router.routes.unshift :restful_router, Rad::RestfulRouter.new
-      router.routes[:restful_router].add :planes, class: Planes
+      router.routers.unshift :restful_router, Rad::Router::RestfulRouter.new
+      router.routers[:restful_router].add :planes, class_name: 'Planes'
     end
     
     it "url_for, url_for_path" do

data/spec/{integration → web}/view_routing_helper_spec.rb

@@ -1,8 +1,13 @@
+require 'spec_helper'
 require 'html/spec_helper'
-require 'integration/spec_helper'
 
-describe "UrlHelper" do
+describe "UrlHelper" do 
+  isolate :conveyors
+   
   before :all do
+    rad.web
+    rad.reset :conveyors
+    
     class MockRouter < Rad::Router
       def url_for_path path, params
         path = if params.blank?
@@ -45,71 +50,74 @@ describe "UrlHelper" do
     remove_constants :MOCK_ROUTER, :MockRouter, :MockUrlHelperContext
   end
   
-  before :each do        
+  before do        
     @t = MockUrlHelperContext.new
   end
   
-  describe "link_to" do
-    before :all do
-      rad[:config] = Rad::Config.new
-    end
-    
-    after :all do
-      rad.clear
-    end
-    
+  describe "link_to" do    
     it "should works with url_for attributes" do
-      @t.link_to('Book', Object, :method, {format: 'json'}, class: 'highlight').to_xhtml('a').
-        should_be_fuzzy_equal_to(class: "highlight", href: "url_for: Object.method?format=json", content: "Book")
+      @t.link_to('Book', Object, :method, {format: 'html'}, class: 'highlight').to_xhtml('a').
+        should_be_fuzzy_equal_to(class: "highlight", href: "url_for: Object.method?format=html", content: 'Book')
         
-      @t.link_to(Object, :method, {format: 'json'}, class: 'highlight'){'Book'}.to_xhtml('a').
-        should_be_fuzzy_equal_to(class: "highlight", href: "url_for: Object.method?format=json", content: "Book")
+      @t.link_to(Object, :method, {format: 'html'}, class: 'highlight'){'Book'}.to_xhtml('a').
+        should_be_fuzzy_equal_to(class: "highlight", href: "url_for: Object.method?format=html", content: 'Book')
         
       @t.link_to('Book', :method).to_xhtml('a').
-        should_be_fuzzy_equal_to(href: "url_for: .method", content: "Book")
+        should_be_fuzzy_equal_to(href: "url_for: .method", content: 'Book')
     end
     
     it "should works with url_for_path attributes" do
       @t.link_to('Book', '/some_book', class: 'highlight').to_xhtml('a').
-        should_be_fuzzy_equal_to(class: "highlight", href: "/some_book", content: "Book")      
+        should_be_fuzzy_equal_to(class: "highlight", href: "/some_book", content: 'Book')      
       
       @t.link_to('/some_book', class: 'highlight'){'Book'}.to_xhtml('a').
-        should_be_fuzzy_equal_to(class: "highlight", href: "/some_book", content: "Book")
+        should_be_fuzzy_equal_to(class: "highlight", href: "/some_book", content: 'Book')
         
       @t.link_to('/some_book'){'Book'}.to_xhtml('a').
-        should_be_fuzzy_equal_to(href: "/some_book", content: "Book")
+        should_be_fuzzy_equal_to(href: "/some_book", content: 'Book')
     end
     
     it "links for 'js', 'json' formats should be automatically became remote" do
       @t.link_to('Book', @t.url_for('/some_book', format: 'json')).to_xhtml('a').should_be_fuzzy_equal_to(
-        href: "url_for: /some_book?format=json", content: "Book",
-        onclick: "$(this).link_to({method: 'get', ajax: true}); return false;"
+        href: '#', content: 'Book',
+        'data-action' => 'url_for: /some_book?format=json', 'data-method' => 'post', 'data-remote' => 'true'
+      )
+      
+      @t.link_to('Book', :method, format: 'js').to_xhtml('a').should_be_fuzzy_equal_to(
+        href: '#', content: 'Book',
+        'data-action' => 'url_for: .method?format=js', 'data-method' => 'post', 'data-remote' => 'true'
       )
       
       @t.link_to('Book', :method, {format: 'js'}, class: 'highlight').to_xhtml('a').should_be_fuzzy_equal_to(
-        href: "url_for: .method?format=js", content: "Book", class: 'highlight',
-        onclick: "$(this).link_to({method: 'get', ajax: true}); return false;"
+        href: '#', content: 'Book', class: 'highlight',
+        'data-action' => 'url_for: .method?format=js', 'data-method' => 'post', 'data-remote' => 'true'
       )
     end
     
     it "confirm" do
-      @t.link_to('Book', '/some_book', confirm: 'Are you shure?').to_xhtml('a').should_be_fuzzy_equal_to(
-        href: "/some_book", content: "Book",
-        onclick: "return confirm('Are you shure?');"
+      attrs = @t.link_to('Book', '/some_book', confirm: 'Are you shure?').to_xhtml('a')
+      attrs.should_not include('data-remote')
+      attrs.should_not include('data-action')
+      attrs.should_not include('data-method')
+      attrs.should_be_fuzzy_equal_to(
+        href: "/some_book", content: 'Book',
+        'data-confirm' => "Are you shure?"
       )
     end
     
     it "POST method" do
-      @t.link_to('Book', '/some_book', method: :post).to_xhtml('a').should_be_fuzzy_equal_to(
-        href: "/some_book", content: "Book",
-        onclick: "$(this).link_to({method: 'post'}); return false;"
-      )
+      attrs = @t.link_to('Book', '/some_book', method: :post).to_xhtml('a')
+      attrs.should_not include('data-remote')
+      attrs.should_be_fuzzy_equal_to(
+        href: "#", content: 'Book',
+        'data-action' => '/some_book', 'data-method' => 'post'
+      )      
     end
     
     it "remote" do
       @t.link_to('Book', '/some_book', remote: true).to_xhtml('a').should_be_fuzzy_equal_to(
-        href: "/some_book", content: "Book",
-        onclick: "$(this).link_to({method: 'get', ajax: true}); return false;"
+        href: "#", content: 'Book',
+        'data-action' => '/some_book', 'data-method' => 'post', 'data-remote' => 'true'
       )
     end
     
@@ -122,13 +130,13 @@ describe "UrlHelper" do
       workspace.stub(:request).and_return(request)
       @t.stub(:workspace).and_return(workspace)
       
-      @t.link_to('Book', :back).to_xhtml('a').should_be_fuzzy_equal_to(href: "/go_back", content: "Book")
+      @t.link_to('Book', :back).to_xhtml('a').should_be_fuzzy_equal_to(href: "/go_back", content: 'Book')
       @t.link_to('Book', :back, class: '_some_js_mark').to_xhtml('a').
-        should_be_fuzzy_equal_to(href: "/go_back", class: '_some_js_mark', content: "Book")
+        should_be_fuzzy_equal_to(href: "/go_back", class: '_some_js_mark', content: 'Book')
     end
     
     it "#" do
-      @t.link_to('Book', '#').to_xhtml('a').should_be_fuzzy_equal_to(href: "#", content: "Book")
+      @t.link_to('Book', '#').to_xhtml('a').should_be_fuzzy_equal_to(href: "#", content: 'Book')
     end
   end
 end