bootstrap_help 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 009745243b1acf73fa3dad07f238728299c96325
-  data.tar.gz: ba4355e89e5251daed1dc606b94cea72cef4908a
+  metadata.gz: f8410998cb554a1cb82729ea606d43258a10f47c
+  data.tar.gz: 4495846e70282207cb75ce8bf48a3450f5ff0c43
 SHA512:
-  metadata.gz: cd050bc37813840f4f73e86e438acefab81b8fed026ccd8ea2b843d90c6e6407f3087906b5c830477ccd6585d368d2b380a3519b8625f3f2690c64224b89adec
-  data.tar.gz: ea0f937330ed2ec0b896c5c7575a1a9f0551bbf1c06a3bfec87a8f5a9d08c3a1dc8051828bc8fd072f277aac35618792bf6620d49760cfbff614e1e8636148bd
+  metadata.gz: a9058bc39bf84d703cb8916d56a9cb2050be435569923ec8c947b7069ca73e4acdf26ff80002eeea769d47bf8fe632f3f9a00a5b67925a7381fd801552a12f20
+  data.tar.gz: c918c2138049ebced3af6067eca8bc4efb49e72f0422b9ab440c8336c00ce8ff7c19d81dc4d48c346906fa0c830697fe6b2a1e84be4213ff223c4b90438ec393

data/README.md

@@ -51,8 +51,8 @@ The Table Helper helps you quickly build Bootstrap tables with collections of in
 The button helper renders buttons with the proper Bootstrap markup. You can optionally add icons from the Bootstrap library that are listed [here](http://getbootstrap.com/2.3.2/base-css.html#icons "Bootstrap Icons")
 
 ```haml
-= button_to "New Store", new_store_path
-= button_to "Edit Store", edit_store_path(@store), icon: "edit"
+= primary_button_to "New Store", new_store_path
+= primary_button_to "Edit Store", edit_store_path(@store), icon: "edit"
 ```
 
 ```haml

data/lib/bootstrap_help/button_helpers.rb

@@ -6,45 +6,47 @@ module BootstrapHelp
     include ActionView::Context
     include BootstrapHelp::OptionHelpers
 
+    BUTTON_OPTIONS = %i(icon icon_color)
+
     def button_toolbar(&block)
       @buttons = []
       block.call
       content_tag :div, class: "btn-toolbar" do
         content_tag :div, class: "btn-group" do
           @buttons.each do |button|
-            concat(draw_icon_button(*button))
+            concat(toolbar_button_to(nil, button[:url], button[:options]))
           end
         end
       end
     end
 
-    def button(*args)
-      @buttons << args
+    def button(url=nil, options={})
+      @buttons << { url: url, options: options }
       nil
     end
 
-    def button_to(name=nil, url=nil, options={})
-      icon_suffix = options[:icon]
-      options.delete_if { |k, v| k == :icon }
+    def primary_button_to(name=nil, url=nil, options={})
       button_options = append_css_class("btn btn-primary", options)
-      link_to url, button_options do
-        if icon_suffix.present?
-          concat(content_tag :i, nil, class: "icon-#{icon_suffix} icon-white")
-          name = " #{name}"
-        end
-        concat(name)
-      end
+      draw_button(name, url, button_options)
+    end
+
+    def toolbar_button_to(name=nil, url=nil, options={})
+      button_options = append_css_class("btn", options)
+      draw_button(nil, url, button_options)
     end
 
     private
 
-    def draw_icon_button(*args)
-      icon_suffix = args.first
-      options = args[1] || {}
-      html_options = args[2] || {}
-      html_options.merge!(class: "btn")
-      link_to options, html_options do
-        content_tag :i, nil, class: "icon-#{icon_suffix}"
+    def draw_button(name=nil, url=nil, options={})
+      icon_suffix = options[:icon]
+      icon_color = options.fetch(:icon_color, "black")
+      options.delete_if { |k, v| BUTTON_OPTIONS.include?(k) }
+      link_to url, options do
+        if icon_suffix.present?
+          concat(content_tag :i, nil, class: "icon-#{icon_suffix} icon-#{icon_color}")
+          name = " #{name}"
+        end
+        concat(name)
       end
     end
   end

data/lib/bootstrap_help/version.rb

@@ -1,3 +1,3 @@
 module BootstrapHelp
-  VERSION = "0.0.28"
+  VERSION = "0.0.29"
 end

data/spec/bootstrap_helper/button_helper_spec.rb

@@ -12,12 +12,12 @@ describe BootstrapHelp::ButtonHelpers do
 
   describe '#table_for' do
     it 'returns a bootstrap table for a given collection' do
-      expected_result = "<div class=\"btn-toolbar\"><div class=\"btn-group\"><a class=\"btn\" href=\"/test\"><i class=\"icon-edit\"></i></a><a class=\"btn\" href=\"/test-again\"><i class=\"icon-new\"></i></a><a class=\"btn\" data-method=\"delete\" href=\"/test-again\" rel=\"nofollow\"><i class=\"icon-new\"></i></a></div></div>"
+      expected_result = "<div class=\"btn-toolbar\"><div class=\"btn-group\"><a class=\"btn\" href=\"/test\"><i class=\"icon-edit icon-black\"></i> </a><a class=\"btn\" href=\"/test-again\"><i class=\"icon-new icon-black\"></i> </a><a class=\"btn\" data-method=\"delete\" href=\"/test-again\" rel=\"nofollow\"><i class=\"icon-new icon-black\"></i> </a></div></div>"
 
       block = Proc.new {
-        helpers.button 'edit', "/test"
-        helpers.button 'new', "/test-again"
-        helpers.button 'new',  "/test-again", method: :delete
+        helpers.button "/test", icon: 'edit'
+        helpers.button "/test-again", icon: 'new'
+        helpers.button "/test-again", method: :delete, icon: 'new'
       }
 
       expect(helpers.button_toolbar(&block)).to eq(expected_result)
@@ -26,12 +26,13 @@ describe BootstrapHelp::ButtonHelpers do
 
   describe '#button_to' do
     it "returns a primary button" do
-      expect(helpers.button_to('New Store', '#')).to eq("<a class=\"btn btn-primary\" href=\"#\">New Store</a>")
+      expect(helpers.primary_button_to('New Store', '#')).to eq("<a class=\"btn btn-primary\" href=\"#\">New Store</a>")
     end
 
     it "returns a primary button with an icon when specified" do
       expected_result = "<a class=\"btn btn-primary\" href=\"#\"><i class=\"icon-edit icon-white\"></i> New Store</a>"
-      expect(helpers.button_to('New Store', '#', icon: "edit")).
+      expect(helpers.primary_button_to('New Store', '#', icon: "edit",
+                                                         icon_color: "white")).
         to eq(expected_result)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_help
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Josh Klina