menumatic 0.1.3 → 0.1.4

data/README.md

@@ -85,7 +85,7 @@ helper:
     <!-- snip -->
     <header>
       <nav>
-       <%= navigation :application %>
+       <%= navigation :navigation => 'application' %>
       </nav>
     </header>
 
@@ -103,17 +103,19 @@ easily achiveable:
     <!-- snip -->
     <header>
       <nav>
-       <%= navigation :application, :level => :primary %>
+       <%= render :navigation => 'application', :level => :primary %>
       </nav>
     </header>
 
     <div class="sub_navigation">
-      <%= navigation :application, :levels => [:secondary, :tertiary] %>
+      <%= render :navigation => application, :levels => [:secondary, :tertiary] %>
     </div>
 
 The above example would render the top-level navigation in the
 `<header>` and everything else in the `sub_navigation` div below.
 
+__Note:__ numbers are also acceptable parameters here, where 1 is the primary level.
+
 
 ## Sitemap generation
 

data/lib/menumatic/hash.rb

@@ -0,0 +1,7 @@
+class Hash
+  # Behaves the same as [merge] but instead of replacing values, they are
+  # automatically joined using the separator parameter
+  def merge_with_join(other_hash, separator = " ")
+    self.merge(other_hash){ |key, value_1, value_2| [value_1, value_2].join(separator) }
+  end
+end

data/lib/menumatic/helpers/navigation_helper.rb

@@ -9,7 +9,7 @@ module Menumatic
         options[:groups] ||= [options[:groups]].delete_if{ |g| g.blank? }
 
         options[:class] ||= ""
-        options[:class] += "navigation #{navigation_id.to_s}"
+        options[:class] = (options[:class].split(" ") + ["navigation #{navigation_id.to_s}"]).join(" ")
 
         navigation = Menumatic::Navigation::Base.load_navigation(navigation_id.to_sym)
         navigation.root.render(request, options)

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

@@ -10,7 +10,11 @@ module Menumatic
 
           if args.length > 2
             options = args[2]
-            self.active_paths = options[:active_on]
+
+            if options[:active_on]
+              self.active_paths = options[:active_on]
+              options.delete(:active_on)
+            end
           end
           self.active_paths ||= []
         end

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

@@ -9,7 +9,9 @@ module Menumatic
           options[:current_level] ||= 0
 
           html_options = {}
-          html_options[:class] = options[:class]
+          html_options[:id] = options[:id] if options[:id]
+          html_options[:class] = options[:class] if options[:class]
+          options.delete(:id)
           options.delete(:class)
           options = options.merge({})
           options[:current_level] += 1
@@ -36,15 +38,15 @@ module Menumatic
 
           # render link
           link = ""
-          link = link_to(self.label, self.destination).html_safe if self.is_link? && !options[:group]
+          link = link_to(self.label, self.destination, self.html_options).html_safe if self.is_link? && !options[:group]
 
           if on_valid_level?(options[:levels], options[:current_level])
             if options[:current_level] == 1 || (self.is_group? && options[:group] == self.group_id)
               list.html_safe
             elsif options[:show] == :all || self.is_active?(request)
-              content_tag(options[:item_tag], link.to_s + list.to_s, html_options).to_s.html_safe
+              content_tag(options[:item_tag], link.to_s + list.to_s, html_options.merge_with_join(self.wrapper_options)).to_s.html_safe
             elsif self.is_link?
-              content_tag(options[:item_tag], link, html_options).to_s.html_safe
+              content_tag(options[:item_tag], link, html_options.merge_with_join(self.wrapper_options)).to_s.html_safe
             end
           elsif self.is_active?(request)
             list.html_safe

data/lib/menumatic/navigation/item.rb

@@ -2,13 +2,18 @@ module Menumatic
   module Navigation
     module Item
       class Base
-        attr_accessor :items, :options
+        attr_accessor :items, :html_options, :wrapper_options
 
         include Menumatic::Navigation::Item::Renderers
         include Menumatic::Navigation::Item::Navigators
 
         def initialize(*args)
-          self.options = args.last
+          self.html_options = {}
+          self.wrapper_options = {}
+          if(args.last.is_a?(Hash))
+            self.html_options = args.last[:link_html] || {}
+            self.wrapper_options = args.last[:wrapper_html] || {}
+          end
           self.items = []
         end
 

data/lib/menumatic/rails/rendering.rb

@@ -1,5 +1,9 @@
 module ActionView
   module Rendering
+
+    # Aliased function for standard rails render function. Adds an option
+    # for :navigation, which will render the selected navigation from the
+    # `app/navigation` directory.
     def render_with_navigation_option(options = {}, locals = {}, &block)
       if options.has_key? :navigation
         navigation_id = options[:navigation]

data/lib/menumatic/version.rb

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

data/lib/menumatic.rb

@@ -21,3 +21,4 @@ end
 require 'menumatic/rails/routes'
 require 'menumatic/rails/rendering'
 require 'menumatic/engine'
+require 'menumatic/hash'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: menumatic
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nicholas Bruning
@@ -49,6 +49,7 @@ files:
 - lib/menumatic.rb
 - lib/menumatic/.DS_Store
 - lib/menumatic/engine.rb
+- lib/menumatic/hash.rb
 - lib/menumatic/helpers/navigation_helper.rb
 - lib/menumatic/navigation.rb
 - lib/menumatic/navigation/.DS_Store