rails-bootstrap-tabs 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa6a1a3802a03c8201ffc5ac76374c4f4ab348ca
-  data.tar.gz: 47c52dc3612df4bb555abf7c30083963f6a24c8b
+SHA256:
+  metadata.gz: a6f78efb3cdc927ca42ae910a5210f8899da6ab8e4061ce34adb916b4d35f561
+  data.tar.gz: de1b46a7967da3780826e6c2e5d0b57cf364ed73beee6cfd1d15fac97467e65e
 SHA512:
-  metadata.gz: 86855c5dfa0aad5caae3aeb4f56f469f61f43fd40a6478cb861293cbc336320ab612ab3b7019df36351d9c79b81cb810e34bde97c921687a27a4306026b759e2
-  data.tar.gz: e80dd1b445b0bb76633cb0476ce29cb79a73fca3bce0fdb2627808fc1646036951f60f3b3a7b88ee42a3d7050d66116c960a90a30f6537e11e9b71c9be4d74ae
+  metadata.gz: 16fb29aec485fba4df89f9531323a054c9d772e4171b3c2559deab8d261eb8e24da503377c5068da359710dbc7918da8de74d28306ba2b79c8e68569b2aa771b
+  data.tar.gz: b1532b2c22b7e3a1e32e0d5f7fa2ff752c01a4dc49f0c065bdbcecc57d8e1a02f28a350c4abb60a1a825d5df08a77ce42b43bf041576eb6ef2d70a8e4c07b73e

data/lib/rails-bootstrap-tabs/rails/engine.rb

@@ -3,6 +3,7 @@ require 'rails-bootstrap-tabs/helpers/tabs_helper'
 module RailsBootstrapTabs
   mattr_accessor :bootstrap_version do; 3; end
   mattr_accessor :fade_effect do; false; end
+  mattr_accessor :nav_markup do; false; end
 
   module Rails
     class Engine < ::Rails::Engine

data/lib/rails-bootstrap-tabs/renderers/tabs_bootstrap3_renderer.rb

@@ -9,7 +9,7 @@ module RailsBootstrapTabs::Renderers
     def render_tab(tab)
       options = tab.options
       content_tag :li, class: ('active' if options[:active]) do
-        link_to "##{options[:anchor]}", class: "#{options[:link_class]}", data: { toggle: 'tab' } do
+        link_to "##{options[:anchor]}", class: (options[:link_class] if options[:link_class]), data: { toggle: 'tab' } do
           yield
         end
       end

data/lib/rails-bootstrap-tabs/renderers/tabs_bootstrap4_renderer.rb

@@ -1,8 +1,14 @@
 module RailsBootstrapTabs::Renderers
   class TabsBootstrap4Renderer < TabsRenderer
     def render_tabs_wrapper
-      content_tag :ul, class: 'nav nav-tabs' do
-        yield
+      if @options[:nav_markup]
+        content_tag :nav, class: 'nav nav-tabs' do
+          yield
+        end
+      else
+        content_tag :ul, class: 'nav nav-tabs' do
+          yield
+        end
       end
     end
 
@@ -10,10 +16,19 @@ module RailsBootstrapTabs::Renderers
       options = tab.options
       link_class = 'nav-link'
       link_class << ' active' if options[:active]
-      content_tag :li, class: 'nav-item' do
-        link_to "##{options[:anchor]}", class: "#{options[:link_class]}", data: { toggle: 'tab' }, class: link_class do
+      link_class << " #{options[:link_class]}" if options[:link_class]
+      li_class = 'nav-item'
+      li_class << ' active' if options[:active]
+      if options[:nav_markup]
+        link_to "##{options[:anchor]}", data: { toggle: 'tab' }, class: link_class do
           yield
         end
+      else
+        content_tag :li, class: li_class do
+          link_to "##{options[:anchor]}", data: { toggle: 'tab' }, class: link_class do
+            yield
+          end
+        end
       end
     end
 

data/lib/rails-bootstrap-tabs/renderers/tabs_renderer.rb

@@ -8,8 +8,9 @@ module RailsBootstrapTabs::Renderers
       @tabs = []
     end
 
-    def rstr
-      (0...8).map { ('a'.ord + rand(26)).chr }.join
+    def rstr(seed)
+      rnd = Random.new(seed)
+      (0...8).map { ('a'.ord + rnd.rand(26)).chr }.join
     end
 
     def render
@@ -20,8 +21,21 @@ module RailsBootstrapTabs::Renderers
 
     def prepare_tabs
       @tabs.each.with_index do |tab, index|
-        tab.options[:anchor] ||= "tab-#{index}-#{rstr}"
-        tab.options[:fade_effect] ||= RailsBootstrapTabs.fade_effect || @options[:fade_effect]
+        tab.options[:anchor] ||= "tab-#{index}-#{rstr(index)}"
+        if tab.options[:fade_effect].nil?
+          if @options.key?(:fade_effect)
+            tab.options[:fade_effect] = @options[:fade_effect]
+          else
+            tab.options[:fade_effect] = RailsBootstrapTabs.fade_effect
+          end
+        end
+        if tab.options[:nav_markup].nil?
+          if @options.key?(:nav_markup)
+            tab.options[:nav_markup] = @options[:nav_markup]
+          else
+            tab.options[:nav_markup] = RailsBootstrapTabs.nav_markup
+          end
+        end
       end
       active_tab = @tabs.find { |t| t.options[:active] }
       active_tab ||= @tabs.first

data/lib/rails-bootstrap-tabs/version.rb

@@ -1,3 +1,3 @@
 module RailsBootstrapTabs
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-bootstrap-tabs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Ivan Reshetnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 description: A Rails plugin to build bootstrap tabs
 email:
 - resivalex@gmail.com
@@ -58,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Rails plugin to build bootstrap tabs