merb 0.4.2 → 0.5.0

data/spec/merb/server_spec.rb

@@ -1,19 +1,19 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Merb::Server do
+describe Merb::Config do
   it "should apply environment from the command line option --environment" do
-    options = Merb::Server.merb_config(["--environment", "performance_testing"])
+    options = Merb::Config.parse_args(["--environment", "performance_testing"])
     options[:environment].should == "performance_testing"
   end
 
   it "should apply environment from the command line option -e" do
-    options = Merb::Server.merb_config(["-e", "selenium"])
+    options = Merb::Config.parse_args(["-e", "selenium"])
     options[:environment].should == "selenium"
   end
   
   it "should load the yaml file for the environment if it exists" do
-    options = Merb::Server.merb_config(["-e", "environment_config_test"])
+    options = Merb::Config.parse_args(["-e", "environment_config_test"])
     options[:loaded_config_for_environment_config_test].should == true
   end
-
+  
 end

data/spec/merb/upload_handler_spec.rb

@@ -64,6 +64,13 @@ describe MerbUploadHandler do
     @handler.request_aborted(@params)
   end
   
+  it 'should log info about aborted requests' do
+    @handler.stub!(:valid_upload?).and_return(@upload_id)
+    Mongrel::Uploads.should_receive(:finish).with(@upload_id)
+    Merb.logger.should_receive :info
+    @handler.request_aborted(@params)
+  end
+  
   it "should not send Mongrel::Uploads :finish unless the request is a valid upload" do
     Mongrel::Uploads.should_not_receive(:finish)
     @handler.stub!(:valid_upload?).and_return(false)

data/spec/merb/version_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'Merb version.rb svn revision methods' do
+  it 'should give a path to a file containing the svn revision' do
+    Merb.svn_revision_file_path.should ==
+      File.expand_path(File.join(Dir.pwd, Merb.svn_revision_filename))
+  end
+  
+  it "should create the #{Merb.svn_revision_filename} file if it does not exist" do
+    File.delete Merb.svn_revision_file_path
+    Merb.svn_revision_from_file
+    File.file?(Merb.svn_revision_file_path).should == true
+  end
+  
+  it 'should not raise permissions error' do
+    File.should_receive(:open).and_raise(Errno::EACCES)
+    Merb.svn_revision_from_file.should_not raise_error(Errno::EACCES)
+  end
+  
+  it 'should get the svn revision' do
+    Merb.svn_revision.should > 0
+  end
+  
+  it "should get the svn revision from the #{Merb.svn_revision_filename} file" do
+    Merb.svn_revision_from_file.should > 0
+  end
+  
+  it 'should get the same number from the helper and the file' do
+    Merb.svn_revision.should == Merb.svn_revision_from_file
+  end
+  
+  it 'should get the svn revision via git'
+end

data/spec/merb/view_context_spec.rb

@@ -1,103 +1,201 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "View Context", "image tag" do
-  
+
   include Merb::ViewContextMixin
-  it "should render an link" do
-    the_link = link_to( "NAME", "http://example.com", :title => "TITLE", :target => "TARGET" )
-    the_link.should match( /<a.+>NAME<\/a>/ )
-    the_link.should match( /href="http:\/\/example.com"/)
-    the_link.should match( /title="TITLE"/)
-    the_link.should match( /target="TARGET"/ )    
+  it "should render a link" do
+    tag = link_to("NAME", "http://example.com", :title => "TITLE", :target => "TARGET")
+    tag.should match_tag(:a, :href => "http://example.com",
+                             :title => "TITLE",
+                             :target => "TARGET",
+                             :content => "NAME")
   end
 
   it "should render local image" do
-    image_tag('foo.gif').clean.should == %[<img src="/images/foo.gif"/>].clean
+    tag = image_tag('foo.gif')
+    tag.should match_tag(:img, :src => "/images/foo.gif")
   end
 
   it "should render a local image with a path_prefix" do
-    Merb::Server.config[:path_prefix] = '/inky'
-    image_tag('foo.gif').clean.should == %[<img src="/inky/images/foo.gif"/>].clean
-    Merb::Server.config.delete(:path_prefix)
+    Merb::Config[:path_prefix] = '/inky'
+
+    tag = image_tag('foo.gif')
+    tag.should match_tag(:img, :src => "/inky/images/foo.gif")
+
+    Merb::Config.delete(:path_prefix)
   end
-  
+
   it "should render local image with class" do
