andy_rails_toolbox 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290b2eef6daf36498d9d7bb54ec8c3667ac23454
-  data.tar.gz: c3ead3f7c84415d4ccac7f4bcb020defeb8213f2
+  metadata.gz: 31b8a7518aee9bf4c54c09b73d02b3fbe89d0706
+  data.tar.gz: 20241958a1185c837802e22afb0cd0d345ddf5b7
 SHA512:
-  metadata.gz: 619d0caa1528cee00e98b1fba0af73026aecb296e414145444e22ed01168b6334ebff3729bba87c31a62eac8a4eef35560d1bd1de64b413625d10f17f7d4884c
-  data.tar.gz: 7c62f301586d085391ce8cc6e2733a437a6cc1446a0a3dc17d243d313240e756555ea71e7a4b14d8a45ff9d31494ea746281ac8b71bd2a6f463a82a3b17d55d1
+  metadata.gz: 41071a296569363077121accbe9b4b174e28073f91bf0be26f71cc67e77d872d0f405f8d172adf83f9494e1aebcb9cdd30f73bbed30954b95eca81323d329c3f
+  data.tar.gz: 13eb21c616bbd1dc29776578c41e40ca32ae5f4c3e55093436d91d656fca8a140b1fc18a36a6cbd319111067d0c642b38cc03651cd6b55e873237412a6e70f70

data/app/helpers/bootstrap_helper.rb

@@ -208,14 +208,21 @@ module BootstrapHelper
   # - OVERRIDE - #
   # ------------ #
 
-  def content_tag(name, content = nil, options = nil, escape = true, &block)
-    options, content = content, capture(&block) if block_given?
-
-    options ||= {}
-    options = options.symbolize_keys
-    options = normalize_options_for_typography(options)
-
-    content_tag_string(name, content, options, escape)
+  def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
+    if block_given?
+      if content_or_options_with_block.is_a?(Hash) || content_or_options_with_block.nil?
+        options = content_or_options_with_block
+        options ||= {}
+        options = options.symbolize_keys
+        options = normalize_options_for_typography(options)
+      end
+      content_tag_string(name, capture(&block), options, escape)
+    else
+      options ||= {}
+      options = options.symbolize_keys
+      options = normalize_options_for_typography(options)
+      content_tag_string(name, content_or_options_with_block, options, escape)
+    end
   end
 
   private

data/lib/andy_rails_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AndyRailsToolbox
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: andy_rails_toolbox
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - ChouAndy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails