bootstrap3_helper 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7690ea3af6632902048f7f389e97a9c2317e007c6dab849b754fabe805a7357e
-  data.tar.gz: 2c8234630ce566f379f1d1a46d9ab7e47e958c3b1059df4aa41a0003a27700bc
+  metadata.gz: 74e356782b2f424f78b9bd3731009d7ba7a1492a392e782c5cade487ea765a26
+  data.tar.gz: 7a8fb76f39fa53b9bdcebf6542239c58448e8caa88b725b5f47c4255ad31d80f
 SHA512:
-  metadata.gz: d54b3740ae4f7bd45adcea82506ebe65fae16dcca0837c42e83ada33480c67053acaee9112ffe7029283d2d4babe71d0cfbe9183e97b8d30e886527fd2cf70e5
-  data.tar.gz: 5e42f3ff987c0e32aa5f2b5dd94c744abc7d4afbadeb41ee17da5b1cfd64b5975a123aa4d3d135e9dd2871fa9abd1ee3ec7d6862cd41d53a8bc41ece2e9a6ea8
+  metadata.gz: 71bad603e6cf3834f68c6f216e1dcc3c0b0e88f76ef4a44c05bc9f101d4eba4271a9312caee0500ae2e317e35485ee9fdd214dc807c4d42422eb9a4acc090c20
+  data.tar.gz: 8f062f014b468ba1b8fb916666556a69b3ddb03cfa9e024738babe7480ffcb4ad55f3507672d69b98abcb55251c4d3ae664f6055bbca1cf2c7de9d21440fb632

data/lib/bootstrap3_helper/accordion.rb

@@ -67,16 +67,27 @@ module Bootstrap3Helper
     #
     # rubocop:disable Metrics/MethodLength
     def header(args = {})
-      id    = args.fetch(:id, nil)
-      klass = args.fetch(:class, '')
-      data  = args.fetch(:data, {})
+      id     = args.fetch(:id, nil)
+      klass  = args.fetch(:class, '')
+      data   = args.fetch(:data, {})
 
       data[:toggle] = 'collapse'
       data[:parent] = "##{@parent_id}"
 
-      @header = content_tag :div, id: id, class: 'panel-heading ' + klass do
+      @header = content_tag(
+        :div,
+        id:    id,
+        role:  'tab',
+        class: 'panel-heading ' + klass
+      ) do
         content_tag :h3, class: 'panel-title' do
-          content_tag :a, href: "##{@collapse_id}", data: data do
+          content_tag(
+            :a,
+            href: "##{@collapse_id}",
+            role: 'button',
+            data: data,
+            aria: { expanded: @expanded, controls: "##{@collapse_id}" }
+          ) do
             content = yield if block_given?
             content.to_s.html_safe
           end
@@ -104,19 +115,27 @@ module Bootstrap3Helper
     # @return [nilClass]
     #
     #
+    # rubocop:disable Metrics/MethodLength
     def body(args = {})
       klass = 'panel-collapse collapse '
       data  = args.fetch(:data, {})
       klass += args.fetch(:class, '')
       klass += ' in' if @expanded
 
-      @body = content_tag :div, id: @collapse_id, class: klass do
+      @body = content_tag(
+        :div,
+        id:    @collapse_id,
+        role:  'tabpanel',
+        class: klass,
+        aria:  { labelledby: "##{@collapse_id}" }
+      ) do
         content_tag :div, class: 'panel-body', data: data do
           content = yield if block_given?
           content.to_s.html_safe
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # @description
     # - Creates the footer element for the accordion

data/lib/bootstrap3_helper/tabs/content.rb

@@ -40,10 +40,19 @@ module Bootstrap3Helper
       #   </code>
       #
       def item(name, args = {})
-        data  = args.fetch(:data, nil)
-        klass = args.fetch(:class, '')
+        data   = args.fetch(:data, nil)
+        klass  = args.fetch(:class, '')
+        active = klass.include? 'active'
 
-        content = content_tag :div, id: name, class: 'tab-pane ' + klass, data: data, role: 'tabpanel' do
+        content = content_tag(
+          :div,
+          id:       name,
+          class:    "tab-pane fade #{active ? 'in' : ''} #{klass}",
+          aria:     { hidden: active },
+          data:     data,
+          role:     'tabpanel',
+          tabindex: -1
+        ) do
           yield if block_given?
         end
 

data/lib/bootstrap3_helper/tabs/dropdown.rb

@@ -44,19 +44,33 @@ module Bootstrap3Helper
       #     }
       #   </code>
       #
+      # rubocop:disable Metrics/MethodLength
       def item(name, args = {})
-        id    = args.fetch(:id, nil)
-        klass = args.fetch(:class, '')
-        data  = args.fetch(:data, nil)
+        id     = args.fetch(:id, nil)
+        klass  = args.fetch(:class, '')
+        data   = args.fetch(:data, nil)
+        active = klass.include? 'active'
 
-        li = content_tag :li, id: id, class: klass, data: data do
-          content_tag :a, href: "##{name}", role: 'tab', data: { toggle: 'tab' }, aria: { controls: name, expanded: false } do
+        li = content_tag(
+          :li,
+          id:    id,
+          class: klass,
+          data:  data
+        ) do
+          content_tag(
+            :a,
+            href: "##{name}",
+            role: 'tab',
+            data: { toggle: 'tab' },
+            aria: { controls: name, expanded: active }
+          ) do
             block_given? ? yield : name.to_s.titleize
           end
         end
 
         @items.push(li)
       end
+      # rubocop:enable Metrics/MethodLength
 
       # @description
       # - Used to render out the object and get the HTML representation.

data/lib/bootstrap3_helper/tabs/menu.rb

@@ -50,19 +50,35 @@ module Bootstrap3Helper
       #     }
       #   </code>
       #
+      # rubocop:disable Metrics/MethodLength
       def item(name, args = {})
-        id    = args.fetch(:id, nil)
-        data  = args.fetch(:data, nil)
-        klass = args.fetch(:class, '')
+        id     = args.fetch(:id, nil)
+        data   = args.fetch(:data, nil)
+        klass  = args.fetch(:class, '')
+        active = klass.include? 'active'
 
-        li = content_tag :li, id: id, class: klass, data: data, role: 'presentation' do
-          content_tag :a, href: "##{name}", data: { toggle: 'tab' }, aria: { controls: '' } do
+        li = content_tag(
+          :li,
+          id:    id,
+          class: klass,
+          data:  data,
+          role:  'presentation'
+        ) do
+          content_tag(
+            :a,
+            href:     "##{name}",
+            role:     'tab',
+            tabindex: -1,
+            data:     { toggle: 'tab' },
+            aria:     { controls: "##{name}", expanded: active, selected: active }
+          ) do
             block_given? ? yield : name.to_s.titleize
           end
         end
 
         @items.push(li)
       end
+      # rubocop:enable Metrics/MethodLength
 
       # @description
       # - Used to create menu items that are Dropdowns

data/lib/bootstrap3_helper/version.rb

@@ -1,3 +1,3 @@
 module Bootstrap3Helper
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/bootstrap3_helper.rb

@@ -162,8 +162,8 @@ module Bootstrap3Helper
   #
   # @param [String|Symbol] name
   #
-  def icon_helper(name = '')
-    content_tag :span, '', class: 'glyphicon glyphicon-' + name.to_s
+  def icon_helper(name)
+    content_tag :span, '', class: "glyphicon glyphicon-#{name}"
   end
 
   # @description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap3_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Robert David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,7 +118,7 @@ files:
 - lib/bootstrap3_helper/tabs/menu.rb
 - lib/bootstrap3_helper/version.rb
 - lib/tasks/bootstrap3_helper_tasks.rake
-homepage: https://github.com/rdavid369/bootstrap3-helper/blob/master/lib/bootstrap3_helper.rb
+homepage: https://github.com/rdavid369/bootstrap3-helper
 licenses:
 - MIT
 metadata: {}