recaptcha 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8bf11b481c77b41f01408a1a79f001e1bd7752d
-  data.tar.gz: ca7ae6470f682b80d318a919d1b52559c801c593
+  metadata.gz: ca2ec26c375c95c1459db34eda553e75cbfaa1b1
+  data.tar.gz: 85136cf39a2bcc76269935fde5265a60162d3a80
 SHA512:
-  metadata.gz: f65791a9b97640e4d3080b36f25b5f8c933d18162a5ba711f0379f24c22bd916c3d058d7d00918866bb50c80d9fa1c0e686f3305545b34d39736a77927b2a067
-  data.tar.gz: ad562b54afb143099f856fb08d13a46cdf3aa543b3adcdf2455e8c9451427c57a68533dd4f4455aaa7319ee41d3e42751738f5b9e740c7a92593b90696589cb5
+  metadata.gz: 7280548570fb6c61c15e18f6ad6f533b06b1df491e7b31f26ad5fcf99b40ff9a5e737dfbf70106b5e96ffd8cd457809459092d693a0450730fbf3a6dae4b5f17
+  data.tar.gz: b002273c513e292f91d5febca4bc37264ddd0495f3b38b7e90781cc647d1a7eda5471a8123b4d479da7845b5d5df6600864560493fd1d72832d23490d1f70c18

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.0 - 2016-05-27
+* remove all non-ssl options
+
 ## 2.3.0 - 2016-05-25
 * enable ssl verification by default ... disable via `disable_ssl_verification = true`
 

data/lib/recaptcha.rb

@@ -8,11 +8,11 @@ module Recaptcha
   CONFIG = {
     'server_url' => 'https://www.google.com/recaptcha/api.js',
     'verify_url' => 'https://www.google.com/recaptcha/api/siteverify'
-  }
+  }.freeze
 
   USE_SSL_BY_DEFAULT              = false
   HANDLE_TIMEOUTS_GRACEFULLY      = true
-  SKIP_VERIFY_ENV = ['test', 'cucumber']
+  SKIP_VERIFY_ENV = ['test', 'cucumber'].freeze
   DEFAULT_TIMEOUT = 3
 
   # Gives access to the current Configuration.
@@ -68,7 +68,6 @@ module Recaptcha
     end
   end
 
-
   class RecaptchaError < StandardError
   end
 

data/lib/recaptcha/client_helper.rb

@@ -3,8 +3,13 @@ module Recaptcha
     # Your public API can be specified in the +options+ hash or preferably
     # using the Configuration.
     def recaptcha_tags(options = {})
-      raise(RecaptchaError, "Secure Token is deprecated.") if options.key?(:stoken)
-      raise(RecaptchaError, "SSL is always true.") if options.key?(:ssl)
+      if options.key?(:stoken)
+        raise(RecaptchaError, "Secure Token is deprecated. Please remove 'stoken' from your calls to recaptcha_tags.")
+      end
+      if options.key?(:ssl)
+        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!
 
       script_url = Recaptcha.configuration.api_server_url
@@ -16,10 +21,10 @@ module Recaptcha
         a[k] = v if data_attributes.include?(k)
       end
       data_attributes[:sitekey] = public_key
-      data_attributes = data_attributes.map { |k,v| %{data-#{k.to_s.tr('_','-')}="#{v}"} }.join(" ")
+      data_attributes = data_attributes.map { |k, v| %(data-#{k.to_s.tr('_', '-')}="#{v}") }.join(" ")
 
-      html = %{<script src="#{script_url}" async defer></script>\n}
-      html << %{<div class="g-recaptcha" #{data_attributes}></div>\n}
+      html = %(<script src="#{script_url}" async defer></script>\n)
+      html << %(<div class="g-recaptcha" #{data_attributes}></div>\n)
 
       if options[:noscript] != false
         html << <<-HTML

data/lib/recaptcha/verify.rb

@@ -5,7 +5,7 @@ module Recaptcha
     # Your private API can be specified in the +options+ hash or preferably
     # using the Configuration.
     def verify_recaptcha(options = {})
-      options = {:model => options} unless options.is_a? Hash
+      options = {model: options} unless options.is_a? Hash
       return true if Recaptcha::Verify.skip?(options[:env])
 
       model = options[:model]
@@ -51,7 +51,12 @@ module Recaptcha
     end
 
     def verify_recaptcha!(options = {})
-      verify_recaptcha(options) or raise VerifyError
+      verify_recaptcha(options) || raise(VerifyError)
+    end
+
+    def self.skip?(env)
+      env ||= ENV['RACK_ENV'] || ENV['RAILS_ENV'] || (Rails.env if defined? Rails.env)
+      Recaptcha.configuration.skip_verify_env.include? env
     end
 
     private
@@ -82,7 +87,7 @@ module Recaptcha
     end
 
     def recaptcha_error(model, attribute, message, key, default)
-      message = message || Recaptcha.i18n(key, default)
+      message ||= Recaptcha.i18n(key, default)
       if model
         model.errors.add attribute, message
       else
@@ -93,10 +98,5 @@ module Recaptcha
     def recaptcha_flash_supported?
       request.respond_to?(:format) && request.format == :html && respond_to?(:flash)
     end
-
-    def self.skip?(env)
-      env ||= ENV['RACK_ENV'] || ENV['RAILS_ENV'] || (Rails.env if defined? Rails.env)
-      Recaptcha.configuration.skip_verify_env.include? env
-    end
   end
 end

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "3.0.0"
+  VERSION = "3.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helpers for the reCAPTCHA API
 email:
 - jasper@ambethia.com