easy_menu 0.4.6 → 0.4.7

data/lib/menu_bar.rb

@@ -32,7 +32,7 @@ class MenuBar
 
     yield mbg if block_given?
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
     @groups << mbg
 
     return mbg
@@ -48,7 +48,7 @@ class MenuBar
 
     mbc = MenuBarContent.new(config, content, options)
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return mbc
   end
@@ -61,7 +61,7 @@ class MenuBar
     mbi = MenuBarItem.new config, content, options
     mbc = MenuBarContent.new(config, mbi, options[:menu_bar_content])
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return mbi
   end
@@ -73,7 +73,7 @@ class MenuBar
     mbi = MenuBarItem.new config, mbin, options[:menu_bar_item]
     mbc = MenuBarContent.new(config, mbi, options[:menu_bar_content])
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return mbi
   end
@@ -91,7 +91,7 @@ class MenuBar
     # We give the menu bar content a special class so we can treat its contents differently than one without a menu inside
     mbc = MenuBarContent.new(config, mbt, merge_class(options[:menu_bar_content], config[:menu_bar_content_with_menu_class]))
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return m
   end
@@ -100,7 +100,7 @@ class MenuBar
     s = @template.content_tag :div, '', :class => config[:menu_bar_separator_class]
     mbc = MenuBarContent.new(config, s, options.reverse_merge(:remove_if_dangling => @options[:remove_dangling_separators]))
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return s
   end
@@ -140,9 +140,11 @@ class MenuBar
     return html_opts
   end
 
-  # Ensure that right aligned menu bar content appears on the page in the order it is inserted
-  def store_menu_bar_content(mbc)
-    if mbc.right_aligned?
+  def store_menu_bar_content(mbc, options = {})
+    if options[:index]
+      @content.insert(options[:index], mbc)
+    # Ensure that right aligned menu bar content appears on the page in the order it is inserted
+    elsif mbc.right_aligned?
       @content.prepend(mbc)
     else
       @content << mbc
@@ -164,7 +166,7 @@ class MenuBar
     end
 
     def empty?
-      @content.join.blank?
+      @content.all?(&:blank?)
     end
 
     def to_s
@@ -291,7 +293,9 @@ class MenuBar
 
       yield mg if block_given?
 
-      @content << MenuContent.new(config, [mgt, mg], options[:menu_content])
+      mc = MenuContent.new(config, [mgt, mg], options[:menu_content])
+
+      store_menu_content(mc, options)
 
       return mg
     end
@@ -304,21 +308,27 @@ class MenuBar
         content = block.call
       end
 
-      @content << MenuContent.new(config, content, options)
+      mc = MenuContent.new(config, content, options)
+
+      store_menu_content(mc, options)
     end
 
     def menu_item(content, options = {})
       initialize_options(options)
 
       mi = MenuItem.new(config, content, options)
-      @content << MenuContent.new(config, mi, options[:menu_content])
+      mc = MenuContent.new(config, mi, options[:menu_content])
+
+      store_menu_content(mc, options)
 
       return mi
     end
 
-    def separator
+    def separator(options = {})
       s = @template.content_tag :div, '', :class => config[:menu_separator_class]
-      @content << MenuContent.new(config, s)
+      mc = MenuContent.new(config, s)
+
+      store_menu_content(mc, options)
 
       return s
     end
@@ -332,6 +342,14 @@ class MenuBar
 
       return options
     end
+
+    def store_menu_content(mc, options = {})
+      if options[:index]
+        @content.insert(options[:index], mc)
+      else
+        @content << mc
+      end
+    end
   end
 
   class MenuGroup < Menu

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: easy_menu
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
+  prerelease: 
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -31,41 +34,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- MIT-LICENSE
-- README
 - app/assets/images/icons.png
 - app/assets/javascripts/easy_menu_jquery.js
 - app/assets/javascripts/easy_menu_prototype.js
 - app/assets/stylesheets/_easy_menu_mixins.scss
 - app/assets/stylesheets/easy_menu.css.scss
 - app/helpers/menu_bar_helper.rb
-- config/initializers/easy_menu_scss_extensions.rb
 - lib/easy_menu.rb
 - lib/easy_menu_configuration.rb
 - lib/easy_menu_helpers.rb
 - lib/menu_bar.rb
+- config/initializers/easy_menu_scss_extensions.rb
+- MIT-LICENSE
+- Gemfile
+- README
 homepage: 
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple menu bar dsl for Rails views
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5ab5af8a5c2025b34e45706804f14bc1491c70e0
-  data.tar.gz: 4f090a2e0b784be7622b7944cf61c9e0b352fa3d
-SHA512:
-  metadata.gz: ad02588e586a6e13dbb820270cf6087e5c3890bc3cac9e147e9115c4e1f3e6aa0bf21cf49b018c2097307aae1fd7dfc882cc0cf725aa6a3200a3932d34f7b412
-  data.tar.gz: ee776677c8ed61894ec0f1fc9d945d3ef4318df27a4036bd8f01a51bca3c0a7147140850782030d8401f7e1336427bb639406604dc126c30fb7727cc0501c58f