captchah 1.1.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aa5d76a22024f7579a41b99405e9766371aba269edcfebf1e34fc4a7bf880db
-  data.tar.gz: 74e1151d527a58884f3f9190c9156913a7d54c4b70ce4615963a4a1b3db20f4c
+  metadata.gz: 2f3926fc6264e56237671ce4eb5b8d5e22f1f2c06651ffcd1280476666c7278a
+  data.tar.gz: 9a95960a66fb60c5f3892b4af08644fecfa33280ef9e2da5f346986c2677ea85
 SHA512:
-  metadata.gz: d9cc0121f8f4a7004ec5873e5f4b2e2d1fc290d26ded59f325df3f91bd18aced57e69552034c8390ec2ca0b918a67d7dcec1bb3e6bc154ed7dbd8e24f030e21a
-  data.tar.gz: b0d3ccd6a1960e6b232b90341a76098493381458fffe804e3ce177e37ccc99b92ea36f2a00d754e5791f81a33accd1cfc5aa28ab3b6886933b80cd60df54d00c
+  metadata.gz: 54ac623eda86756c98bd106be582f3693e6c16fff821c407a225514c87cf39a63adac17f2740fe6f550db5cc4486fc3498a2532a406d30795b4e20bf74faa3c5
+  data.tar.gz: 7a9f81c829f33feeb6512544c6f5cee6df881a0fac7affed21ea310c1129b466d04ab0412958156980e868f61dcceedf6f8f74eb0098464873225f15f86fcc46

data/README.md

@@ -7,7 +7,7 @@ A Rails captcha gem that attempts to determine whether or not a user is human.
 Add this line to your application's Gemfile:
 
 ```
-gem 'captchah', '~> 1.1'
+gem 'captchah'
 ```
 
 And execute:
