From 680abc960fae0c04890001a73351c158de0ebc22 Mon Sep 17 00:00:00 2001
From: Tsukuru Tanimichi <tanimichi@outlook.jp>
Date: Sun, 14 Dec 2014 18:11:14 +0900
Subject: [PATCH 1/3] Can't override primary button classes

---
 lib/bootstrap_form/helpers/bootstrap.rb | 2 +-
 test/bootstrap_other_components_test.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/bootstrap_form/helpers/bootstrap.rb b/lib/bootstrap_form/helpers/bootstrap.rb
index 0dac054b6..7446b934e 100644
--- a/lib/bootstrap_form/helpers/bootstrap.rb
+++ b/lib/bootstrap_form/helpers/bootstrap.rb
@@ -7,7 +7,7 @@ def submit(name = nil, options = {})
       end
 
       def primary(name = nil, options = {})
-        options.merge! class: 'btn btn-primary'
+        options.reverse_merge! class: 'btn btn-primary'
         submit(name, options)
       end
 
diff --git a/test/bootstrap_other_components_test.rb b/test/bootstrap_other_components_test.rb
index 5b2258100..b86fb9d63 100644
--- a/test/bootstrap_other_components_test.rb
+++ b/test/bootstrap_other_components_test.rb
@@ -51,4 +51,9 @@ def setup
     expected = %{<input class="btn btn-primary" name="commit" type="submit" value="Submit Form" />}
     assert_equal expected, @builder.primary("Submit Form")
   end
+
+  test "override primary button classes" do
+    expected = %{<input class="btn btn-primary disabled" name="commit" type="submit" value="Submit Form" />}
+    assert_equal expected, @builder.primary("Submit Form", class: "btn btn-primary disabled")
+  end
 end

From b25964e07b2c14c14cb1e322d46abcf28184ac98 Mon Sep 17 00:00:00 2001
From: Tsukuru Tanimichi <tanimichi@outlook.jp>
Date: Sun, 14 Dec 2014 18:23:32 +0900
Subject: [PATCH 2/3] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4dc24aa7..1f218308a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Bugfixes:
 
   - Use #underscore, not #downcase for help text scope (#140, @atipugin)
   - Radio button and checkbox labels will now include the disabled class as needed. (#156, @ScottSwezey)
+  - Can't override primary button classes (#183, @tanimichi)
 
 Features:
 

From ba689f3d591d9f5398df8b26bace4de554a74ae0 Mon Sep 17 00:00:00 2001
From: Tsukuru Tanimichi <tanimichi@outlook.jp>
Date: Sun, 14 Dec 2014 18:25:53 +0900
Subject: [PATCH 3/3] Refactoring

---
 lib/bootstrap_form/helpers/bootstrap.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bootstrap_form/helpers/bootstrap.rb b/lib/bootstrap_form/helpers/bootstrap.rb
index 7446b934e..44bc6d816 100644
--- a/lib/bootstrap_form/helpers/bootstrap.rb
+++ b/lib/bootstrap_form/helpers/bootstrap.rb
@@ -2,7 +2,7 @@ module BootstrapForm
   module Helpers
     module Bootstrap
       def submit(name = nil, options = {})
-        options.merge! class: 'btn btn-default' unless options.has_key? :class
+        options.reverse_merge! class: 'btn btn-default'
         super(name, options)
       end