rad_core 0.0.13 → 0.0.14

data/spec/router/{basic_spec.rb → router_spec.rb}

@@ -1,10 +1,9 @@
-require 'router/spec_helper'
+require 'spec_helper'
 
-describe "Router Basic" do
-  
-  before :all do
+describe "Router Basic" do  
+  before :all do    
     class ::BlogsController
-      include Rad::CoreRoutingHelper
+      include Rad::Router::CoreRoutingHelper
       
       def show; end
     end
@@ -14,42 +13,40 @@ describe "Router Basic" do
     remove_constants %w(BlogsController)
   end
   
-  before :each do
+  before do
     @router = Rad::Router.new :class
     
-    @params = Rad::Params.new
+    @params = Rad::Conveyors::Params.new
     @router.stub(:safe_workspace).and_return({params: @params}.to_openobject)
   end
   
   it "encode" do
     @router.encode(BlogsController, :show, format: 'json').should == ["/blogs_controller/show.json", {}]
   end
-  
+    
   it "encode_method" do
-    lambda{@router.encode_method :class_method}.should raise_error(/route method/)    
-    @router.routes.first.should_receive(:encode_method).and_return([BlogsController, :show])
-    @router.encode_method(:class_method).should == [BlogsController, :show]
+    lambda{@router.encode_method :class_method, false}.should raise_error(/route method/)    
+    @router.routers.first.should_receive(:encode_method).and_return([BlogsController, :show])
+    @router.encode_method(:class_method, false).should == [BlogsController, :show]
   end
     
   it "decode" do    
     @router.decode("/blogs_controller/show", {}).should == [BlogsController, :show, {}]
-  end  
-  
-  it "skip" do
-    @router.skip(/\/fs/)
-    
-    skip = catch :skip do
-      @router.decode("/fs/user/avatar", {})
-      nil
-    end
-    skip.should_not be_nil
-  end
+  end    
     
   describe "url_for" do
     it "should convert complex params to json" do
       @router.url_for(BlogsController, :show, a: :b, as_json: true).should == %(/blogs_controller/show?json=%7B%22a%22%3A%22b%22%7D)
     end
     
+    it "should works with full url" do
+      @router.url_for('http://google.com').should == "http://google.com"
+    end
+    
+    it "should not allow to use url_root/params/format with full url (http://)" do
+      lambda{@router.url_for('http://google.com', {a: 'b'})}.should raise_error(/can't use option/)      
+    end
+    
     it "should escape params" do
       @router.url_for(BlogsController, :show, a: 'b/c').should == "/blogs_controller/show?a=b%2Fc"
     end
@@ -83,10 +80,16 @@ describe "Router Basic" do
       @router.url_for(BlogsController, :show, options).should == "/blogs_controller/show.js"
       options.should == {format: :js}
     end
+    
+    # it "should check for false :url_root (from error)" do
+    #   config.set! :url_root, '/bag'
+    # 
+    #   @router.url_for("/some_url", url_root: false).should == "/some_url"
+    # end    
   end
   
   describe "persistent params" do
-    before :each do
+    before do
       @router.persistent_params << :l
     end
     

data/spec/router/routing_helper_spec.rb

@@ -1,10 +1,9 @@
-require 'router/spec_helper'
+require 'spec_helper'
 
-describe "Routing Helper" do
-  
+describe "Routing Helper" do    
   before :all do
     class ::BlogsController
-      include Rad::CoreRoutingHelper
+      include Rad::Router::CoreRoutingHelper
       
       def show; end
     end
@@ -14,10 +13,10 @@ describe "Routing Helper" do
     remove_constants %w(BlogsController)
   end
   
-  before :each do
+  before do
     @router = Rad::Router.new :class
     
-    @params = Rad::Params.new
+    @params = Rad::Conveyors::Params.new
     @router.stub(:safe_workspace).and_return({params: @params}.to_openobject)
     
     @controller = BlogsController.new

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'rspec_ext'
+
+require 'rad'
+require 'rad/spec'

data/spec/support/callbacks_spec.rb

@@ -1,6 +1,6 @@
 require 'support/spec_helper'
 
-require "rad/support/callbacks"
+require "rad/_support/callbacks"
 
 describe "Callbacks" do
   before :all do

data/spec/support/filters_spec.rb

@@ -1,7 +1,7 @@
 require 'support/spec_helper'
 
-require "rad/support/callbacks"
-require "rad/support/filters"
+require "rad/_support/callbacks"
+require "rad/_support/filters"
 
 describe "Filters" do
   module ARemote

data/spec/support/spec_helper.rb

@@ -1,4 +1,4 @@
 require 'rspec_ext'
 
-require 'rad/support/active_support'
+require 'rad/_support/active_support'
 require 'ruby_ext'

data/spec/template/template_spec/views/format_for_partials/dialog.js.erb

@@ -1 +1 @@
-$.showDialog(<%= render 'form' %>)
+rad.dialog().show("<%= render 'form' %>")

data/spec/template/template_spec/views/nested/format/a.erb

@@ -1 +1 @@
-<%= options.format %> format, <%= render 'b' %>
+<%= render 'b' %>

data/spec/template/template_spec/views/nested/format/b.js.erb

@@ -0,0 +1 @@
+b.js

data/spec/template/template_spec/views/nesting_format/dialog.js.erb

@@ -1 +1 @@
-$.showDialog(<%= render 'edit', format: 'html' %>)
+rad.dialog().show("<%= render 'edit', format: 'html' %>")

data/spec/template/template_spec.rb

@@ -1,47 +1,51 @@
-require 'template/spec_helper'
+require 'spec_helper'
 
 describe "Template" do
-  Template = Rad::Template
-  
-  delegate :render, to: Template
-  
-  with_environment environment: :development
   with_view_path "#{spec_dir}/views"
   
-  before :all do
-    ::RenderResult = OpenObject.new
-    
+  before :all do      
     class ::SomeObject
       attr_accessor :ivariable      
     end
+  end    
+  after :all do
+    remove_constants %w(SomeObject)
   end
   
-  after :all do
-    remove_constants %w(SomeObject RenderResult)
+  before do
+    rad.mode = :development, true
+    $render_result = OpenObject.new
+  end  
+  after{rad.mode = :test, true}
+  
+  inject template: :template
+  
+  def render *a, &b
+    template.render *a, &b
   end
   
   describe 'special' do
     it "read" do
-      Template.read('/other/template').should == %{<% "ruby code" %> content}
+      template.read('/other/template').should == %{<% "ruby code" %> content}
     end
     
     it "exist?" do
-      Template.should exist('/other/template')
-      Template.should_not exist('/other/non-existing-template')
+      template.should exist('/other/template')
+      template.should_not exist('/other/non-existing-template')
     end
     
     it "template prefixes" do
-      Template.exist?('/prefixes/underscored', prefixes: ['']).should be_false
+      template.exist?('/prefixes/underscored', prefixes: ['']).should be_false
       render('/prefixes/underscored', prefixes: ['_', '']).should == "underscored"
       render('/prefixes/underscored.erb', prefixes: ['_', '']).should == "underscored"
       
-      Template.exist?('/prefixes/without_prefix', prefixes: ['_']).should be_false
+      template.exist?('/prefixes/without_prefix', prefixes: ['_']).should be_false
       render('/prefixes/without_prefix', prefixes: ['']).should == "whthout prefix"
     end
     
     it "should not use prefixes for :action" do
-      Template.exist?('/prefixes/underscored').should be_true
-      Template.exist?('/prefixes/underscored', action: true).should be_false
+      template.exist?('/prefixes/underscored').should be_true
+      template.exist?('/prefixes/underscored', prefixes: [''], exact_format: true).should be_false
     end
   end
   
@@ -69,11 +73,11 @@ Yield: content for :content}
     end
     
     it "should not render wrong format if :action specified" do
