merb-slices 0.9.8 → 0.9.9

data/README

@@ -64,9 +64,9 @@ add_slice(:BlogSlice)
 
 add_slice(:BlogSlice, 'foo') # same as :path => 'foo'
 
-# example: /:lang/:controller/:action/:id (with :a param set)
+# example: /:lang/:controller/:action/:id
 
-add_slice(:BlogSlice, :path => ':lang', :params => { :a => 'b' })
+add_slice(:BlogSlice, :path => ':lang')
 
 # example: /:controller/:action/:id
 

data/Rakefile

@@ -4,6 +4,8 @@ require "extlib"
 require 'merb-core/tasks/merb_rake_helper'
 require "spec/rake/spectask"
 
+require File.join(File.dirname(__FILE__), "../merb-core/lib/merb-core/version.rb")
+
 ##############################################################################
 # Package && release
 ##############################################################################
@@ -17,7 +19,7 @@ GEM_EMAIL  = "info@fabien.be"
 
 GEM_NAME    = "merb-slices"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
+GEM_VERSION = Merb::VERSION + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,7 +37,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.8')
+  s.add_dependency('merb-core', '>= 0.9.9')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile Generators TODO) + Dir.glob("{lib,spec}/**/*")
   s.bindir = "bin"

data/bin/slice

@@ -16,9 +16,11 @@ Merb::Config.use { |c|
 
 if File.exists?(slice_file = File.join(__DIR__, 'lib', "#{slice_name}.rb"))
   Merb::BootLoader.before_app_loads do
-    # See Merb::Slices::ModuleMixin - $SLICE_MODULE is used as a flag
     $SLICE_MODULE = Merb::Slices.filename2module(slice_file)
     require slice_file
+  end
+  Merb::BootLoader.after_app_loads do
+    # See Merb::Slices::ModuleMixin - $SLICE_MODULE is used as a flag
     Merb::Router.prepare do 
       slice($SLICE_MODULE)
       slice_id = slice_name.gsub('-', '_').to_sym

data/lib/generators/base.rb

@@ -8,6 +8,11 @@ module Merb::Generators
     desc <<-DESC
       Generates a merb slice.
     DESC
+
+    def initialize(*args)
+      Merb.disable(:initfile)
+      super
+    end
     
     first_argument :name, :required => true
     

data/lib/generators/full.rb

@@ -1,6 +1,11 @@
 module Merb::Generators
   
   class FullSliceGenerator < BaseSliceGenerator
+    
+    def initialize(*args)
+      Merb.disable(:initfile)
+      super
+    end
 
     def self.source_root
       File.join(File.dirname(__FILE__), 'templates', 'full')
@@ -19,6 +24,9 @@ module Merb::Generators
     
     first_argument :name, :required => true
     
+    option :testing_framework, :default => :rspec,
+                               :desc => 'Testing framework to use (one of: rspec, test_unit).'
+    
     def destination_root
       File.join(@destination_root, base_name)
     end

data/lib/generators/templates/common/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) <%= Time.now.year %> YOUR NAME
+Copyright (c) <%= Time.now.year %> Engine Yard
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/generators/templates/common/Rakefile