-    image_tag('foo.gif', :class => 'bar').clean.should == %[<img src="/images/foo.gif" class="bar" />].clean
+    tag = image_tag('foo.gif', :class => 'bar')
+    tag.should match_tag(:img, :src => "/images/foo.gif", :class => "bar")
   end
 
   it "should render local image with class and explicit path" do
-    image_tag('foo.gif', :class => 'bar', :path => '/files/').clean.should == %[<img src="/files/foo.gif" class="bar" />].clean
+    tag = image_tag('foo.gif', :class => 'bar', :path => '/files/')
+    tag.should match_tag(:img, :src => "/files/foo.gif", :class => "bar")
   end
 
   it "should render remote image" do
-    image_tag('http://test.com/foo.gif').clean.should == %[<img src="http://test.com/foo.gif"/>].clean    
+    tag = image_tag('http://test.com/foo.gif')
+    tag.should match_tag(:img, :src => "http://test.com/foo.gif")
   end
 
   it "should render remote SSL image" do
-    image_tag('https://test.com/foo.gif').clean.should == %[<img src="https://test.com/foo.gif"/>].clean
+    tag = image_tag('https://test.com/foo.gif')
+    tag.should match_tag(:img, :src => "https://test.com/foo.gif")
   end
 
 end
 
 describe "View Context", "css tag" do
-  
+
   include Merb::ViewContextMixin
-  
+
   it "should render a link tag with the css_include_tag method" do
-    css_include_tag('foo.css').clean.should ==
-    %[<link href="/stylesheets/foo.css" media="all" rel="Stylesheet" type="text/css"/>].clean
+    tag = css_include_tag('foo.css')
+    tag.should match_tag(:link, :href => "/stylesheets/foo.css",
+                                :media => "all",
+                                :rel => "Stylesheet",
+                                :type => "text/css",
+                                :content => nil)
 
     css_include_tag('foo').should == css_include_tag('foo.css')
-
     css_include_tag('foo', 'bar').should ==
-    css_include_tag('foo') +
-    css_include_tag('bar')
+      css_include_tag('foo') + css_include_tag('bar')
   end
   
+  it "should alter the 'media' attribute based on the provided options" do
+    tag = css_include_tag('foo.css', :media => :screen)
+    tag.should match_tag(:link, :href => "/stylesheets/foo.css",
+                                :media => "screen",
+                                :rel => "Stylesheet",
+                                :type => "text/css",
+                                :content => nil)
+  end
+
   it "should render a link tag with a path_prefix" do
-    Merb::Server.config[:path_prefix] = '/inky'
-    css_include_tag('foo.css').clean.should ==
-      %[<link href="/inky/stylesheets/foo.css" media="all" rel="Stylesheet" type="text/css"/>].clean
-    Merb::Server.config.delete(:path_prefix)
+    Merb::Config[:path_prefix] = '/inky'
+
+    tag = css_include_tag('foo.css')
+    tag.should match_tag(:link, :href => "/inky/stylesheets/foo.css",
+                                :media => "all",
+                                :rel => "Stylesheet",
+                                :type => "text/css",
+                                :content => nil)
+
+    Merb::Config.delete(:path_prefix)
   end
-  
+
   it "should not generate a script tag with the include_required_css" do
     include_required_css.clean.should == ''
   end
-  
+
   it "should generate script tags with the include_required_css" do
     require_css('foo')
     require_css('bar')
-    include_required_css.should ==
-      css_include_tag('foo') + css_include_tag('bar')
+    include_required_css.should == css_include_tag('foo') + css_include_tag('bar')
   end
 end
 
-describe "View Context", "script tag" do
-  
+describe "View Context", "css tag with bundles" do
+
   include Merb::ViewContextMixin
   