@@ -81,6 +81,8 @@ captchah_tag(
   reload_max: 5,             # Integer value                    Default: 5
   reload: true,              # Boolean value                    Default: true
   css: true,                 # Boolean value                    Default: true
+  csp_nonce: 'csp-id',       # String value                     Default: nil
+  required: true,            # Boolean value                    Default: false
   puzzle_font: 'Verdana'     # String value                     Default: 'Verdana'
 )
 ```

data/app/controllers/captchah/captchah_controller.rb

@@ -37,6 +37,8 @@ module Captchah
         reload_count: payload[:reload_count] + 1,
         reload: payload[:reload],
         css: payload[:css],
+        csp_nonce: payload[:csp_nonce],
+        required: payload[:required],
         puzzle_font: payload[:puzzle_font]
       }
     end

data/lib/captchah/generators/captcha.rb

@@ -27,6 +27,8 @@ module Captchah
         @reload_count = args[:reload_count] || DEFAULT_RELOAD_COUNT
         @reload = args[:reload] == false ? false : allow_reload?
         @css = (args[:css] != false)
+        @csp_nonce = args[:csp_nonce]
+        @required = !!args[:required] # rubocop:disable Style/DoubleNegation
         @puzzle_font = args[:puzzle_font] || DEFAULT_PUZZLE_FONT
       end
 
@@ -43,6 +45,8 @@ module Captchah
         :reload_count,
         :reload,
         :css,
+        :csp_nonce,
+        :required,
         :puzzle_font
       )
 
@@ -58,7 +62,9 @@ module Captchah
           reload_payload: reload_payload,
           reload_label: reload_label,
           reload: reload,
-          css: css
+          css: css,
+          csp_nonce: csp_nonce,
+          required: required
         )
       end
 
@@ -88,6 +94,8 @@ module Captchah
           reload_count: reload_count,
           reload: reload,
           css: css,
+          csp_nonce: csp_nonce,
+          required: required,
           puzzle_font: puzzle_font
         )
       end

data/lib/captchah/generators/html.rb

@@ -13,6 +13,8 @@ module Captchah
         reload_label
         reload
         css
+        csp_nonce
+        required
       ].freeze
 
       def self.call(*args)
@@ -49,7 +51,7 @@ module Captchah
       def style_tag
         return unless css
 
-        "<style type='text/css'>
+        "<style type='text/css' nonce='#{csp_nonce}'>
           ##{container_id} {
             background-color: #f9f9f9;
             border-radius: 2px;
@@ -81,6 +83,9 @@ module Captchah
             margin-top: 11px;
             transform: translateY(-50%);
           }
+          ##{container_id} .hidden {
+            display: none;
+          }
 
           ##{container_id} .captchah-puzzle,
           ##{container_id} .captchah-guess {
@@ -129,6 +134,7 @@ module Captchah
       def guess_tag
         '<input ' \
         "type='text' " \
+        "#{'required' if required} " \
         "autocomplete='off' " \
         "name='captchah[guess]' " \
         "class='captchah-guess'>"
@@ -143,15 +149,13 @@ module Captchah
       def reload_animation_tag
         '<img ' \
         "src='#{"data:image/gif;base64,#{Base64Images.loader}"}' " \
-        "style='display: none;' " \
-        "class='captchah-reload-animation'>"
+        "class='captchah-reload-animation hidden'>"
       end
 
       def reload_tag
         return unless reload
 
         '<span ' \
-        "onclick='captchah(this)' " \
         "data-payload='#{reload_payload}' " \
         "class='captchah-reload'>" \
           "#{reload_label}" \
@@ -161,14 +165,14 @@ module Captchah
       def javascript_tag
         return unless reload
 
-        "<script type='text/javascript'>
-          var captchah = function(reload) {
+        "<script type='text/javascript' nonce='#{csp_nonce}'>
+          var captchah = function(el) {
             var captchahLoaderAnimation = function(el_show, el_hide){
-              el_hide.style.display='none';
-              el_show.style.display='inline-block';
+              el_show.classList.remove('hidden');
+              el_hide.classList.add('hidden');
             };
 
-            captchahLoaderAnimation(reload.previousSibling, reload);
+            captchahLoaderAnimation(el.previousSibling, el);
 
             var xhr = new XMLHttpRequest();
             xhr.open('POST', '/captchah');
@@ -176,15 +180,25 @@ module Captchah
             xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
             xhr.onload = function() {
               if (xhr.status === 200) {
-                reload.parentNode.outerHTML = xhr.responseText;
+                el.parentNode.outerHTML = xhr.responseText;
               }
               else if (xhr.status !== 200) {
                 console.log('Error: Unable to change captcha.');
-                captchahLoaderAnimation(reload, reload.previousSibling);
+                captchahLoaderAnimation(el, el.previousSibling);
               }
             };
-            xhr.send(JSON.stringify({captchah: reload.dataset.payload}));
+            xhr.send(JSON.stringify({captchah: el.dataset.payload}));
           };
+
+          var button = document.querySelector('##{container_id} .captchah-reload');
+          var container = document.getElementById('#{container_id}');
+          var containerParent = container.parentNode;
+
+          containerParent.addEventListener('click', function(e) {
+            console.log(e);
+            if([...e.target.classList].includes('captchah-reload'))
+              captchah(e.target);
+          });
         </script>"
       end
 

data/lib/captchah/generators/puzzle.rb

@@ -43,7 +43,7 @@ module Captchah
           c.draw("line 0,#{rand(25..35)} 290,30") if difficulty > 1
           c.fill(rgba(color1, opacity))
           c.pointsize(26)
-          c.draw("text 82,#{rand(25..40)} '#{truth[3..-1]}'")
+          c.draw("text 82,#{rand(25..40)} '#{truth[3..-1]}'") # rubocop:disable Style/SlicingWithRange
           c.draw("line 0,#{rand(10..20)} 400,20") if difficulty > 1
 
           if difficulty < 3
@@ -83,14 +83,11 @@ module Captchah
       end
 
       def image
-        @image ||=
-          begin
-            base64_image = Base64Images.puzzle_background
-            decoded_image = Base64.strict_decode64(base64_image)
-            MiniMagick::Image.read(decoded_image)
-          rescue NameError => e
-            raise Error, 'Missing MiniMagick.' if e.to_s.include?('MiniMagick')
-          end
+        @image ||= begin
+          base64_image = Base64Images.puzzle_background
+          decoded_image = Base64.strict_decode64(base64_image)
+          MiniMagick::Image.read(decoded_image)
+        end
       end
 
       def opacity

data/lib/captchah/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Captchah
-  VERSION = '1.1.1'
+  VERSION = '2.0.1'
 end

data/lib/captchah.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'mini_magick'
 require 'captchah/version'
 require 'captchah/generators/html'
 require 'captchah/generators/puzzle'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: captchah
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Evgeni Radev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -38,35 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-description: 
+description:
 email:
 - evgeniradev@gmail.com
 executables: []
@@ -90,7 +62,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - You must have ImageMagick or GraphicsMagick installed.
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A Rails captcha gem that attempts to determine whether or not a user is human.
 test_files: []