merb 0.4.0 → 0.4.1

data/spec/fixtures/models/router_spec_models.rb

@@ -0,0 +1,20 @@
+class Blogposts
+  def to_param
+    id
+  end 
+  def id
+    42
+  end
+end     
+
+class Comment
+  def to_param
+    id
+  end 
+  def id
+    24
+  end
+  def blogpost_id
+    42
+  end  
+end

data/spec/fixtures/parts/views/layout/todo_part.html.erb

@@ -0,0 +1,3 @@
+TODOLAYOUT
+<%= catch_content :layout %>
+TODOLAYOUT

data/spec/fixtures/parts/views/layout/todo_part.xml.erb

@@ -0,0 +1,3 @@
+<todolayout>
+<%= catch_content :layout %>
+</todolayout>

data/spec/fixtures/parts/views/todo_part/formatted_output.html.erb

@@ -0,0 +1 @@
+part_html_format

data/spec/fixtures/parts/views/todo_part/formatted_output.js.erb

@@ -0,0 +1 @@
+part_js_format

data/spec/fixtures/parts/views/todo_part/formatted_output.xml.erb

@@ -0,0 +1 @@
+part_xml_format

data/spec/fixtures/parts/views/todo_part/list.html.erb

@@ -0,0 +1,3 @@
+TODOPART
+<%= @todos.join('|') %>
+TODOPART

data/spec/fixtures/sample.txt

@@ -0,0 +1 @@
+This is a text file with some small content in it.

data/spec/fixtures/views/erubis.html.erb

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

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

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

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

@@ -0,0 +1 @@
+= "Hello!"

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

@@ -0,0 +1 @@
+"Hello!"

data/spec/fixtures/views/examples/_throw_content.html.erb

@@ -0,0 +1,6 @@
+<% throw_content :from_partial do %>
+  CONTENT THROWN FROM PARTIAL
+<% end %>
+<% throw_content :from_partial do %>
+  CONTENT THROWN FROM PARTIAL
+<% end %>

data/spec/fixtures/views/examples/hello.xml.builder

@@ -0,0 +1 @@
+xml.hello "world"

data/spec/fixtures/views/examples/js.js.erb

@@ -0,0 +1 @@
+new Ajax.Request("<%= :embedded_ruby_symbol %>");

data/spec/fixtures/views/examples/template_catch_content.html.erb

@@ -0,0 +1,15 @@
+<% throw_content :header do %>
+  CAUGHT CONTENT
+<% end %>
+
+<% throw_content :footer do %>
+  CAUGHT FOOTER
+<% end %>
+
+START HEADER
+<%= catch_content :header -%>
+END HEADER
+
+START FOOTER
+<%= catch_content :footer -%>
+END FOOTER

data/spec/fixtures/views/examples/template_catch_content_from_partial.html.erb

@@ -0,0 +1,6 @@
+<% partial "examples/throw_content" %>
+
+<%= catch_content :from_partial %>
+<% partial "examples/throw_content" %>
+
+<%= catch_content :from_partial %>

data/spec/fixtures/views/examples/template_throw_content.html.erb

@@ -0,0 +1,10 @@
+<% throw_content :header do %>
+  THROWN CONTENT
+<% end %>
+
+<%= controller.thrown_content[:header] -%>
+<% throw_content :header do %>
+  THROWN CONTENT
+<% end %>
+
+<%= @_header_content -%>

data/spec/fixtures/views/exceptions/admin_access_required.html.erb

@@ -0,0 +1 @@
+<%= "An Error Occurred!" %>

data/spec/fixtures/views/extension_template_controller/_nested_js.js.erb

@@ -0,0 +1 @@
+nested_js_partial

data/spec/fixtures/views/extension_template_controller/_nested_xml.xml.erb

@@ -0,0 +1 @@
+nested_xml_partial

data/spec/fixtures/views/extension_template_controller/_render_partial_multiple_times.html.erb

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

data/spec/fixtures/views/extension_template_controller/erubis_templates.html.erb

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/erubis_templates.js.erb

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/erubis_templates.rhtml

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/erubis_templates.xml.erb

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/haml_templates.html.haml

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/haml_templates.js.haml

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/haml_templates.xml.haml

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/markaby_templates.html.mab

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/markaby_templates.js.mab

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/markaby_templates.xml.mab

@@ -0,0 +1 @@
+ 

data/spec/fixtures/views/extension_template_controller/render_multiple_partials.html.erb

@@ -0,0 +1,4 @@
+Template contents
+<% (1..10).each do |i| -%>
+<%= partial :render_partial_multiple_times, {:count => i} %>
+<% end -%>

data/spec/fixtures/views/extension_template_controller/render_nested_js.js.erb

@@ -0,0 +1 @@
+<%= partial( "nested_js" )%>

data/spec/fixtures/views/extension_template_controller/render_nested_xml.xml.erb

@@ -0,0 +1 @@
+<%= partial("nested_xml") %>

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

@@ -0,0 +1 @@
+= "Hello!"

data/spec/fixtures/views/haml.xml.haml

@@ -0,0 +1,2 @@
+!!! XML
+%hello= "world"

data/spec/fixtures/views/layout/application.html.erb

@@ -0,0 +1 @@
+<%= catch_content :layout %>

data/spec/fixtures/views/layout/application.xml.erb

@@ -0,0 +1 @@
+<%= catch_content :layout %>

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

@@ -0,0 +1 @@
+<%= catch_content :layout %>

data/spec/fixtures/views/markaby.html.mab

@@ -0,0 +1 @@
+"Hello!"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,7 @@
+%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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,15 @@
+<% @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

@@ -0,0 +1,15 @@
+- @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

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

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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1 @@
+ 

data/spec/merb/abstract_controller_spec.rb

@@ -0,0 +1,37 @@
+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::Server.load_controller_template_path_cache
+  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/caching_spec.rb

@@ -0,0 +1,102 @@
+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::Server.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::Server.config[:cache_store] = 'file'
+    @c = Merb::Caching::Fragment
+    @c.clear
+  end
+
+  it_should_behave_like "all fragment caching"
+end

data/spec/merb/config_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Merb::Config do
+  before(:all) do
+    @config_yml = File.expand_path(File.dirname(__FILE__) / ".." / "fixtures")
+  end
+  
+  it "should have a default configuration" do
+    Merb::Config.defaults.should be_is_a(Hash)
+    Merb::Config.defaults[:merb_root].should == Dir.pwd
+  end
+  
+  it "should not load the config.yml file if it does not exist" do
+    Merb::Config.setup.should be_is_a(Hash)
+    Merb::Config.setup.should == Merb::Config.defaults
+  end
+  
+  it "should load the config.yml file if it exists" do
+    Merb::Config.defaults.merge!(:merb_root => @config_yml)
+    Merb::Config.setup.should be_is_a(Hash)
+    Merb::Config.setup[:host].should == "127.0.0.1"
+  end
+
+  it "should accept erb in the config.yml file" do
+    Merb::Config.defaults.merge!(:merb_root => @config_yml)
+    Merb::Config.setup.should be_is_a(Hash)
+    Merb::Config.setup[:environment].should == "test"
+  end
+end