css3buttons 0.9.3 → 0.9.4

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    css3buttons (0.9.3)
+    css3buttons (0.9.4)
       actionpack (>= 3.0.0)
 
 GEM

data/lib/css3buttons/helpers/button_helper.rb

@@ -4,11 +4,11 @@ module Css3buttons
       include ActionView::Helpers::UrlHelper
       include ActionView::Helpers::FormTagHelper
       def method_missing(method, *args)
-        if method.to_s.index("button_link_to") || method.to_s.index("button_submit_tag")
+        if is_link_method?(method) || is_submit_method?(method) || is_button_method?(method)
           qualifiers = ["primary", "big", "positive", "negative", "pill", "danger", "safe", "button"]
           color_map = {"positive" => "safe", "negative" => "danger"}
 
-          method_qualifiers = method.to_s.split("_")[0...-3] + ["button"]
+          method_qualifiers = strip_method_name(method).split("_") + ["button"]
           method_qualifiers.map! do |qualifier|
             if color_map.has_key?(qualifier)
               qualifier = color_map[qualifier]
@@ -31,6 +31,8 @@ module Css3buttons
 
             if is_link_method?(method)
               link_to(label, link, options)
+            elsif is_button_method?(method)
+              content_tag :button, label, { "type" => "submit", "name" => "commit", "value" => "commit" }.merge(options.stringify_keys)
             else
               submit_tag(label, options)
             end
@@ -74,6 +76,18 @@ module Css3buttons
       def is_link_method?(method)
         method.to_s.index("button_link_to")
       end
+
+      def is_button_method?(method)
+        method.to_s.index("button_tag")
+      end
+
+      def is_submit_method?(method)
+        method.to_s.index("button_submit_tag")
+      end
+
+      def strip_method_name(method)
+        method.to_s.gsub("button_link_to", "").gsub("button_tag", "").gsub("button_submit_tag", "")
+      end
     end
   end
 end

data/lib/css3buttons/version.rb

@@ -1,3 +1,3 @@
 module Css3buttons
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/readme.md

@@ -108,12 +108,39 @@ And, of course, minor groups:
       You know the drill by now.
     <% end %>
 
-## Other stuff
 
-Submit tags are also ushered in with this version. Everything works as it does above, except instead of `button_link_to` it's `button_submit_tag`. Example:
+## Submit tags, button tags and using icons on form buttons
+
+Submit tags were ushered in with version 0.9.2. Everything works as it does above, except instead of `button_link_to` it's `button_submit_tag`. Example:
 
     <%= positive_button_submit_tag "Publish" %>
 