-      Template.exist?('/basic/non_existing_format', format: 'html', action: true).should be_true
-      Template.exist?('/basic/non_existing_format', format: :invalid, action: true).should be_false
+      template.exist?('/basic/non_existing_format', format: 'html', prefixes: [''], exact_format: true).should be_true
+      template.exist?('/basic/non_existing_format', format: :invalid, prefixes: [''], exact_format: true).should be_false
       
       # from error
-      Template.exist?('non_existing_format', format: :invalid, action: true, current_dir: "#{spec_dir}/views/basic").should be_false
+      template.exist?('non_existing_format', format: :invalid, prefixes: [''], exact_format: true, current_dir: "#{spec_dir}/views/basic").should be_false
     end
     
     it "extension" do
@@ -82,31 +86,31 @@ Yield: content for :content}
     end
     
     it "must support custom context_class" do
-      class CustomTemplateContext < Rad::TemplateContext
+      class CustomTemplateContext < Rad::Template::Context
         def custom_helper
           'custom helper'
         end
       end
     
-      render('/basic/custom_context', context_class: CustomTemplateContext).should == "content from custom helper"
+      render('/basic/custom_context', context: CustomTemplateContext.new).should == "content from custom helper"
     end
     
-    it "must support explicit context, and it should overtake context_class" do
-      class CustomTemplateContext < Rad::TemplateContext
-        def custom_helper
-          'custom helper'
-        end
-      end
-    
-      render(
-        '/basic/custom_context', 
-        context: CustomTemplateContext.new, 
-        context_class: Object
-      ).should == "content from custom helper"
-    end
+    # it "must support explicit context, and it should overtake context_class" do
+    #   class CustomTemplateContext < Rad::Template::Context
+    #     def custom_helper
+    #       'custom helper'
+    #     end
+    #   end
+    # 
+    #   render(
+    #     '/basic/custom_context', 
+    #     context: CustomTemplateContext.new, 
+    #     context_class: Object
+    #   ).should == "content from custom helper"
+    # end
     
     it "no template" do
-      lambda{render('/non-existing-template')}.should raise_error(/No template/)
+      lambda{render('/non-existing-template')}.should raise_error(/no template/)
     end
     
     it "should render arbitrary file" do
@@ -116,19 +120,19 @@ Yield: content for :content}
   
   describe 'format' do
     it "basic" do
-      render('/format/format', format: 'html', action: true).should == "html format"
-      render('/format/format', format: 'js', action: true).should == "js format"
-      render('/format/format', format: :non_existing, action: true).should == "universal format"
-      render('/format/format.html', format: 'js', action: true).should == "html format"
-      render('/format/format.html.erb', format: 'js', action: true).should == "html format"
+      render('/format/format', format: 'html', prefixes: [''], exact_format: true).should == "html format"
+      render('/format/format', format: 'js', prefixes: [''], exact_format: true).should == "js format"
+      render('/format/format', format: :non_existing, prefixes: [''], exact_format: true).should == "universal format"
+      render('/format/format.html', format: 'js', prefixes: [''], exact_format: true).should == "html format"
+      render('/format/format.html.erb', format: 'js', prefixes: [''], exact_format: true).should == "html format"
     end
     
     it "nesting different formats" do
-      render('/nesting_format/dialog', format: 'js', action: true).should == "$.showDialog(dialog, dialog form)"
+      render('/nesting_format/dialog', format: 'js', prefixes: [''], exact_format: true).should == %(rad.dialog().show("dialog, dialog form"))
     end
     
     it "should not force format for partials (if :action not specified)" do
-      render('/format_for_partials/dialog', format: 'js', action: true).should == "$.showDialog(dialog form)"
+      render('/format_for_partials/dialog', format: 'js', prefixes: [''], exact_format: true).should == %(rad.dialog().show("dialog form"))
     end
   end
   
@@ -145,14 +149,24 @@ Yield: content for :content}
     end
     
     it "nested templates should use the same format" do
-      render('/nested/format/a', format: 'js').should == "js format, js format"
+      render('/nested/format/a', format: 'js').should == "b.js"
+      # render('/nested/format/a', format: 'html')
     end
   end
   
   describe "layout" do