+  before(:each) do
+    @bundler = mock(:bundler)
+    Merb::Assets.stub!(:bundle?).and_return(true)
+    Merb::Assets::StylesheetAssetBundler.stub!(:new).and_return(@bundler)
+    @bundler.stub!(:bundle!).and_return(:all)
+  end
+  
+  it "should not bundle stylesheets if asset bundling is disabled" do
+    Merb::Assets.should_receive(:bundle?).and_return(false)
+    
+    tag = css_include_tag(:fonts, :colors, :bundle => true)
+    tag.should == css_include_tag(:fonts) + css_include_tag(:colors)
+  end
+  
+  it "should not bundle stylesheets if only a single stylesheet was provided" do
+    css_include_tag(:fonts, :bundle => true).should == css_include_tag(:fonts)
+  end
+  
+  it "should bundle all stylesheets as 'all.css' if no bundle name is provided" do
+    Merb::Assets.should_receive(:bundle?).and_return(true)
+    Merb::Assets::StylesheetAssetBundler.should_receive(:new).with(true, :fonts, :colors).and_return(@bundler)
+    @bundler.should_receive(:bundle!).and_return(:all)
+    
+    tag = css_include_tag(:fonts, :colors, :bundle => true)
+    tag.should match_tag(:link, :href => "/stylesheets/all.css",
+                                :media => "all",
+                                :rel => "Stylesheet",
+                                :type => "text/css",
+                                :content => nil)
+  end
+  
+  it "should bundle all stylesheets whatever bundle name is provided" do
+    Merb::Assets.should_receive(:bundle?).and_return(true)
+    Merb::Assets::StylesheetAssetBundler.should_receive(:new).with(:base, :fonts, :colors).and_return(@bundler)
+    @bundler.should_receive(:bundle!).and_return(:base)
+    
+    tag = css_include_tag(:fonts, :colors, :bundle => :base)
+    tag.should match_tag(:link, :href => "/stylesheets/base.css",
+                                :media => "all",
+                                :rel => "Stylesheet",
+                                :type => "text/css",
+                                :content => nil)
+  end
+  
+  it "should not generate a stylesheet tag with the include_required_css" do
+    include_required_css(:bundle => true).clean.should == ''
+  end
+
+  it "should generate stylesheet tags with the include_required_css" do
+    Merb::Assets.should_receive(:bundle?).and_return(true)
+    Merb::Assets::StylesheetAssetBundler.should_receive(:new).with(true, :fonts, :colors).and_return(@bundler)
+    @bundler.should_receive(:bundle!).and_return(:all)
+    
+    require_css(:fonts)
+    require_css(:colors)
+    tag = include_required_css(:bundle => true)
+    
+    tag.should match_tag(:link, :href => "/stylesheets/all.css",
+                                :media => "all",
+                                :rel => "Stylesheet",
+                                :type => "text/css",
+                                :content => nil)
+  end
+end
+
+describe "View Context", "script tag" do
+
+  include Merb::ViewContextMixin
+
   it "should render a script tag with the js_include_tag method" do
