Merge pull request #219 from agworld/hotfix/207

richmolj · web-flow · commit aa36551d350b · 2020-03-19T13:06:01.000-04:00
Hotfix/207
diff --git a/.travis.yml b/.travis.yml
@@ -3,45 +3,74 @@ language: ruby
 rvm:
 - 2.5
 - 2.6
+- 2.7
 gemfile:
   - Gemfile
   - gemfiles/rails_4.gemfile
-  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_6.gemfile
-  - gemfiles/rails_5_graphiti_rails.gemfile
+  - gemfiles/rails_5_0_graphiti_rails.gemfile
+  - gemfiles/rails_5_1_graphiti_rails.gemfile
+  - gemfiles/rails_5_2_graphiti_rails.gemfile
   - gemfiles/rails_6_graphiti_rails.gemfile
 env:
   - COMMAND="standardrb --no-fix --format progress"
   - COMMAND=rspec
   - 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"
-      gemfile: gemfiles/rails_5.gemfile
+      gemfile: gemfiles/rails_5_0.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_1.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_2.gemfile
     - 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
-      gemfile: gemfiles/rails_5.gemfile
+      gemfile: gemfiles/rails_5_0.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5_1.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5_2.gemfile
     - env: COMMAND=rspec
       gemfile: gemfiles/rails_6.gemfile
     - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5_graphiti_rails.gemfile
+      gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
+    - env: COMMAND=rspec
+      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
       rvm: 2.6
+    - gemfile: gemfiles/rails_4.gemfile
+      rvm: 2.7
 
 script:
   - bundle _1.17.3_ exec $COMMAND
diff --git a/Appraisals b/Appraisals
@@ -1,18 +1,50 @@
 appraise "rails-4" do
-  gem "rails", "~> 4.1"
+  gem "rails", "~> 4.2"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
   gem "database_cleaner"
 end
 
-appraise "rails-5" do
+appraise "rails-5_0" do
+  gem "rails", "~> 5.0"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+end
+
+appraise "rails-5_1" do
+  gem "rails", "~> 5.1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+end
+
+appraise "rails-5_2" do
   gem "rails", "~> 5.2"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
   gem "database_cleaner"
 end
 
-appraise "rails-5-graphiti-rails" do
+appraise "rails-5_0-graphiti-rails" do
+  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"
+end
+
+appraise "rails-5_1-graphiti-rails" do
+  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"
+end
+
+appraise "rails-5_2-graphiti-rails" do
   gem "rails", "~> 5.2"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
@@ -22,14 +54,14 @@ appraise "rails-5-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"
 end
 
 appraise "rails-6-graphiti-rails" do
-  gem "rails", "~> 6.0.0.rc1"
+  gem "rails", "~> 6.0"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile
@@ -0,0 +1,18 @@
+# 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"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_5_0_graphiti_rails.gemfile b/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: "../"
diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile
@@ -0,0 +1,18 @@
+# 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"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_5_1_graphiti_rails.gemfile b/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: "../"
diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile
diff --git a/gemfiles/rails_5_2_graphiti_rails.gemfile b/gemfiles/rails_5_2_graphiti_rails.gemfile
diff --git a/gemfiles/rails_6.gemfile b/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"
diff --git a/gemfiles/rails_6_graphiti_rails.gemfile b/gemfiles/rails_6_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"
diff --git a/lib/graphiti/adapters/active_record.rb b/lib/graphiti/adapters/active_record.rb
@@ -57,41 +57,28 @@ def filter_string_not_eql(scope, attribute, value)
         filter_string_eql(scope, attribute, value, is_not: true)
       end
 
-      def filter_string_prefix(scope, attribute, value, is_not: false)
-        column = column_for(scope, attribute)
-        map = value.map { |v| "#{v}%" }
-        clause = column.lower.matches_any(map)
-        is_not ? scope.where.not(clause) : scope.where(clause)
-      end
-
-      def filter_string_not_prefix(scope, attribute, value)
-        filter_string_prefix(scope, attribute, value, is_not: true)
-      end
-
-      def filter_string_suffix(scope, attribute, value, is_not: false)
-        column = column_for(scope, attribute)
-        map = value.map { |v| "%#{v}" }
-        clause = column.lower.matches_any(map)
-        is_not ? scope.where.not(clause) : scope.where(clause)
-      end
-
-      def filter_string_not_suffix(scope, attribute, value)
-        filter_string_suffix(scope, attribute, value, is_not: true)
-      end
-
       # Arel has different match escaping behavior before rails 5.
       # Since rails 4.x does not expose methods to escape LIKE statements
       # 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)
-          escape_char = '\\'
-          column = column_for(scope, attribute)
-          map = value.map { |v|
-            v = v.downcase
-            v = scope.sanitize_sql_like(v)
+          clause = sanitized_like_for(scope, attribute, value) { |v|
             "%#{v}%"
           }
-          clause = column.lower.matches_any(map, escape_char, true)
+          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) { |v|
+            "#{v}%"
+          }
+          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) { |v|
+            "%#{v}"
+          }
           is_not ? scope.where.not(clause) : scope.where(clause)
         end
       else
@@ -103,6 +90,28 @@ def filter_string_match(scope, attribute, value, is_not: false)
           clause = column.lower.matches_any(map)
           is_not ? scope.where.not(clause) : scope.where(clause)
         end
+
+        def filter_string_prefix(scope, attribute, value, is_not: false)
+          column = column_for(scope, attribute)
+          map = value.map { |v| "#{v}%" }
+          clause = column.lower.matches_any(map)
+          is_not ? scope.where.not(clause) : scope.where(clause)
+        end
+
+        def filter_string_suffix(scope, attribute, value, is_not: false)
+          column = column_for(scope, attribute)
+          map = value.map { |v| "%#{v}" }
+          clause = column.lower.matches_any(map)
+          is_not ? scope.where.not(clause) : scope.where(clause)
+        end
+      end
+
+      def filter_string_not_prefix(scope, attribute, value)
+        filter_string_prefix(scope, attribute, value, is_not: true)
+      end
+
+      def filter_string_not_suffix(scope, attribute, value)
+        filter_string_suffix(scope, attribute, value, is_not: true)
       end
 
       def filter_string_not_match(scope, attribute, value)
@@ -298,6 +307,26 @@ def column_for(scope, name)
           table[name]
         end
       end
+
+      def sanitized_like_for(scope, attribute, value, &block)
+        escape_char = '\\'
+        column = column_for(scope, attribute)
+        map = value.map { |v|
+          v = v.downcase
+          v = Sanitizer.sanitize_like(v, escape_char)
+          block.call v
+        }
+
+        column.lower.matches_any(map, escape_char, true)
+      end
+
+      class Sanitizer
+        extend ::ActiveRecord::Sanitization::ClassMethods
+
+        def self.sanitize_like(*args)
+          sanitize_sql_like(*args)
+        end
+      end
     end
   end
 end
diff --git a/spec/integration/rails/finders_spec.rb b/spec/integration/rails/finders_spec.rb
