bootstrap-components-helpers 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5817863cad4e746bee07c1e955669653071c9745
-  data.tar.gz: 7c3b965765d7d91a3af14f179680da00bbe3c3aa
+  metadata.gz: 19936223524696b2929edcfe7eb6d443ba67231d
+  data.tar.gz: 03499a47b9d2f88302a53b7cbd7535329924f171
 SHA512:
-  metadata.gz: b4cbb196124b509fd54f035aa8d6b0deb82b09d156dd04938f4e6c8a693f0e8d95ee75db4a36ddde3bd4252b0734fb9b7406be8bf16c7c283934904e746887b2
-  data.tar.gz: 3ef9238abadb235368ce0d773a899edda29a5e8621f0a193bdee5d81319dcb38a9cea4a16145f1c07f649247d417776965f4da991ba76a0ab4314243a0278af0
+  metadata.gz: 7baf4c3dc8fc97e30af97dd5dff20f00f56b14f4646b903595500cc72d6a5b43f2a61bae07c9702babee99fd939e306eda5dbf4e2591b0102a6e53574f8c9297
+  data.tar.gz: fcca9bc6562ba23ceb3fd9c3e630585104946327d4b62922bc93a5a916ec5290ffe069608dd990af04ac162fd70c7f9edc14a471dd307c2c996c2d27d0bd9116

data/README.markdown

@@ -54,3 +54,5 @@ In your Gemfile:
 
   - Graham Torn
   - Caleb Adam Haye
+  - Darkside73
+  - Dave Burt

data/lib/bootstrap-components-helpers/modal_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module BootstrapComponentsHelpers
   module ModalHelper
     
@@ -40,4 +42,4 @@ module BootstrapComponentsHelpers
   end
 end
 
-ActionView::Base.send :include, BootstrapComponentsHelpers::ModalHelper
+ActionView::Base.send :include, BootstrapComponentsHelpers::ModalHelper

data/lib/bootstrap-components-helpers/tabs_helper.rb

@@ -5,6 +5,8 @@ module BootstrapComponentsHelpers
       opts[:style] ||= 'tabs'
       builder = TabsBuilder.new self
       yield builder
+      pane_handles_html = builder.pane_handles_html
+      return unless pane_handles_html
       tabs = content_tag(:ul, builder.pane_handles_html, :class => "nav nav-#{opts[:style]}")
       contents = content_tag(:div, builder.pane_contents_html, :class => 'tab-content')
       css_direction = "tabs-#{opts[:direction]}" unless opts[:direction] == 'above'
@@ -14,6 +16,7 @@ module BootstrapComponentsHelpers
     end
 
     class TabsBuilder
+      include ActionView::Helpers::OutputSafetyHelper
 
       attr_reader :parent, :pane_contents, :pane_handles
       delegate :capture, :content_tag, :to => :parent
@@ -26,28 +29,47 @@ module BootstrapComponentsHelpers
 
       def pane title, options = {}, &block
         css_class = options[:active] ? 'active' : ''
-        link = content_tag(:a, title, :'data-toggle' => 'tab', :href => "##{title.parameterize}_tab")
-        @pane_handles << [link, css_class]
-        @pane_contents << [css_class, title, capture(&block)]
+        tab_id = options[:id] || default_tab_id(title)
+        link = content_tag(:a, :'data-toggle' => 'tab', :href => "##{tab_id}") do
+          if options[:icon]
+            title = raw(content_tag(:i, '', class: "#{options[:icon]}") + ' ' + title)
+          end
+          title
+        end
+        content = capture(&block)
+        if content.present?
+          @pane_handles << [link, css_class]
+          @pane_contents << [[css_class, options[:class]], title, tab_id, content]
+        end
         nil
       end
-      
+
       def pane_handles_html
