Merge pull request #3 from stacksocial/merge-upstream

[ENG-5563] Merge upstream up to the point before dropping support for Ruby 2.7

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,4 @@
+Why and what is being done.
+
+## Pre-Merge Checklist
+- [ ] CHANGELOG.md updated with short summary

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: Test ruby version matrix
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2', 'head', 'truffleruby-head']
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake test
+
+  rubocop:
+    name: Run rubocop
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.7'
+          bundler-cache: true
+      - run: bundle exec rake rubocop

.rubocop.yml

@@ -1,24 +1,26 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.7
   Include:
     - 'lib/**/*'
     - 'Rakefile'
     - 'Gemfile'
   Exclude:
     - 'vendor/**/*'
     - 'demo/**/*'
+  SuggestExtensions: false
+  NewCops: enable
 
-LineLength:
+Layout/LineLength:
   Max: 120
 
-ClassLength:
+Metrics/ClassLength:
   Enabled: false
 
-Style/StringLiterals:
+Style/FetchEnvVar:
   Enabled: false
 
-HashSyntax:
-   EnforcedStyle: ruby19
+Style/StringLiterals:
+  Enabled: false
 
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
@@ -50,13 +52,13 @@ Style/StringLiteralsInInterpolation:
 Style/NumericLiterals:
   Enabled: false
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   Enabled: false
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Layout/MultilineOperationIndentation:

CHANGELOG.md

@@ -1,4 +1,71 @@
 ## Next
+* Add key setup to v3 example in README
+* Remove unnecessary id from textarea - This was unused and may cause accessability concerns if there is more than one recaptcha on the page due to multiple elements with the same id
+* Update to latest version of rubocop
+
+## 5.16.0
+* Allow usage of `options[:turbo]` as well as `options[:turbolinks]` for `recaptcha_v3`
+
+## 5.15.0
+* Add 3.2 to the list of Ruby CI versions
+* Add ability to submit verify_recaptcha via POST with JSON Body with `options[:json] = true`
+
+## 5.14.0
+* drop json dependency
+
+## 5.13.1
+* Permit actions as symbol
+
+## 5.13.0
+* Added option to ignore_no_element.
+
+## 5.12.3
+* Remove score fallback for enterprise
+* Update enterprise tests to v1 assessment schema
+
+## 5.12.2
+* Fix minimum score for enterprise
+
+## 5.12.1
+* Fix Japanese locale
+
+## 5.12.0
+* Added Japanese locale
+
+## 5.11.0
+* Added Dutch locale
+
+## 5.10.1
+* Fix enterprise_verify_url #415
+
+## 5.10.0
+* Drop ruby 2.4 2.5 2.6
+* Add maxiumm score support for hcaptcha
+
+## 5.9.0
+* Gracefully handle invalid params
+
+## 5.8.1
+* Allow configuring response limit
+
+## 5.8.0
+* Add support for the enterprise API
+
+## 5.7.0
+* french locale
+* drop ruby 2.3
+
+## 5.6.0
+* Allow multiple invisible recaptchas on a single page by setting custom selector
+
+## 5.5.0
+* add `recaptcha_reply` controller method for better debugging/inspection
+
+## 5.4.1
+* fix v2 vs 'data' postfix
+
+## 5.4.0
+* added 'data' postfix to g-recaptcha-response attribute name to avoid collisions
 
 ## 5.3.0
 * turbolinks support

Gemfile.lock

@@ -1,15 +1,14 @@
 PATH
   remote: .
   specs:
-    recaptcha (5.3.0)
-      json
+    recaptcha (5.16.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
+    ast (2.4.2)
     bump (0.8.0)
     byebug (11.0.1)
     coderay (1.1.2)
@@ -19,37 +18,47 @@ GEM
     hashdiff (0.3.9)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    json (2.3.0)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
     maxitest (3.1.0)
       minitest (>= 5.0.0, < 5.12.0)
     metaclass (0.0.4)
     method_source (0.9.2)
     minitest (5.11.3)
     mocha (1.8.0)
       metaclass (~> 0.0.1)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (3.0.3)
-    rainbow (3.0.0)
+    racc (1.7.3)
+    rainbow (3.1.1)
     rake (12.3.2)
-    rubocop (0.68.1)
-      jaro_winkler (~> 1.5.1)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rubocop (1.60.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     safe_yaml (1.0.5)
-    unicode-display_width (1.5.0)
+    unicode-display_width (2.5.0)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)