Skip to content

Commit

Permalink
Merge pull request #59 from IFTTT/update-ruby-to-2.6.5
Browse files Browse the repository at this point in the history
Update and fix
  • Loading branch information
jakeonfire authored Apr 22, 2020
2 parents 6326b1a + c683ec9 commit 10f77db
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.5
2.6.5
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.2.10
- 2.6.5
gemfile:
- gemfiles/rails32.gemfile
- gemfiles/rails40.gemfile
Expand All @@ -9,4 +9,4 @@ gemfile:
- gemfiles/rails50.gemfile
- gemfiles/rails51.gemfile
- gemfiles/rails52.gemfile
before_install: gem install bundler -v 1.11.2
before_install: gem install bundler -v 2.1.4
19 changes: 13 additions & 6 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
appraise "rails32" do
gem "activerecord", "3.2.22"
gem "activerecord", "3.2.22.5"
gem "sqlite3", "1.3.13"
end

appraise "rails40" do
gem "activerecord", "4.0.13"
gem "sqlite3", "1.3.13"
end

appraise "rails41" do
gem "activerecord", "4.1.12"
gem "activerecord", "4.1.16"
gem "sqlite3", "1.3.13"
end

appraise "rails42" do
gem "activerecord", "4.2.10"
gem "activerecord", "4.2.11.1"
gem "sqlite3", "1.3.13"
end

appraise "rails50" do
gem "activerecord", "5.0.7"
gem "activerecord", "5.0.7.2"
gem "sqlite3", "1.3.13"
end

appraise "rails51" do
gem "activerecord", "5.1.6"
gem "activerecord", "5.1.7"
gem "sqlite3", "1.4.2"
end

appraise "rails52" do
gem "activerecord", "5.2.0"
gem "activerecord", "5.2.4.2"
gem "sqlite3", "1.4.2"
end
3 changes: 2 additions & 1 deletion gemfiles/rails32.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "activerecord", "3.2.22"
gem "activerecord", "3.2.22.5"
gem "sqlite3", "1.3.13"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/rails40.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "activerecord", "4.0.13"
gem "sqlite3", "1.3.13"

gemspec path: "../"
3 changes: 2 additions & 1 deletion gemfiles/rails41.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "activerecord", "4.1.12"
gem "activerecord", "4.1.16"
gem "sqlite3", "1.3.13"

gemspec path: "../"
3 changes: 2 additions & 1 deletion gemfiles/rails42.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "activerecord", "4.2.10"
gem "activerecord", "4.2.11.1"
gem "sqlite3", "1.3.13"

gemspec path: "../"
3 changes: 2 additions & 1 deletion gemfiles/rails50.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "activerecord", "5.0.7"
gem "activerecord", "5.0.7.2"
gem "sqlite3", "1.3.13"

gemspec path: "../"
3 changes: 2 additions & 1 deletion gemfiles/rails51.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "activerecord", "5.1.6"
gem "activerecord", "5.1.7"
gem "sqlite3", "1.4.2"

gemspec path: "../"
3 changes: 2 additions & 1 deletion gemfiles/rails52.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "activerecord", "5.2.0"
gem "activerecord", "5.2.4.2"
gem "sqlite3", "1.4.2"

gemspec path: "../"
24 changes: 24 additions & 0 deletions lib/initializers/arel.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# https://stackoverflow.com/a/44286212
if ActiveRecord::VERSION::MAJOR < 5
module Arel
module Visitors
class DepthFirst < Arel::Visitors::Visitor
alias :visit_Integer :terminal
end

class Dot < Arel::Visitors::Visitor
alias :visit_Integer :visit_String
end

if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2
class ToSql < Arel::Visitors::Reduce
alias :visit_Integer :literal
end
else
class ToSql < Arel::Visitors::Visitor
alias :visit_Integer :literal
end
end
end
end
end
1 change: 1 addition & 0 deletions lib/polo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
require "polo/collector"
require "polo/translator"
require "polo/configuration"
require "initializers/arel"

module Polo

Expand Down
2 changes: 1 addition & 1 deletion lib/polo/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Polo
VERSION = "0.5.0"
VERSION = "0.6.0"
end
6 changes: 3 additions & 3 deletions polo.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
spec.add_dependency "activerecord", ">= 3.2"

spec.add_development_dependency "appraisal"
spec.add_development_dependency "bundler", "~> 1.10"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "bundler", "~> 2.1.4"
spec.add_development_dependency "rake", "~> 13.0.1"
spec.add_development_dependency "rspec"

spec.add_development_dependency "sqlite3", "1.3.10"
spec.add_development_dependency "sqlite3", ">= 1.3.13"
end

0 comments on commit 10f77db

Please sign in to comment.