merb-parts 0.9.7 → 0.9.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 YOUR NAME
+Copyright (c) 2008 Daniel Neighman
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -17,7 +17,7 @@ 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.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.7')
+  s.add_dependency('merb-core', '>= 0.9.8')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,merb_generators}/**/*")
 end
@@ -45,21 +45,33 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+end
 
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
-
 end
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new("specs") do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir["spec/**/*_spec.rb"].sort
+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
 end
+
+desc 'Default: run spec examples'
+task :default => 'spec'

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

@@ -29,8 +29,8 @@ module Merb
       klasses, opts = opts.partition do |k,v| 
         k.respond_to?(:ancestors) && k.ancestors.include?(Merb::PartController)
       end       
-        
-      opts = Hash[*(opts.flatten)]
+
+      opts = opts.empty? ? {} : Hash[*(opts.first)]
       
       res = klasses.inject([]) do |memo,(klass,action)|
         memo << klass.new(self, opts)._dispatch(action)

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

@@ -36,22 +36,8 @@ module Merb
           request.route
         end
 
-        def url(name, rparams={})
-          Merb::Router.generate(name, rparams,
-            { :controller => @web_controller.controller_name,
-              :action => @web_controller.action_name,
-              :format => params[:format]
-            }
-          )
-        end
-        
-        private 
-        # This method is here to overwrite the one in the general_controller mixin
-        # The method ensures that when a url is generated with a hash, it contains a controller
-        def get_controller_for_url_generation(opts)
-           controller = opts[:controller] || @web_controller.params[:controller]
-           raise "No Controller Specified for url()" unless controller
-           controller
+        def url(name, *args)
+          @web_controller.url(name, *args)
         end
         
       end

data/lib/merb-parts/part_controller.rb

@@ -72,6 +72,25 @@ module Merb
       super
       @content_type = @web_controller.content_type
     end
+    
+    # ==== Parameters
+    # name<~to_sym, Hash>:: The name of the URL to generate.
+    # rparams<Hash>:: Parameters for the route generation.
+    #
+    # ==== Returns
+    # String:: The generated URL.
+    #
+    # ==== Alternatives
+    # If a hash is used as the first argument, a default route will be
+    # generated based on it and rparams.
+    # ====
+    # TODO: Update this documentation
+    def url(name, *args)
+      args << params
+      Merb::Router.url(name, *args)
+    end
+
+    alias_method :relative_url, :url
 
     # ==== Parameters
     # action<~to_s>:: An action to dispatch to. Defaults to :to_s.

data/spec/fixtures/controllers/main.rb

@@ -22,6 +22,10 @@ class Main < Merb::Controller
     part(TodoPart => :part_with_params, :my_param => "my_value")
   end
   
+  def part_with_arrays_in_params
+    part(TodoPart => :part_with_params, :my_param => ['my_first_value', 'my_second_value'])
+  end
+
   def part_within_view
     render
   end

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

@@ -1,3 +1,7 @@
 <% params.each do |param, value| %>
-  <%= param %> = <%= value %>
+  <% if value.is_a? Array %>
+    <%= param %> = <%= value.join(", ") %>
+  <% else %>
+    <%= param %> = <%= value %>
+  <% end %>
 <% end %>

data/spec/merb-parts_spec.rb

@@ -46,6 +46,11 @@ describe "A Merb PartController" do
     controller = dispatch_to(Main, :part_with_params)
     controller.body.should match( /my_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/)
+  end
   
   it "should render from inside a view" do
     controller = dispatch_to(Main, :part_within_view)

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ 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'
+Merb.start :environment => 'test', :adapter => 'runner'
 
 Spec::Runner.configure do |config|
   config.include Merb::Test::RequestHelper  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-parts
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 +03:00
+date: 2008-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 description: Merb plugin that provides Part Controllers.
 email: has.sox@gmail.com