merb_parts 0.9.13 → 0.9.14

data/CHANGELOG

@@ -0,0 +1,4 @@
+== 0.9.14
+* Fix multiple parameter bug for part() method [#192 status:resolved]
+* Added /lib/merb_parts/version.rb
+* Added CHANGELOG

data/Rakefile

@@ -1,77 +1,55 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-require "extlib"
-require 'merb-core/tasks/merb_rake_helper'
-require "spec/rake/spectask"
-require "#{File.dirname(__FILE__)}" / ".." / "version"
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Merb plugin that provides Part Controllers."
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Daniel Neighman"
-GEM_EMAIL  = "has.sox@gmail.com"
-
-GEM_NAME    = "merb_parts"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.9") + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = RUBY_FORGE_PROJECT
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = GEM_AUTHOR
-  s.email = GEM_EMAIL
-  s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.9')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib}/**/*")
-end
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb/merb-core/lib/merb-core/version', __FILE__)
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb_parts/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Parts::VERSION
+
+    gemspec.name        = "merb_parts"
+    gemspec.description = "Merb plugin that provides Part Controllers."
+    gemspec.summary     = "Merb plugin that provides Part Controllers."
+
+    gemspec.authors     = [ "Daniel Neighman" ]
+    gemspec.email       = "has.sox@gmail.com"
+    gemspec.homepage    = "http://github.com/merb/merb_parts"
+
+    gemspec.files       = %w(CHANGELOG LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core',     ">= 0.9.9"
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc "Run all examples (or a specific spec with TASK=xxxx)"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts  = ["-cfs"]
-  t.spec_files = begin
-    if ENV["TASK"] 
-      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
-    else
-      FileList['spec/**/*_spec.rb']
-    end
-  end
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
 desc 'Default: run spec examples'

data/lib/merb_parts/mixins/parts_mixin.rb

@@ -30,7 +30,7 @@ module Merb
         k.respond_to?(:ancestors) && k.ancestors.include?(Merb::PartController)
       end       
 
-      opts = opts.empty? ? {} : Hash[*(opts.first)]
+      opts = opts.inject({}) {|h,v| h[v.first] = v.last; h}
       
       res = klasses.inject([]) do |memo,(klass,action)|
         memo << klass.new(self, opts)._dispatch(action)
@@ -39,4 +39,4 @@ module Merb
     end
     
   end
-end
+end

data/lib/merb_parts/version.rb

@@ -0,0 +1,5 @@
+module Merb
+  module Parts 
+    VERSION    = '0.9.14'.freeze
+  end
+end

data/spec/fixtures/controllers/main.rb

@@ -0,0 +1,37 @@
+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", :my_second_param => "my_value")
+  end
+  
+  def part_with_arrays_in_params
+    part(TodoPart => :part_with_params, :my_param => ['my_first_value', 'my_second_value'], :my_second_param => "my_value")
+  end
+
+  def part_within_view
+    render
+  end
+  
+  def parth_with_absolute_template
+    part(TodoPart => :parth_with_absolute_template)
+  end
+  
+end

data/spec/fixtures/parts/done_part.rb

@@ -0,0 +1,4 @@
+require File.dirname(__FILE__) / 'todo_part'
+
+class DonePart < TodoPart
+end

data/spec/fixtures/parts/todo_part.rb

@@ -0,0 +1,30 @@
+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
+  
+  def parth_with_absolute_template
+    render :template => File.expand_path(self._template_root) / 'todo_part' / 'formatted_output'
+  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,7 @@
+<% params.each do |param, value| %>
+  <% if value.is_a? Array %>
+    <%= param %> = <%= value.join(", ") %>
+  <% else %>
+    <%= param %> = <%= value %>
+  <% end %>
+<% 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,91 @@
+require 'spec_helper'
+
+describe "A Merb PartController" do
+  
+  before(:each) do
+    Merb::Router.prepare do
+      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/)
+    controller.body.should match( /my_second_param = my_value/)
+  end
+
+  it "should provide arrays from params when calling a part" do
+    controller = dispatch_to(Main, :part_with_arrays_in_params)
+    controller.body.should match(/my_param = my_first_value, my_second_value/)
+    controller.body.should match( /my_second_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
+  
+  it "should render a template from an absolute path" do
+    controller = dispatch_to(Main, :parth_with_absolute_template)
+    controller.body.should match(/part_html_format/m)
+  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
+
+describe "A Merb Part Controller inheriting from another Part Controller" do
+  
+  it "should inherit the _template_root" do
+    TodoPart._template_root.should == File.expand_path(File.dirname(__FILE__) / 'fixtures' / 'parts' / 'views')
+    TodoPart._template_root.should == DonePart._template_root
+  end
+  
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -0,0 +1,23 @@
+require 'rubygems'
+
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb/merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require "merb-core"
+
+# The lib under test
+require 'merb_parts'
+
+# Require the fixtures
+Dir[File.join(File.dirname(__FILE__), "fixtures", "*/**.rb")].each{|f| require f }
+
+Merb.start(
+  :environment => 'test',
+  :adapter => 'runner',
+  :log_level => :error,
+  :disabled_components => [:json]
+)
+
+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.13
+  version: 0.9.14
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -08:00
+date: 2009-11-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
 description: Merb plugin that provides Part Controllers.
 email: has.sox@gmail.com
 executables: []
@@ -29,26 +39,41 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
-- TODO
+- README
 files: 
+- CHANGELOG
 - LICENSE
 - README
 - Rakefile
 - TODO
-- lib/merb_parts
+- lib/merb_parts.rb
 - lib/merb_parts/merbtasks.rb
-- lib/merb_parts/mixins
 - lib/merb_parts/mixins/parts_mixin.rb
 - lib/merb_parts/mixins/web_controller.rb
 - lib/merb_parts/part_controller.rb
-- lib/merb_parts.rb
+- lib/merb_parts/version.rb
+- spec/fixtures/controllers/main.rb
+- spec/fixtures/parts/done_part.rb
+- spec/fixtures/parts/todo_part.rb
+- spec/fixtures/parts/views/layout/todo_part.html.erb
+- spec/fixtures/parts/views/layout/todo_part.xml.erb
+- 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/main/part_within_view.html.erb
+- spec/merb-parts_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
-post_install_message: 
-rdoc_options: []
+homepage: http://github.com/merb/merb_parts
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -65,10 +90,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: merb
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Merb plugin that provides Part Controllers.
-test_files: []
-
+test_files: 
+- spec/fixtures/controllers/main.rb
+- spec/fixtures/parts/done_part.rb
+- spec/fixtures/parts/todo_part.rb
+- spec/merb-parts_spec.rb
+- spec/spec_helper.rb