@@ -47,4 +47,12 @@ task :gemspec do
   File.open("#{GEM_NAME}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end
+<% if testing_framework.to_sym == :rspec %>
+require 'spec/rake/spectask'
+require 'merb-core/test/tasks/spectasks'
+desc 'Default: run spec examples'
+task :default => 'spec'
+<% elsif testing_framework.to_sym == :test_unit %>
+require 'rake/testtask'
+<% end %>

data/lib/generators/templates/full/README

@@ -96,9 +96,9 @@ add_slice(:<%= module_name %>)
 
 add_slice(:<%= module_name %>, 'foo') # same as :path => 'foo'
 
-# example: /:lang/:controller/:action/:id (with :a param set)
+# example: /:lang/:controller/:action/:id
 
-add_slice(:<%= module_name %>, :path => ':lang', :params => { :a => 'b' })
+add_slice(:<%= module_name %>, :path => ':lang')
 
 # example: /:controller/:action/:id
 

data/lib/generators/templates/full/Rakefile

@@ -1,10 +1,8 @@
 require 'rubygems'
 require 'rake/gempackagetask'
-require 'spec/rake/spectask'
 
 require 'merb-core'
 require 'merb-core/tasks/merb'
-require 'merb-core/test/tasks/spectasks'
 
 GEM_NAME = "<%= base_name %>"
 AUTHOR = "Your Name"
@@ -50,18 +48,11 @@ task :gemspec do
     file.puts spec.to_ruby
   end
 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
-end
-
+<% if testing_framework.to_sym == :rspec %>
+require 'spec/rake/spectask'
+require 'merb-core/test/tasks/spectasks'
 desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => 'spec'
+<% elsif testing_framework.to_sym == :test_unit %>
+require 'rake/testtask'
+<% end %>

data/lib/generators/templates/full/lib/%base_name%.rb

@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
     # Slice metadata
     self.description = "<%= module_name %> is a chunky Merb slice!"
     self.version = "0.0.1"
-    self.author = "YOUR NAME"
+    self.author = "Engine Yard"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader
     # right after a slice's classes have been loaded internally.
@@ -56,6 +56,8 @@ if defined?(Merb::Plugins)
       scope.match('/index(.:format)').to(:controller => 'main', :action => 'index').name(:index)
       # the slice is mounted at /<%= base_name %> - note that it comes before default_routes
       scope.match('/').to(:controller => 'main', :action => 'index').name(:home)
+      # enable slice-level default routes by default
+      scope.default_routes
     end
     
   end

data/lib/generators/templates/full/spec/controllers/main_spec.rb

@@ -48,7 +48,7 @@ describe "<%= module_name %>::Main (controller)" do
     controller.slice_url(:index, :format => 'html').should == url
     
     url = controller.url(:<%= symbol_name %>_home)
-    url.should == "/<%= base_name %>"
+    url.should == "/<%= base_name %>/"
     controller.slice_url(:home).should == url
   end
   

data/lib/generators/templates/thin/README

@@ -81,9 +81,9 @@ add_slice(:<%= module_name %>)
 
 add_slice(:<%= module_name %>, 'foo') # same as :path => 'foo'
 
-# example: /:lang/:controller/:action/:id (with :a param set)
+# example: /:lang/:controller/:action/:id
 
-add_slice(:<%= module_name %>, :path => ':lang', :params => { :a => 'b' })
+add_slice(:<%= module_name %>, :path => ':lang')
 
 # example: /:controller/:action/:id
 

data/lib/generators/templates/thin/lib/%base_name%.rb

@@ -18,7 +18,7 @@ if defined?(Merb::Plugins)
     # Slice metadata
     self.description = "<%= module_name %> is a thin Merb slice!"
     self.version = "0.0.1"
-    self.author = "YOUR NAME"
+    self.author = "Engine Yard"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader
     # right after a slice's classes have been loaded internally.
@@ -47,6 +47,8 @@ if defined?(Merb::Plugins)
     # @note prefix your named routes with :<%= symbol_name %>_
     #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
+      # enable slice-level default routes by default
+      scope.default_routes
     end
     
     # This sets up a thin slice's structure.

data/lib/generators/templates/very_thin/README

@@ -61,9 +61,9 @@ add_slice(:<%= module_name %>)
 
 add_slice(:<%= module_name %>, 'foo') # same as :path => 'foo'
 
-# example: /:lang/:controller/:action/:id (with :a param set)
+# example: /:lang/:controller/:action/:id
 
-add_slice(:<%= module_name %>, :path => ':lang', :params => { :a => 'b' })
+add_slice(:<%= module_name %>, :path => ':lang')
 
 # example: /:controller/:action/:id
 

data/lib/generators/templates/very_thin/lib/%base_name%.rb

@@ -17,7 +17,7 @@ if defined?(Merb::Plugins)
     # Slice metadata
     self.description = "<%= module_name %> is a very thin Merb slice!"
     self.version = "0.0.1"
-    self.author = "YOUR NAME"
+    self.author = "Engine Yard"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader
     # right after a slice's classes have been loaded internally.
@@ -46,6 +46,8 @@ if defined?(Merb::Plugins)
     # @note prefix your named routes with :<%= symbol_name %>_
     #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
+      # enable slice-level default routes by default
+      scope.default_routes
     end
     
     # This sets up a very thin slice's structure.

data/lib/generators/thin.rb

@@ -22,6 +22,9 @@ module Merb::Generators
     
     first_argument :name, :required => true
     
+    option :testing_framework, :default => :rspec,
+                               :desc => 'Testing framework to use (one of: rspec, test_unit).'
+    
     def destination_root
       File.join(@destination_root, base_name)
     end

data/lib/generators/very_thin.rb

@@ -19,6 +19,9 @@ module Merb::Generators
     
     first_argument :name, :required => true
     
+    option :testing_framework, :default => :rspec,
+                               :desc => 'Testing framework to use (one of: rspec, test_unit).'
+    
     def destination_root
       File.join(@destination_root, base_name)
     end

data/lib/merb-slices/controller_mixin.rb

@@ -1,6 +1,42 @@
 module Merb
   module Slices
     
+    module Support
+      
+      # This module should be explicitly included into a controller,
+      # for example in Application (the main controller of your app).
+      # It contains optional methods for slice/plugin developers.
+      
+      # Generate a slice url - takes the slice's :path_prefix into account.
+      #
+      # @param slice_name<Symbol> 
+      #   The name of the slice - in identifier_sym format (underscored).
+      # @param *args<Array[Symbol,Hash]> 
+      #   There are several possibilities regarding arguments:
+      #   - when passing a Hash only, the :default route of the current 
+      #     slice will be used
+      #   - when a Symbol is passed, it's used as the route name
+      #   - a Hash with additional params can optionally be passed
+      # 
+      # @return <String> A uri based on the requested slice.
+      #
+      # @example slice_url(:awesome, :format => 'html')
+      # @example slice_url(:forum, :posts, :format => 'xml')          
+      def slice_url(slice_name, *args)
+        opts = args.last.is_a?(Hash) ? args.pop : {}
+        route_name = args[0].is_a?(Symbol) ? args.shift : :default
+        
+        routes = Merb::Slices.named_routes[slice_name]
+        unless routes && route = routes[route_name]
+          raise Merb::Router::GenerationError, "Named route not found: #{route_name}"
+        end
+        
+        args.push(opts)
+        route.generate(args, params)
+      end
+      
+    end
+    
     module ControllerMixin
       
       def self.included(klass)

data/lib/merb-slices/module.rb

@@ -39,7 +39,7 @@ module Merb
         slice_path  = File.expand_path(File.dirname(slice_file) + '/..')
         # check if slice_path exists instead of just the module name - more flexible
         if !self.paths.include?(slice_path) || force
-          Merb.logger.info!("Registered slice '#{module_name}' located at #{slice_path}") if force
+          Merb.logger.verbose!("Registered slice '#{module_name}' located at #{slice_path}") if force
           self.files[module_name] = slice_file
           self.paths[module_name] = slice_path
           slice_mod = setup_module(module_name)

data/lib/merb-slices/router_ext.rb

@@ -1,78 +1,71 @@
-module Merb
-  class Router
-        
-    class Behavior
+Merb::Router.extensions do
       
-      # Add all known slices to the router
-      #
-      # By combining this with Merb::Slices.activate_by_file and Merb::Slices.deactivate
-      # one can enable/disable slices at runtime, without restarting your app.
-      #
-      # @param config<Hash> 
-      #  Optional hash, mapping slice module names to their settings;
-      #  set :path (or use a string) if you want to override what appears on the url.
-      #
-      # @yield A new Behavior instance is yielded in the block for nested routes.
-      # @yieldparam ns<Behavior> The namespace behavior object.
-      #
-      # @example all_slices('BlogSlice' => 'blog', 'ForumSlice' => { :path => 'forum' })
-      #
-      # @note The block is yielded for each slice individually.
-      def all_slices(config = {}, &block)
-        Merb::Slices.slice_names.each { |module_name| add_slice(module_name, config[module_name] || {}, &block) }
-      end
-      alias :add_slices :all_slices
+  # Add all known slices to the router
+  #
+  # By combining this with Merb::Slices.activate_by_file and Merb::Slices.deactivate
+  # one can enable/disable slices at runtime, without restarting your app.
+  #
+  # @param config<Hash> 
+  #  Optional hash, mapping slice module names to their settings;
+  #  set :path (or use a string) if you want to override what appears on the url.
+  #
+  # @yield A new Behavior instance is yielded in the block for nested routes.
+  # @yieldparam ns<Behavior> The namespace behavior object.
+  #
+  # @example all_slices('BlogSlice' => 'blog', 'ForumSlice' => { :path => 'forum' })
+  #
+  # @note The block is yielded for each slice individually.
+  def all_slices(config = {}, &block)
+    Merb::Slices.slice_names.each { |module_name| add_slice(module_name, config[module_name] || {}, &block) }
+  end
+  alias :add_slices :all_slices
+  
+  # Add a Slice in a router namespace
+  # 
+  # @param slice_module<String, Symbol, Module> A Slice module to mount.
+  # @param options<Hash, String> Optional hash, set :path if you want to override what appears on the url.
+  # 
+  # @yield A new Behavior instance is yielded in the block for nested routes - runs before the slice routes are setup.
+  # @yieldparam ns<Behavior> The namespace behavior object.
+  #
+  # @return <Behaviour> The current router context.
+  #
+  # @note If a slice has no routes at all, the activate hook won't be executed.
+  #
+  # @note Normally you should specify the slice_module using a String or Symbol
+  #       this ensures that your module can be removed from the router at runtime.
+  def add_slice(slice_module, options = {}, &block)
+    if Merb::Slices.exists?(slice_module)
+      options = { :path => options } if options.is_a?(String)
+      slice_module = Object.full_const_get(slice_module.to_s.camel_case) if slice_module.class.in?(String, Symbol)
+      namespace = options[:namespace] || slice_module.identifier_sym
+      options[:path] ||= options[:path_prefix] || slice_module[:path_prefix] || options[:namespace] || slice_module.identifier
+      options[:prepend_routes] = block if block_given?
+      slice_module[:path_prefix] = options[:path]
+      Merb.logger.verbose!("Mounting slice #{slice_module} at /#{options[:path]}")
       
-      # Add a Slice in a router namespace
-      # 
-      # @param slice_module<String, Symbol, Module> A Slice module to mount.
-      # @param options<Hash, String> Optional hash, set :path if you want to override what appears on the url.
-      # 
-      # @yield A new Behavior instance is yielded in the block for nested routes - runs before the slice routes are setup.
-      # @yieldparam ns<Behavior> The namespace behavior object.
-      #
-      # @return <Behaviour> The current router context.
-      #
-      # @note If a slice has no routes at all, the activate hook won't be executed.
-      #
-      # @note Normally you should specify the slice_module using a String or Symbol
-      #       this ensures that your module can be removed from the router at runtime.
-      def add_slice(slice_module, options = {}, &block)
-        if Merb::Slices.exists?(slice_module)
-          options = { :path => options } if options.is_a?(String)
-          slice_module = Object.full_const_get(slice_module.to_s.camel_case) if slice_module.class.in?(String, Symbol)
-          namespace = options[:namespace] || slice_module.identifier_sym
-          options[:path] ||= options[:path_prefix] || slice_module[:path_prefix] || options[:namespace] || slice_module.identifier
-          options[:default_routes] = true unless options.key?(:default_routes)
-          options[:prepend_routes] = block if block_given?
-          slice_module[:path_prefix] = options[:path]
-          Merb.logger.info!("Mounting slice #{slice_module} at /#{options[:path]}")
-          
-          # reset the inherited controller prefix - especially for 'slice' entries (see below)
-          @options[:controller_prefix] = nil if options.delete(:reset_controller_prefix)
-          
-          # setup routes - capture the slice's routes for easy reference
-          self.namespace(namespace, options.except(:default_routes, :prepend_routes, :append_routes, :path_prefix)) do |ns|
-            Merb::Slices.named_routes[slice_module.identifier_sym] = ns.capture do
-              options[:prepend_routes].call(ns) if options[:prepend_routes].respond_to?(:call)
-              slice_module.setup_router(ns)     # setup the routes from the slice itself
-              options[:append_routes].call(ns)  if options[:append_routes].respond_to?(:call)
-              ns.default_routes(options[:params] || {}) if options[:default_routes]
-            end
-          end
-        else 
-          Merb.logger.info!("Skipped adding slice #{slice_module} to router...")
-        end
-        self
-      end
+      # reset the inherited controller prefix - especially for 'slice' entries (see below)
+      @options[:controller_prefix] = nil if options.delete(:reset_controller_prefix)
       
-      # Insert a slice directly into the current router context.
-      #
-      # This will still setup a namespace, but doesn't set a path prefix. Only for special cases.
-      def slice(slice_module, options = {}, &block)
-        add_slice(slice_module, options.merge(:path => '', :reset_controller_prefix => true), &block)
+      # setup routes - capture the slice's routes for easy reference
+      self.namespace(namespace, options.except(:default_routes, :prepend_routes, :append_routes, :path_prefix)) do |ns|
+        Merb::Slices.named_routes[slice_module.identifier_sym] = ns.capture do
+          options[:prepend_routes].call(ns) if options[:prepend_routes].respond_to?(:call)
+          slice_module.setup_router(ns)     # setup the routes from the slice itself
+          options[:append_routes].call(ns)  if options[:append_routes].respond_to?(:call)
+        end
       end
-      
+    else 
+      Merb.logger.info!("Skipped adding slice #{slice_module} to router...")
     end
+    self
+  end
+  
+  # Insert a slice directly into the current router context.
+  #
+  # This will still setup a namespace, but doesn't set a path prefix. Only for special cases.
+  def slice(slice_module, options = {}, &block)
+    add_slice(slice_module, options.merge(:path => '', :reset_controller_prefix => true), &block)
   end
+
 end

data/lib/merb-slices.rb

@@ -96,7 +96,7 @@ if defined?(Merb::Plugins)
   
     def self.run
       Merb::Slices.each_slice do |slice|
-        Merb.logger.info!("Initializing slice '#{slice}' ...") 
+        Merb.logger.verbose!("Initializing slice '#{slice}' ...") 
         slice.init if slice.respond_to?(:init)
       end
     end

data/spec/full_slice_spec.rb

@@ -63,7 +63,7 @@ describe "A slice" do
   it "should have metadata properties" do
     FullTestSlice.description.should == "FullTestSlice is a chunky Merb slice!"
     FullTestSlice.version.should == "0.0.1"
-    FullTestSlice.author.should == "YOUR NAME"
+    FullTestSlice.author.should == "Engine Yard"
   end
   
   it "should have a :named_routes property" do

data/spec/merb-slice_spec.rb

@@ -54,7 +54,7 @@ describe "The Merb::Router::Behavior methods" do
         scope.match('/dashboard').to(:controller => 'main', :action => 'index').name(:dashboard)
       end
       add_slice(:thin_test_slice, 'thin') # shortcut for :path => 'thin'
-      slice(:very_thin_test_slice, :name_prefix => 'awesome', :params => { :foo => 'bar' })
+      slice(:very_thin_test_slice, :name_prefix => 'awesome')
     end    
   end
   
@@ -83,11 +83,7 @@ describe "The Merb::Router::Behavior methods" do
     Merb::Router.named_routes[:awesome_default].should == VeryThinTestSlice.named_routes[:default]
   end
   
-  it "should allow default params to be set on a route" do
-    Merb::Router.named_routes[:awesome_default].params[:foo].should == '"bar"'
-  end
-  
-  it "enable url() and slice_url() respectively" do
+  it "enables url() and slice_url() respectively" do
     controller = dispatch_to(FullTestSlice::Main, 'index')
     controller.url(:full_test_slice_index, :format => 'html').should == '/full/index.html'
     controller.slice_url(:full_test_slice, :index, :format => 'html').should == '/full/index.html'
@@ -98,4 +94,12 @@ describe "The Merb::Router::Behavior methods" do
     controller.slice_url(:dashboard).should == '/full/dashboard'
   end
   
+  it "enables slice_url() for Controllers that include Merb::Slices::Support" do
+    controller = dispatch_to(Merb::Test::SampleAppController, 'index')
+    controller.slice_url(:full_test_slice, :dashboard).should == '/full/dashboard'
+    params = { :controller => 'foo', :action => 'bar', :id => 'baz' }
+    controller.slice_url(:thin_test_slice, :default, params).should == '/thin/foo/bar/baz'
+    controller.slice_url(:very_thin_test_slice, :default, params).should == '/foo/bar/baz'
+  end
+  
 end

data/spec/slices/full-test-slice/LICENSE

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

data/spec/slices/full-test-slice/README

@@ -96,9 +96,9 @@ add_slice(:FullTestSlice)
 
 add_slice(:FullTestSlice, 'foo') # same as :path => 'foo'
 
-# example: /:lang/:controller/:action/:id (with :a param set)
+# example: /:lang/:controller/:action/:id
 
-add_slice(:FullTestSlice, :path => ':lang', :params => { :a => 'b' })
+add_slice(:FullTestSlice, :path => ':lang')
 
 # example: /:controller/:action/:id
 

data/spec/slices/full-test-slice/Rakefile

@@ -1,10 +1,8 @@
 require 'rubygems'
 require 'rake/gempackagetask'
-require 'spec/rake/spectask'
 
 require 'merb-core'
 require 'merb-core/tasks/merb'
-require 'merb-core/test/tasks/spectasks'
 
 GEM_NAME = "full-test-slice"
 AUTHOR = "Your Name"
@@ -51,17 +49,7 @@ task :gemspec do
   end
 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
-end
-
+require 'spec/rake/spectask'
+require 'merb-core/test/tasks/spectasks'
 desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => 'spec'

data/spec/slices/full-test-slice/lib/full-test-slice.rb

@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
     # Slice metadata
     self.description = "FullTestSlice is a chunky Merb slice!"
     self.version = "0.0.1"
-    self.author = "YOUR NAME"
+    self.author = "Engine Yard"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader
     # right after a slice's classes have been loaded internally.
@@ -56,6 +56,8 @@ if defined?(Merb::Plugins)
       scope.match('/index(.:format)').to(:controller => 'main', :action => 'index').name(:index)
       # the slice is mounted at /full-test-slice - note that it comes before default_routes
       scope.match('/').to(:controller => 'main', :action => 'index').name(:home)
+      # enable slice-level default routes by default
+      scope.default_routes
     end
     
   end

data/spec/slices/thin-test-slice/LICENSE

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

data/spec/slices/thin-test-slice/README

@@ -81,9 +81,9 @@ add_slice(:ThinTestSlice)
 
 add_slice(:ThinTestSlice, 'foo') # same as :path => 'foo'
 
-# example: /:lang/:controller/:action/:id (with :a param set)
+# example: /:lang/:controller/:action/:id
 
-add_slice(:ThinTestSlice, :path => ':lang', :params => { :a => 'b' })
+add_slice(:ThinTestSlice, :path => ':lang')
 
 # example: /:controller/:action/:id
 

data/spec/slices/thin-test-slice/lib/thin-test-slice.rb

@@ -18,7 +18,7 @@ if defined?(Merb::Plugins)
     # Slice metadata
     self.description = "ThinTestSlice is a thin Merb slice!"
     self.version = "0.0.1"
-    self.author = "YOUR NAME"
+    self.author = "Engine Yard"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader
     # right after a slice's classes have been loaded internally.
@@ -47,6 +47,8 @@ if defined?(Merb::Plugins)
     # @note prefix your named routes with :thin_test_slice_
     #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
+      # enable slice-level default routes by default
+      scope.default_routes
     end
     
     # This sets up a thin slice's structure.

data/spec/slices/very-thin-test-slice/LICENSE

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

data/spec/slices/very-thin-test-slice/README

@@ -61,9 +61,9 @@ add_slice(:VeryThinTestSlice)
 
 add_slice(:VeryThinTestSlice, 'foo') # same as :path => 'foo'
 
-# example: /:lang/:controller/:action/:id (with :a param set)
+# example: /:lang/:controller/:action/:id
 
-add_slice(:VeryThinTestSlice, :path => ':lang', :params => { :a => 'b' })
+add_slice(:VeryThinTestSlice, :path => ':lang')
 
 # example: /:controller/:action/:id
 

data/spec/slices/very-thin-test-slice/lib/very-thin-test-slice.rb

@@ -17,7 +17,7 @@ if defined?(Merb::Plugins)
     # Slice metadata
     self.description = "VeryThinTestSlice is a very thin Merb slice!"
     self.version = "0.0.1"
-    self.author = "YOUR NAME"
+    self.author = "Engine Yard"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader
     # right after a slice's classes have been loaded internally.
@@ -46,6 +46,8 @@ if defined?(Merb::Plugins)
     # @note prefix your named routes with :very_thin_test_slice_
     #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
+      # enable slice-level default routes by default
+      scope.default_routes
     end
     
     # This sets up a very thin slice's structure.

data/spec/spec_helper.rb

@@ -11,6 +11,16 @@ require 'generators/very_thin'
 
 module Merb
   module Test
+    
+    class SampleAppController < Merb::Controller
+      
+      include Merb::Slices::Support
+      
+      def index
+      end
+      
+    end
+    
     module SliceHelper
       
       def current_slice_root=(path)

data/spec/thin_slice_spec.rb

@@ -67,7 +67,7 @@ describe "A thin slice" do
   it "should have metadata properties" do
     ThinTestSlice.description.should == "ThinTestSlice is a thin Merb slice!"
     ThinTestSlice.version.should == "0.0.1"
-    ThinTestSlice.author.should == "YOUR NAME"
+    ThinTestSlice.author.should == "Engine Yard"
   end
   
   it "should have a :named_routes property" do

data/spec/very_thin_slice_spec.rb

@@ -67,7 +67,7 @@ describe "A very thin slice" do
   it "should have metadata properties" do
     VeryThinTestSlice.description.should == "VeryThinTestSlice is a very thin Merb slice!"
     VeryThinTestSlice.version.should == "0.0.1"
-    VeryThinTestSlice.author.should == "YOUR NAME"
+    VeryThinTestSlice.author.should == "Engine Yard"
   end
   
   it "should have a :named_routes property" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-slices
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Fabien Franzen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 +03:00
+date: 2008-10-13 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.8
+        version: 0.9.9
     version: 
 description: Merb-Slices is a Merb plugin for using and creating application 'slices' which help you modularize your application.
 email: info@fabien.be