semantic_navigation 0.1.8 → 0.1.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjJkZDMyMDczZDgxODNiNDcyZGI3OWFhZGIwNzZiNjE4NjFmMDI3NQ==
-  data.tar.gz: !binary |-
-    NjZjZTlhZDU3MTE0MTZjMTlkMDc2MjljMjU2M2E1MGYwMmVjYWQwYw==
+SHA1:
+  metadata.gz: abaa34622db084f42353e8bd203fc9a8033dc5bb
+  data.tar.gz: a03e0dd5a7cacb1051566512b85a61a40ee39909
 SHA512:
-  metadata.gz: !binary |-
-    ZTVjYTY1ZGE1OTE0YmVkMjA3YzM0ZDVmNmNmYTY4ODQ2YjcxYmJjZjNlMjI5
-    ZTliNjFjZDEyODA0YTkzNDU5ZDQ3M2VlMjU0NWVlYWM3YjI3MDVmNDk3ZmY4
-    YWVkNTg5MmRiMzc3MWRmMjQ5NTcxZTQwZjU3MGQwOWIxNDZhYTE=
-  data.tar.gz: !binary |-
-    ZDE1MTRlY2M1ZjBiYjdjM2I0NGYwYzE1NGI0Nzg0NmNkNzk5ZjYzOGJjNzYx
-    MTUxOWI4OTg3MzE4MTdmYmU2ZGRlNGU0OGJkYmU1MGY0Mjg3ZTg1MWYxNTAw
-    Yjk3ZTJhOTJjMTQ3YzE0Nzg1ODE5MDY0NGQ5MDFiZWE1MmNlNmI=
+  metadata.gz: 1d9059d2ce1e114d204295bde77b555c2be3fe27b527d105fbc66454fed87212057f88499fb1963ec85964c68f11e296ac4c64ad26f43a7032b595d7e0dbc51b
+  data.tar.gz: 9f0a9ad6f392626b0a4e6ef11f8082821351ce019ea5f84f0fab314f7e14ba6d2e345e13f04b2e80c75339c2415f4e8243a63bcd673b8d2da6f14bfd9ae9924b

data/lib/semantic_navigation/configuration.rb

@@ -1,6 +1,8 @@
 module SemanticNavigation
   class Configuration
 
+    @@bootstrap_version = 2
+
     @@navigations = {}
     @@renderers = {}
     @@render_styles = {}
@@ -63,5 +65,13 @@ module SemanticNavigation
       @@navigations[name]
     end
 
+    def self.bootstrap_version(version=nil)
+      if version
+        @@bootstrap_version = version
+      else
+        @@bootstrap_version
+      end
+    end
+
   end
 end

data/lib/semantic_navigation/railtie.rb

@@ -11,10 +11,16 @@ module SemanticNavigation
       conf = SemanticNavigation::Configuration
       conf.register_renderer :list, Renderers::List
       conf.register_renderer :breadcrumb, Renderers::BreadCrumb
-      conf.register_renderer :bootstrap_breadcrumb, TwitterBootstrap::Breadcrumb
-      conf.register_renderer :bootstrap_list, TwitterBootstrap::List
-      conf.register_renderer :bootstrap_tabs, TwitterBootstrap::Tabs
-      conf.register_renderer :bootstrap_pills, TwitterBootstrap::Tabs
+    end
+
+    def self.register_bootstrap_renderers
+      conf = SemanticNavigation::Configuration
+      namespace = conf.bootstrap_version == 2 ? TwitterBootstrap : TwitterBootstrap3
+      conf.register_renderer :bootstrap_breadcrumb, namespace::Breadcrumb
+      conf.register_renderer :bootstrap_list, namespace::List
+      conf.register_renderer :bootstrap_tabs, namespace::Tabs
+      conf.register_renderer :bootstrap_pills, namespace::Tabs
+      
       conf.register_renderer :bootstrap_simple_nav, SemanticNavigation::Renderers::List
 
       conf.styles_for :bootstrap_pills do
@@ -25,15 +31,17 @@ module SemanticNavigation
       end
     end
 
-     if Rails.env == "production"
-       config.after_initialize {
-         load SemanticNavigation.actual_config_location
-       }
-     else
-       ActionDispatch::Callbacks.before {
-         load SemanticNavigation.actual_config_location
-       }
-     end
+    if Rails.env == "production"
+     config.after_initialize {
+       load SemanticNavigation.actual_config_location
+       SemanticNavigation::Railtie.register_bootstrap_renderers
+     }
+    else
+     ActionDispatch::Callbacks.before {
+       load SemanticNavigation.actual_config_location
+       SemanticNavigation::Railtie.register_bootstrap_renderers
+     }
+    end
 
   end
 end

