merb 0.5.3 → 0.9.2

data/spec/fixtures/views/nested/example/test.html.erb

@@ -1 +0,0 @@
-<%= "Hello!" %>

data/spec/fixtures/views/partials/_erubis.html.erb

@@ -1 +0,0 @@
-<%= respond_to?(:yo) && yo  ? yo : "No Locals!" %>

data/spec/fixtures/views/partials/_erubis_collection.html.erb

@@ -1 +0,0 @@
-<%= erubis_collection %>

data/spec/fixtures/views/partials/_erubis_collection_with_locals.html.erb

@@ -1 +0,0 @@
-<%= number %>

data/spec/fixtures/views/partials/_erubis_new.html.erb

@@ -1 +0,0 @@
-<%= respond_to?(:yo)  ? yo : "No Locals!" %>

data/spec/fixtures/views/partials/_haml.html.haml

@@ -1 +0,0 @@
-= respond_to?(:yo) && yo ? yo : "No Locals!"

data/spec/fixtures/views/partials/_haml_collection.html.haml

@@ -1 +0,0 @@
-= haml_collection

data/spec/fixtures/views/partials/_haml_collection_with_locals.html.haml

@@ -1 +0,0 @@
-= number

data/spec/fixtures/views/partials/_haml_new.html.haml

@@ -1 +0,0 @@
-= respond_to?(:yo) && yo ? yo : "No Locals!"

data/spec/fixtures/views/partials/_markaby.html.mab

@@ -1 +0,0 @@
-"#{defined?(yo) && yo ? yo : "No Locals!"}"

data/spec/fixtures/views/partials/_markaby_collection.html.mab

@@ -1 +0,0 @@
-"#{markaby_collection}\n"

data/spec/fixtures/views/partials/_markaby_collection_with_locals.html.mab

@@ -1 +0,0 @@
-"#{number}\n"

data/spec/fixtures/views/partials/_markaby_new.html.mab

@@ -1 +0,0 @@
-"#{defined?(yo) && yo ? yo : "No Locals!"}"

data/spec/fixtures/views/render_object_controller/render_object_with_template.html.erb

@@ -1 +0,0 @@
-object with template html format

data/spec/fixtures/views/render_object_controller/render_object_with_template.js.erb

@@ -1 +0,0 @@
-object with template js format

data/spec/fixtures/views/render_object_controller/render_object_with_template.xml.erb

@@ -1 +0,0 @@
-object with template xml format

data/spec/fixtures/views/template_views/interface__buffer_erubis.html.erb

@@ -1,4 +0,0 @@
-respond_to?(:_buffer) = <%= respond_to?(:_buffer) ? "TRUE" : "FALSE" %>
-
-Test the view_buffer helper
-<% _buffer( binding ) << "Text for the view buffer" %>

data/spec/fixtures/views/template_views/interface__buffer_haml.html.haml

@@ -1,7 +0,0 @@
-%p 
-  respond_to?(:_buffer) =
-  = respond_to?(:_buffer) ? "TRUE" : "FALSE" 
-
-%p 
-  Test the view_buffer helper
-  - _buffer( binding ) << "Text for the view buffer"

data/spec/fixtures/views/template_views/interface__buffer_markaby.html.mab

@@ -1,7 +0,0 @@
-p do 
-  "respond_to?(:_buffer) = #{respond_to?(:_buffer) ? "TRUE" : "FALSE"}"
-end
-p do
- text "Test the view_buffer helper"
- _buffer( binding ) << "Text for the view buffer"
-end

data/spec/fixtures/views/template_views/interface_capture_erubis.html.erb

@@ -1,15 +0,0 @@
-<% @foo = capture do %>
-  Capture Text Without Args
-<% end %>
-<%= @foo %>
-
-<% @struct = Struct.new( :value ) -%>
-<% @obj = @struct.new( "capture text from yielded object" )%>
-
-<% @foo2 = capture( @obj ) do |obj| %>
-  BEFORE
-  <%= obj.value %>
-  AFTER
-<% end %>
-
-<%= @foo2 %>

data/spec/fixtures/views/template_views/interface_capture_haml.html.haml

@@ -1,15 +0,0 @@
-- @foo = capture do
-  Capture Text Without Args
-
-= @foo
-
-- @struct = Struct.new( :value ) 
-- @obj = @struct.new( "capture text from yielded object" )
-
-- @foo2 = capture( @obj ) do |obj| 
-  BEFORE
-  = obj.value 
-  AFTER
-
-
-= @foo2

data/spec/fixtures/views/template_views/interface_capture_markaby.html.mab

