leather 0.2.2 → 0.2.3

data/app/helpers/navigation_helper.rb

@@ -0,0 +1,9 @@
+module NavigationHelper
+  def active_class(href, options)
+    if (@current_nav.present? && options[:current_nav].present? && @current_nav == options[:current_nav]) || current_page?(href)
+      'active'
+    else
+      ''
+    end
+  end
+end

data/app/views/leather/_dropdown_nav_item.html.haml

@@ -1,9 +1,5 @@
 - id = Time.now.to_f
-- if active
-  - css_class = 'active'
-- else 
-  - css_class = ''
-%li{:class => 'dropdown ' + css_class}
+%li{ class: "#{active_class(href, options)} dropdown" }
   %a.dropdown-toggle{:id => id, :href=>href, :data => {:target => '#', :toggle => 'dropdown'}}
     = text
     %b.caret

data/app/views/leather/_nav_item.html.haml

@@ -1,2 +1,2 @@
-%li{ class: current_page?(href) ? 'active' : '' }
+%li{ class: active_class(href, options) }
   =link_to text, href, options

data/lib/leather/leather_helpers.rb

@@ -1,6 +1,6 @@
 module Leather
   module LeatherHelpers
-    def modal_toggle(text, id, html_options = {})
+    def modal_toggle(text, id = 'modal', html_options = {})
       link_to text, "##{id}", data: { toggle: "modal" }, class: html_options[:class]
     end
 
@@ -20,14 +20,6 @@ module Leather
       render partial: 'leather/modal_footer', locals: { close_text: close_text }
     end
 
-    def nav_item(text, href, options = {})
-      render partial: 'leather/nav_item', locals: { text: text, href: href, options: options }
-    end
-
-    def nav_list(html_options = {}, &block)
-      render partial: 'leather/nav_list', locals: { block: capture(&block), html_options: html_options }
-    end
-
     def navbar(title, brand_link, html_options = {}, &block)
       html_options = { class: "navbar-default" }.merge(html_options)
       render partial: 'leather/navbar', locals: { title: title, brand_link: brand_link, block: capture(&block), html_options: html_options }
@@ -43,8 +35,16 @@ module Leather
       navbar(html_options, &block)
     end
 
-    def dropdown_nav_item(text, href, active = false, &block)
-      render partial: 'leather/dropdown_nav_item', locals: { block: capture(&block), text: text, href: href, active: active }
+    def nav_list(html_options = {}, &block)
+      render partial: 'leather/nav_list', locals: { block: capture(&block), html_options: html_options }
+    end
+
+    def nav_item(text, href, options = {})
+      render partial: 'leather/nav_item', locals: { text: text, href: href, options: options }
+    end
+
+    def dropdown_nav_item(text, href, options = {}, &block)
+      render partial: 'leather/dropdown_nav_item', locals: { block: capture(&block), text: text, href: href, options: options }
     end
   end
 end

data/lib/leather/version.rb

@@ -1,3 +1,3 @@
 module Leather
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leather
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,6 +149,7 @@ files:
 - app/assets/stylesheets/bootstrap_variables.css.scss
 - app/assets/stylesheets/devise.css.scss
 - app/config/initializers/high_voltage.rb
+- app/helpers/navigation_helper.rb
 - app/views/devise/passwords/edit.html.erb
 - app/views/devise/passwords/new.html.erb
 - app/views/devise/registrations/new.html.erb
@@ -188,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2858582222601974244
+      hash: -3058274935175038772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2858582222601974244
+      hash: -3058274935175038772
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24