From 7b2aa113abbe383d8c14e3023e873d85f4174f17 Mon Sep 17 00:00:00 2001
From: Anton Pawlik <git+noreply@antpaw.org>
Date: Mon, 13 May 2019 21:08:08 +0200
Subject: [PATCH 1/4] update sqlite3, ruby min version

---
 .rubocop.yml              | 2 +-
 Gemfile                   | 2 +-
 bootstrap_form.gemspec    | 2 +-
 test/gemfiles/5.0.gemfile | 2 +-
 test/gemfiles/5.1.gemfile | 2 +-
 test/gemfiles/5.2.gemfile | 2 +-
 test/gemfiles/6.0.gemfile | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 1c17cf2cb..2d44f7849 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,7 +3,7 @@
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.2.2
+  TargetRubyVersion: 2.3
   Exclude:
     - "bin/*"
     - Capfile
diff --git a/Gemfile b/Gemfile
index fa27a71e5..12dd8f7a1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,6 @@ group :test do
   gem "mocha"
   # sqlite3 1.4.0 breaks the test suite.
   # https://github.com/rails/rails/pull/35154
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4"
   gem "timecop", "~> 0.7.1"
 end
diff --git a/bootstrap_form.gemspec b/bootstrap_form.gemspec
index 309366ba7..1af225852 100644
--- a/bootstrap_form.gemspec
+++ b/bootstrap_form.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.2.2"
+  s.required_ruby_version = ">= 2.3"
 
   s.add_dependency("actionpack", ">= 5.0")
   s.add_dependency("activemodel", ">= 5.0")
diff --git a/test/gemfiles/5.0.gemfile b/test/gemfiles/5.0.gemfile
index 084475dfd..a12435ac2 100644
--- a/test/gemfiles/5.0.gemfile
+++ b/test/gemfiles/5.0.gemfile
@@ -13,6 +13,6 @@ group :test do
   gem "equivalent-xml"
   gem "minitest", "~> 5.10.3"
   gem "mocha"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4"
   gem "timecop", "~> 0.7.1"
 end
diff --git a/test/gemfiles/5.1.gemfile b/test/gemfiles/5.1.gemfile
index 29ce89d3c..0163f2539 100644
--- a/test/gemfiles/5.1.gemfile
+++ b/test/gemfiles/5.1.gemfile
@@ -12,6 +12,6 @@ group :test do
   gem "diffy"
   gem "equivalent-xml"
   gem "mocha"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4"
   gem "timecop", "~> 0.7.1"
 end
diff --git a/test/gemfiles/5.2.gemfile b/test/gemfiles/5.2.gemfile
index 57018b5e0..9812577ba 100644
--- a/test/gemfiles/5.2.gemfile
+++ b/test/gemfiles/5.2.gemfile
@@ -12,6 +12,6 @@ group :test do
   gem "diffy"
   gem "equivalent-xml"
   gem "mocha"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4"
   gem "timecop", "~> 0.7.1"
 end
diff --git a/test/gemfiles/6.0.gemfile b/test/gemfiles/6.0.gemfile
index 54a71912e..842910302 100644
--- a/test/gemfiles/6.0.gemfile
+++ b/test/gemfiles/6.0.gemfile
@@ -12,6 +12,6 @@ group :test do
   gem "diffy"
   gem "equivalent-xml"
   gem "mocha"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4"
   gem "timecop", "~> 0.7.1"
 end

From 8d5241aead5fe8e87761677d15015a069a91b6a8 Mon Sep 17 00:00:00 2001
From: Anton Pawlik <git+noreply@antpaw.org>
Date: Mon, 13 May 2019 21:08:23 +0200
Subject: [PATCH 2/4] fix rubocop linting warnings

---
 .rubocop.yml                           | 3 ---
 lib/bootstrap_form/inputs/check_box.rb | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d44f7849..bf72c57ea 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -59,9 +59,6 @@ Naming/MemoizedInstanceVariableName:
 Naming/VariableNumber:
   Enabled: false
 
-Performance/Casecmp:
-  Enabled: false
-
 Rails:
   Enabled: true
 
diff --git a/lib/bootstrap_form/inputs/check_box.rb b/lib/bootstrap_form/inputs/check_box.rb
index 68e6466d8..147c5f935 100644
--- a/lib/bootstrap_form/inputs/check_box.rb
+++ b/lib/bootstrap_form/inputs/check_box.rb
@@ -39,7 +39,10 @@ def check_box_label(name, options, checked_value, &block)
 
       def check_box_description(name, options, &block)
         content = block_given? ? capture(&block) : options[:label]
-        content || (object && object.class.human_attribute_name(name)) || name.to_s.humanize
+        return content if content
+        return object.class.human_attribute_name(name) if object
+
+        name.to_s.humanize
       end
 
       def check_box_value(name, value)

From cdce99836453f4495c19a0ac6060ef3d0de3c94c Mon Sep 17 00:00:00 2001
From: Anton Pawlik <git+noreply@antpaw.org>
Date: Mon, 13 May 2019 21:08:41 +0200
Subject: [PATCH 3/4] make linting simpler by including .editorconfig

---
 .editorconfig | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..5d1263484
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

From 1dc25c8ec1440a665a75cb42c9aecbbf641d569a Mon Sep 17 00:00:00 2001
From: Larry Reid <lcreid@jadesystems.ca>
Date: Wed, 29 May 2019 21:00:00 -0700
Subject: [PATCH 4/4] Revert sqlite3 to a version that works

---
 test/gemfiles/5.0.gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/gemfiles/5.0.gemfile b/test/gemfiles/5.0.gemfile
index a12435ac2..084475dfd 100644
--- a/test/gemfiles/5.0.gemfile
+++ b/test/gemfiles/5.0.gemfile
@@ -13,6 +13,6 @@ group :test do
   gem "equivalent-xml"
   gem "minitest", "~> 5.10.3"
   gem "mocha"
-  gem "sqlite3", "~> 1.4"
+  gem "sqlite3", "~> 1.3.6"
   gem "timecop", "~> 0.7.1"
 end