@@ -1,4 +0,0 @@
-@foo = capture do 
-  "Capture Text Without Args"
-end
-

data/spec/fixtures/views/template_views/interface_concat_erubis.html.erb

@@ -1,12 +0,0 @@
-Test the Concat Helper
-<% concat( "Concat Text", binding ) -%>
-
-<% def tester( &block ) -%>
-<%   concat( "Start Tester Block", block.binding ) %>
-<%   yield %>
-<%   concat( "Finish Tester Block", block.binding ) %>
-<% end %>
-
-<% tester do %>
-  In Tester Block
-<% end %>

data/spec/fixtures/views/template_views/interface_concat_haml.html.haml

@@ -1,11 +0,0 @@
-Test the Concat Helper
-- concat( "Concat Text", binding )
-
-- def tester( &block )
-  -  concat( "Start Tester Block", block.binding )
-  -   yield 
-  -  concat( "Finish Tester Block", block.binding ) 
-
-
-- tester do 
-  In Tester Block

data/spec/fixtures/views/template_views/interface_concat_markaby.html.mab

@@ -1,14 +0,0 @@
-p do
-  "Test the Concat Helper"
-  concat( "Concat Text", binding )
-end
-
-def tester_helper( &block )
- concat( "Start Tester Block", block.binding )
- yield
- concat( "Finish Tester Block", block.binding )
-end
-
-tester_helper do
-  text "In Tester Block"
-end

data/spec/fixtures/views/test.dir/the_template.html.erb

@@ -1 +0,0 @@
- 

data/spec/merb/abstract_controller_spec.rb

@@ -1,38 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Merb::AbstractController do
-  
-  before(:all) do
-    @abc = Merb::AbstractController
-    @template = "/my/template/path/file.html.erb"
-    @key = "/my/template/path/file.html"
-  end
-  
-  before(:each) do 
-    @abc.reset_template_path_cache!
-  end
-  
-  after(:all) do
-    Merb::BootLoader.load_controller_template_path_cache
-    Merb::BootLoader.load_inline_helpers    
-  end
-  
-  it "should add a template path" do
-    @abc.add_path_to_template_cache(@template)
-    @abc._template_path_cache.should include(@key)
-    @abc._template_path_cache[@key].should == @template
-  end
-  
-  it "should reset the template_path_cache" do
-    @abc.add_path_to_template_cache(@template)
-    @abc._template_path_cache.should_not be_empty
-    @abc.reset_template_path_cache!
-    @abc._template_path_cache.should be_empty
-  end
-  
-  it "should return false if the template is the wrong format when adding" do
-    @abc.add_path_to_template_cache("/my/path/to/template.rhtml").should == false
-    @abc._template_path_cache.should_not include( "/my/path/to/template.rhtml")
-  end
-  
-end

data/spec/merb/assets_spec.rb

@@ -1,207 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-require "fileutils"
-
-describe Merb::Assets, "in the production environment" do
-  
-  before(:each) do
-    @old_env = Merb::Config[:environment]
-    Merb::Config[:environment] = :production
-    Merb::Config.delete(:bundle_assets)
-  end
-  
-  after(:each) do
-    Merb::Config[:environment] = @old_env
-  end
-  
-  it "should bundle assets" do
-    Merb::Assets.bundle?.should == true
-  end
-  
-end
-
-describe Merb::Assets, "in the development environment" do
-  
-  before(:each) do
-    @old_env = Merb::Config[:environment]
-    Merb::Config[:environment] = :development
-    Merb::Config.delete(:bundle_assets)
-  end
-  
-  after(:each) do
-    Merb::Config[:environment] = @old_env
-  end
-  
-  it "should not bundle assets" do
-    Merb::Assets.bundle?.should == false
-  end
-  
-end
-
-describe Merb::Assets, "in the development environment with asset bundling enabled" do
-  
-  before(:each) do
-    @old_env = Merb::Config[:environment]
-    Merb::Config[:environment] = :development
-    Merb::Config[:bundle_assets] = true
-  end
-  
-  after(:each) do
-    Merb::Config[:environment] = @old_env
-  end
-  
-  it "should bundle assets" do
-    Merb::Assets.bundle?.should == true
-  end
-  
-end
-
-describe Merb::Assets::AssetHelpers, "asset_path" do
-  
-  include Merb::Assets::AssetHelpers
-  
-  it "should turn a symbol shorthand for a javascript asset into a URI path" do
-    asset_path(:javascript, :dingo).should == "/javascripts/dingo.js"
-  end
-  
-  it "should turn a string shorthand for a javascript asset into a URI path" do
-    asset_path(:javascript, "dingo").should == "/javascripts/dingo.js"
-    asset_path(:javascript, "dingo.r7337").should == "/javascripts/dingo.r7337.js"
-    asset_path(:javascript, "dingo/wakka").should == "/javascripts/dingo/wakka.js"
-  end
-  
-  it "should turn the filename of a javascript asset into a URI path" do
-    asset_path(:javascript, "dingo.js").should == "/javascripts/dingo.js"
-  end
-  
-  it "should turn a symbol shorthand for a stylesheet asset into a URI path" do
-    asset_path(:stylesheet, :dingo).should == "/stylesheets/dingo.css"
-  end
-  
-  it "should turn a string shorthand for a stylesheet asset into a URI path" do
-    asset_path(:stylesheet, "dingo").should == "/stylesheets/dingo.css"
-    asset_path(:stylesheet, "dingo.r7337").should == "/stylesheets/dingo.r7337.css"
-    asset_path(:stylesheet, "dingo/wakka").should == "/stylesheets/dingo/wakka.css"
-  end
-  
-  it "should turn the filename of a stylesheet asset into a URI path" do
-    asset_path(:stylesheet, "dingo.css").should == "/stylesheets/dingo.css"
-  end
-  
-  it "should turn an asset name into a file path" do
-    asset_path(:stylesheet, :dingo, true).should == "public/stylesheets/dingo.css"
-  end
-  
-  it "should prepend any path prefix to a URI path" do
-    begin
-      Merb::Config[:path_prefix] = '/inky'
-      asset_path(:stylesheet, "dingo.css").should == "/inky/stylesheets/dingo.css"
-    ensure
-      Merb::Config.delete(:path_prefix)
-    end
-  end
-  
-  it "should prepend any path prefix to a local path" do
-    begin
-      Merb::Config[:path_prefix] = '/inky'
-      asset_path(:stylesheet, "dingo.css", true).should == "public/stylesheets/dingo.css"
-    ensure
-      Merb::Config.delete(:path_prefix)
-    end
-  end
-end
-
-describe "an asset bundler with callbacks", :shared => true do
-  it "should collect callbacks for execution after bundling" do
-    @bundler_klass.add_callback { |filename| "yay #{filename}" }
-    @bundler_klass.callbacks.should have(1).procs
-    @bundler_klass.callbacks.first.call("me").should == "yay me"
-    @bundler_klass.callbacks.clear
-  end
-end
-
-describe "an asset bundler", :shared => true do
-  
-  include Merb::Assets::AssetHelpers
-  
-  before(:each) do
-    FileUtils.mkdir_p("./public/#{@bundler_klass.asset_type}s")
-    create_fixture_files
-  end
-  
-  after(:each) do
-    FileUtils.rm_rf("./public")
-  end
-  
-  def create_fixture_files
-    @asset1 = :asset1
-    @asset1filename = asset_path(@bundler_klass.asset_type, @asset1, true)
-    File.open(@asset1filename, "w") { |f| f << "one" }
-    
-    @asset2 = :asset2
-    @asset2filename = asset_path(@bundler_klass.asset_type, @asset2, true)
-    File.open(@asset2filename, "w") { |f| f << "two" }
-    
-    @asset3 = :asset3
-    @asset3filename = asset_path(@bundler_klass.asset_type, @asset3, true)
-    File.open(@asset3filename, "w") { |f| f << "three" }
-  end
-  
-  it "should combine files into a single file" do
-    bundler = @bundler_klass.new(true, @asset1, @asset2, @asset3)
-    bundle_name = bundler.bundle!
-    File.read(asset_path(@bundler_klass.asset_type, bundle_name, true)).should == "one\ntwo\nthree\n"
-  end
-  
-  it "should not overwrite bundles" do
-    File.open(asset_path(@bundler_klass.asset_type, :all, true), "w") { |f| f << "exists" }
-    bundler = @bundler_klass.new(true, @asset1, @asset2, @asset3)
-    bundle_name = bundler.bundle!
-    File.read(asset_path(@bundler_klass.asset_type, bundle_name, true)).should == "exists"
-  end
-  
-  it "should execute all callbacks, passing them the bundled file's path" do
-    begin
-      @bundler_klass.add_callback do |filename|
-        File.open(filename, "a") do |f|
-          f.puts "yay"
-        end
-      end
-      
-      bundler = @bundler_klass.new(true, @asset1, @asset2, @asset3)
-      bundle_name = bundler.bundle!
-      File.read(asset_path(@bundler_klass.asset_type, bundle_name, true)).should == "one\ntwo\nthree\nyay\n"
-    ensure
-      @bundler_klass.callbacks.clear
-    end
-  end
-  
-end
-
-describe Merb::Assets::JavascriptAssetBundler do
-  
-  before(:each) do
-    @bundler_klass = Merb::Assets::JavascriptAssetBundler
-  end
-  
-  it "should handle javascript assets" do
-    @bundler_klass.asset_type.should == :javascript
-  end
-  
-  it_should_behave_like "an asset bundler"
-  it_should_behave_like "an asset bundler with callbacks"
-end
-
-describe Merb::Assets::StylesheetAssetBundler do
-  
-  before(:each) do
-    @bundler_klass = Merb::Assets::StylesheetAssetBundler
-  end
-  
-  it "should handle stylesheet assets" do
-    @bundler_klass.asset_type.should == :stylesheet
-  end
-  
-  it_should_behave_like "an asset bundler"
-  it_should_behave_like "an asset bundler with callbacks"
-end

