acts_as_textcaptcha 4.5.1 → 4.5.2

data/lib/acts_as_textcaptcha/textcaptcha_api.rb

@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 module ActsAsTextcaptcha
   class TextcaptchaApi
-
-    BASE_URL = 'http://textcaptcha.com'
+    BASE_URL = "http://textcaptcha.com"
 
     def initialize(api_key: nil, api_endpoint: nil, raise_errors: false)
-      if api_endpoint
-        self.uri = URI(api_endpoint)
-      else
-        self.uri = URI("#{BASE_URL}/#{api_key}.json")
-      end
+      self.uri = if api_endpoint
+                   URI(api_endpoint)
+                 else
+                   URI("#{BASE_URL}/#{api_key}.json")
+                 end
       self.raise_errors = raise_errors || false
-    rescue URI::InvalidURIError => exception
-      raise ApiKeyError.new(api_key, exception)
+    rescue URI::InvalidURIError => e
+      raise ApiKeyError.new(api_key, e)
     end
 
     def fetch
@@ -24,35 +23,33 @@ module ActsAsTextcaptcha
 
     private
 
-      attr_accessor :uri, :raise_errors
-
-      def get
-        response = Net::HTTP.new(uri.host, uri.port).get(uri.path)
-        if response.code == '200'
-          response.body
-        else
-          handle_error ResponseError.new(uri, "status: #{response.code}")
-        end
-      rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
-        Errno::EHOSTUNREACH, EOFError, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
-        Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-        Net::ProtocolError => exception
-        handle_error ResponseError.new(uri, exception)
-      end
+    attr_accessor :uri, :raise_errors
 
-      def parse(response)
-        JSON.parse(response) unless response.empty?
-      rescue JSON::ParserError
-        handle_error ParseError.new(uri)
+    def get
+      response = Net::HTTP.new(uri.host, uri.port).get(uri.path)
+      if response.code == "200"
+        response.body
+      else
+        handle_error ResponseError.new(uri, "status: #{response.code}")
       end
+    rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
+           Errno::EHOSTUNREACH, EOFError, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
+           Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+           Net::ProtocolError => e
+      handle_error ResponseError.new(uri, e)
+    end
 
-      def handle_error(error)
-        if raise_errors
-          raise error
-        else
-          Rails.logger.error("#{error.class} #{error.message}")
-          nil
-        end
-      end
+    def parse(response)
+      JSON.parse(response) unless response.empty?
+    rescue JSON::ParserError
+      handle_error ParseError.new(uri)
+    end
+
+    def handle_error(error)
+      raise error if raise_errors
+
+      Rails.logger.error("#{error.class} #{error.message}")
+      nil
+    end
   end
 end

data/lib/acts_as_textcaptcha/textcaptcha_cache.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
 # A simple cache for storing Textcaptcha answers, Rails.cache is used as the
-# backend (ActiveSupport::Cache)
+# backend (ActiveSupport::Cache). This must not be set as a `:null_store`.
 
 module ActsAsTextcaptcha
   class TextcaptchaCache
-
-    KEY_PREFIX = 'acts_as_textcaptcha-'
+    KEY_PREFIX = "acts_as_textcaptcha-"
     DEFAULT_EXPIRY_MINUTES = 10
 
     def write(key, value, options = {})
-      unless options.has_key?(:expires_in)
-        options[:expires_in] = DEFAULT_EXPIRY_MINUTES.minutes
-      end
+      options[:expires_in] = DEFAULT_EXPIRY_MINUTES.minutes unless options.has_key?(:expires_in)
       Rails.cache.write(cache_key(key), value, options)
     end
 
@@ -26,8 +23,8 @@ module ActsAsTextcaptcha
 
     private
 
-      def cache_key(key)
-        "#{KEY_PREFIX}#{key}"
-      end
+    def cache_key(key)
+      "#{KEY_PREFIX}#{key}"
+    end
   end
 end

data/lib/acts_as_textcaptcha/textcaptcha_config.rb

@@ -2,47 +2,46 @@
 
 module ActsAsTextcaptcha
   class TextcaptchaConfig
+    YAML = <<~CONFIG
+      development: &common_settings
+        api_key: 'TEXTCAPTCHA_API_IDENT' # see https://textcaptcha.com for details
+        # api_endpoint: nil        # Optional API URL to fetch questions and answers from
+        # raise_errors: false      # Optional flag, if true errors will be raised if the API endpoint fails
+        # cache_expiry_minutes: 10 # Optional minutes for captcha answers to persist in the cache (default 10 minutes)
 