+        return if pane_handles.empty?
         pane_handles.first[1] = 'active' unless pane_handles.detect {|ph| ph[1] == 'active'}
         pane_handles.map do |link, css_class|
           content_tag(:li, link, :class => css_class)
         end.join("\n").html_safe
       end
-      
+
       def pane_contents_html
-        pane_contents.first[0] = 'active' unless pane_contents.detect {|pc| pc[0] == 'active'}
-        pane_contents.map do |css_class, title, content|
-          content_tag :div, content, :class => "tab-pane #{css_class}", :id => "#{title.parameterize}_tab"
+        return if pane_contents.empty?
+        pane_contents.first[0] << 'active' unless pane_contents.detect {|pc| pc[0].include? 'active'}
+        pane_contents.map do |css_class, title, tab_id, content|
+          css_class << 'in' if css_class.include?('active') && css_class.include?('fade')
+          css_class = css_class.join(' ').strip
+          content_tag :div, content, :class => "tab-pane #{css_class}", :id => "#{tab_id}"
         end.join("\n").html_safe
       end
 
+      private
+
+      def default_tab_id(title)
+        title.parameterize + '_tab'
+      end
+
     end
-    
+
   end
 end
 

data/test/test_accordion_helper.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 
 class AccordionHelperTest < ActionView::TestCase
-  
+
   include BootstrapComponentsHelpers::AccordionHelper
-  
+
   test "accordion method" do
     html = accordion do |accordion|
       accordion.pane 'My pane' do

data/test/test_helper.rb

@@ -4,9 +4,9 @@ require 'action_view/template'
 require 'bootstrap-components-helpers'
 
 class ActionView::TestCase
-  
+
   def assert_helper_output fixture_name, actual_output
-    assert_equal File.read("#{File.dirname __FILE__}/fixtures/#{fixture_name}.html"), actual_output
+    assert_equal File.read("#{File.dirname __FILE__}/fixtures/#{fixture_name}.html").strip, actual_output
   end
-  
-end
+
+end

data/test/test_tabs_helper.rb

@@ -1,9 +1,8 @@
 require 'test_helper'
 
 class TabsHelperTest < ActionView::TestCase
-  
   include BootstrapComponentsHelpers::TabsHelper
-  
+
   test "calling tabs method" do
     html = tabs do |tabs|
       tabs.pane 'My first pane' do
@@ -13,4 +12,35 @@ class TabsHelperTest < ActionView::TestCase
     assert_helper_output 'tabs', html
   end
 
+  test "extra options" do
+    html = tabs do |tabs|
+      tabs.pane 'My first pane<br>', id: 'custom_id', icon: 'fa fa-ok', class: 'custom-class' do
+        'inside the pane'
+      end
+    end
+    assert_match /href="#custom_id"/, html
+    assert_match /id="custom_id"/, html
+    assert_match /i class="fa fa-ok"/, html
+    assert_match /class=".*custom-class.*"/, html
+    refute_match /<br>/, html
+  end
+
+  test "adds 'in' css class to active tab with 'ade effect" do
+    html = tabs do |tabs|
+      tabs.pane 'My first pane', class: 'fade', active: true do
+        'inside the pane'
+      end
+    end
+    assert_match /class=".*active.*"/, html
+    assert_match /class=".*in.*"/, html
+  end
+
+  test "empty pane does not included in html" do
+    html = tabs do |tabs|
+      tabs.pane 'Empty pane' do
+        ''
+      end
+    end
+    refute_match /Empty pane/, html
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-components-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ivan Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -32,10 +32,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.markdown
+- lib/bootstrap-components-helpers.rb
 - lib/bootstrap-components-helpers/accordion_helper.rb
 - lib/bootstrap-components-helpers/modal_helper.rb
 - lib/bootstrap-components-helpers/tabs_helper.rb
-- lib/bootstrap-components-helpers.rb
 - test/test_accordion_helper.rb
 - test/test_helper.rb
 - test/test_modal_helper.rb
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: View helpers for Twitter Bootstrap components