merb-parts 0.9.3 → 0.9.4

data/Rakefile

@@ -1,49 +1,61 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
 require "spec/rake/spectask"
 
-PLUGIN = "merb-parts"
-NAME = "merb-parts"
-VERSION = "0.9.3"
-AUTHOR = "Hassox"
-EMAIL = ""
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-parts/"
-SUMMARY = "Merb More: Merb plugin that provides Part Controllers."
+##############################################################################
+# 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.4") + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
 
 spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
+  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 = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.3')
+  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.4')
   s.require_path = 'lib'
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,merb_generators}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
-
+desc "Install the gem"
 task :install => [:package] do
-  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_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 #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
   end
-  
+
 end
 
 desc "Run all specs"

data/lib/merb-parts.rb

@@ -1,44 +1,4 @@
-require File.join(File.dirname(__FILE__), 'merb-parts','part_controller')
+require File.join(File.dirname(__FILE__), "merb-parts", "part_controller")
+require File.join(File.dirname(__FILE__), "merb-parts", "mixins", "parts_mixin")
 
-module Merb
-  class Controller
-    # Dispatches a PartController.
-    # ==== Parameters
-    # opts<Hash>:: A Hash of Options. (see below)
-    #
-    # ==== Options
-    # An option hash has two parts.
-    # 1. keys that are Merb::PartControllers with values that are action names (as symbols)
-    # 2. key value pairs that will become available in the PartController as params merged
-    #    with the web controllers params
-    #
-    # ==== Example
-    #  Calling a part controller
-    #  {{{
-    #    part TodoPart => :list
-    #   }}}
-    #
-    #  Calling a part with additional options
-    #  {{{
-    #    part TodoPart => :list, :limit => 20, :user => current_user 
-    #  }}}
-    #
-    # ==== Returns
-    #   Returns the result of the PartControllers action, which is a string.
-    def part(opts = {})
-      # Extract any params out that may have been specified
-      klasses, opts = opts.partition do |k,v| 
-        k.respond_to?(:ancestors) && k.ancestors.include?(Merb::PartController)
-      end       
-        
-      opts = Hash[*(opts.flatten)]
-      
-      res = klasses.inject([]) do |memo,(klass,action)|
-        memo << klass.new(self, opts)._dispatch(action)
-      end
-      res.size == 1 ? res[0] : res
-    end
-    
-    
-  end
-end
+Merb::Controller.send(:include, Merb::PartsMixin)

data/lib/merb-parts/mixins/parts_mixin.rb

@@ -0,0 +1,42 @@
+module Merb
+  module PartsMixin
+    
+    # Dispatches a PartController.
+    # ==== Parameters
+    # opts<Hash>:: A Hash of Options. (see below)
+    #
+    # ==== Options
+    # An option hash has two parts.
+    # 1. keys that are Merb::PartControllers with values that are action names (as symbols)
+    # 2. key value pairs that will become available in the PartController as params merged
+    #    with the web controllers params
+    #
+    # ==== Example
+    #  Calling a part controller
+    #  {{{
+    #    part TodoPart => :list
+    #   }}}
+    #
+    #  Calling a part with additional options
+    #  {{{
+    #    part TodoPart => :list, :limit => 20, :user => current_user 
+    #  }}}
+    #
+    # ==== Returns
+    #   Returns the result of the PartControllers action, which is a string.
+    def part(opts = {})
+      # Extract any params out that may have been specified
+      klasses, opts = opts.partition do |k,v| 
+        k.respond_to?(:ancestors) && k.ancestors.include?(Merb::PartController)
+      end       
+        
+      opts = Hash[*(opts.flatten)]
+      
+      res = klasses.inject([]) do |memo,(klass,action)|
+        memo << klass.new(self, opts)._dispatch(action)
+      end
+      res.size == 1 ? res[0] : res
+    end
+    
+  end
+end

data/lib/merb-parts/mixins/web_controller.rb

@@ -1,5 +1,5 @@
 # Includes files into the class to allow it to minimally delegates to a web controller
-module Merb #:nodoc:
+module Merb
   module Mixins
     module WebController
       

data/lib/merb-parts/part_controller.rb

@@ -1,21 +1,21 @@
 require File.join(File.dirname(__FILE__), "mixins", "web_controller")
 module Merb
-  
+
   # A Merb::PartController is a light weight way to share logic and templates
-  # amongst controllers.  
-  # Merb::PartControllers work just like Merb::controller.  
+  # amongst controllers.
+  # Merb::PartControllers work just like Merb::controller.
   # There is a filter stack, layouts (if needed) all the render functions,
-  # and url generation.  
+  # and url generation.
   #
