From 0bc5fb984f0675fe7a3ebb8dda1b524acab12851 Mon Sep 17 00:00:00 2001 From: Zeeshan Ishtiaq Date: Wed, 17 Mar 2021 12:47:29 +0000 Subject: [PATCH 1/4] update flex ruby gem --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 6fa8038..75eb859 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gemspec # your gem to rubygems.org. # Shift Commerce gem -gem "flex_commerce_api", git: "https://github.com/flex-commerce/flex-ruby-gem.git", branch: "feature/matalan" +gem "flex_commerce_api", git: "https://github.com/flex-commerce/flex-ruby-gem.git", branch: "upgrade_json_api_client" group :development, :test do # Debugging tools diff --git a/Gemfile.lock b/Gemfile.lock index 2cf044e..f845046 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://github.com/flex-commerce/flex-ruby-gem.git - revision: f1c15f1dd5454cce1861906e94d41c5dc1191ab3 - branch: feature/matalan + revision: 3d478966c037decb24c759d1a8b2ab4739aee5fe + branch: upgrade_json_api_client specs: - flex_commerce_api (0.6.57) + flex_commerce_api (0.8.4.2) activesupport (>= 4.0) faraday-http-cache (= 1.3.0) - json_api_client (= 1.1.1) + json_api_client (= 1.6.0) oj (~> 2.12) rack (>= 1.6) PATH remote: . specs: - shiftcommerce-rails (0.6.19) + shiftcommerce-rails (0.6.20) activemerchant (~> 1.54) meta-tags (~> 2.4) rack-timeout (~> 0.5.1) @@ -108,11 +108,11 @@ GEM hashdiff (0.3.4) i18n (1.8.9) concurrent-ruby (~> 1.0) - json_api_client (1.1.1) + json_api_client (1.6.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) addressable (~> 2.2) - faraday (~> 0.9) + faraday (~> 0.15, >= 0.15.2) faraday_middleware (~> 0.9) loofah (2.9.0) crass (~> 1.0.2) From e430a8f113e08452bf2027cbab37442f925fd147 Mon Sep 17 00:00:00 2001 From: Zeeshan Ishtiaq Date: Wed, 17 Mar 2021 12:59:43 +0000 Subject: [PATCH 2/4] update gemspec --- Gemfile.lock | 2 +- shiftcommerce-rails.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f845046..29e6b2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,7 @@ PATH activemerchant (~> 1.54) meta-tags (~> 2.4) rack-timeout (~> 0.5.1) - rails (~> 6.0) + rails (>= 5) GEM remote: https://rubygems.org/ diff --git a/shiftcommerce-rails.gemspec b/shiftcommerce-rails.gemspec index 1d6152a..aea3b62 100644 --- a/shiftcommerce-rails.gemspec +++ b/shiftcommerce-rails.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } - spec.add_dependency "rails", "~> 6.0" + spec.add_dependency "rails", ">= 5" spec.add_dependency "activemerchant", "~> 1.54" spec.add_dependency "meta-tags", "~> 2.4" spec.add_dependency "rack-timeout", "~> 0.5.1" From 7960b5d5348011d7d7c9bf6bf319b31c202d6de8 Mon Sep 17 00:00:00 2001 From: Zeeshan Ishtiaq Date: Thu, 1 Apr 2021 17:46:00 +0100 Subject: [PATCH 3/4] update flex_ruby_gem --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 29e6b2e..1e2b1a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/flex-commerce/flex-ruby-gem.git - revision: 3d478966c037decb24c759d1a8b2ab4739aee5fe + revision: 25bc84b1153bc19c9bfdaf94bab588d9ffd68a84 branch: upgrade_json_api_client specs: - flex_commerce_api (0.8.4.2) + flex_commerce_api (0.8.4.3) activesupport (>= 4.0) faraday-http-cache (= 1.3.0) json_api_client (= 1.6.0) @@ -86,8 +86,8 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) builder (3.2.4) byebug (9.0.6) coderay (1.1.1) @@ -106,7 +106,7 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) hashdiff (0.3.4) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) json_api_client (1.6.0) activemodel (>= 3.2.0) @@ -143,7 +143,7 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (2.0.5) + public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) rack-test (1.1.0) From 473bc2d72edb47667cb9d8e709712df784302b66 Mon Sep 17 00:00:00 2001 From: Zeeshan Ishtiaq Date: Wed, 19 May 2021 14:08:02 +0100 Subject: [PATCH 4/4] update gems --- Gemfile.lock | 156 +++++++++++++++++----------------- lib/shift_commerce/version.rb | 2 +- 2 files changed, 77 insertions(+), 81 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1e2b1a7..4c8c4bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/flex-commerce/flex-ruby-gem.git - revision: 25bc84b1153bc19c9bfdaf94bab588d9ffd68a84 + revision: e665297b2578854b78f8b262b0f36cc7966a190f branch: upgrade_json_api_client specs: - flex_commerce_api (0.8.4.3) + flex_commerce_api (0.8.4.4) activesupport (>= 4.0) faraday-http-cache (= 1.3.0) json_api_client (= 1.6.0) @@ -22,65 +22,65 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.1.3) - actionpack (= 6.1.3) - activesupport (= 6.1.3) + actioncable (6.1.3.2) + actionpack (= 6.1.3.2) + activesupport (= 6.1.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.3) - actionpack (= 6.1.3) - activejob (= 6.1.3) - activerecord (= 6.1.3) - activestorage (= 6.1.3) - activesupport (= 6.1.3) + actionmailbox (6.1.3.2) + actionpack (= 6.1.3.2) + activejob (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) mail (>= 2.7.1) - actionmailer (6.1.3) - actionpack (= 6.1.3) - actionview (= 6.1.3) - activejob (= 6.1.3) - activesupport (= 6.1.3) + actionmailer (6.1.3.2) + actionpack (= 6.1.3.2) + actionview (= 6.1.3.2) + activejob (= 6.1.3.2) + activesupport (= 6.1.3.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.3) - actionview (= 6.1.3) - activesupport (= 6.1.3) + actionpack (6.1.3.2) + actionview (= 6.1.3.2) + activesupport (= 6.1.3.2) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.3) - actionpack (= 6.1.3) - activerecord (= 6.1.3) - activestorage (= 6.1.3) - activesupport (= 6.1.3) + actiontext (6.1.3.2) + actionpack (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) nokogiri (>= 1.8.5) - actionview (6.1.3) - activesupport (= 6.1.3) + actionview (6.1.3.2) + activesupport (= 6.1.3.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.3) - activesupport (= 6.1.3) + activejob (6.1.3.2) + activesupport (= 6.1.3.2) globalid (>= 0.3.6) activemerchant (1.119.0) activesupport (>= 4.2) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) nokogiri (~> 1.4) - activemodel (6.1.3) - activesupport (= 6.1.3) - activerecord (6.1.3) - activemodel (= 6.1.3) - activesupport (= 6.1.3) - activestorage (6.1.3) - actionpack (= 6.1.3) - activejob (= 6.1.3) - activerecord (= 6.1.3) - activesupport (= 6.1.3) - marcel (~> 0.3.1) - mimemagic (~> 0.3.2) - activesupport (6.1.3) + activemodel (6.1.3.2) + activesupport (= 6.1.3.2) + activerecord (6.1.3.2) + activemodel (= 6.1.3.2) + activesupport (= 6.1.3.2) + activestorage (6.1.3.2) + actionpack (= 6.1.3.2) + activejob (= 6.1.3.2) + activerecord (= 6.1.3.2) + activesupport (= 6.1.3.2) + marcel (~> 1.0.0) + mini_mime (~> 1.0.2) + activesupport (6.1.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -89,11 +89,11 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) builder (3.2.4) - byebug (9.0.6) - coderay (1.1.1) + byebug (11.1.3) + coderay (1.1.3) concurrent-ruby (1.1.8) - crack (0.4.3) - safe_yaml (~> 1.0.0) + crack (0.4.5) + rexml crass (1.0.6) diff-lcs (1.4.4) erubi (1.10.0) @@ -105,7 +105,7 @@ GEM faraday (>= 0.7.4, < 1.0) globalid (0.4.2) activesupport (>= 4.2.0) - hashdiff (0.3.4) + hashdiff (1.0.1) i18n (1.8.10) concurrent-ruby (~> 1.0) json_api_client (1.6.0) @@ -114,34 +114,31 @@ GEM addressable (~> 2.2) faraday (~> 0.15, >= 0.15.2) faraday_middleware (~> 0.9) - loofah (2.9.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) meta-tags (2.14.0) actionpack (>= 3.2.0, < 6.2) - method_source (0.8.2) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.5.0) + method_source (1.0.0) + mini_mime (1.0.3) + mini_portile2 (2.5.1) minitest (5.14.4) multipart-post (2.1.1) nio4r (2.5.7) - nokogiri (1.11.1) + nokogiri (1.11.4) mini_portile2 (~> 2.5.0) racc (~> 1.4) oj (2.18.5) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) - pry (~> 0.10) - pry-rails (0.3.6) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) racc (1.5.2) @@ -149,33 +146,34 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.1.3) - actioncable (= 6.1.3) - actionmailbox (= 6.1.3) - actionmailer (= 6.1.3) - actionpack (= 6.1.3) - actiontext (= 6.1.3) - actionview (= 6.1.3) - activejob (= 6.1.3) - activemodel (= 6.1.3) - activerecord (= 6.1.3) - activestorage (= 6.1.3) - activesupport (= 6.1.3) + rails (6.1.3.2) + actioncable (= 6.1.3.2) + actionmailbox (= 6.1.3.2) + actionmailer (= 6.1.3.2) + actionpack (= 6.1.3.2) + actiontext (= 6.1.3.2) + actionview (= 6.1.3.2) + activejob (= 6.1.3.2) + activemodel (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) bundler (>= 1.15.0) - railties (= 6.1.3) + railties (= 6.1.3.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.1.3) - actionpack (= 6.1.3) - activesupport (= 6.1.3) + railties (6.1.3.2) + actionpack (= 6.1.3.2) + activesupport (= 6.1.3.2) method_source rake (>= 0.8.7) thor (~> 1.0) rake (13.0.3) + rexml (3.2.5) rspec-core (3.9.3) rspec-support (~> 3.9.3) rspec-expectations (3.9.4) @@ -193,8 +191,6 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - safe_yaml (1.0.4) - slop (3.6.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) diff --git a/lib/shift_commerce/version.rb b/lib/shift_commerce/version.rb index a1ec257..540017f 100644 --- a/lib/shift_commerce/version.rb +++ b/lib/shift_commerce/version.rb @@ -1,3 +1,3 @@ module ShiftCommerce - VERSION = '0.6.20' + VERSION = '0.6.21' end