menumatic 0.1.1 → 0.1.3

data/Gemfile

@@ -7,4 +7,4 @@ gem 'rspec'
 gem 'autotest'
 gem 'autotest-growl'
 gem 'factory_girl'
-gem 'rails', '~>3.0.4'
+gem 'rails', '3.0.5'

data/README.md

@@ -3,6 +3,7 @@
 Menumatic is a _Rails 3 exclusive_ gem which aids in developing HTML
 navigation menus.
 
+__Please note__ menumatic is still in alpha however all the features mentioned in the readme should be working as expected - at the moment we're focussed on improving test coverage to bring us up to a proper, full release.
 
 ## Philosophy
 
@@ -28,7 +29,7 @@ Then update your bundle:
 
 You can then get started by generating a new navigation:
 
-    $ rails g navigation
+    $ rails g menumatic:navigation
 
 This will create the file `app/navigation/application_navigation.rb` which you can use to
 define the structure of your navigation items.
@@ -45,7 +46,7 @@ Navigations are stored in `app/navigation`. The default navigation is
 given a name of 'application', however you can specify the name in the
 generator:
 
-    $ rails g navigation application
+    $ rails g menumatic:navigation application
 
 Which will generate a navigation called
 `app/navigation/application_navigation.rb` and the basic stylesheet.

data/lib/menumatic/engine.rb

@@ -1,4 +1,5 @@
 module Menumatic
   class Engine < Rails::Engine
+    ActionController::Base.helper(Menumatic::Helpers::NavigationHelper)
   end
 end

data/lib/menumatic/helpers/navigation_helper.rb

@@ -1,7 +1,7 @@
 module Menumatic
   module Helpers
     module NavigationHelper
-      def navigation(navigation_id = "application", options = {})
+      def menumatic(navigation_id = :application, options = {})
         options[:level] ||= nil # single level to render, overrides any other level settings
         options[:levels] ||= [options[:level]].delete_if{ |l| l.blank? }
 
@@ -9,9 +9,9 @@ module Menumatic
         options[:groups] ||= [options[:groups]].delete_if{ |g| g.blank? }
 
         options[:class] ||= ""
-        options[:class] += "navigation #{navigation_id}"
+        options[:class] += "navigation #{navigation_id.to_s}"
 
-        navigation = load_navigation(navigation_id)
+        navigation = Menumatic::Navigation::Base.load_navigation(navigation_id.to_sym)
         navigation.root.render(request, options)
       end
 
@@ -19,18 +19,6 @@ module Menumatic
         navigation = load_navigation(navigation_id)
         navigation.root.render_sitemap(document, request, options)
       end
-
-      def load_navigation(navigation_id)
-        # Eager load the requested navgation (allows for use of normal if/unless statements)
-        Menumatic::Navigation::Base.destroy_all
-        load "app/navigation/#{navigation_id}_navigation.rb"
-        Menumatic::Navigation::Base.get(navigation_id)
-      end
-
-      def navigation_group(navigation_id, group_id, options = {})
-        options = options.merge({:group => group_id})
-        navigation(navigation_id, options)
-      end
     end
   end
 end

data/lib/menumatic/navigation/item/link.rb

@@ -10,8 +10,9 @@ module Menumatic
 
           if args.length > 2
             options = args[2]
-            self.active_paths = options[:active_paths]
+            self.active_paths = options[:active_on]
           end
+          self.active_paths ||= []
         end
       end
     end

data/lib/menumatic/navigation/item/renderers.rb

@@ -26,7 +26,7 @@ module Menumatic
           unless list.blank?
             list_options = html_options.merge({})
             list_options[:class] += " level_#{options[:current_level]}"
-            list_options[:class] += " depth_#{count_active_descendants(request)}" if options[:current_level] == 1
+            list_options[:class] += " depth_#{depth_count(request, options)}" if options[:current_level] == 1
             if on_valid_level?(options[:levels], options[:current_level]) || options[:current_level] == 1
               list = content_tag(options[:wrapper_tag], list.html_safe, list_options)
             else
@@ -92,8 +92,19 @@ module Menumatic
           0
         end
 
+        def depth_count(request, options = {})
+          return options[:levels].count unless options[:levels].empty?
+          count_active_descendants(request)
+        end
+
         def paths_match?(request)
-          request.fullpath == self.destination || request.url == self.destination if self.is_link?
+          if self.is_link?
+            self.active_paths.each do |path|
+              return true if path.is_a?(Regexp) && (request.fullpath =~ path || request.url =~ path)
+              return true if path.is_a?(String) && (request.fullpath == path || request.url == path)
+            end
+            return request.fullpath == self.destination || request.url == self.destination if self.active_paths.empty?
+          end
         end
 
         def on_valid_level?(levels, current_level)
@@ -101,7 +112,7 @@ module Menumatic
         end
 
         def levels_to_i(levels_in_words)
-          levels_in_words.map{ |word| @@level_options.index(word.to_sym) + 1 }
+          levels_in_words.map{ |word| word.is_a?(Symbol) ? @@level_options.index(word.to_sym) + 1 : word }
         end
       end
     end

data/lib/menumatic/navigation.rb

@@ -38,6 +38,13 @@ module Menumatic
         def destroy_all
           @@navigations = {}
         end
+
+        def load_navigation(navigation_id)
+          # Eager load the requested navgation (allows for use of normal if/unless statements)
+          Menumatic::Navigation::Base.destroy_all
+          load "app/navigation/#{navigation_id}_navigation.rb"
+          Menumatic::Navigation::Base.get(navigation_id)
+        end
       end
 
       def initialize(id)

data/lib/menumatic/rails/rendering.rb

@@ -0,0 +1,14 @@
+module ActionView
+  module Rendering
+    def render_with_navigation_option(options = {}, locals = {}, &block)
+      if options.has_key? :navigation
+        navigation_id = options[:navigation]
+        options.delete(:navigation)
+        menumatic(navigation_id, options)
+      else
+        render_without_navigation_option(options, locals, &block)
+      end
+    end
+    alias_method_chain :render, :navigation_option
+  end
+end

data/lib/menumatic/version.rb

@@ -1,3 +1,3 @@
 module Menumatic
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/menumatic.rb

@@ -1,7 +1,6 @@
 module Menumatic
   module Helpers
     autoload :NavigationHelper, 'menumatic/helpers/navigation_helper'
-    ActionController::Base.helper(Menumatic::Helpers::NavigationHelper)
   end
 
   module Navigation
@@ -20,4 +19,5 @@ module Menumatic
 end
 
 require 'menumatic/rails/routes'
+require 'menumatic/rails/rendering'
 require 'menumatic/engine'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: menumatic
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nicholas Bruning
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +11:00
+date: 2011-03-10 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +57,7 @@ files:
 - lib/menumatic/navigation/item/link.rb
 - lib/menumatic/navigation/item/navigators.rb
 - lib/menumatic/navigation/item/renderers.rb
+- lib/menumatic/rails/rendering.rb
 - lib/menumatic/rails/routes.rb
 - lib/menumatic/version.rb
 - menumatic.gemspec