data/lib/semantic_navigation/renderers.rb

@@ -10,6 +10,9 @@ renderers/bread_crumb
 twitter_bootstrap/breadcrumb
 twitter_bootstrap/list
 twitter_bootstrap/tabs
+twitter_bootstrap_3/breadcrumb
+twitter_bootstrap_3/list
+twitter_bootstrap_3/tabs
 ).each do |file|
   require "semantic_navigation/#{file}"
 end

data/lib/semantic_navigation/twitter_bootstrap_3/breadcrumb.rb

@@ -0,0 +1,66 @@
+module SemanticNavigation
+  module TwitterBootstrap3
+    class Breadcrumb
+      include SemanticNavigation::Renderers::MixIn::RenderHelpers
+      include SemanticNavigation::Renderers::MixIn::ActsAsBreadcrumb
+
+      style_accessor last_as_link: false,
+                     breadcrumb_separator: '/'
+
+      navigation_default_classes [:breadcrumb]
+
+      show_navigation_active_class false
+      show_node_active_class false
+      show_leaf_active_class false
+      show_link_active_class false
+      show_navigation_id false
+      show_node_id false
+      show_leaf_id false
+      show_link_id false
+
+      property_for :base, :ico
+
+      private
+
+      def navigation(object)
+        content_tag :ol, nil, {id: show_id(:navigation, object.id),
+                               class: merge_classes(:navigation, object.active, object.classes)
+                              }.merge(object.html) do
+          yield
+        end
+      end
+
+      def node(object)
+        content_tag(:li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html)) do
+          [object.ico ? content_tag(:i, nil, class: "icon-#{object.ico}") : ''.html_safe,
+          link_to(object_name(object),
+                  object.url,
+                  {id: show_id(:link, object.id),
+                   class: merge_classes(:link, object.active, object.link_classes)
+                  }.merge(object.link_html))].sum
+        end +
+        yield
+      end
+
+      def leaf(object)
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html) do
+          [object.ico ? content_tag(:i, nil, class: "icon-#{object.ico}") : ''.html_safe,
+          if last_as_link
+            link_to(object_name(object),
+                    object.url,
+                    {id: show_id(:link, object.id),
+                     class: merge_classes(:link, object.active, object.link_classes)
+                    }.merge(object.link_html))
+          else
+            object_name(object)
+          end].sum
+        end
+      end
+
+    end
+  end
+end

data/lib/semantic_navigation/twitter_bootstrap_3/list.rb

@@ -0,0 +1,87 @@
+module SemanticNavigation
+  module TwitterBootstrap3
+    class List
+      include SemanticNavigation::Renderers::MixIn::RenderHelpers
+      include SemanticNavigation::Renderers::MixIn::ActsAsList
+
+      navigation_default_classes [:nav, 'navbar-nav']
+      node_default_classes ['dropdown-menu']
+      show_navigation_id false
+      show_node_id false
+      show_leaf_id false
+      show_link_id false
+
+      property_for :base, :ico
+
+      private
+
+      def navigation(object)
+        content_tag :ul, nil, {id: show_id(:navigation, object.id),
+                               class: merge_classes(:navigation, object.active, object.classes)
+                              }.merge(object.html) do
+          yield
+        end
+      end
+
+      def node(object)
+        if object.ico
+          name = [content_tag(:i,nil, class: "icon-#{object.ico}"),
+                  object_name(object),
+                  content_tag(:span, nil, class: 'caret')].sum
+        else
+          name = [object_name(object),
+                  content_tag(:span, nil, class: 'caret')].sum
+        end
+
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, [*object.classes, 'dropdown'])
+                              }.merge(object.html) do
+           link_to(name.html_safe, object.url,
+              {id: show_id(:link, object.id),
+               class: merge_classes(:link, object.active, [*object.link_classes, 'dropdown-toggle']),
+               'data-toggle' => 'dropdown'
+              }.merge(object.link_html)) +
+          yield
+        end
+      end
+
+      def node_content(object)
+        content_tag(:ul, nil, {id: show_id(:node, object.id),
+                               class: merge_classes(:node, object.active, object.node_classes)
+                              }.merge(object.node_html)) do
+          yield
+        end
+      end
+
+      def leaf(object)
+        if object_name(object).empty? && object.url.nil?
+          classes = 'divider'
+        elsif object.url.nil?
+          classes = 'nav-header'
+        else
+          classes = merge_classes(:leaf, object.active, object.classes)
+        end
+
+        if object.ico
+          name = [content_tag(:i,nil,class: "icon-#{object.ico}"),
+                  object_name(object)].sum
+        else
+          name = object_name(object)
+        end
+
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: classes
+                              }.merge(object.html) do
+          if object.url.nil?
+            name
+          else
+            link_to name, object.url, {id: show_id(:link, object.id),
+                                       class: merge_classes(:link, object.active, object.link_classes)
+                                      }.merge(object.link_html)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/semantic_navigation/twitter_bootstrap_3/tabs.rb

