From 7f7a1604b048886e4f971d994c178525df4e3d67 Mon Sep 17 00:00:00 2001 From: Amir Tocker Date: Thu, 11 Jul 2019 18:14:27 +0300 Subject: [PATCH 1/8] Update TravisCI ruby version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b75754d8..cdcd2f87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ before_install: - gem install bundler rvm: -- 1.9.3 +- 1.9.3-p551 - ruby-head script: bundle exec rspec From a07a7339db937cb8bbf9a02e27c0483d56d743f8 Mon Sep 17 00:00:00 2001 From: Amir Tocker Date: Thu, 11 Jul 2019 18:23:35 +0300 Subject: [PATCH 2/8] Update TravisCI ruby version --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cdcd2f87..726b1f3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: ruby +dist: precise before_install: - gem install bundler rvm: -- 1.9.3-p551 +- 1.9.3 - ruby-head script: bundle exec rspec From ed1ebee2721ef6a12ff2c9ca994c7d64b2545d5a Mon Sep 17 00:00:00 2001 From: Amir Tocker Date: Fri, 12 Jul 2019 11:52:41 +0300 Subject: [PATCH 3/8] Fix TravisCI for ruby 1.9 --- .travis.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 726b1f3f..8ffdb464 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: ruby -dist: precise -before_install: - - gem install bundler - -rvm: -- 1.9.3 -- ruby-head +matrix: + include: + - name: "Ruby 1.9" + rvm: 1.9.3 + before_install: + - gem install bundler -v 1.17.3 + - name: "Ruby head" + rvm: ruby-head + before_install: + - gem install bundler script: bundle exec rspec From 482fba10b900e8971e7660d2cc0f5b219ff55915 Mon Sep 17 00:00:00 2001 From: Amir Tocker Date: Fri, 12 Jul 2019 12:08:20 +0300 Subject: [PATCH 4/8] Fix TravisCI for ruby 1.9 take 2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8ffdb464..7aba73d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: ruby +dist: precise matrix: include: From b77c11b39668fff606af172c1d95c1ed79a11bae Mon Sep 17 00:00:00 2001 From: Amir Tocker Date: Fri, 12 Jul 2019 16:04:00 +0300 Subject: [PATCH 5/8] Fix TravisCI for ruby 1.9 take 3 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7aba73d0..151fbf04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,14 @@ language: ruby -dist: precise matrix: include: - name: "Ruby 1.9" + dist: precise rvm: 1.9.3 before_install: - gem install bundler -v 1.17.3 - name: "Ruby head" + dist: xenial rvm: ruby-head before_install: - gem install bundler From 5e5e59e2e55b822f5d1290907265d404028ee261 Mon Sep 17 00:00:00 2001 From: Amir Tocker Date: Fri, 12 Jul 2019 16:22:23 +0300 Subject: [PATCH 6/8] Fix TravisCI for ruby 1.9 take 4 - Remove deprecation warning. - Use preinstalled Ruby version. --- .travis.yml | 4 ++-- lib/cloudinary/utils.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 151fbf04..300066f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,9 @@ matrix: rvm: 1.9.3 before_install: - gem install bundler -v 1.17.3 - - name: "Ruby head" + - name: "Ruby 2.5.3" dist: xenial - rvm: ruby-head + rvm: ruby-2.5.3 before_install: - gem install bundler script: bundle exec rspec diff --git a/lib/cloudinary/utils.rb b/lib/cloudinary/utils.rb index 353e495e..0b53f1fe 100644 --- a/lib/cloudinary/utils.rb +++ b/lib/cloudinary/utils.rb @@ -305,7 +305,7 @@ def self.process_if(ifValue) EXP_REPLACEMENT = PREDEFINED_VARS.merge(CONDITIONAL_OPERATORS) def self.normalize_expression(expression) - if expression =~ /^!.+!$/ # quoted string + if expression.is_a? String && expression =~ /^!.+!$/ # quoted string expression else expression.to_s.gsub(EXP_REGEXP,EXP_REPLACEMENT).gsub(/[ _]+/, "_") From 33a9a447c9da0f9061464e926df3f154375fc4c7 Mon Sep 17 00:00:00 2001 From: Amir Tocker Date: Fri, 12 Jul 2019 17:41:06 +0300 Subject: [PATCH 7/8] Fix expression evaluation --- lib/cloudinary/utils.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cloudinary/utils.rb b/lib/cloudinary/utils.rb index 0b53f1fe..d050e49c 100644 --- a/lib/cloudinary/utils.rb +++ b/lib/cloudinary/utils.rb @@ -305,7 +305,7 @@ def self.process_if(ifValue) EXP_REPLACEMENT = PREDEFINED_VARS.merge(CONDITIONAL_OPERATORS) def self.normalize_expression(expression) - if expression.is_a? String && expression =~ /^!.+!$/ # quoted string + if expression.is_a?( String) && expression =~ /^!.+!$/ # quoted string expression else expression.to_s.gsub(EXP_REGEXP,EXP_REPLACEMENT).gsub(/[ _]+/, "_") From d9b3344809b0483b70a36954a125482c9ae185fe Mon Sep 17 00:00:00 2001 From: Amir Tocker Date: Fri, 12 Jul 2019 20:55:56 +0300 Subject: [PATCH 8/8] Upgrade rubyzip version --- cloudinary.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinary.gemspec b/cloudinary.gemspec index 66d7b748..431bd4de 100644 --- a/cloudinary.gemspec +++ b/cloudinary.gemspec @@ -28,6 +28,6 @@ Gem::Specification.new do |s| s.add_development_dependency "rake" s.add_development_dependency "rspec", '>=3.5' s.add_development_dependency "rspec-rails" - s.add_development_dependency "rubyzip", "<=1.2.0" # support testing Ruby 1.9 + s.add_development_dependency "rubyzip", ">= 1.2.2" # support testing Ruby 1.9 s.add_development_dependency "simplecov" end