diff --git a/.travis.yml b/.travis.yml index 20cba3d..cd9866d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ gemfile: - gemfiles/rails_5.1.gemfile - gemfiles/rails_5.2.gemfile - gemfiles/rails_6.0.gemfile + - gemfiles/rails_6.1.gemfile rvm: - 2.5.6 - 2.6.4 diff --git a/Appraisals b/Appraisals index a3d0b8d..679fcf1 100644 --- a/Appraisals +++ b/Appraisals @@ -14,3 +14,8 @@ appraise 'rails-6.0' do gem 'rails', '6.0.0' gem 'sqlite3', '1.4.1' end + +appraise 'rails-6.1' do + gem 'rails', '6.1' + gem 'sqlite3', '1.4.1' +end diff --git a/Gemfile.lock b/Gemfile.lock index 8cd3cc2..446d111 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: zapier_rest_hooks (0.0.3) - rails (>= 5.1.0, < 6.1.0) + rails (>= 5.1.0, < 6.2.0) rest-client (~> 2.0) GEM @@ -85,10 +85,10 @@ GEM factory_bot (~> 4.11.1) railties (>= 3.0.0) fakeweb-fi (1.3.1) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (1.0.0) + activesupport (>= 5.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.5) domain_name (~> 0.5) i18n (1.8.5) concurrent-ruby (~> 1.0) @@ -102,20 +102,25 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (1.0.0) - mime-types (3.3) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0904) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) + mime-types-data (3.2022.0105) + mimemagic (0.3.10) + nokogiri (~> 1) + rake + mini_mime (1.1.2) + mini_portile2 (2.5.0) minitest (5.14.2) netrc (0.11.0) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nio4r (2.5.8) + nokogiri (1.13.6) + mini_portile2 (~> 2.5.0) + nokogiri (1.13.6-arm64-darwin) + racc (~> 1.4) parallel (1.17.0) parser (2.6.4.1) ast (~> 2.4.0) + racc (1.6.0) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -187,12 +192,12 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (4.0.2) + sprockets (4.0.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.1) thor (1.0.1) @@ -201,14 +206,15 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) + unf_ext (0.0.8.2) unicode-display_width (1.6.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) zeitwerk (2.4.2) PLATFORMS + arm64-darwin-21 ruby DEPENDENCIES diff --git a/db/migrate/20160614153212_create_zapier_rest_hooks_hooks.rb b/db/migrate/20160614153212_create_zapier_rest_hooks_hooks.rb index 29a7528..af22fa1 100644 --- a/db/migrate/20160614153212_create_zapier_rest_hooks_hooks.rb +++ b/db/migrate/20160614153212_create_zapier_rest_hooks_hooks.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class CreateZapierRestHooksHooks < ActiveRecord::Migration[6.0] +class CreateZapierRestHooksHooks < ActiveRecord::Migration[6.1] def change create_table :zapier_rest_hooks_hooks do |t| t.string :event_name diff --git a/db/migrate/20160614204418_add_owner_to_hooks.rb b/db/migrate/20160614204418_add_owner_to_hooks.rb index cd8d2c8..4ecc9b1 100644 --- a/db/migrate/20160614204418_add_owner_to_hooks.rb +++ b/db/migrate/20160614204418_add_owner_to_hooks.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class AddOwnerToHooks < ActiveRecord::Migration[6.0] +class AddOwnerToHooks < ActiveRecord::Migration[6.1] def change add_column :zapier_rest_hooks_hooks, :owner_id, :string, default: 0 add_column :zapier_rest_hooks_hooks, :owner_class_name, :string, default: 'Struct::ZapierApp' diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 39aed8e..4be1d45 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -1,10 +1,8 @@ -# frozen_string_literal: true - # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', '5.1.7' -gem 'sqlite3', '1.3.11' +gem "rails", "5.1.7" +gem "sqlite3", "1.3.11" -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 8242f21..edb94ec 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: zapier_rest_hooks (0.0.3) - rails (>= 5.1.0, < 6.1.0) + rails (>= 5.1.0, < 6.2.0) rest-client (~> 2.0) GEM @@ -71,7 +71,7 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.5) domain_name (~> 0.5) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -83,9 +83,9 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) method_source (0.9.2) - mime-types (3.3) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0904) + mime-types-data (3.2022.0105) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) @@ -178,13 +178,14 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) + unf_ext (0.0.8.2) unicode-display_width (1.6.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) PLATFORMS + arm64-darwin-21 ruby DEPENDENCIES diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 76e7364..77fe840 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -1,10 +1,8 @@ -# frozen_string_literal: true - # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', '5.2.3' -gem 'sqlite3', '1.3.11' +gem "rails", "5.2.3" +gem "sqlite3", "1.3.11" -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 0aec1e2..f2225bb 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: zapier_rest_hooks (0.0.3) - rails (>= 5.1.0, < 6.1.0) + rails (>= 5.1.0, < 6.2.0) rest-client (~> 2.0) GEM @@ -75,7 +75,7 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.5) domain_name (~> 0.5) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -89,20 +89,25 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mime-types (3.3) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0904) - mimemagic (0.3.3) + mime-types-data (3.2022.0105) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) netrc (0.11.0) nio4r (2.5.1) - nokogiri (1.10.4) + nokogiri (1.11.2) mini_portile2 (~> 2.4.0) + nokogiri (1.11.2-arm64-darwin) + racc (~> 1.4) parallel (1.17.0) parser (2.6.4.1) ast (~> 2.4.0) + racc (1.6.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -186,13 +191,14 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) + unf_ext (0.0.8.2) unicode-display_width (1.6.0) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) PLATFORMS + arm64-darwin-21 ruby DEPENDENCIES diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 91b745e..b7d50c6 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -1,10 +1,8 @@ -# frozen_string_literal: true - # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', '6.0.0' -gem 'sqlite3', '1.4.1' +gem "rails", "6.0.0" +gem "sqlite3", "1.4.1" -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 6131685..924305f 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: zapier_rest_hooks (0.0.3) - rails (>= 5.1.0, < 6.1.0) + rails (>= 5.1.0, < 6.2.0) rest-client (~> 2.0) GEM @@ -88,7 +88,7 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.5) domain_name (~> 0.5) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -102,20 +102,25 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mime-types (3.3) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0904) - mimemagic (0.3.3) + mime-types-data (3.2022.0105) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) netrc (0.11.0) nio4r (2.5.1) - nokogiri (1.10.4) + nokogiri (1.11.2) mini_portile2 (~> 2.4.0) + nokogiri (1.11.2-arm64-darwin) + racc (~> 1.4) parallel (1.17.0) parser (2.6.4.1) ast (~> 2.4.0) + racc (1.6.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -201,7 +206,7 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) + unf_ext (0.0.8.2) unicode-display_width (1.6.0) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) @@ -209,6 +214,7 @@ GEM zeitwerk (2.1.10) PLATFORMS + arm64-darwin-21 ruby DEPENDENCIES diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile new file mode 100644 index 0000000..5d74ee5 --- /dev/null +++ b/gemfiles/rails_6.1.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "6.1" +gem "sqlite3", "1.4.1" + +gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock new file mode 100644 index 0000000..4fe5b77 --- /dev/null +++ b/gemfiles/rails_6.1.gemfile.lock @@ -0,0 +1,238 @@ +PATH + remote: .. + specs: + zapier_rest_hooks (0.0.3) + rails (>= 5.1.0, < 6.2.0) + rest-client (~> 2.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.1.0) + actionpack (= 6.1.0) + activesupport (= 6.1.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.1.0) + actionpack (= 6.1.0) + activejob (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) + mail (>= 2.7.1) + actionmailer (6.1.0) + actionpack (= 6.1.0) + actionview (= 6.1.0) + activejob (= 6.1.0) + activesupport (= 6.1.0) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.1.0) + actionview (= 6.1.0) + activesupport (= 6.1.0) + 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.0) + actionpack (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) + nokogiri (>= 1.8.5) + actionview (6.1.0) + activesupport (= 6.1.0) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.0) + activesupport (= 6.1.0) + globalid (>= 0.3.6) + activemodel (6.1.0) + activesupport (= 6.1.0) + activerecord (6.1.0) + activemodel (= 6.1.0) + activesupport (= 6.1.0) + activestorage (6.1.0) + actionpack (= 6.1.0) + activejob (= 6.1.0) + activerecord (= 6.1.0) + activesupport (= 6.1.0) + marcel (~> 0.3.1) + mimemagic (~> 0.3.2) + activesupport (6.1.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + builder (3.2.4) + codeclimate-test-reporter (0.5.2) + simplecov (>= 0.7.1, < 1.0.0) + concurrent-ruby (1.1.10) + crass (1.0.6) + database_cleaner (1.99.0) + diff-lcs (1.5.0) + docile (1.4.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + erubi (1.10.0) + factory_bot (4.11.1) + activesupport (>= 3.0.0) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) + railties (>= 3.0.0) + fakeweb-fi (1.3.1) + globalid (1.0.0) + activesupport (>= 5.0) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + i18n (1.10.0) + concurrent-ruby (~> 1.0) + jaro_winkler (1.5.4) + loofah (2.18.0) + 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) + method_source (1.0.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) + mimemagic (0.3.10) + nokogiri (~> 1) + rake + mini_mime (1.1.2) + mini_portile2 (2.8.0) + minitest (5.15.0) + netrc (0.11.0) + nio4r (2.5.8) + nokogiri (1.13.6) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + parallel (1.22.1) + parser (3.1.2.0) + ast (~> 2.4.1) + racc (1.6.0) + rack (2.2.3.1) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.1.0) + actioncable (= 6.1.0) + actionmailbox (= 6.1.0) + actionmailer (= 6.1.0) + actionpack (= 6.1.0) + actiontext (= 6.1.0) + actionview (= 6.1.0) + activejob (= 6.1.0) + activemodel (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) + bundler (>= 1.15.0) + railties (= 6.1.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.4.2) + loofah (~> 2.3) + railties (6.1.0) + actionpack (= 6.1.0) + activesupport (= 6.1.0) + method_source + rake (>= 0.8.7) + thor (~> 1.0) + rainbow (3.1.1) + rake (13.0.6) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + rspec-core (3.9.3) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-rails (3.9.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.4) + rubocop (0.74.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.6) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rails (2.5.2) + activesupport + rack (>= 1.1) + rubocop (>= 0.72.0) + ruby-progressbar (1.11.0) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) + simplecov (0.21.2) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + sprockets (4.0.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + sprockets (>= 3.0.0) + sqlite3 (1.4.1) + thor (1.2.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (1.6.1) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.5.4) + +PLATFORMS + arm64-darwin-21 + ruby + +DEPENDENCIES + appraisal + codeclimate-test-reporter (~> 0.5.1) + database_cleaner (~> 1.5, >= 1.3.11) + factory_bot_rails (~> 4.11, >= 4.11.1) + fakeweb-fi (~> 1.3, >= 1.3.1) + rails (= 6.1) + rspec-rails (~> 3.8) + rubocop (~> 0.74.0) + rubocop-rails (~> 2.3) + shoulda-matchers (~> 3.1, >= 3.1.2) + sqlite3 (= 1.4.1) + zapier_rest_hooks! + +BUNDLED WITH + 1.17.2 diff --git a/zapier_rest_hooks.gemspec b/zapier_rest_hooks.gemspec index 4bff55d..532394b 100644 --- a/zapier_rest_hooks.gemspec +++ b/zapier_rest_hooks.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.rdoc'] s.test_files = Dir['spec/**/*'] - s.add_dependency 'rails', '>= 5.1.0', '< 6.1.0' + s.add_dependency 'rails', '>= 5.1.0', '< 6.2.0' s.add_dependency 'rest-client', '~> 2.0' s.add_development_dependency 'appraisal'