-    def render_with_layout template, options, layout
-      content, context = Template.basic_render(Template.parse_arguments(template, options))
-      Template.render_layout(layout, content: content, context: context)
+    def render_with_layout path, options, layout
+      content, context = template.basic_render(template.parse_arguments(path, options))
+
+      render layout, context: context do |*args|
+        if args.empty?
+          content
+        else
+          args.size.must_be == 1
+          variable_name = args.first.to_s
+          context.content_variables[variable_name]
+        end
+      end
     end
     
     it "templates and layout must share the same context" do

data/spec/template/tilt_spec/views/concat_and_capture.erb

@@ -1 +1 @@
-<% concat "text for concatenation" %><% RenderResult.erb_capture = capture do %>text for capturing<% end %>
+<% concat "text for concatenation" %><% $render_result.erb_capture = capture do %>text for capturing<% end %>

data/spec/template/tilt_spec/views/concat_and_capture.haml

@@ -1,3 +1,3 @@
 - concat "text for concatenation"
-- RenderResult.haml_capture = capture do
+- $render_result.haml_capture = capture do
 	text for capturing

data/spec/template/tilt_spec.rb

@@ -1,15 +1,16 @@
-require 'template/spec_helper'
+require 'spec_helper'
 
 describe "Tilt" do
-  with_environment environment: :development
   with_view_path "#{spec_dir}/views"
   
-  delegate :render, to: Rad::Template
+  inject template: :template
+  
+  def render *a, &b
+    template.render *a, &b
+  end
   
   before :all do
-    ::RenderResult = OpenObject.new
-    
-    class TemplateContextStub < Rad::TemplateContext
+    class TemplateContextStub < Rad::Template::Context
       def tag name, content = nil, &block      
         if block_given?
           content = capture(&block)
@@ -22,15 +23,12 @@ describe "Tilt" do
     end
   end
   
-  after :all do
-    remove_constants %w(RenderResult)
+  before do
+    $render_result = OpenObject.new
+    rad.mode = :development, true
   end
+  after{rad.mode = :test, true}
   
-  # def render template_name, options = {}
-  #   options[:context_class] ||= TemplateContextStub
-  #   Rad::Template.render template_name, options
-  # end
-  # 
   it "haml should be ugly" do
     render('/ugly.haml').should_not =~ /^\s/
   end
@@ -42,10 +40,10 @@ describe "Tilt" do
   
   it "concat & capture" do    
     render('/concat_and_capture.erb').should =~ /^text for concatenation.?$/
-    RenderResult.erb_capture.should =~ /^text for capturing.?$/
+    $render_result.erb_capture.should =~ /^text for capturing.?$/
     
     render('/concat_and_capture.haml').should =~ /^text for concatenation.?$/
-    RenderResult.haml_capture.should =~ /^text for capturing.?$/
+    $render_result.haml_capture.should =~ /^text for capturing.?$/
   end
   
   it "yield" do
@@ -61,19 +59,19 @@ describe "Tilt" do
     it "broken haml concat (from error)" do
       render(
         '/mixed_templates/broken_haml_concat_haml',
-        context_class: TemplateContextStub
+        context: TemplateContextStub.new
       ).gsub("\n", "").should == "<div>some content</div>"
       
       render(
         '/mixed_templates/broken_haml_concat_erb',
-        context_class: TemplateContextStub
+        context: TemplateContextStub.new
       ).gsub("\n", "").should == "<div>some content</div>"
     end
   
     it "broken erb concat (from error)" do
       render(
         '/mixed_templates/broken_erb_concat_erb', 
-        context_class: TemplateContextStub
+        context: TemplateContextStub.new
       ).gsub("\n", "").should == "haml content<div>\tsome content</div>"
     end
   end
@@ -92,7 +90,7 @@ describe "Tilt" do
       end
     end
     
-    render('/nested_capture_and_concat', context_class: TestTC).gsub("\n", '').should == 
+    render('/nested_capture_and_concat', context: TestTC.new).gsub("\n", '').should == 
       "<form_tag><form_field>some field</form_field></form_tag>"
   end
 end

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