data/spec/merb/caching_spec.rb

@@ -1,102 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "all fragment caching", :shared => true do
-
-  it "should be able to store and retrieve a key" do
-    @c.put(:foo, "Bar")
-    @c.get(:foo).should == "Bar"
-  end
-  
-  it "should be able to expire a fragment" do
-    @c.put(:foo, "Bar")
-    @c.get(:foo).should == "Bar"
-    @c.expire_fragment(:foo)
-    @c.get(:foo).should == nil
-  end  
-  
-  it "should clear the cache on reset" do
-    @c.put(:foo, "Bar")
-    @c.get(:foo).should == "Bar"
-    @c.clear
-    @c.get(:foo).should == nil
-  end
-  
-  it "should be ok to clear the cache twice" do
-    @c.clear
-    @c.clear
-  end
-  
-  it "should accept keys and subkeys" do
-    @c.put([:user, :joe], "Joe's data")
-    @c.get([:user, :joe]).should. == "Joe's data"
-  end
-  
-  it "should keep subkeys separate" do
-    @c.put([:user, :joe], "Joe's data")
-    @c.put([:user, :bill], "Bill's data")
-    @c.get([:user, :joe]).should == "Joe's data"
-    @c.get([:user, :bill]).should == "Bill's data"
-  end
-  
-  it "should expire a subkey" do
-    @c.put([:user, :joe], "Joe's data")
-    @c.put([:user, :bill], "Bill's data")
-    @c.expire_fragment([:user,:joe])
-    @c.get([:user, :joe]).should == nil
-    @c.get([:user, :bill]).should == "Bill's data"
-  end
-  
-  it "should expire a key and all its children when passed an array containing only the top key" do
-    @c.put([:user, :joe], "Joe's data")
-    @c.put([:user, :bill], "Bill's data")
-    @c.expire_fragment([:user])
-    @c.get([:user, :joe]).should == nil
-    @c.get([:user, :bill]).should == nil
-  end
-    
-  it "should expire a key and all its children when passed only the top key" do
-    @c.put([:user, :joe], "Joe's data")
-    @c.put([:user, :bill], "Bill's data")
-    @c.expire_fragment(:user)
-    @c.get([:user, :joe]).should == nil
-    @c.get([:user, :bill]).should == nil
-  end
-  
-  it "should handle arbitrary levels of keys" do
-     @c.put([:users, :show, :bob], "Bob's data")
-     @c.put([:users, :show, :mary], "Mary's data")
-     @c.put([:users, :edit, :bob], "Bob's editable data")
-     @c.get([:users, :show, :bob]).should == "Bob's data"
-     @c.get([:users, :edit, :bob]).should == "Bob's editable data"
-     @c.expire_fragment([:users, :show, :mary])
-     @c.get([:users, :show, :mary]).should == nil
-     @c.get([:users, :show, :bob]).should == "Bob's data"     
-     @c.expire_fragment([:users, :show])
-     @c.get([:users, :show, :bob]).should == nil
-     @c.expire_fragment([:users])
-     @c.get([:users, :edit, :bob]).should == nil
-   end  
-    
-  
-end
-
-
-describe "fragment caching in memory" do
-  before do
-    Merb::Config['cache_store'] = 'memory'
-    @c = Merb::Caching::Fragment
-    @c.clear
-  end
-
-  it_should_behave_like "all fragment caching"
-end
-
-describe "fragment caching to a file" do
-  before do
-    Merb::Config[:cache_store] = 'file'
-    @c = Merb::Caching::Fragment
-    @c.clear
-  end
-
-  it_should_behave_like "all fragment caching"
-end