+Keep in mind however, that icons do not work on `<submit>` tags. If you're wanting to include icons in your forms there is also a helper method to insert `<button>` tags instead. The method suffix in this case is `button_tag`. Examples:
+
+    <%= approve_button_tag "Update profile" %>
+    <%= negative_trash_button_tag "Deactivate account" %>
+
+
+# Formtastic compatibility
+
+If you're using
+[formtastic](https://github.com/justinfrench/formtastic), you may
+experience issues with using css3buttons in your forms, due to the
+way the built-in formtastic styles modify default form buttons. In this
+instance, you can insert the following into your
+`formtastic_changes.css` stylesheet.
+
+    form.formtastic input.button, form.formtastic.button.button {
+      height: 25px;
+      padding: 0.2em 1em 0.2em 2.5em;
+      font-family: sans-serif;
+      font-size: 11px;
+      margin-left: 5px;
+    }
+
+CSS Snippet courtesy of [vitobotta](https://github.com/vitobotta).
+
+
 
 # What's missing?
 

data/spec/button_helper_spec.rb

@@ -10,6 +10,8 @@ describe Css3buttons::Helpers::ButtonHelper do
     @path = "/search/site"
   end
 
+  #--- basic buttons
+
   it "should create basic buttons" do
     link = html(button_link_to(@label, @path))
 
@@ -18,15 +20,23 @@ describe Css3buttons::Helpers::ButtonHelper do
       link.should_not have_selector("a.#{qualifier}")
     end
   end
-
   it "should create basic submit buttons" do
     button = html(button_submit_tag(@label))
-    
+
     button.should have_selector("input.button[type='submit']")
     @qualifiers.each do |qualifier|
       button.should_not have_selector("input.#{qualifier}")
     end
   end
+  it "should create basic button tags" do
+    button = html(button_tag(@label))
+    button.should have_selector("button.button")
+    @qualifiers.each do |qualifier|
+      button.should_not have_selector("button.#{qualifier}")
+    end
+  end
+
+  #--- basic buttons with icons
 
   it "should create basic buttons with valid icons" do
     @icons.each do |icon|
@@ -34,7 +44,15 @@ describe Css3buttons::Helpers::ButtonHelper do
       link.should have_selector("a.button.icon.#{icon}[href='#{@path}']")
     end
   end
-  
+  it "should create basic button tags with valid icons" do
+    @icons.each do |icon|
+      button = html(send(:"#{icon}_button_tag", @label))
+      button.should have_selector("button.button.icon.#{icon}[type='submit']")
+    end
+  end
+
+  #--- positive buttons
+
   it "should create positive buttons" do
     link = html(positive_button_link_to(@label, @path))
     link.should have_selector("a.button.safe[href='#{@path}']")
@@ -42,7 +60,6 @@ describe Css3buttons::Helpers::ButtonHelper do
       link.should_not have_selector("a.#{qualifier}") unless qualifier == "safe"
     end
   end
-
   it "should create positive submit buttons" do
     button = html(positive_button_submit_tag(@label))
     button.should have_selector("input.button.safe[type='submit']")
@@ -50,6 +67,15 @@ describe Css3buttons::Helpers::ButtonHelper do
       button.should_not have_selector("input.#{qualifier}") unless qualifier == "safe"
     end
   end
+  it "should create positive button tags" do
+    button = html(positive_button_tag(@label))
+    button.should have_selector("button.button.safe[type='submit']")
+    @qualifiers.each do |qualifier|
+      button.should_not have_selector("button.#{qualifier}") unless qualifier == "safe"
+    end
+  end
+
+  #--- negative buttons
 
   it "should create negative buttons" do
     link = html(negative_button_link_to(@label, @path))
@@ -58,14 +84,22 @@ describe Css3buttons::Helpers::ButtonHelper do
       link.should_not have_selector("a.#{qualifier}") unless qualifier == "danger"
     end
   end
-
-  it "should create positive submit buttons" do
+  it "should create negative submit buttons" do
     button = html(negative_button_submit_tag(@label))
     button.should have_selector("input.button.danger[type='submit']")
     @qualifiers.each do |qualifier|
-      button.should_not have_selector("a.#{qualifier}") unless qualifier == "danger"
+      button.should_not have_selector("input.#{qualifier}") unless qualifier == "danger"
     end
   end
+  it "should create negative button tags" do
+    button = html(negative_button_tag(@label))
+    button.should have_selector("button.button.danger[type='submit']")
+    @qualifiers.each do |qualifier|
+      button.should_not have_selector("button.#{qualifier}") unless qualifier == "danger"
+    end
+  end
+
+  #--- positive buttons with icons
 
   it "should create positive buttons with valid icons" do
     @icons.each do |icon|
@@ -76,6 +110,17 @@ describe Css3buttons::Helpers::ButtonHelper do
       end
     end
   end
+  it "should create positive button tags with valid icons" do
+    @icons.each do |icon|
+      button = html(send(:"positive_#{icon}_button_tag", @label))
+      button.should have_selector("button.button.safe.icon.#{icon}[type='submit']")
+      @qualifiers.each do |qualifier|
+        button.should_not have_selector("button.#{qualifier}") unless qualifier == "safe"
+      end
+    end
+  end
+
+  #--- negative buttons with icons
 
   it "should create negative buttons with valid icons" do
     @icons.each do |icon|
@@ -86,6 +131,17 @@ describe Css3buttons::Helpers::ButtonHelper do
       end
     end
   end
+  it "should create negative button tags with valid icons" do
+    @icons.each do |icon|
+      button = html(send(:"negative_#{icon}_button_tag"))
+      button.should have_selector("button.button.danger.icon.#{icon}[type='submit']")
+      @qualifiers.each do |qualifier|
+        button.should_not have_selector("button.#{qualifier}") unless qualifier == "danger"
+      end
+    end
+  end
+
+  #--- pill buttons
 
   it "should create pill buttons" do
     link = html(pill_button_link_to(@label, @path))
@@ -94,7 +150,6 @@ describe Css3buttons::Helpers::ButtonHelper do
       link.should_not have_selector("a.#{qualifier}") unless qualifier == "pill"
     end
   end
-
   it "should create pill submit buttons" do
     button = html(pill_button_submit_tag(@label))
     button.should have_selector("input.button.pill[type='submit']")
@@ -102,6 +157,15 @@ describe Css3buttons::Helpers::ButtonHelper do
       button.should_not have_selector("input.#{qualifier}") unless qualifier == "pill"
     end
   end
+  it "should create pill button tags" do
+    button = html(pill_button_tag(@label))
+    button.should have_selector("button.button.pill[type='submit']")
+    @qualifiers.each do |qualifier|
+      button.should_not have_selector("button.#{qualifier}") unless qualifier == "pill"
+    end
+  end
+
+  #--- pill buttons with icons
 
   it "should create pill buttons with valid icons" do
     @icons.each do |icon|
@@ -112,30 +176,53 @@ describe Css3buttons::Helpers::ButtonHelper do
       end
     end
   end
+  it "should create pill button tags with valid icons" do
+    @icons.each do |icon|
+      button = html(send(:"pill_#{icon}_button_tag", @label))
+      button.should have_selector("button.button.pill.icon.#{icon}[type='submit']")
+      @qualifiers.each do |qualifier|
+        button.should_not have_selector("button.#{qualifier}") unless qualifier == "pill"
+      end
+    end
+  end
+
+  #--- positive pill buttons
 
   it "should create positive pill buttons" do
     link = html(positive_pill_button_link_to(@label, @path))
     link.should have_selector("a.button.pill.safe[href='#{@path}']")
     link.should_not have_selector("a.danger")
   end
-
   it "should create positive pill submit buttons" do
     button = html(positive_pill_button_submit_tag(@label))
     button.should have_selector("input.button.pill.safe[type='submit']")
     button.should_not have_selector("input.danger")
   end
+  it "should create positive pill button tags" do
+    button = html(positive_pill_button_tag(@label))
+    button.should have_selector("button.button.pill.safe[type='submit']")
+    button.should_not have_selector("button.danger")
+  end
+
+  #--- negative pill buttons
 
   it "should create negative pill buttons" do
     link = html(negative_pill_button_link_to(@label, @path))
     link.should have_selector("a.button.pill.danger[href='#{@path}']")
     link.should_not have_selector("a.safe")
   end
-
   it "should create negative pill submit buttons" do
     button = html(negative_pill_button_submit_tag(@label))
     button.should have_selector("input.button.pill.danger[type='submit']")
     button.should_not have_selector("input.safe")
   end
+  it "should create negative pill button tags" do
+    button = html(negative_pill_button_tag(@label))
+    button.should have_selector("button.button.pill.danger[type='submit']")
+    button.should_not have_selector("button.safe")
+  end
+
+  #--- positive pill buttons with icons
 
   it "should create positive pill buttons with valid icons" do
     @icons.each do |icon|
@@ -144,14 +231,32 @@ describe Css3buttons::Helpers::ButtonHelper do
       link.should_not have_selector("a.danger")
     end
   end
+  it "should create positive pill button tags with valid icons" do
+    @icons.each do |icon|
+      button = html(send(:"positive_pill_#{icon}_button_tag", @label))
+      button.should have_selector("button.button.safe.pill.icon.#{icon}[type='submit']")
+      button.should_not have_selector("button.danger")
+    end
+  end
+
+  #--- negative pill buttons with icons
 
   it "should create negative pill buttons with valid icons" do
     @icons.each do |icon|
       link = html(send(:"negative_pill_#{icon}_button_link_to", @label, @path))
       link.should have_selector("a.button.danger.pill.icon.#{icon}[href='#{@path}']")
-      link.should_not have_selector("a.positive")
+      link.should_not have_selector("a.safe")
     end
   end
+  it "should create negative pill button tags with valid icons" do
+    @icons.each do |icon|
+      button = html(send(:"negative_pill_#{icon}_button_tag", @label))
+      button.should have_selector("button.button.danger.pill.icon.#{icon}[type='submit']")
+      button.should_not have_selector("button.safe")
+    end
+  end
+
+  #--- end
 
   def html(text)
     Capybara::string(text)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: css3buttons
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Nicholas Bruning
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 +10:00
+date: 2011-05-03 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency