recaptcha 3.4.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a20fd376758062148a3889f9f705e388c03e7f0
-  data.tar.gz: 20e4347e487bedfa42d4fac9844ef13582eb88a3
+  metadata.gz: 5d7c9ac18ec9de3fed55d8c19fbf4f673a8c1ff8
+  data.tar.gz: e303da2bfe6fa08bdd1a41b91629bbba37ea9bf8
 SHA512:
-  metadata.gz: e878f44d1a2cd1e83e68ff970a45bda7132aaf6a693df821919bbd1a27da96919b4f90d29687f947b0ab89251ef771bc4638666545884555dee8ecad6e875f91
-  data.tar.gz: ababd2e302f90d8f52f860a9cd3b83e71a00fac62d0d6f431a4e1a2993d9e74c297ce99e19c1fd255d441b922dad21840ba1c0ca817b92b5765d53fef1709679
+  metadata.gz: 9432fbc21f27f050db6ec0463af0b5ef07fb1ea35a0ed32e78ef53748b9aad43b51563603e63d1a86311082da4d1d7cbc72e07240992dc85693327b292036dde
+  data.tar.gz: 19a54357999754e6eaec65b4bfbe1ad95dc21122fb90aaa6a71f3cf834a94bbb7442734857b0f8dfcb68bcc09a05dfe5065fc515617e8d28296141e91f51ef5c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.0.0 - 2016-11-14
+* public_key -> site_key and private_key -> secret_key
+
+## 3.4.0 - 2016-11-01
+* Update fallback html
+
 ## 3.2.0 - 2016-06-13
 * remove SKIP_VERIFY_ENV constant, use `skip_verify_env` instance variable instead
 

data/README.md

@@ -25,8 +25,8 @@ Set in production and locally use [dotenv](https://github.com/bkeepers/dotenv),
 Otherwise see [Alternative API key setup](#alternative-api-key-setup).
 
 ```
-export RECAPTCHA_PUBLIC_KEY  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
-export RECAPTCHA_PRIVATE_KEY = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+export RECAPTCHA_SITE_KEY  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+export RECAPTCHA_SECRET_KEY = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
 ```
 
 Add `recaptcha_tags` to the forms you want to protect.
@@ -69,7 +69,7 @@ Some of the options available:
 | :noscript   | Include <noscript> content (default `true`)|
 | :display    | Takes a hash containing the `theme` and `tabindex` options per the API. (default `nil`), options: 'red', 'white', 'blackglass', 'clean', 'custom'|
 | :ajax       | Render the dynamic AJAX captcha per the API. (default `false`)|
-| :public_key | Override public API key |
+| :site_key   | Override site API key |
 | :error      | Override the error code returned from the reCAPTCHA API (default `nil`)|
 | :size       | Specify a size (default `nil`)|
 | :hl         | Optional. Forces the widget to render in a specific language. Auto-detects the user's language if unspecified. (See [language codes](https://developers.google.com/recaptcha/docs/language)) |
@@ -93,7 +93,7 @@ Some of the options available:
 | :model       | Model to set errors.
 | :attribute   | Model attribute to receive errors. (default :base)
 | :message     | Custom error message.
-| :private_key | Override private API key.
+| :secret_key  | Override secret API key.
 | :timeout     | The number of seconds to wait for reCAPTCHA servers before give up. (default `3`)
 | :response    | Custom response parameter. (default: params['g-recaptcha-response'])
 | :hostname    | Expected hostname or a callable that validates the hostname, see [domain validation](https://developers.google.com/recaptcha/docs/domain_validation) and [hostname](https://developers.google.com/recaptcha/docs/verify#api-response) docs. (default: `nil`, but can be changed by setting `config.hostname`)
@@ -113,7 +113,7 @@ Also you can translate API response errors to human friendly by adding translati
 en:
   recaptcha:
     errors:
-      incorrect-captcha-sol: 'Fail'
+      verification_failed: 'Fail'
 ```
 
 ## Testing
@@ -131,8 +131,8 @@ Recaptcha.configuration.skip_verify_env.delete("test")
 ```Ruby
 # config/initializers/recaptcha.rb
 Recaptcha.configure do |config|
-  config.public_key  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
-  config.private_key = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+  config.site_key  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+  config.secret_key = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
   # Uncomment the following line if you are using a proxy server:
   # config.proxy = 'http://myproxy.com.au:8080'
 end
@@ -143,8 +143,8 @@ end
 For temporary overwrites (not thread safe).
 
 ```Ruby
-Recaptcha.with_configuration(public_key: '12345') do
-  # Do stuff with the overwritten public_key.
+Recaptcha.with_configuration(site_key: '12345') do
+  # Do stuff with the overwritten site_key.
 end
 ```
 
@@ -153,11 +153,11 @@ end
 Pass in keys as options at runtime, for code base with multiple reCAPTCHA setups:
 
 ```Ruby
-recaptcha_tags public_key: '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+recaptcha_tags site_key: '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
 
 and
 
-verify_recaptcha private_key: '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+verify_recaptcha secret_key: '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
 ```
 
 ## Misc

data/lib/recaptcha/client_helper.rb

@@ -10,17 +10,17 @@ module Recaptcha
         raise(RecaptchaError, "SSL is now always true. Please remove 'ssl' from your calls to recaptcha_tags.")
       end
 
-      public_key = options[:public_key] || Recaptcha.configuration.public_key!
+      site_key = options[:site_key] || Recaptcha.configuration.site_key!
 
       script_url = Recaptcha.configuration.api_server_url
       script_url += "?hl=#{options[:hl]}" unless options[:hl].to_s == ""
-      fallback_uri = "#{script_url.chomp('.js')}/fallback?k=#{public_key}"
+      fallback_uri = "#{script_url.chomp('.js')}/fallback?k=#{site_key}"
 
       data_attributes = [:theme, :type, :callback, :expired_callback, :size]
       data_attributes = options.each_with_object({}) do |(k, v), a|
         a[k] = v if data_attributes.include?(k)
       end
-      data_attributes[:sitekey] = public_key
+      data_attributes[:sitekey] = site_key
       tag_attributes = data_attributes.map { |k, v| %(data-#{k.to_s.tr('_', '-')}="#{v}") }.join(" ")
 
       if id = options[:id]

data/lib/recaptcha/configuration.rb

@@ -15,7 +15,7 @@ module Recaptcha
   # Your are able to customize all attributes listed below. All values have
   # sensitive default and will very likely not need to be changed.
   #
-  # Please note that the public and private key for the reCAPTCHA API Access
+  # Please note that the site and secret key for the reCAPTCHA API Access
   # have no useful default value. The keys may be set via the Shell enviroment
   # or using this configuration. Settings within this configuration always take
   # precedence.
@@ -23,27 +23,27 @@ module Recaptcha
   # Setting the keys with this Configuration
   #
   #   Recaptcha.configure do |config|
-  #     config.public_key  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
-  #     config.private_key = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
+  #     config.site_key  = '6Lc6BAAAAAAAAChqRbQZcn_yyyyyyyyyyyyyyyyy'
+  #     config.secret_key = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
   #   end
   #
   class Configuration
-    attr_accessor :skip_verify_env, :private_key, :public_key, :proxy, :handle_timeouts_gracefully, :hostname
+    attr_accessor :skip_verify_env, :secret_key, :site_key, :proxy, :handle_timeouts_gracefully, :hostname
 
     def initialize #:nodoc:
       @skip_verify_env            = %w[test cucumber]
       @handle_timeouts_gracefully = HANDLE_TIMEOUTS_GRACEFULLY
 
-      @private_key           = ENV['RECAPTCHA_PRIVATE_KEY']
-      @public_key            = ENV['RECAPTCHA_PUBLIC_KEY']
+      @secret_key           = ENV['RECAPTCHA_SECRET_KEY']
+      @site_key             = ENV['RECAPTCHA_SITE_KEY']
     end
 
-    def private_key!
-      private_key || raise(RecaptchaError, "No private key specified.")
+    def secret_key!
+      secret_key || raise(RecaptchaError, "No secret key specified.")
     end
 
-    def public_key!
-      public_key || raise(RecaptchaError, "No public key specified.")
+    def site_key!
+      site_key || raise(RecaptchaError, "No site key specified.")
     end
 
     def api_server_url

data/lib/recaptcha/verify.rb

@@ -62,11 +62,11 @@ module Recaptcha
     private
 
     def recaptcha_verify_via_api_call(request, recaptcha_response, options)
-      private_key = options[:private_key] || Recaptcha.configuration.private_key!
+      secret_key = options[:secret_key] || Recaptcha.configuration.secret_key!
       remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
 
       verify_hash = {
-        "secret"    => private_key,
+        "secret"    => secret_key,
         "remoteip"  => remote_ip.to_s,
         "response"  => recaptcha_response
       }

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "3.4.0".freeze
+  VERSION = "4.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Helpers for the reCAPTCHA API