Fix styling for standardrb, gemfiles, exclusions

Author: Jack Casey

.travis.yml

@@ -21,6 +21,11 @@ env:
   - COMMAND=rspec APPRAISAL_INITIALIZED=true
 matrix:
   exclude:
+    # Don't run the appraisal version of the specs for the base gemfile
+    - env: COMMAND=rspec APPRAISAL_INITIALIZED=true
+      gemfile: Gemfile
+    # Don't run the standardrb check on any gemfile except the base gemfile
+    # (but run it for each ruby version)
     - env: COMMAND="standardrb --no-fix --format progress"
       gemfile: gemfiles/rails_4.gemfile
     - env: COMMAND="standardrb --no-fix --format progress"
@@ -32,11 +37,14 @@ matrix:
     - env: COMMAND="standardrb --no-fix --format progress"
       gemfile: gemfiles/rails_6.gemfile
     - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_5_graphiti_rails.gemfile
+      gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
     - env: COMMAND="standardrb --no-fix --format progress"
       gemfile: gemfiles/rails_6_graphiti_rails.gemfile
-    - env: COMMAND=rspec APPRAISAL_INITIALIZED=true
-      gemfile: Gemfile
+    # Don't run the basic versions of the specs for any of the specific gemfiles
     - env: COMMAND=rspec
       gemfile: gemfiles/rails_4.gemfile
     - env: COMMAND=rspec
@@ -55,6 +63,8 @@ matrix:
       gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
     - env: COMMAND=rspec
       gemfile: gemfiles/rails_6_graphiti_rails.gemfile
+
+    # Don't run rails 4 egmfile against any rubies (for some reason?)
     - gemfile: gemfiles/rails_4.gemfile
       rvm: 2.5
     - gemfile: gemfiles/rails_4.gemfile

Appraisals

@@ -54,7 +54,7 @@ appraise "rails-5_2-graphiti-rails" do
 end
 
 appraise "rails-6" do
-  gem "rails", "~> 6.0.0.rc1"
+  gem "rails", "~> 6.0"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"

gemfiles/rails_5_0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 5.0"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.3.6"
 gem "database_cleaner"

gemfiles/rails_5_0_graphiti_rails.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

gemfiles/rails_5_1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.7"
+gem "rails", "~> 5.1"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.3.6"
 gem "database_cleaner"

gemfiles/rails_5_1_graphiti_rails.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

gemfiles/rails_5_graphiti_rails.gemfile renamed to gemfiles/rails_5_2_graphiti_rails.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 6.0"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"

gemfiles/rails_6.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 6.0"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"

gemfiles/rails_6_graphiti_rails.gemfile

@@ -62,23 +62,23 @@ def filter_string_not_eql(scope, attribute, value)
       # anyway, we just don't support proper LIKE escaping in those versions.
       if ::ActiveRecord.version >= Gem::Version.new("5.0.0")
         def filter_string_match(scope, attribute, value, is_not: false)
-          clause = sanitized_like_for(scope, attribute, value) do |v|
+          clause = sanitized_like_for(scope, attribute, value) { |v|
             "%#{v}%"
-          end
+          }
           is_not ? scope.where.not(clause) : scope.where(clause)
         end
 
         def filter_string_prefix(scope, attribute, value, is_not: false)
-          clause = sanitized_like_for(scope, attribute, value) do |v|
+          clause = sanitized_like_for(scope, attribute, value) { |v|
             "#{v}%"
-          end
+          }
           is_not ? scope.where.not(clause) : scope.where(clause)
         end
 
         def filter_string_suffix(scope, attribute, value, is_not: false)
-          clause = sanitized_like_for(scope, attribute, value) do |v|
+          clause = sanitized_like_for(scope, attribute, value) { |v|
             "%#{v}"
-          end
+          }
           is_not ? scope.where.not(clause) : scope.where(clause)
         end
       else
@@ -311,11 +311,11 @@ def column_for(scope, name)
       def sanitized_like_for(scope, attribute, value, &block)
         escape_char = '\\'
         column = column_for(scope, attribute)
-        map = value.map do |v|
+        map = value.map { |v|
           v = v.downcase
           v = Sanitizer.sanitize_like(v, escape_char)
           block.call v
-        end
+        }
 
         column.lower.matches_any(map, escape_char, true)
       end