easy_menu 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4f6990701058e22283c180fef8fe41a1ec80951
-  data.tar.gz: 28e9fc33e9e1e32424885884bf9967ba8cc48129
+  metadata.gz: eff880680823c216010cbc9bf92e3bb050a1336d
+  data.tar.gz: e31cf70182254be782dcd09e0dc2c50bf36634fb
 SHA512:
-  metadata.gz: 6a2f590cdc0d64bbeb095272a4008cccb46925382564126dfe0d9b102becbd82a5600c13ae2b35495ebea4c6abfbdcd2723d03389f80a5a9ad4cbb4c7cc41b15
-  data.tar.gz: a6c806734115f44e2ceea6a437956c75b8948b1ec3c6b8e3b193b7273a78eef5db66db9dce63fe0d91f7cbc8293ed57bb2715920fe99c6bd1b95a37d423a40fa
+  metadata.gz: 8e7c3839d7874d81a774f0bcbe1ff898d74aceb5bfc128367fdf6b43b36782aa489b2adcca5068bce3bfe928fecb04f9b9cd986f109e48c6d99d9a95cbaa8033
+  data.tar.gz: 8348be985f00988bcd56d5a4936e6bfa3cdbe0a3b96ac35d92952f579aaa0f784cc6bf24cda07a0d3ddbcf3f5de4e58eced2cefb104b68f851815e34cd7db826

data/app/assets/stylesheets/_easy_menu_mixins.scss

@@ -229,10 +229,10 @@ $menu-bar-item-pressed-zindex: 3;
 }
 @mixin menu_item_hover {
   &.selected a {
-    background: url("/assets/checkbox_selected.png") no-repeat 5px center;
+    background: asset_url("checkbox_selected.png") no-repeat 5px center;
 
     &:hover {
-      background: url("/assets/checkbox_selected_hovered.png") no-repeat 5px center;
+      background: asset_url("checkbox_selected_hovered.png") no-repeat 5px center;
     }
   }
   &:hover {

data/app/assets/stylesheets/easy_menu.css.scss

@@ -122,7 +122,7 @@
     }
     &.with_menu {
       .menu_bar_item .arrow{
-        background: url('/assets/arrows.png') center 87px;
+        background: asset_url('arrows.png') center 87px;
         display: inline-block;
         margin-left: 3px;
         height: 10px;

data/lib/easy_menu.rb

@@ -1,6 +1,5 @@
 module EasyMenu
-	require 'easy_menu_helpers'
-  require 'easy_menu_configuration'
+  require 'menu_bar'
 
 	class Engine < Rails::Engine
 	end

data/{app/helpers → lib}/menu_bar.rb

@@ -1,4 +1,7 @@
 # TODO make menu bar group an actual group instead of a state toggle
+require 'easy_menu_helpers'
+require 'easy_menu_configuration'
+
 class MenuBar
   include EasyMenu::Helpers
   include EasyMenu::Configuration
@@ -42,7 +45,8 @@ class MenuBar
     end
 
     mbc = MenuBarContent.new(config, content, options)
-    @content << mbc
+
+    store_menu_bar_content(mbc)
 
     return mbc
   end
@@ -53,7 +57,9 @@ class MenuBar
     raise if config[:template].is_a?(Hash) || config[:template].nil?
 
     mbi = MenuBarItem.new config, content, options
-    @content << MenuBarContent.new(config, mbi, options[:menu_bar_content])
+    mbc = MenuBarContent.new(config, mbi, options[:menu_bar_content])
+
+    store_menu_bar_content(mbc)
 
     return mbi
   end
@@ -63,7 +69,9 @@ class MenuBar
 
     mbin = MenuBarInput.new config, content, options
     mbi = MenuBarItem.new config, mbin, options[:menu_bar_item]
-    @content << MenuBarContent.new(config, mbi, options[:menu_bar_content])
+    mbc = MenuBarContent.new(config, mbi, options[:menu_bar_content])
+
+    store_menu_bar_content(mbc)
 
     return mbi
   end
@@ -79,14 +87,18 @@ class MenuBar
     yield m if block_given?
 
     # We give the menu bar content a special class so we can treat its contents differently than one without a menu inside
-    @content << MenuBarContent.new(config, mbt, merge_class(options[:menu_bar_content], config[:menu_bar_content_with_menu_class]))
+    mbc = MenuBarContent.new(config, mbt, merge_class(options[:menu_bar_content], config[:menu_bar_content_with_menu_class]))
+
+    store_menu_bar_content(mbc)
 
     return m
   end
 
   def separator(options = {})
     s = @template.content_tag :div, '', :class => config[:menu_bar_separator_class]
-    @content << MenuBarContent.new(config, s, options.reverse_merge(:remove_if_dangling => @options[:remove_dangling_separators]))
+    mbc = MenuBarContent.new(config, s, options.reverse_merge(:remove_if_dangling => @options[:remove_dangling_separators]))
+
+    store_menu_bar_content(mbc)
 
     return s
   end
@@ -103,7 +115,7 @@ class MenuBar
     options[:menu_bar_content] ||= {}
 
     # Alignment always lies with the content wrapper
-    options[:menu_bar_content][:align] = options.delete(:align)
+    options[:menu_bar_content][:align] ||= options.delete(:align)
 
     return options
   end
@@ -118,6 +130,15 @@ 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.options[:align].to_s == 'right'
+      @content.prepend(mbc)
+    else
+      @content << mbc
+    end
+  end
+
   # ABSTRACT CLASSES
 
   class AbstractContent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_menu
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,12 +41,12 @@ files:
 - 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.rb
 - 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
 homepage: 
 licenses: []
 metadata: {}
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple menu bar dsl for Rails views