simple_navigation_renderers 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b1c37c5e0b2ef981172bbf81dc7c32a6a5a949
-  data.tar.gz: 3ad07a991af0a78262e0f7a26b390b2fa3522630
+  metadata.gz: 7276bc421ed996e92fba1beaa61417df42c5a5dd
+  data.tar.gz: 59e906ca0a02541ab03496dc57c9d35de21b8901
 SHA512:
-  metadata.gz: 8cc6a6757952d15c52a0adea721363ac9a75b653261964a600c8fcadec6eee7feb731ecff1c4e45c516e1a7960de0a7758113994a75aadce0b8576da1bdf9048
-  data.tar.gz: 33908fadd6c3336692d7ee2d5c07182a21b8e8668c22c20ccdc387b5b122728015875481294d2532adf03e223fca7508d9a8babdd9b0a32388af386a8d269572
+  metadata.gz: 50ce8afe6ff9a59e02fb0a115dad076a6cc048142b6d888f9dbc71ef554c364bb10f5cafeb23e3373a51b0d4108f731748c569dc7bb8075c151551574b21479a
+  data.tar.gz: 0dd816e533d28ba476f3535f9a81120440461f73fb76fe0c460ac4a0166c103b260195b6846f204c08a9635b35ad16b656b4aa1effbb00705484f1d7716c77ff

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+coverage
 Gemfile.lock
 doc/
 pkg

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
+  - "2.1.1"
+  - "2.1.0"
   - "2.0.0"
   - "1.9.3"

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.0.2
+
+* fix README
+* add Code Climate, Coveralls and Gemnasium
+* refactor rendering
+
+
 ## v1.0.1
 
 * fix problem with `name_generator` method (appeared after `simple-navigation` changes)

data/README.md