-    YAML = <<-CONFIG
-development: &common_settings
-  api_key: 'TEXTCAPTCHA_API_IDENT' # see http://textcaptcha.com for details
-  # api_endpoint: nil        # Optional API URL to fetch questions and answers from
-  # raise_errors: false      # Optional flag, if true errors will be raised if the API endpoint fails
-  # cache_expiry_minutes: 10 # Optional minutes for captcha answers to persist in the cache (default 10 minutes)
+        questions:
+            - question: 'Is ice hot or cold?'
+              answers: 'cold'
+            - question: 'what color is an orange?'
+              answers: 'orange'
+            - question: 'what is two plus 3?'
+              answers: '5,five'
+            - question: 'what is 5 times two?'
+              answers: '10,ten'
+            - question: 'How many colors in the list, green, brown, foot and blue?'
+              answers: '3,three'
+            - question: 'what is Georges name?'
+              answers: 'george'
+            - question: '11 minus 1?'
+              answers: '10,ten'
+            - question: 'is boiling water hot or cold?'
+              answers: 'hot'
+            - question: 'what color is my blue shirt today?'
+              answers: 'blue'
+            - question: 'what is 16 plus 4?'
+              answers: '20,twenty'
 
-  questions:
-      - question: 'Is ice hot or cold?'
-        answers: 'cold'
-      - question: 'what color is an orange?'
-        answers: 'orange'
-      - question: 'what is two plus 3?'
-        answers: '5,five'
-      - question: 'what is 5 times two?'
-        answers: '10,ten'
-      - question: 'How many colors in the list, green, brown, foot and blue?'
-        answers: '3,three'
-      - question: 'what is Georges name?'
-        answers: 'george'
-      - question: '11 minus 1?'
-        answers: '10,ten'
-      - question: 'is boiling water hot or cold?'
-        answers: 'hot'
-      - question: 'what color is my blue shirt today?'
-        answers: 'blue'
-      - question: 'what is 16 plus 4?'
-        answers: '20,twenty'
+      test:
+        <<: *common_settings
+        api_key: 'TEST_TEXTCAPTCHA_API_IDENT'
 
-test:
-  <<: *common_settings
-  api_key: 'TEST_TEXTCAPTCHA_API_IDENT'
+      production:
+        <<: *common_settings
+    CONFIG
 
-production:
-  <<: *common_settings
-CONFIG
-
-    def self.create(path: './config/textcaptcha.yml')
+    def self.create(path: "./config/textcaptcha.yml")
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, 'w') { |f| f.write(YAML) }
+      File.open(path, "w") { |f| f.write(YAML) }
     end
   end
 end

data/lib/acts_as_textcaptcha/textcaptcha_helper.rb

@@ -2,23 +2,20 @@
 
 module ActsAsTextcaptcha
   module TextcaptchaHelper
-
-    def textcaptcha_fields(f, &block)
-      if f.object.perform_textcaptcha? && f.object.textcaptcha_key
-        build_textcaptcha_form_elements(f, &block)
-      end
+    def textcaptcha_fields(form, &block)
+      build_textcaptcha_form_elements(form, &block) if form.object.perform_textcaptcha? && form.object.textcaptcha_key
     end
 
     private
 
-      def build_textcaptcha_form_elements(f, &block)
-        captcha_html = f.hidden_field(:textcaptcha_key)
-        if f.object.textcaptcha_question
-          captcha_html += capture(&block)
-        elsif f.object.textcaptcha_answer
-          captcha_html += f.hidden_field(:textcaptcha_answer)
-        end
-        captcha_html.html_safe
+    def build_textcaptcha_form_elements(form, &block)
+      captcha_html = form.hidden_field(:textcaptcha_key)
+      if form.object.textcaptcha_question
+        captcha_html += capture(&block)
+      elsif form.object.textcaptcha_answer
+        captcha_html += form.hidden_field(:textcaptcha_answer)
       end
+      captcha_html.html_safe
+    end
   end
 end

data/lib/acts_as_textcaptcha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsTextcaptcha
-  VERSION = '4.5.1'
+  VERSION = "4.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_textcaptcha
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Matthew Hutchinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +109,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.3.4
 - !ruby/object:Gem::Dependency
   name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +178,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".simplecov"
 - ".travis.yml"
 - Appraisals
@@ -202,7 +217,7 @@ metadata:
   source_code_uri: https://github.com/matthutchinson/acts_as_textcaptcha
   bug_tracker_uri: https://github.com/matthutchinson/acts_as_textcaptcha/issues
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - ActAsTextcaptcha
@@ -215,15 +230,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A text-based logic question captcha for Rails
 test_files: []