rails-bootstrap-tabs 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bbfbb9984d3664b81fac5ecece7d5cf5dddbae0d
-  data.tar.gz: 85e4087ad3bc28c067ad3c55293239099c7076e1
+SHA256:
+  metadata.gz: 0c51419b342fc09fc1fbdbf5fe3eeafff572dda98651851d699cd9a6f5c9ae30
+  data.tar.gz: 0b1b7d81087af4f222e417f985acd3ad94ce6bec2b0d7f58df95bb880f15ca7e
 SHA512:
-  metadata.gz: 02d055262060e0e158bbdd326d2d1e9d59b5d7e62806727471d91a1478603fec8a8593ffa2005c408e302ff0dd6ca5f96f09cbc25be6721c452ffdff4998af62
-  data.tar.gz: 663814a10dc371c32cd3ec6cf4c488eedfccbf10767ee327afcc026f62a519d23d33bdfcdb86dd99018538fb0eaa32f93a576c3d4664690d75eb68baf267e8f0
+  metadata.gz: '0555693dc97f1a3a98d80861f37ef837a62a1372adbc7bbc08dea44b8f6ea1757e30aea3488cf58bb8611759a75581d52e43a98db4dcfe35081ae542f210b4ab'
+  data.tar.gz: 6e7113b6ef0fccef9fca7c7d9d04ffa12b66b40c9086932e1c6df90df8e6cc6fe95655701265d9f16a7b347a6039c72f088c8d11bb9cf40e4ed61b98d4d85f2d

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_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
 
@@ -11,10 +17,16 @@ module RailsBootstrapTabs::Renderers
       link_class = 'nav-link'
       link_class << ' active' if options[:active]
       link_class << " #{options[:link_class]}" if options[:link_class]
-      content_tag :li, class: 'nav-item' do
+      if options[:nav_markup]
         link_to "##{options[:anchor]}", data: { toggle: 'tab' }, class: link_class do
           yield
         end
+      else
+        content_tag :li, class: 'nav-item' 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

@@ -22,7 +22,20 @@ module RailsBootstrapTabs::Renderers
     def prepare_tabs
       @tabs.each.with_index do |tab, index|
         tab.options[:anchor] ||= "tab-#{index}-#{rstr(index)}"
-        tab.options[:fade_effect] ||= RailsBootstrapTabs.fade_effect || @options[:fade_effect]
+        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.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-bootstrap-tabs
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Ivan Reshetnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Rails plugin to build bootstrap tabs