recaptcha 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6710df017f96e264b7f914194e950839c6a0ad
-  data.tar.gz: 26648a4faeed741fa8212dcf28f88474da2cd822
+  metadata.gz: e8bf11b481c77b41f01408a1a79f001e1bd7752d
+  data.tar.gz: ca7ae6470f682b80d318a919d1b52559c801c593
 SHA512:
-  metadata.gz: 4831c5776304df750fdecdec42bbd7bc8a6e8eeaa43348eafe6d2067de1fd91638907aad1b237dea67e9175ef9915c211de931dcfd2d7970510e19dac11f29a2
-  data.tar.gz: 3d5ed2fc4d54261339f1c7d66b3d222b7a63303db2bb23f9f6ba720bb20a073e13e337dfec02ac51adfa5b02703d720838bd6ddb5f57aa34485abbd6c07414a5
+  metadata.gz: f65791a9b97640e4d3080b36f25b5f8c933d18162a5ba711f0379f24c22bd916c3d058d7d00918866bb50c80d9fa1c0e686f3305545b34d39736a77927b2a067
+  data.tar.gz: ad562b54afb143099f856fb08d13a46cdf3aa543b3adcdf2455e8c9451427c57a68533dd4f4455aaa7319ee41d3e42751738f5b9e740c7a92593b90696589cb5

data/README.md

@@ -66,7 +66,6 @@ Some of the options available:
 
 | Option      | Description |
 |-------------|-------------|
-| :ssl        | Uses secure http for captcha widget (default `false`, but can be changed by setting `config.use_ssl_by_default`)|
 | :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`)|
@@ -133,7 +132,6 @@ Recaptcha.configure do |config|
   config.private_key = '6Lc6BAAAAAAAAKN3DRm6VA_xxxxxxxxxxxxxxxxx'
   # Uncomment the following line if you are using a proxy server:
   # config.proxy = 'http://myproxy.com.au:8080'
-  # config.disable_ssl_verification # if you do not want to verify ssl connection
 end
 ```
 

data/lib/recaptcha.rb

@@ -6,8 +6,7 @@ require 'net/http'
 
 module Recaptcha
   CONFIG = {
-    'server_url' => '//www.google.com/recaptcha/api.js',
-    'secure_server_url' => 'https://www.google.com/recaptcha/api.js',
+    'server_url' => 'https://www.google.com/recaptcha/api.js',
     'verify_url' => 'https://www.google.com/recaptcha/api/siteverify'
   }
 
@@ -56,12 +55,7 @@ module Recaptcha
     uri = URI.parse(Recaptcha.configuration.verify_url + '?' + query)
     http_instance = http.new(uri.host, uri.port)
     http_instance.read_timeout = http_instance.open_timeout = options[:timeout] || DEFAULT_TIMEOUT
-    if uri.port == 443
-      http_instance.use_ssl = true
-      if Recaptcha.configuration.disable_ssl_verification
-        http_instance.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-    end
+    http_instance.use_ssl = true if uri.port == 443
     request = Net::HTTP::Get.new(uri.request_uri)
     http_instance.request(request).body
   end

data/lib/recaptcha/client_helper.rb

@@ -3,10 +3,11 @@ 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[:stoken]
+      raise(RecaptchaError, "Secure Token is deprecated.") if options.key?(:stoken)
+      raise(RecaptchaError, "SSL is always true.") if options.key?(:ssl)
       public_key = options[:public_key] || Recaptcha.configuration.public_key!
 
-      script_url = Recaptcha.configuration.api_server_url(ssl: options[:ssl])
+      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}"
 

data/lib/recaptcha/configuration.rb

@@ -28,12 +28,11 @@ module Recaptcha
   #   end
   #
   class Configuration
-    attr_accessor :skip_verify_env, :private_key, :public_key, :proxy, :handle_timeouts_gracefully, :use_ssl_by_default, :hostname, :disable_ssl_verification
+    attr_accessor :skip_verify_env, :private_key, :public_key, :proxy, :handle_timeouts_gracefully, :hostname
 
     def initialize #:nodoc:
       @skip_verify_env            = SKIP_VERIFY_ENV
       @handle_timeouts_gracefully = HANDLE_TIMEOUTS_GRACEFULLY
-      @use_ssl_by_default         = USE_SSL_BY_DEFAULT
 
       @private_key           = ENV['RECAPTCHA_PRIVATE_KEY']
       @public_key            = ENV['RECAPTCHA_PUBLIC_KEY']
@@ -47,27 +46,12 @@ module Recaptcha
       public_key || raise(RecaptchaError, "No public key specified.")
     end
 
-    def api_server_url(ssl: nil)
-      ssl = use_ssl_by_default if ssl.nil?
-      key = (ssl ? 'secure_server_url' : 'server_url')
-      CONFIG.fetch(key)
+    def api_server_url
+      CONFIG.fetch('server_url')
     end
 
     def verify_url
       CONFIG.fetch('verify_url')
     end
-
-    def api_version=(v)
-      if v == 'v2'
-        warn 'setting api_version is deprecated and will be removed shortly, only v2 is supported'
-      else
-        raise ArgumentError, "only v2 is supported, not #{v.inspect}"
-      end
-    end
-
-    def api_version
-      warn 'getting api_version is deprecated and will be removed shortly, only v2 is supported'
-      'v2'
-    end
   end
 end

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "2.3.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json