merb-parts 0.9.2 → 0.9.3

data/Rakefile

@@ -4,7 +4,7 @@ require "spec/rake/spectask"
 
 PLUGIN = "merb-parts"
 NAME = "merb-parts"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Hassox"
 EMAIL = ""
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-parts/"
@@ -21,25 +21,27 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.2')
+  s.add_dependency('merb-core', '>= 0.9.3')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
+
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
 end
 
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{SUDO} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
   end
   
 end

data/lib/merb-parts/part_controller.rb

@@ -68,8 +68,10 @@ module Merb
     end    
     
     # Send any methods that are missing back up to the web controller
+    # Patched to set partial locals on the web controller
     def method_missing(sym, *args, &blk)
+      @web_controller.instance_variable_set(:@_merb_partial_locals, @_merb_partial_locals)
       @web_controller.send(sym, *args, &blk)
-    end    
+    end
   end
 end

data/spec/fixtures/controllers/main.rb

@@ -0,0 +1,29 @@
+class Main < Merb::Controller
+  self._template_root = File.dirname(__FILE__) / ".." / "views"
+  
+  def index
+    part TodoPart => :list
+  end
+  
+  def index2
+    part TodoPart => :one    
+  end
+  
+  def index3
+    part(TodoPart => :one) + part(TodoPart => :list)
+  end
+  
+  def index4
+    provides :xml, :js
+    part(TodoPart => :formatted_output)
+  end
+  
+  def part_with_params
+    part(TodoPart => :part_with_params, :my_param => "my_value")
+  end
+  
+  def part_within_view
+    render
+  end
+  
+end

data/spec/fixtures/parts/todo_part.rb

@@ -0,0 +1,26 @@
+class TodoPart < Merb::PartController
+  self._template_root = File.expand_path(File.join(File.dirname(__FILE__), "views"))
+  
+  before :load_todos
+  
+  def list
+    render
+  end
+  
+  def one
+    render :list, :layout => false
+  end
+  
+  def load_todos
+    @todos = ["Do this", "Do that", 'Do the other thing']
+  end
+  
+  def formatted_output
+    render
+  end
+  
+  def part_with_params
+    render
+  end
+  
+end

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

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

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

@@ -0,0 +1,3 @@
+<todolayout>
+<%= catch_content :for_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/parts/views/todo_part/part_with_params.html.erb

@@ -0,0 +1,3 @@
+<% params.each do |param, value| %>
+  <%= param %> = <%= value %>
+<% end %>

data/spec/fixtures/views/main/part_within_view.html.erb

@@ -0,0 +1 @@
+<%= part TodoPart => :one %>

data/spec/merb-parts_spec.rb

@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "A Merb PartController" do
+  
+  before(:each) do
+    Merb::Router.prepare do |r|
+      r.default_routes
+    end
+  end  
+  
+  it "should render a part template with no layout" do
+    controller = dispatch_to(Main, :index2)
+    controller.body.should ==
+      "TODOPART\nDo this|Do that|Do the other thing\nTODOPART"
+  end
+  
+  it "should render a part template with it's own layout" do
+    controller = dispatch_to(Main, :index)
+    controller.body.should ==
+      "TODOLAYOUT\nTODOPART\nDo this|Do that|Do the other thing\nTODOPART\nTODOLAYOUT"
+  end 
+  
+  it "should render multiple parts if more then one part is passed in" do
+    controller = dispatch_to(Main, :index3)
+    controller.body.should ==
+      "TODOPART\nDo this|Do that|Do the other thing\nTODOPART" +
+      "TODOLAYOUT\nTODOPART\nDo this|Do that|Do the other thing\nTODOPART\nTODOLAYOUT"
+  end 
+  
+  it "should render the html format by default to the controller that set it" do
+    controller = dispatch_to(Main, :index4)
+    controller.body.should match(/part_html_format/m) 
+  end
+  
+  it "should render the xml format according to the controller" do
+    controller = dispatch_to(Main, :index4, {:format => 'xml'} )
+    controller.body.should match(/part_xml_format/m)
+  end
+  
+  it "should render the js format according to the controller" do
+    controller = dispatch_to(Main, :index4, :format => 'js')
+    controller.body.should match(/part_js_format/m)
+  end
+  
+  it "should provide params when calling a part" do
+    controller = dispatch_to(Main, :part_with_params)
+    controller.body.should match( /my_param = my_value/)
+  end
+  
+  it "should render from inside a view" do
+    controller = dispatch_to(Main, :part_within_view)
+    controller.body.should match( /Do this/)
+  end
+  
+  
+end  
+
+describe "A Merb Part Controller with urls" do
+   
+  def new_url_controller(route, params = {:action => 'show', :controller => 'Test'})    
+    @controller = dispatch_to(Main, :index)
+    TodoPart.new(@controller)
+  end
+  
+  it "should use the web_controllers type if no controller is specified" do
+    c = new_url_controller(@default_route, :controller => "my_controller")
+    the_url = c.url(:action => "bar")
+    the_url.should == "/main/bar"
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require "merb-core"
+require File.join( File.dirname(__FILE__), "..", "lib", "merb-parts" )
+
+# Require the fixtures
+Dir[File.join(File.dirname(__FILE__), "fixtures", "*/**.rb")].each{|f| require f }
+
+Merb.start :environment => 'test'
+
+Spec::Runner.configure do |config|
+  config.include Merb::Test::RequestHelper  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-parts
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Hassox
@@ -9,7 +9,7 @@ autorequire: merb-parts
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 description: "Merb More: Merb plugin that provides Part Controllers."
 email: ""
@@ -42,6 +42,26 @@ files:
 - lib/merb-parts/mixins/web_controller.rb
 - lib/merb-parts/part_controller.rb
 - lib/merb-parts.rb
+- spec/fixtures
+- spec/fixtures/controllers
+- spec/fixtures/controllers/main.rb
+- spec/fixtures/parts
+- spec/fixtures/parts/todo_part.rb
+- spec/fixtures/parts/views
+- spec/fixtures/parts/views/layout
+- spec/fixtures/parts/views/layout/todo_part.html.erb
+- spec/fixtures/parts/views/layout/todo_part.xml.erb
+- spec/fixtures/parts/views/todo_part
+- spec/fixtures/parts/views/todo_part/formatted_output.html.erb
+- spec/fixtures/parts/views/todo_part/formatted_output.js.erb
+- spec/fixtures/parts/views/todo_part/formatted_output.xml.erb
+- spec/fixtures/parts/views/todo_part/list.html.erb
+- spec/fixtures/parts/views/todo_part/part_with_params.html.erb
+- spec/fixtures/views
+- spec/fixtures/views/main
+- spec/fixtures/views/main/part_within_view.html.erb
+- spec/merb-parts_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://merb-plugins.rubyforge.org/merb-parts/
 post_install_message: