effective_resources 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022dfa4ea62f6a71b19192016d4a3108f657bda0
-  data.tar.gz: 2c0d60521353a87ca54acde430540636742adbd8
+  metadata.gz: e7c20435511222c5ce79dd666f0316afd80725d7
+  data.tar.gz: 70f5d6058d90bc1a1d0e0464c33b0169066769ba
 SHA512:
-  metadata.gz: f10e53623093ce79fe6b8a22aa10087aeed62014eb672338741d1277681c627cc7d1b5129c32cc1b0a1fa44332853ad9c2b02711d76801a130e85bbf3b356b71
-  data.tar.gz: cc17e8e6b4f1af4a4c1af4acdaaba2a47e4e9055ddee77975a05f878552410369ded8c65bedf01f1f9c0baa8f0cce4a069257554c0c0c8b254c7f93f863c010f
+  metadata.gz: 1f42d5f5d8bc2818e92e7f242546bdb795a7a62a9d780825e775a49876dc42a515da003e00c9391a22cc72eb5fd404a3ec91d5de2582e86196ab143d9e09fe35
+  data.tar.gz: a5dfe04ab6f0cee8360208feacba38c4c202160ee53efbd5fbaf5564bff6612cfa31a3ac089f47eed9a3a0b8e3c9f589989721f39cde23858daba92bbe33e98d

data/app/helpers/effective_bootstrap3_helper.rb

@@ -36,23 +36,25 @@ module EffectiveBootstrap3Helper
   #     %p Exports
 
   # If you pass active 'label' it will make that tab active. Otherwise first.
-  def tabs(active: nil, &block)
+  def tabs(active: nil, panel: {}, list: {}, content: {}, &block)
     raise 'expected a block' unless block_given?
 
     @_tab_mode = :panel
     @_tab_active = (active || :first)
 
-    content_tag(:div, role: 'tabpanel') do
-      content_tag(:ul, class: 'nav nav-tabs', role: 'tablist') { yield } # Yield to tab the first time
-    end + content_tag(:div, class: 'tab-content') do
+    content_tag(:div, {role: 'tabpanel'}.merge(panel)) do
+      content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) { yield } # Yield to tab the first time
+    end + content_tag(:div, {class: 'tab-content'}.merge(content)) do
       @_tab_mode = :content
       @_tab_active = (active || :first)
       yield # Yield tot ab the second time
     end
   end
 
-  def tab(label, &block)
-    controls = label.to_s.parameterize.gsub('_', '-')
+  def tab(label, controls = nil, &block)
+    controls ||= label.to_s.parameterize.gsub('_', '-')
+    controls = controls[1..-1] if controls[0] == '#'
+
     active = (@_tab_active == :first || @_tab_active == label)
 
     @_tab_active = nil if @_tab_active == :first

data/app/helpers/effective_resources_helper.rb

@@ -115,11 +115,11 @@ module EffectiveResourcesHelper
     glyphicon_to('remove', path, {title: 'Remove'}.merge(options))
   end
 
-  def glyphicon_tag(icon)
+  def glyphicon_tag(icon, options = {})
     if icon.to_s.start_with?('glyphicon-')
-      content_tag(:span, '', class: "glyphicon #{icon}")
+      content_tag(:span, '', {class: "glyphicon #{icon}"}.merge(options))
     else
-      content_tag(:span, '', class: "glyphicon glyphicon-#{icon}")
+      content_tag(:span, '', {class: "glyphicon glyphicon-#{icon}"}.merge(options))
     end
   end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.7.9'.freeze
+  VERSION = '0.7.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Make any controller an effective resource controller.