simple_navigation_renderers 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 616b1a87c82cdb976a28aadc839c4be6546a8e78
-  data.tar.gz: 70eac40e4239df1041b6dc9bc97d32960e8627ca
+  metadata.gz: e3b1c37c5e0b2ef981172bbf81dc7c32a6a5a949
+  data.tar.gz: 3ad07a991af0a78262e0f7a26b390b2fa3522630
 SHA512:
-  metadata.gz: e3f18bdd23db2dcbed7641834dd75da7f2ba9c2816de206a624d2017667925c542f15bef4227a958d649ff11de95582e47d92524785c7224b65d28e28a1371df
-  data.tar.gz: 29ce774d04e11f5e303d0059de7af07aede50ff521b0a283695ad646097364b2518cbe3a0dd7ab5bad9051b51b09a405eafca9c8efc5e41d91adfe06623cc29d
+  metadata.gz: 8cc6a6757952d15c52a0adea721363ac9a75b653261964a600c8fcadec6eee7feb731ecff1c4e45c516e1a7960de0a7758113994a75aadce0b8576da1bdf9048
+  data.tar.gz: 33908fadd6c3336692d7ee2d5c07182a21b8e8668c22c20ccdc387b5b122728015875481294d2532adf03e223fca7508d9a8babdd9b0a32388af386a8d269572

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.0.1
+
+* fix problem with `name_generator` method (appeared after `simple-navigation` changes)
+
+
 ## v1.0.0
 
 * separate 'divider' Bootstrap element

data/lib/simple_navigation_renderers/bootstrap.rb

@@ -6,51 +6,47 @@ module SimpleNavigationRenderers
       if (skip_if_empty? && item_container.empty?)
         ''
       else
-        config_selected_class = SimpleNavigation.config.selected_class
-        SimpleNavigation.config.selected_class = "active"
-        @config_name_generator = SimpleNavigation.config.name_generator
-        SimpleNavigation.config.name_generator = self.method(:name_generator)
-        
-        list_content = item_container.items.inject([]) do |list, item|
-          li_options = item.html_options
-
-          navbar_text = li_options.delete(:navbar_text)
-          navbar_divider = li_options.delete(:divider)
-          navbar_header = li_options.delete(:header)
-          link_options = li_options.delete(:link) || {}
-          split = li_options.delete(:split)
-
-          if navbar_text
-            list << li_text( item.name, li_options )
-          elsif navbar_divider
-            list << li_divider( item_container.level, li_options )
-          elsif navbar_header && (item_container.level != 1)
-            list << li_header( item.name, li_options )
-          else
-            li_content = if include_sub_navigation?(item)
-              if item_container.level == 1
-                if split
-                  main_li_options = li_options.dup
-                  main_li_options[:class] = [ main_li_options[:class], "dropdown-split-left" ].flatten.compact.join(' ')
-                  list << content_tag(:li, simple_link(item, link_options), main_li_options)
-                  li_options[:id] = nil
-                  item.sub_navigation.dom_class = [ item.sub_navigation.dom_class, "pull-right" ].flatten.compact.join(' ')
+        list_content = with_bootstrap_configs do
+
+          item_container.items.inject([]) do |list, item|
+            li_options = item.html_options
+
+            navbar_text = li_options.delete(:navbar_text)
+            navbar_divider = li_options.delete(:divider)
+            navbar_header = li_options.delete(:header)
+            link_options = li_options.delete(:link) || {}
+            split = li_options.delete(:split)
+
+            if navbar_text
+              list << li_text( item.name, li_options )
+            elsif navbar_divider
+              list << li_divider( item_container.level, li_options )
+            elsif navbar_header && (item_container.level != 1)
+              list << li_header( item.name, li_options )
+            else
+              li_content = if include_sub_navigation?(item)
+                if item_container.level == 1
+                  if split
+                    main_li_options = li_options.dup
+                    main_li_options[:class] = [ main_li_options[:class], "dropdown-split-left" ].flatten.compact.join(' ')
+                    list << content_tag(:li, simple_link(item, link_options), main_li_options)
+                    li_options[:id] = nil
+                    item.sub_navigation.dom_class = [ item.sub_navigation.dom_class, "pull-right" ].flatten.compact.join(' ')
+                  end
+                  li_options[:class] = [ li_options[:class], "dropdown", (split ? "dropdown-split-right" : nil) ].flatten.compact.join(' ')
+                  dropdown_link(item, split, link_options) + render_sub_navigation_for(item)
+                else
+                  li_options[:class] = [ li_options[:class], "dropdown-submenu"].flatten.compact.join(' ')
+                  simple_link(item, link_options) + render_sub_navigation_for(item)
                 end
-                li_options[:class] = [ li_options[:class], "dropdown", (split ? "dropdown-split-right" : nil) ].flatten.compact.join(' ')
-                dropdown_link(item, split, link_options) + render_sub_navigation_for(item)
               else
-                li_options[:class] = [ li_options[:class], "dropdown-submenu"].flatten.compact.join(' ')
-                simple_link(item, link_options) + render_sub_navigation_for(item)
+                simple_link(item, link_options)
               end
-            else
-              simple_link(item, link_options)
+              list << content_tag(:li, li_content, li_options)
             end
-            list << content_tag(:li, li_content, li_options)
-          end
-        end.join
+          end.join
 
-        SimpleNavigation.config.selected_class = config_selected_class
-        SimpleNavigation.config.name_generator = @config_name_generator
+        end
 
         item_container.dom_class = [ item_container.dom_class,
                                      (item_container.level == 1) ? "nav#{(options[:bv] == 2) ? '' : ' navbar-nav'}" :
@@ -90,13 +86,27 @@ module SimpleNavigationRenderers
         link_to(link, "#", link_options)
       end
 
-      def name_generator( name )
-        if name.instance_of?(Hash)
-          raise SimpleNavigationRenderers::InvalidHash unless name.keys.include?(:icon) || name.keys.include?(:text)
-          [ (name[:icon] ? content_tag(:span, '', {class: name[:icon]}.merge(name[:title] ? {title: name[:title]} : {}) ) : nil), name[:text] ].compact.join(' ')
-        else
-          @config_name_generator.call(name)
+      def with_bootstrap_configs
+        config_selected_class = SimpleNavigation.config.selected_class
+        config_name_generator = SimpleNavigation.config.name_generator
+
+        SimpleNavigation.config.selected_class = "active"
+        # name_generator should be proc (not lambda or method) to be compatible with earlier versions of simple-navigation
+        SimpleNavigation.config.name_generator = proc do | name, item |
+          if name.instance_of?(Hash)
+            raise SimpleNavigationRenderers::InvalidHash unless name.keys.include?(:icon) || name.keys.include?(:text)
+            [ (name[:icon] ? content_tag(:span, '', {class: name[:icon]}.merge(name[:title] ? {title: name[:title]} : {}) ) : nil), name[:text] ].compact.join(' ')
+          else
+            config_name_generator.call( name, item )
+          end
         end
+
+        result = yield
+
+        SimpleNavigation.config.name_generator = config_name_generator
+        SimpleNavigation.config.selected_class = config_selected_class
+
+        result
       end
 
   end

data/lib/simple_navigation_renderers/version.rb

@@ -1,3 +1,3 @@
 module SimpleNavigationRenderers
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_navigation_renderers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Pavel Shpak
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: 'simple_navigation_renderers gem adds renderers for Bootstrap 2 and 3. With