-    js_include_tag('foo.js').clean.should == %[<script src="/javascripts/foo.js" type="text/javascript">//</script>].clean
+    tag = js_include_tag('foo.js')
+    tag.should match_tag(:script, :src => "/javascripts/foo.js",
+                                  :type => "text/javascript",
+                                  :content => "//")
 
     js_include_tag('foo').should == js_include_tag('foo.js')
-
     js_include_tag('foo', 'bar').should ==
-    js_include_tag('foo') +
-    js_include_tag('bar')
+      js_include_tag('foo') + js_include_tag('bar')
   end
-  
+
   it "should render a script tag with a path_prefix" do
-    Merb::Server.config[:path_prefix] = '/inky'
-    js_include_tag('foo.js').clean.should ==
-      %[<script src="/inky/javascripts/foo.js" type="text/javascript">//</script>].clean
-    Merb::Server.config.delete(:path_prefix)
+    Merb::Config[:path_prefix] = '/inky'
+
+    tag = js_include_tag('foo.js')
+    tag.should match_tag(:script, :src => "/inky/javascripts/foo.js",
+                                  :type => "text/javascript",
+                                  :content => "//")
+
+    Merb::Config.delete(:path_prefix)
   end
-  
+
   it "should not generate a script tag with the include_required_js" do
     include_required_js.clean.should == ''
   end
-  
+
   it "should generate script tags with the include_required_js" do
     require_js('foo')
     require_js('bar')
@@ -105,10 +203,73 @@ describe "View Context", "script tag" do
   end
 end
 
-describe "View Context", "throw_content, catch_content" do
-  
+describe "View Context", "script tag with bundles" do
+
   include Merb::ViewContextMixin
   
+  before(:each) do
+    @bundler = mock(:bundler)
+    Merb::Assets.stub!(:bundle?).and_return(true)
+    Merb::Assets::JavascriptAssetBundler.stub!(:new).and_return(@bundler)
+    @bundler.stub!(:bundle!).and_return(:all)
+  end
+  
+  it "should not bundle scripts if asset bundling is disabled" do
+    Merb::Assets.should_receive(:bundle?).and_return(false)
+    
+    tag = js_include_tag(:prototype, :lowpro, :bundle => true)
+    tag.should == js_include_tag(:prototype) + js_include_tag(:lowpro)
+  end
+  
+  it "should not bundle scripts if only a single script was provided" do
+    css_include_tag(:prototype, :bundle => true).should == css_include_tag(:prototype)
+  end
+  
+  it "should bundle all scripts as 'all.js' if no bundle name is provided" do
+    Merb::Assets.should_receive(:bundle?).and_return(true)
+    Merb::Assets::JavascriptAssetBundler.should_receive(:new).with(true, :prototype, :lowpro).and_return(@bundler)
+    @bundler.should_receive(:bundle!).and_return(:all)
+    
+    tag = js_include_tag(:prototype, :lowpro, :bundle => true)
+    tag.should match_tag(:script, :src => "/javascripts/all.js",
+                                  :type => "text/javascript",
+                                  :content => "//")
+  end
+  
+  it "should bundle all stylesheets whatever bundle name is provided" do
+    Merb::Assets.should_receive(:bundle?).and_return(true)
+    Merb::Assets::JavascriptAssetBundler.should_receive(:new).with(:base, :prototype, :lowpro).and_return(@bundler)
+    @bundler.should_receive(:bundle!).and_return(:base)
+
+    tag = js_include_tag(:prototype, :lowpro, :bundle => :base)
+    tag.should match_tag(:script, :src => "/javascripts/base.js",
+                                  :type => "text/javascript",
+                                  :content => "//")
+  end
+  
+  it "should not generate a script tag with the include_required_js" do
+    include_required_js(:bundle => true).clean.should == ''
+  end
+
+  it "should generate script tags with the include_required_js" do
+    Merb::Assets.should_receive(:bundle?).and_return(true)
+    Merb::Assets::JavascriptAssetBundler.should_receive(:new).with(true, :prototype, :lowpro).and_return(@bundler)
+    @bundler.should_receive(:bundle!).and_return(:all)
+    
+    require_js(:prototype)
+    require_js(:lowpro)
+    
+    tag = include_required_js(:bundle => true)
+    tag.should match_tag(:script, :src => "/javascripts/all.js",
+                                  :type => "text/javascript",
+                                  :content => "//")
+  end
+end
+
+describe "View Context", "throw_content, catch_content" do
+
+  include Merb::ViewContextMixin
+
   it "should throw content" do
     c = new_controller
     content = c.render :template => "examples/template_throw_content", :layout => :none
@@ -126,14 +287,14 @@ describe "View Context", "throw_content, catch_content" do
     content = c.render :template => "examples/template_catch_content", :layout => :none
     content.should match( /CAUGHT CONTENT/m)
   end
-  
+
   it "should catch content with multiple throws" do
     c = new_controller
     content = c.render :template => "examples/template_catch_content", :layout => :none
     content.should match( /CAUGHT FOOTER/m )
     content.should match( /START FOOTER\s+CAUGHT FOOTER\s+END FOOTER/m )
   end
-  
+
   it "should not render the block inline" do
     c = new_controller
     content = c.render :template => "examples/template_catch_content", :layout => :none
@@ -152,25 +313,22 @@ describe Merb::ViewContextMixin do
   it "should render the start of a tag" do
     open_tag(:div).should == "<div>"
   end
-  
+
   it "should render the start of a tag with attributes" do
     tag = open_tag(:div, :id => 1, :class => "CLASS")
-    tag.should match( /^<div /)
-    tag.should match( /id="1"/)
-    tag.should match( /class="CLASS"/)
-    tag.should match( />$/ )
+    tag.should match_tag(:div, :id => "1", :class => "CLASS")
   end
-  
+
   it "should render a self closing tag" do
-    self_closing_tag( :br ).should == "<br/>"
+    self_closing_tag(:br).should == "<br/>"
   end
-  
+
   it "should render a self closing tag with attributes" do
-    self_closing_tag(:img, :src => "SOURCE" ).should == "<img src=\"SOURCE\"/>"
+    self_closing_tag(:img, :src => "SOURCE").should match_tag(:img, :src => "SOURCE")
   end
-  
+
   it "should render a closing tag" do
     close_tag(:div).should == "</div>"
   end
-    
+
 end

data/spec/spec_generator_helper.rb

@@ -17,3 +17,18 @@ rescue LoadError
   require 'rubigen'
 end
 require 'rubigen/helpers/generator_test_helper'
+
+
+def directory_should_be_created(directory)
+  File.should be_exist(File.join(APP_ROOT, directory))
+  File.should be_directory(File.join(APP_ROOT, directory))
+end
+
+def file_should_be_created(file)
+  File.should be_exist(File.join(APP_ROOT, file))
+  File.should be_file(File.join(APP_ROOT, file))
+end
+
+def file_should_be_executable(file)
+  File.should be_executable(File.join(APP_ROOT, file))
+end