@@ -1,27 +1,25 @@
-require 'integration/spec_helper'
+require 'spec_helper'
 
-describe "Integration" do
-  with_environment
-  with_http
+describe "Core" do  
   with_load_path spec_dir
+  isolate :conveyors, before: :all
   
   before :all do
-    HttpController = Rad::HttpController
     load 'rad/profiles/web.rb'
   end
   
   after :all do        
-    remove_constants %w(
-      HttpController
+    remove_constants %w(      
       SmokeTestSpec
       JsonFormatSpec
       RequestAndSessionSpec
+      FullUrl
     )
   end
   
-  it "smoke test" do
+  it "smoke test" do    
     class ::SmokeTestSpec
-      inherit HttpController
+      inherit Rad::Controller::Http
       
       def action
         respond_to do |format|
@@ -35,12 +33,33 @@ describe "Integration" do
     response.body.should == %(some content)
     
     wcall("/smoke_test_spec/action", format: 'json')
-    response.body.should == %({"a":"b"})
+    response.body.should == %({"a":"b"})        
+  end
+  
+  it "full url (from error)" do
+    class ::FullUrl
+      inherit Rad::Controller::Http
+      
+      def action
+        params.a.should == 'b'
+        render inline: 'ok'
+      end
+    end
+    
+    wcall "http://localhost/full_url/action?a=b" do |c|
+      check = {
+        'PATH_INFO'    => '/full_url/action',
+        'QUERY_STRING' => 'a=b'
+      }
+      workspace.env.subset(check.keys).should == check
+      c.call
+    end
+    response.body.should == %(ok)
   end
   
   it "json" do
     class ::JsonFormatSpec
-      inherit HttpController
+      inherit Rad::Controller::Http
       
       def action
         render json: {a: 'b'}
@@ -54,7 +73,7 @@ describe "Integration" do
   
   it "should have workspace, request, env, and session" do
     class ::RequestAndSessionSpec
-      inherit HttpController
+      inherit Rad::Controller::Http
             
       inject workspace: :workspace
       def action

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

@@ -1,8 +1,10 @@
-require 'html/spec_helper'
-require 'integration/spec_helper'
+require 'spec_helper'
 
-describe "UrlHelper" do
+describe "UrlHelper" do  
   before :all do
+    rad.web
+    rad.reset :conveyors
+    
     class ControllerStub
       inherit Rad::ControllerRoutingHelper, Rad::ControllerMicelaneousHelper
     
@@ -16,13 +18,13 @@ describe "UrlHelper" do
     remove_constants :ControllerStub
   end
   
-  before :each do        
+  before do        
     @c = ControllerStub.new
   end
   
   def stub_workspace
-    @response = Rad::Response.new
-    @params = Rad::Params.new
+    @response = Rad::Http::Response.new
+    @params = Rad::Conveyors::Params.new
     
     @workspace = Object.new    
     @workspace.stub(:params).and_return(@params)
@@ -32,11 +34,11 @@ describe "UrlHelper" do
   end
   
   def within_request &block
-    @response.body = catch(:halt_render){block.call}
+    @response.body = catch(:halt){block.call}
   end
   
   describe "redirect_to" do
-    before :each do
+    before do
       stub_workspace
     end
     
@@ -44,7 +46,7 @@ describe "UrlHelper" do
       @params.format = 'html'
       
       within_request{@c.redirect_to('/some_book')}
-      @response.status.should == 301
+      @response.status.should == 302
       @response.headers['Location'].should == "/some_book"
       @response.body.should =~ /You are being/
     end
@@ -53,7 +55,7 @@ describe "UrlHelper" do
       @params.format = 'html'
       
       within_request{@c.redirect_to('http://localhost/some_book')}
-      @response.status.should == 301
+      @response.status.should == 302
       @response.headers['Location'].should == "http://localhost/some_book"
       @response.body.should =~ /You are being/
     end
@@ -69,7 +71,7 @@ describe "UrlHelper" do
   end 
   
   describe "reload_page" do
-    before :each do
+    before do
       stub_workspace
     end