-  # Cookies, params, and even the request object are shared with the web controller  
+  # Cookies, params, and even the request object are shared with the web controller
   class PartController < AbstractController
     include Merb::Mixins::WebController
-    
+
     attr_reader :params
 
     cattr_accessor :_subclasses
     self._subclasses = Set.new
-    
+
     # ==== Returns
     # Array[Class]:: Classes that inherit from Merb::PartController.
     def self.subclasses_list() _subclasses end
@@ -23,26 +23,43 @@ module Merb
     # ==== Parameters
     # action<~to_s>:: The name of the action that will be rendered.
     # type<~to_s>::
-    #    The mime-type of the template that will be rendered. Defaults to nil.
+    #    The mime-type of the template that will be rendered. Defaults to html.
     # controller<~to_s>::
     #   The name of the controller that will be rendered. Defaults to
     #   controller_name.
     #
     # ==== Returns
     # String:: The template location, i.e. ":controller/:action.:type".
-    def _template_location(action, type = nil, controller = controller_name)
+    def _template_location(action, type = :html, controller = controller_name)
       "#{controller}/#{action}.#{type}"
     end
+    
+    # The location to look for a template and mime-type. This is overridden 
+    # from AbstractController, which defines a version of this that does not 
+    # involve mime-types.
+    #
+    # ==== Parameters
+    # template<String>:: 
+    #    The absolute path to a template - without mime and template extension.
+    #    The mime-type extension is optional - it will be appended from the 
+    #    current content type if it hasn't been added already.
+    # type<~to_s>::
+    #    The mime-type of the template that will be rendered. Defaults to nil.
+    #
+    # @public
+    def _absolute_template_location(template, type)
+      template.match(/\.#{type.to_s.escape_regexp}$/) ? template : "#{template}.#{type}"
+    end
 
     # Sets the template root to the default parts view directory.
     #
     # ==== Parameters
     # klass<Class>::
-    #   The Merb::PartController inheriting from the base class.  
+    #   The Merb::PartController inheriting from the base class.
     def self.inherited(klass)
       _subclasses << klass.to_s
       super
-      klass.class_eval %{self._template_root = Merb.dir_for(:part) / "views"}
+      klass._template_root = Merb.dir_for(:part) / "views" unless self._template_root
     end
 
     # ==== Parameters
@@ -50,7 +67,7 @@ module Merb
     # opts<Hash>:: Additional options for this part.
     def initialize(web_controller, opts = {})
       @web_controller = web_controller
-      @params = @web_controller.params
+      @params = @web_controller.params.dup
       @params.merge!(opts) unless opts.empty?
       super
       @content_type = @web_controller.content_type
@@ -65,8 +82,8 @@ module Merb
       self.action_name = action
       super(action)
       @body
-    end    
-    
+    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)
@@ -74,4 +91,4 @@ module Merb
       @web_controller.send(sym, *args, &blk)
     end
   end
-end
+end

data/spec/fixtures/controllers/main.rb

@@ -26,4 +26,8 @@ class Main < Merb::Controller
     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

@@ -23,4 +23,8 @@ class TodoPart < Merb::PartController
     render
   end
   
+  def parth_with_absolute_template
+    render :template => File.expand_path(self._template_root) / 'todo_part' / 'formatted_output'
+  end
+  
 end

data/spec/merb-parts_spec.rb

@@ -29,7 +29,7 @@ describe "A Merb PartController" do
   
   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) 
+    controller.body.should match(/part_html_format/m)
   end
   
   it "should render the xml format according to the controller" do
@@ -52,6 +52,10 @@ describe "A Merb PartController" do
     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  
 
@@ -68,4 +72,13 @@ describe "A Merb Part Controller with urls" do
     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

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: merb-parts
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
-- Hassox
-autorequire: merb-parts
+- Daniel Neighman
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
-description: "Merb More: Merb plugin that provides Part Controllers."
-email: ""
+description: Merb plugin that provides Part Controllers.
+email: has.sox@gmail.com
 executables: []
 
 extensions: []
@@ -39,6 +40,7 @@ files:
 - lib/merb-parts
 - 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
@@ -46,6 +48,7 @@ files:
 - spec/fixtures/controllers
 - spec/fixtures/controllers/main.rb
 - spec/fixtures/parts
+- spec/fixtures/parts/done_part.rb
 - spec/fixtures/parts/todo_part.rb
 - spec/fixtures/parts/views
 - spec/fixtures/parts/views/layout
@@ -63,7 +66,7 @@ files:
 - spec/merb-parts_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merb-plugins.rubyforge.org/merb-parts/
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -83,10 +86,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: merb
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: "Merb More: Merb plugin that provides Part Controllers."
+summary: Merb plugin that provides Part Controllers.
 test_files: []