@@ -30,13 +30,13 @@ module ActionController "#{path}/#{post_component_order.select { |c| [ :category, :year, :month ].include?(c) }.map { |c| ":#{c}" }.join('/')}", :controller => HushCMS.configuration['controllers']['posts'], :action => 'archive', - :requirements => { :year => /\d{4}/, :month => /\d{2}/ } + :requirements => { :year => post_component_order.include?(:year) ? /\d{4}/ : nil, :month => post_component_order.include?(:month) ? /\d{2}/ : nil } named_route 'hush_cms_post', "#{path}/#{post_component_order.map { |c| ":#{c}" }.join('/')}", :controller => HushCMS.configuration['controllers']['posts'], :action => 'show', - :requirements => { :year => /\d{4}/, :month => /\d{2}/, :day => /\d{2}/ } + :requirements => { :year => post_component_order.include?(:year) ? /\d{4}/ : nil, :month => post_component_order.include?(:month) ? /\d{2}/ : nil, :day => post_component_order.include?(:day) ? /\d{2}/ : nil } end def hush_cms_admin(path) lib/extensions/mapper.rb @@ -31,11 +31,15 @@ module HushCMSViewHelpers private def hush_cms_post_location(m, post) send m, { - :category => post.category.slug, - :year => post.published_at.year, - :month => '%02d' % post.published_at.month, - :day => '%02d' % post.published_at.day, - :slug => post.slug + :category => named_route_uses_key?('hush_cms_post', :category) ? post.category.slug : nil, + :year => named_route_uses_key?('hush_cms_post', :year) ? post.published_at.year : nil, + :month => named_route_uses_key?('hush_cms_post', :month) ? '%02d' % post.published_at.month : nil, + :day => named_route_uses_key?('hush_cms_post', :day) ? '%02d' % post.published_at.day: nil, + :slug => named_route_uses_key?('hush_cms_post', :slug) ? post.slug : nil } end + + def named_route_uses_key?(named_route, key) + ActionController::Routing::Routes.named_routes[named_route].segment_keys.include?(key) + end end lib/helpers/hush_cms_view_helpers.rb 96fc8698c314c77721e3d54cdfccadd37b3b6bc8 James Brooks james@gooddogdesign.com http://github.com/JamesBrooks/hush_cms/commit/483cc3637e5eb2068497af7f8e23b8ed9778a271 483cc3637e5eb2068497af7f8e23b8ed9778a271 2009-04-06T23:17:13-07:00 2009-04-06T23:17:13-07:00 the hush_cms_post route helpers are now aware for what keys the route wants and will not provide extras. Route requirements for year/month/day are now only present if those keys are included in the options array passed to hush_cms_posts in routes.rb dfad7d09e69bb7d59f50daac2772f68d7e73a68c James Brooks james@gooddogdesign.com