@@ -1,9 +1,15 @@
-# SimpleNavigationRenderers [![Build Status](https://travis-ci.org/ShPakvel/simple_navigation_renderers.png?branch=master)](https://travis-ci.org/ShPakvel/simple_navigation_renderers)
+# SimpleNavigationRenderers
+
+[![Gem Version](https://badge.fury.io/rb/simple_navigation_renderers.png)](http://badge.fury.io/rb/simple_navigation_renderers)
+[![Build Status](https://travis-ci.org/ShPakvel/simple_navigation_renderers.png?branch=master)](https://travis-ci.org/ShPakvel/simple_navigation_renderers)
+[![Code Climate](https://codeclimate.com/github/ShPakvel/simple_navigation_renderers.png)](https://codeclimate.com/github/ShPakvel/simple_navigation_renderers)
+[![Coverage Status](https://coveralls.io/repos/ShPakvel/simple_navigation_renderers/badge.png)](https://coveralls.io/r/ShPakvel/simple_navigation_renderers)
+[![Dependency Status](https://gemnasium.com/ShPakvel/simple_navigation_renderers.png)](https://gemnasium.com/ShPakvel/simple_navigation_renderers)
 
 This gem adds several [Simple Navigation](https://github.com/andi/simple-navigation) renderers.  
 For now, it is include renderers for:
-* [Bootstrap 2 navigation](http://getbootstrap.com/components/#navbar)
-* [Bootstrap 3 navigation](http://getbootstrap.com/2.3.2/components.html#navbar)
+* [Bootstrap 2 navigation](http://getbootstrap.com/2.3.2/components.html#navbar)
+* [Bootstrap 3 navigation](http://getbootstrap.com/components/#navbar)
 
 With these renderers you will be able create **any bootstrap navigation elements**, such as: **submenu**, **navbar-text**, **divider**, **header**. As well as add **icons** to menu elements, such as: gliphicons, font-awesome icons, even custom icons. Also you have **split** option for main menu containing submenu.
 
@@ -176,3 +182,8 @@ $ rake
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+## MIT License
+
+See the file LICENSE.txt for copying permission.

data/lib/simple_navigation_renderers/bootstrap.rb

@@ -1,114 +1,65 @@
+require "simple_navigation_renderers/rendered_item"
+
 module SimpleNavigationRenderers
 
   module Bootstrap
 
     def render( item_container )
-      if (skip_if_empty? && item_container.empty?)
+      if skip_if_empty? && item_container.empty?
         ''
       else
         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
-              else
-                simple_link(item, link_options)
-              end
-              list << content_tag(:li, li_content, li_options)
-            end
+            list << SimpleNavigationRenderers::RenderedItem.new( self, item, item_container.level, options[:bv] ).to_s
           end.join
-
         end
-
-        item_container.dom_class = [ item_container.dom_class,
-                                     (item_container.level == 1) ? "nav#{(options[:bv] == 2) ? '' : ' navbar-nav'}" :
-                                                                   "dropdown-menu" ].flatten.compact.join(' ')
+        item_container.dom_class = [ item_container.dom_class, container_class(item_container.level) ].flatten.compact.join(' ')
         content_tag(:ul, list_content, {id: item_container.dom_id, class: item_container.dom_class})
       end
     end
 
 
-    protected
-
-      def li_text( text, li_options )
-        content_tag(:li, content_tag(:p, text, {class: 'navbar-text'}), li_options)
-      end
+    private
 
-      def li_divider( level, li_options )
-        li_options[:class] = [ li_options[:class], ((level == 1) ? "divider-vertical" : "divider") ].flatten.compact.join(' ')
-        content_tag(:li, '', li_options)
-      end
-
-      def li_header( text, li_options )
-        li_options[:class] = [ li_options[:class], ((options[:bv] == 2) ? "nav-header" : "dropdown-header") ].flatten.compact.join(' ')
-        content_tag(:li, text, li_options)
-      end
-
-      def simple_link( item, link_options )
-        link_options[:method] ||= item.method
-        link_to(item.name, (item.url || "#"), link_options)
-      end
-
-      def dropdown_link( item, split, link_options )
-        link_options = {} if split
-        link_options[:class] = [ link_options[:class], "dropdown-toggle" ].flatten.compact.join(' ')
-        link_options[:"data-toggle"] = "dropdown"
-        link_options[:"data-target"] = "#"
-        link = [ (split ? nil : item.name), content_tag(:b, '', class: "caret") ].compact.join(' ')
-        link_to(link, "#", link_options)
+      def container_class( level )
+        if level == 1
+          "nav" + ((options[:bv] == 3) ? ' navbar-nav' : '')
+        else
+          "dropdown-menu"
+        end
       end
 
       def with_bootstrap_configs
-        config_selected_class = SimpleNavigation.config.selected_class
-        config_name_generator = SimpleNavigation.config.name_generator
-
-        SimpleNavigation.config.selected_class = "active"
+        sn_config = SimpleNavigation.config
+        config_selected_class = sn_config.selected_class
+        config_name_generator = sn_config.name_generator
+        sn_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
+        sn_config.name_generator = proc do | name, item |
+          config_name_generator.call( prepare_name(name), item )
         end
 
         result = yield
 
-        SimpleNavigation.config.name_generator = config_name_generator
-        SimpleNavigation.config.selected_class = config_selected_class
+        sn_config.name_generator = config_name_generator
+        sn_config.selected_class = config_selected_class
 
         result
       end
 
+      def prepare_name( name )
+        if name.instance_of?(Hash)
+          if name[:icon]
+            icon_options = {class: name[:icon], title: name[:title]}.reject { |_, v| v.nil? }
+            content_tag(:span, '', icon_options) + ' ' + (name[:text] || '')
+          else
+            name[:text] || (raise SimpleNavigationRenderers::InvalidHash)
+          end
+        else
+          name
+        end
+      end
+
   end
 
 

data/lib/simple_navigation_renderers/rendered_item.rb

@@ -0,0 +1,112 @@
+require 'forwardable'
+
+module SimpleNavigationRenderers
+
+  class RenderedItem
+    extend Forwardable
+
+    attr_reader :renderer
+    def_delegators :renderer, :link_to, :content_tag, :include_sub_navigation?, :render_sub_navigation_for
+
+    def initialize( renderer, item, level, bootstrap_version )
+      @renderer = renderer
+      @item = item
+      @level = level
+      @bootstrap_version = bootstrap_version
+
+      @options = item.html_options
+      @navbar_text = options.delete(:navbar_text)
+      @divider = options.delete(:divider)
+      @header = options.delete(:header)
+      @link_options = options.delete(:link) || {}
+      @split = options.delete(:split)
+    end
+
+    def to_s
+      if navbar_text
+        li_text
+      elsif divider
+        li_divider
+      elsif header && (level != 1)
+        li_header
+      else
+        li_link
+      end
+    end
+
+
+    private
+
+      attr_reader :item, :level, :bootstrap_version, :options, :navbar_text, :divider, :header, :link_options, :split
+
+      def li_text
+        content_tag(:li, content_tag(:p, item.name, {class: 'navbar-text'}), options)
+      end
+
+      def li_divider
+        options[:class] = [ options[:class], ((level == 1) ? "divider-vertical" : "divider") ].flatten.compact.join(' ')
+        content_tag(:li, '', options)
+      end
+
+      def li_header
+        options[:class] = [ options[:class], ((bootstrap_version == 3) ? "dropdown-header" : "nav-header") ].flatten.compact.join(' ')
+        content_tag(:li, item.name, options)
+      end
+
+      def li_link
+        if include_sub_navigation?(item)
+          if level == 1
+            if split
+              splitted_simple_part + splitted_dropdown_part
+            else
+              dropdown_part( item.name + ' ' + caret )
+            end
+          else
+            content_tag(:li, dropdown_submenu_link, options)
+          end
+        else
+          content_tag(:li, simple_link, options)
+        end
+      end
+
+      def splitted_simple_part
+        main_li_options = options.dup
+        main_li_options[:class] = [ main_li_options[:class], "dropdown-split-left" ].flatten.compact.join(' ')
+        content_tag(:li, simple_link, main_li_options)
+      end
+
+      def splitted_dropdown_part
+        item.sub_navigation.dom_class = [ item.sub_navigation.dom_class, "pull-right" ].flatten.compact.join(' ')
+        link_options = {}
+        options[:id] = nil
+        options[:class] = [ options[:class], "dropdown-split-right" ].flatten.compact.join(' ')
+        dropdown_part( caret )
+      end
+
+      def dropdown_part( name )
+        options[:class] = [ options[:class], "dropdown" ].flatten.compact.join(' ')
+        link_options[:class] = [ link_options[:class], "dropdown-toggle" ].flatten.compact.join(' ')
+        link_options[:"data-toggle"] = "dropdown"
+        link_options[:"data-target"] = "#"
+
+        content = link_to( name, "#", link_options ) + render_sub_navigation_for(item)
+        content_tag(:li, content, options)
+      end
+
+      def caret
+        content_tag(:b, '', class: "caret")
+      end
+
+      def dropdown_submenu_link
+        options[:class] = [ options[:class], "dropdown-submenu" ].flatten.compact.join(' ')
+        simple_link + render_sub_navigation_for(item)
+      end
+
+      def simple_link
+        link_options[:method] ||= item.method
+        link_to(item.name, (item.url || "#"), link_options)
+      end
+
+  end
+
+end

data/lib/simple_navigation_renderers/version.rb

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

data/simple_navigation_renderers.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "coveralls", "~> 0.7"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 ENV["RAILS_ENV"] = "test"
 require 'action_controller'
 module Rails

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: simple_navigation_renderers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Pavel Shpak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-navigation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: 'simple_navigation_renderers gem adds renderers for Bootstrap 2 and 3.
   With these renderers you will be able create any bootstrap navigation elements,
   such as: submenu, navbar-text, divider, header. As well as add icons to menu elements,
@@ -91,10 +105,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -104,6 +118,7 @@ files:
 - lib/simple_navigation_renderers/bootstrap.rb
 - lib/simple_navigation_renderers/engine.rb
 - lib/simple_navigation_renderers/exceptions.rb
+- lib/simple_navigation_renderers/rendered_item.rb
 - lib/simple_navigation_renderers/version.rb
 - simple_navigation_renderers.gemspec
 - spec/lib/simple_navigation_renderers/bootstrap_spec.rb
@@ -124,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 'simple_navigation_renderers gem adds renderers for Bootstrap 2 and 3. With