@@ -0,0 +1,76 @@
+module SemanticNavigation
+  module TwitterBootstrap3
+    class Tabs
+      include SemanticNavigation::Renderers::MixIn::RenderHelpers
+      include SemanticNavigation::Renderers::MixIn::ActsAsList
+
+      style_accessor direction: 'left'
+
+      navigation_default_classes [:nav, 'nav-tabs']
+      show_navigation_id false
+      show_node_id false
+      show_leaf_id false
+      show_link_id false
+
+      property_for :base, :ico
+
+      private
+
+      def navigation(object)
+        content_tag :ul, nil, {id: show_id(:navigation, object.id),
+                               class: merge_classes(:navigation, object.active, [object.classes,"pull-#{direction}"])
+                              }.merge(object.html) do
+          yield
+        end
+      end
+
+      def node(object)
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, [object.classes,'dropdown'].flatten)
+                              }.merge(object.html) do
+          content_tag(:a, {:href => '#',
+                           id: show_id(:link, object.id),
+                           class: merge_classes(:link, object.active, [object.link_classes,'dropdown-toggle'].flatten),
+                           'data-toggle'=> :dropdown
+                           }.merge(object.link_html)) do
+            [object.ico ? content_tag(:i,nil,class: "icon-#{object.ico}") : '',
+             object_name(object),
+             content_tag(:b,nil,class: :caret)
+            ].sum.html_safe
+          end +
+          yield
+        end
+      end
+
+      def node_content(object)
+        content_tag(:ul, nil, {id: show_id(:node, object.id),
+                               class: merge_classes(:node, false, [object.node_classes,'dropdown-menu'].flatten)
+                              }.merge(object.node_html)) do
+          yield
+        end
+      end
+
+      def leaf(object)
+        if object.ico
+          name = [content_tag(:i,nil,class: "icon-#{object.ico}"),
+                  object_name(object)].sum
+        else
+          name = object_name(object)
+        end
+
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                              class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html) do
+          if object.url.nil?
+            name
+          else
+            link_to name, object.url, {id: show_id(:link, object.id),
+                                      class: merge_classes(:link, object.active, object.link_classes)
+                                      }.merge(object.link_html)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/semantic_navigation/version.rb

@@ -1,3 +1,3 @@
 module SemanticNavigation
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,82 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: semantic_navigation
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Sergey Gribovski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: appraisal
   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: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-description: ! "Simply and customizable navigation in the Ruby on Rails 3 application.\n
-  \                    Predefined bootstrap renderers"
+description: |-
+  Simply and customizable navigation in the Ruby on Rails 3 application.
+                       Predefined bootstrap renderers
 email:
 - megacoder@rambler.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .editorconfig
-- .gitignore
-- .travis.yml
+- ".editorconfig"
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - Changelog.md
 - Gemfile
@@ -120,6 +121,9 @@ files:
 - lib/semantic_navigation/twitter_bootstrap/breadcrumb.rb
 - lib/semantic_navigation/twitter_bootstrap/list.rb
 - lib/semantic_navigation/twitter_bootstrap/tabs.rb
+- lib/semantic_navigation/twitter_bootstrap_3/breadcrumb.rb
+- lib/semantic_navigation/twitter_bootstrap_3/list.rb
+- lib/semantic_navigation/twitter_bootstrap_3/tabs.rb
 - lib/semantic_navigation/version.rb
 - semantic_navigation.gemspec
 - spec/lib/semantic_navigation/configuration_spec.rb
@@ -144,17 +148,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: semantic_navigation
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Make the navigation in your Rails app by several lines