kandr-easy_captcha 0.9.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9098d3c82557be66d9f3769ef7a815d1bea207b9b0de7931cde92c5289766e
-  data.tar.gz: 4df8b4194f3e77b338e1193f8f0973da28cdcf52c332beee4dfbca1338a21bbe
+  metadata.gz: 4f480d073b0f9492cf7ea45423c41c996b8d9d7410843fbbac6ed16409b45754
+  data.tar.gz: c96d490a4ef8726c2a3cf063995170763d13a5139b5dea9d7e7bcd06b07dae08
 SHA512:
-  metadata.gz: 1f103d10c86ebd21a5e7c2e364d63c3a58d84276e225b03d499498f929d742ca304ea6b53af277de01aa8ffb56b1af7d2ceb8defbec730b32cd3b11d88add2ae
-  data.tar.gz: 9050a9ba91f71fc3a4990b84ba013604539add8a3ad291e5a9ef73a8e21d08d4e68f6b9c289e75bb531ddc56037fa60338c743019f1e57f3cb77eec46a150c62
+  metadata.gz: 86c45902d40052711b77645989d0e5a976960ef893887464623bf19ca9c78594172799f67b2350f8cfbc4d48433f705fc7005087f670d31b82f205f2c1765053
+  data.tar.gz: 82253e91a9e2227ca6a0d54c0f125efdcd4bc09adefc69320e036b13da56edbe3f3074a5c3b556b7e59a83a746a66d25f2825e209462357307cefb97ed3ccb38

data/LICENSE.txt

@@ -1,4 +1,5 @@
 Copyright (c) 2010 Marco Scholl
+Copyright (c) 2020-2021 Karl Wilbur; K&R Software, LLC.; and EasyCAPTCHA Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,6 @@
 # EasyCAPTCHA
 
-[![Build Status](https://travis-ci.org/K-and-R/easy_captcha.svg?branch=master)](https://travis-ci.org/K-and-R/easy_captcha)
+[![Build Status](https://travis-ci.com/K-and-R/easy_captcha.svg?branch=master)](https://travis-ci.org/K-and-R/easy_captcha)
 [![Maintainability](https://api.codeclimate.com/v1/badges/0505012081a472de86e2/maintainability)](https://codeclimate.com/github/K-and-R/easy_captcha/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/0505012081a472de86e2/test_coverage)](https://codeclimate.com/github/K-and-R/easy_captcha/test_coverage)
 
@@ -48,73 +48,92 @@ you want to customize the default configuration
 
 ```ruby
   EasyCaptcha.setup do |config|
-    # Cache
-    # config.cache          = true
+    # #####
+    # # Cache
+    # config.cache                   = true
     # Cache temp dir from Rails.root
-    # config.cache_temp_dir = Rails.root.join('tmp', 'captchas')
+    # config.cache_temp_dir          = Rails.root.join('tmp', 'captchas')
     # Cache size
-    # config.cache_size     = 500
+    # config.cache_size              = 500
     # Cache expire
-    # config.cache_expire   = 1.day
-
-    # Chars
-    # config.chars          = %w(2 3 4 5 6 7 9 A C D E F G H J K L M N P Q R S T U X Y Z)
-
-    # Length
-    # config.length         = 6
-
+    # config.cache_expire            = 1.day
+
+    # #####
+    # # CAPTCHA
+    # # Chars available for CAPTCHA
+    # config.captcha_character_pool  = %w(2 3 4 5 6 7 9 A C D E F G H J K L M N P Q R S T U X Y Z)
+    #
+    # # Length of CAPTCHA string
+    # config.captcha_character_count = 6
+    # config.captcha_character_count_max = 6
+    # config.captcha_character_count_min = 6
+    #
+    # # CAPTCHA Image dimensions
+    # config.captcha_image_height    = 40
+
+    #####
     # Image
-    # config.image_height   = 40
-    # config.image_width    = 140
+    # config.captcha_image_height    = 40
+    # config.captcha_image_width     = 140
+
+    # #####
+    # # eSpeak
+    # # Enable eSpeak using all defaults:
+    # config.espeak = true
 
-    # eSpeak (default disabled)
+    # # Enable eSpeak using custom config:
     # config.espeak do |espeak|
-      # Amplitude, 0 to 200
-      # espeak.amplitude = 80..120
+    #   Amplitude, 0 to 200
+    #   espeak.amplitude = 80..120
 
-      # Word gap. Pause between words
-      # espeak.gap = 80
+    #   Word gap. Pause between words
+    #   espeak.gap = 80
 
-      # Pitch adjustment, 0 to 99
-      # espeak.pitch = 30..70
+    #   Pitch adjustment, 0 to 99
+    #   espeak.pitch = 30..70
 
-      # Use voice file of this name from espeak-data/voices
-      # espeak.voice = nil
+    #   Use voice file of this name from espeak-data/voices
+    #   espeak.voice = nil
     # end
 
-    # configure generator
+    # #####
+    # # Generator
     # config.generator :default do |generator|
-
-      # Font
-      # generator.font_size              = 24
-      # generator.font_fill_color        = '#333333'
-      # generator.font_stroke_color      = '#000000'
-      # generator.font_stroke            = 0
-      # generator.font                   = File.expand_path('../../resources/afont.ttf', __FILE__)
-
-
-      # Background color
-      # generator.image_background_color = "#FFFFFF"
-      # Or background image (e.g. transparent png)
-      # generator.background_image       = File.expand_path('../../resources/captcha_bg.png', __FILE__)
-
-      # Wave
-      # generator.wave                   = true
-      # generator.wave_length            = (60..100)
-      # generator.wave_amplitude         = (3..5)
-
-      # Sketch
-      # generator.sketch                 = true
-      # generator.sketch_radius          = 3
-      # generator.sketch_sigma           = 1
-
-      # Implode
-      # generator.implode                = 0.1
-
-      # Blur
-      # generator.blur                   = true
-      # generator.blur_radius            = 1
-      # generator.blur_sigma             = 2
+    #   # # Backgound
+    #   # # Ignored (set as `none`) when using custom background image or fill
+    #   # generator.background_color = '#FFFFFF'
+    #   # An instance of a `Fill` class. RMagick supplies three `Fill` classes:
+    #   #    - `HatchFill`
+    #   #    - `GradientFill`
+    #   #    - `TextureFill`.
+    #   generator.background_fill  = nil
+    #   # # Custom image to be used for CAPTCHA background
+    #   # generator.background_image = nil
+
+    #   # Blur
+    #   # generator.blur                   = true
+    #   # generator.blur_radius            = 1
+    #   # generator.blur_sigma             = 2
+
+    #   # # Font
+    #   # generator.font_size              = 24
+    #   # generator.font_fill_color        = '#333333'
+    #   # generator.font_stroke_color      = '#000000'
+    #   # generator.font_stroke            = 0
+    #   # generator.font_family            = File.expand_path('../../resources/afont.ttf', __FILE__)
+
+    #   # # Implode  (the "funhouse mirror" effect; negative values allowed)
+    #   # generator.implode                = 0.1
+
+    #   # # Sketch
+    #   # generator.sketch                 = true
+    #   # generator.sketch_radius          = 0.0
+    #   # generator.sketch_sigma           = 1.0
+
+    #   # Wave
+    #   # generator.wave                   = true
+    #   # generator.wave_length            = (60..100)
+    #   # generator.wave_amplitude         = (3..5)
     # end
   end
 ```
@@ -127,11 +146,11 @@ file below.
 ```ruby
   EasyCaptcha.setup do |config|
     # Cache
-    config.cache          = true
+    config.cache            = true
     # Cache temp dir from Rails.root
-    config.cache_temp_dir = Rails.root.join('tmp', 'captchas')
+    config.cache_temp_dir   = Rails.root.join('tmp', 'captchas')
     # Cache expire
-    config.cache_expire   = 1.day
+    config.cache_expire     = 1.day
     # Cache size
     # config.cache_size     = 500
   end
@@ -174,4 +193,7 @@ See the [CHANGELOG.md](./CHANGELOG.md)
 
 ## Copyright
 
-Copyright (c) 2010 Marco Scholl. See LICENSE.txt for further details.
+EasyCAPTCHA is licensed under The MIT License.
+
+Copyright (c) 2010-2021 Marco Scholl; K&R Software, LLC.; and EasyCAPTCHA Contributors.
+See [`LICENSE.txt`](./LICENSE.txt) and [`CHANGELOG.md`](./CHANGELOG.md) for further details.

data/lib/easy_captcha.rb

@@ -22,6 +22,8 @@ module EasyCaptcha
     cache_size: 500,
     captcha_character_pool: %w[2 3 4 5 6 7 9 A C D E F G H J K L M N P Q R S T U X Y Z],
     captcha_character_count: 6,
+    captcha_character_count_max: 6,
+    captcha_character_count_min: 6,
     captcha_image_height: 40,
     captcha_image_width: 140
   }.freeze
@@ -42,7 +44,7 @@ module EasyCaptcha
   mattr_accessor :captcha_character_pool
 
   # Length
-  mattr_accessor :captcha_character_count
+  mattr_accessor :captcha_character_count, :captcha_character_count_max, :captcha_character_count_min
 
   # Image dimensions
   mattr_accessor :captcha_image_height, :captcha_image_width
@@ -61,6 +63,13 @@ module EasyCaptcha
       cache
     end
 
+    def captcha_code_length
+      max = [captcha_character_count_min, captcha_character_count_max].max
+      min = [captcha_character_count_min, captcha_character_count_max].min
+      return (min..max).to_a.sample if captcha_character_count == :range
+      captcha_character_count
+    end
+
     # select generator and configure this
     def generator(generator = nil, &block)
       resolve_generator(generator, &block) unless generator.nil?

data/lib/easy_captcha/captcha_controller.rb

@@ -7,6 +7,13 @@ module EasyCaptcha
 
     # send the generated image to browser
     def captcha
+      # Reset the CAPTCHA code on request
+      session.delete(:captcha)
+
+      # Generate the new CAPTCHA code
+      generate_captcha_code
+
+      # Generate and output the CAPTCHA image/audio file
       if (params[:format] == 'wav') && EasyCaptcha.espeak?
         send_data(generate_speech_captcha, disposition: 'inline', type: 'audio/wav')
       else

data/lib/easy_captcha/controller_helpers.rb

@@ -50,7 +50,7 @@ module EasyCaptcha
     # rubocop:disable Metrics/AbcSize, Naming/MemoizedInstanceVariableName
     def generate_captcha_code
       @captcha_code ||= begin
-        length = EasyCaptcha.captcha_character_count
+        length = EasyCaptcha.captcha_code_length
         # overwrite `current_captcha_code`
         session[:captcha] = Array.new(length) { EasyCaptcha.captcha_character_pool.sample }.join
         Rails.logger.info(

data/lib/easy_captcha/generator/default.rb

@@ -10,6 +10,8 @@ module EasyCaptcha
     # default generator
     class Default < Base
       DEFAULT_CONFIG = {
+        background_color: '#FFFFFF',
+        background_fill: nil,
         background_image: nil,
         blur: true,
         blur_radius: 1,
@@ -19,7 +21,6 @@ module EasyCaptcha
         font_size: 24,
         font_stroke: 0,
         font_stroke_color: '#000000',
-        image_background_color: '#FFFFFF',
         implode: 0.05,
         sketch: true,
         sketch_radius: 3,
@@ -36,15 +37,15 @@ module EasyCaptcha
         end
       end
 
-      # Gaussian Blur
+      # Background
+      attr_accessor :background_color, :background_fill, :background_image
+
+      # Blur
       attr_accessor :blur, :blur_radius, :blur_sigma
 
       # Font
       attr_accessor :font_size, :font_fill_color, :font, :font_family, :font_stroke, :font_stroke_color
 
-      # Background
-      attr_accessor :image_background_color, :background_image
-
       # Implode
       attr_accessor :implode
 
@@ -60,6 +61,18 @@ module EasyCaptcha
       # The CAPTCHA image
       attr_reader :image
 
+      def image_background_color=(val)
+        warn  '[DEPRECATION] EasyCaptcha configuration option `image_background_color` is deprecated. ' \
+              'Please use `background_color` instead.'
+        self.background_color = val
+      end
+
+      def image_background_color
+        warn  '[DEPRECATION] EasyCaptcha configuration option `image_background_color` is deprecated. ' \
+              'Please use `background_color` instead.'
+        background_color
+      end
+
       def blur? #:nodoc:
         @blur
       end
@@ -76,25 +89,27 @@ module EasyCaptcha
       def generate(code)
         @code = code
         render_code_in_image
-        apply_blur
-        apply_wave
-        apply_sketch
-        apply_implode
-        apply_crop
+        apply_effects
         create_blob
         set_image_encoding
         free_canvas
         @image
       end
 
+      def apply_effects
+        apply_sketch
+        apply_implode
+        apply_blur
+        apply_wave
+        apply_crop
+      end
+
       def create_blob
-        @image = begin
-          if generator_config.background_image.present?
-            create_composite_blob
-          else
-            canvas.to_blob { self.format = 'PNG' }
-          end
-        end
+        @image =  if generator_config.background_image.present?
+                    create_composite_blob
+                  else
+                    canvas.to_blob { self.format = 'PNG' }
+                  end
       end
 
       def create_composite_blob
@@ -128,37 +143,101 @@ module EasyCaptcha
       private
 
       def apply_blur
-        return unless blur?
-        @canvas = canvas.blur_image(generator_config.blur_radius, generator_config.blur_sigma)
+        return @canvas unless blur?
+        apply_image_blur
+        apply_motion_blur
+      end
+
+      def apply_image_blur
+        return @canvas unless canvas.respond_to?(:blur_image)
+        ###
+        # https://rmagick.github.io/image1.html#blur_image
+        # Parameters:
+        #     radius (Float) (defaults to: 0.0) - The radius of the Gaussian operator.
+        #     sigma (Float) (defaults to: 1.0) - The standard deviation of the Gaussian operator. Must be non-zero.
+        @canvas = canvas.blur_image(
+          generator_config.blur_radius,
+          generator_config.blur_sigma
+        )
+      end
+
+      def apply_motion_blur
+        return @canvas unless canvas.respond_to?(:motion_blur)
+        ###
+        # https://rmagick.github.io/image2.html#motion_blur
+        # Parameters:
+        #     radius (Float) (defaults to: 0.0) - The radius of the Gaussian operator.
+        #     sigma (Float) (defaults to: 1.0) - The standard deviation of the Gaussian operator. Must be non-zero.
+        #     angle (Float) (defaults to: 0.0) - The angle (in degrees) of the blurring motion.
+        @canvas = canvas.motion_blur(
+          generator_config.blur_radius,
+          generator_config.blur_sigma,
+          rand(180)
+        )
       end
 
       def apply_crop
+        return @canvas unless canvas.respond_to?(:crop)
         # Crop image because to big after waveing
+        ###
+        # https://rmagick.github.io/image1.html#crop
+        # Parameters:
+        #    gravity (Magick::GravityType) - the gravity type
+        #    width (Numeric) - width of region
+        #    height (Numeric) - height of region
         @canvas = canvas.crop(Magick::CenterGravity, EasyCaptcha.captcha_image_width, EasyCaptcha.captcha_image_height)
       end
 
       def apply_implode
+        ###
+        # https://rmagick.github.io/image2.html#implode
+        # Parameters:
+        #     amount (Float) (defaults to: 0.50) - The precentage to implode the image
         @canvas = canvas.implode(generator_config.implode.to_f) if generator_config.implode.is_a? Float
       end
 
       def apply_sketch
-        return unless sketch? && canvas.respond_to?(:sketch)
+        return @canvas unless sketch? && canvas.respond_to?(:sketch)
+        ###
+        # https://rmagick.github.io/image3.html#sketch
+        # Parameters:
+        #     radius (Float) (defaults to: 0.0) - The radius of the Gaussian operator.
+        #     sigma (Float) (defaults to: 1.0) - The standard deviation of the Gaussian operator.
+        #     angle (Float) (defaults to: 0.0) - The angle (in degrees) of the sketch lines.
         @canvas = canvas.sketch(generator_config.sketch_radius, generator_config.sketch_sigma, rand(180))
       end
 
       def apply_wave
-        return unless wave?
+        return @canvas unless wave? && canvas.respond_to?(:wave)
+        ###
+        # https://rmagick.github.io/image3.html#wave
+        # Parameters:
+        #     amplitude (Float) (defaults to: 25.0) - the amplitude
+        #     wavelength (Float) (defaults to: 150.0) - the wave length
         @canvas = canvas.wave(random_wave_amplitude, random_wave_length)
       end
 
+      # rubocop:disable Metrics/AbcSize
       def canvas
         config = generator_config
         @canvas = nil if @canvas.respond_to?('destroyed?') && @canvas.destroyed?
-        @canvas ||= Magick::Image.new(EasyCaptcha.captcha_image_width, EasyCaptcha.captcha_image_height) do |_variable|
-          self.background_color = config.image_background_color unless config.image_background_color.nil?
-          self.background_color = 'none' if config.background_image.present?
+        ###
+        # https://rmagick.github.io/image1.html#new
+        # Parameters:
+        #     cols (Numeric) - the image width
+        #     rows (Numeric) - the image height
+        #     fill (Magick::GradientFill, Magick::HatchFill, Magick::TextureFill) (defaults to: nil)
+        #                    - if object is given as fill argument, background color will be filled using it.
+        @canvas ||= Magick::Image.new(
+          EasyCaptcha.captcha_image_width,
+          EasyCaptcha.captcha_image_height,
+          config.background_fill
+        ) do |image|
+          image.background_color = config.background_color unless config.background_color.nil?
+          image.background_color = 'none' if config.background_image.present? || config.background_fill.present?
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def generator_config
         @generator_config ||= self

data/lib/easy_captcha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EasyCaptcha
-  VERSION = '0.9.2'
+  VERSION = '0.11.0'
 end

data/lib/generators/templates/easy_captcha.rb

@@ -46,6 +46,17 @@ EasyCaptcha.setup do |config|
   # #####
   # # Generator
   # config.generator :default do |generator|
+  #   # Backgound
+  #   # Ignored (set as `none`) when using custom background image or fill
+  #   generator.background_color = '#FFFFFF'
+  #   # An instance of a `Fill` class. RMagick supplies three `Fill` classes:
+  #   #    - `HatchFill`
+  #   #    - `GradientFill`
+  #   #    - `TextureFill`.
+  #   generator.background_fill  = nil
+  #   # Custom image to be used for CAPTCHA background
+  #   generator.background_image = nil
+  #
   #   # Blur
   #   generator.blur                   = true
   #   generator.blur_radius            = 1
@@ -58,10 +69,7 @@ EasyCaptcha.setup do |config|
   #   generator.font_stroke            = 0
   #   generator.font_stroke_color      = '#000000'
   #
-  #   # Image
-  #   generator.image_background_color = "#FFFFFF"
-  #
-  #   # Implode
+  #   # Implode  (the "funhouse mirror" effect; negative values allowed)
   #   generator.implode                = 0.1
   #
   #   # Sketch

data/spec/easy_captcha/generator/default_generator_spec.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'spec_helper'
+
+require 'easy_captcha'
+
+custom_generator_config_options = {
+  background_color: '#abc123',
+  background_fill: nil,
+  background_image: nil,
+  blur: true,
+  blur_radius: 2,
+  blur_sigma: 5,
+  font_size: 20,
+  font_fill_color: '#123456',
+  font_stroke_color: '#fedcba',
+  font_stroke: 2,
+  font_family: File.expand_path('../resources/afont.ttf', __dir__),
+  implode: 0.1,
+  sketch: true,
+  sketch_radius: 5,
+  sketch_sigma: 2,
+  wave: true,
+  wave_length: (50..80),
+  wave_amplitude: (2..8)
+}
+
+RSpec.describe EasyCaptcha::Generator::Default do
+  let(:default_config) { described_class::DEFAULT_CONFIG }
+  let(:length) { EasyCaptcha.captcha_code_length }
+  let(:code) { Array.new(length) { EasyCaptcha.captcha_character_pool.sample }.join }
+
+  before do
+    EasyCaptcha.setup
+  end
+
+  context 'when using defaults' do
+    let(:generator) { EasyCaptcha.generator }
+
+    described_class::DEFAULT_CONFIG.map do |k, v|
+      it "has #{k} value that matches the default config" do
+        expect(generator.send(k)).to eq v
+      end
+    end
+
+    context 'when generating an image' do
+      it 'generates an image' do
+        expect(generator.generate(code)).not_to be_empty
+      end
+    end
+  end
+
+  context 'when overriding defaults' do
+    let(:generator) do
+      described_class.new do |g|
+        custom_generator_config_options.each { |k, v| g.send("#{k}=", v) }
+      end
+    end
+
+    custom_generator_config_options.map do |k, v|
+      it "uses the `#{k}` value from the custom config" do
+        expect(generator.send(k)).to eq v
+      end
+    end
+
+    context 'when generating an image' do
+      it 'generates an image' do
+        expect(generator.generate(code)).not_to be_empty
+      end
+
+      describe 'canvas' do
+        let(:canvas) { generator.send(:canvas) }
+
+        it 'has a row count that matches the defined captcha_image_height' do
+          expect(canvas.rows).to eq EasyCaptcha.captcha_image_height
+        end
+
+        it 'has a columns count that matches the defined captcha_image_width' do
+          expect(canvas.columns).to eq EasyCaptcha.captcha_image_width
+        end
+
+        it 'has a background color that matches the defined background_color code' do
+          # RGB 8-bit hex codes (like `#abc123`) are converted to 16-bit (`#ababc1c12323`)
+          # I would expect `#abc123` to become `#00ab00c10023`, but that's not what happens
+          color_code = '#abc123'
+          generator.background_color = color_code
+          color_code_alnum = color_code[1..6]
+          sixteen_bit_color_code = '#' + color_code_alnum.scan(/../).map { |color| color * 2 }.join.upcase # rubocop:disable Style/StringConcatenation
+          expect(generator.send(:canvas).background_color).to eq sixteen_bit_color_code
+        end
+
+        it 'has a background color that matches the defined background_color name' do
+          # Using a color name string like "red"
+          color_name = 'red'
+          generator.background_color = color_name
+          expect(generator.send(:canvas).background_color).to eq color_name
+        end
+
+        it 'ignores the background_color value with using a `Fill` object' do
+          generator.background_fill = Magick::GradientFill.new(0, 0, 0, 1000, '#990000', '#000000')
+          # `nil` or `'none'` gets converted to `'black'`
+          expect(generator.send(:canvas).background_color).to eq 'black'
+        end
+      end
+    end
+  end
+end

data/spec/easy_captcha/generators/install_generator_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe EasyCaptcha::Generators::InstallGenerator, type: :generator do
     File.open "#{temp_dir}/app/controllers/application_controller.rb", 'w' do |f|
       f.write "class ApplicationController \nend"
     end
-    # Ensure taht `ApplicationController` is already defined.
+    # Ensure that `ApplicationController` is already defined.
     require "#{temp_dir}/app/controllers/application_controller.rb"
     run_generator
   end
@@ -33,39 +33,40 @@ RSpec.describe EasyCaptcha::Generators::InstallGenerator, type: :generator do
   end
   # rubocop:enable RSpec/BeforeAfterAll
 
-  # rubocop:disable Lint/AmbiguousBlockAssociation
-  specify do
-    expect(destination_root).to have_structure {
-      directory('config') do
-        directory('initializers') do
-          file('easy_captcha.rb') do
-            contains('EasyCaptcha.setup')
-          end
-        end
-      end
-    }
+  specify 'creates proper initializer' do
+    expect(destination_root).to(have_structure do
+                                  directory('config') do
+                                    directory('initializers') do
+                                      file('easy_captcha.rb') do
+                                        contains('EasyCaptcha.setup')
+                                      end
+                                    end
+                                  end
+                                end
+                               ) # editorconfig-checker-disable-line
   end
 
-  specify do
-    expect(destination_root).to have_structure {
-      directory('app') do
-        directory('controllers') do
-          file('application_controller.rb') do
-            contains('reset_last_captcha_code!')
-          end
-        end
-      end
-    }
+  specify 'adds `reset_last_captcha_code!` to `application_controller`' do
+    expect(destination_root).to(have_structure do
+                                  directory('app') do
+                                    directory('controllers') do
+                                      file('application_controller.rb') do
+                                        contains('reset_last_captcha_code!')
+                                      end
+                                    end
+                                  end
+                                end
+                               ) # editorconfig-checker-disable-line
   end
 
-  specify do
-    expect(destination_root).to have_structure {
-      directory('config') do
-        file('routes.rb') do
-          contains('captcha_route')
-        end
-      end
-    }
+  specify 'adds `captcha_route`' do
+    expect(destination_root).to(have_structure do
+                                  directory('config') do
+                                    file('routes.rb') do
+                                      contains('captcha_route')
+                                    end
+                                  end
+                                end
+                               ) # editorconfig-checker-disable-line
   end
-  # rubocop:enable Lint/AmbiguousBlockAssociation
 end

data/spec/easy_captcha_spec.rb

@@ -2,6 +2,14 @@
 
 require 'spec_helper'
 
+custom_captcha_config_options = {
+  cache: false,
+  captcha_character_pool: %w[2 4 6 8 A E I O U],
+  captcha_image_height: 6,
+  captcha_image_width: 9,
+  captcha_character_count: 6
+}
+
 describe EasyCaptcha do
   it 'has a VERSION' do
     expect(described_class::VERSION).not_to be_blank
@@ -13,57 +21,39 @@ describe EasyCaptcha do
         expect { described_class.setup }.not_to raise_error
       end
 
-      it 'will use defaults if no block given' do
-        described_class.setup
-      end
-
       it 'has default generator' do
         expect(described_class.generator).to be_an(EasyCaptcha::Generator::Default)
       end
-    end
 
-    context 'when chaging defaults' do
-      let(:captcha_config_options) do
-        {
-          cache: false,
-          captcha_character_pool: %w[2 4 6 8 A E I O U],
-          captcha_image_height: 6,
-          captcha_image_width: 9,
-          captcha_character_count: 6
-        }
-      end
+      context 'with default options' do
+        before do
+          described_class.setup
+        end
 
-      let(:generator_config_options) do
-        {
-          blur: true,
-          blur_radius: 1,
-          blur_sigma: 2,
-          font_size: 24,
-          font_fill_color: '#333333',
-          font_stroke_color: '#000000',
-          font_stroke: 0,
-          font_family: File.expand_path('../resources/afont.ttf', __dir__),
-          image_background_color: '#FFFFFF',
-          implode: 0.1,
-          sketch: true,
-          sketch_radius: 3,
-          sketch_sigma: 1,
-          wave: true,
-          wave_length: (60..100),
-          wave_amplitude: (3..5)
-        }
+        described_class::DEFAULT_CONFIG.map do |k, v|
+          it "has #{k} value that matches the default config" do
+            expect(described_class.send(k)).to eq v
+          end
+        end
       end
+    end
 
+    context 'when changing defaults' do
       before do
         described_class.setup do |config|
-          captcha_config_options.each { |k, v| config.send("#{k}=", v) }
-          config.generator(:default) { |generator| generator_config_options.each { |k, v| generator.send("#{k}=", v) } }
+          custom_captcha_config_options.each { |k, v| config.send("#{k}=", v) }
         end
       end
 
       it 'does not cache' do
         expect(described_class).not_to be_cache
       end
+
+      custom_captcha_config_options.map do |k, v|
+        it "uses the `#{k}` value from the custom config" do
+          expect(described_class.send(k)).to eq v
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -21,7 +21,3 @@ require 'action_dispatch'
 require 'action_view'
 require 'rspec/rails'
 require 'easy_captcha'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kandr-easy_captcha
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Marco Scholl
@@ -69,6 +69,7 @@ files:
 - spec/easy_captcha/captcha_spec.rb
 - spec/easy_captcha/controller_helpers_spec.rb
 - spec/easy_captcha/espeak_spec.rb
+- spec/easy_captcha/generator/default_generator_spec.rb
 - spec/easy_captcha/generators/install_generator_spec.rb
 - spec/easy_captcha/model_helpers_spec.rb
 - spec/easy_captcha/routing_spec.rb
@@ -77,7 +78,6 @@ files:
 - spec/fixtures/application.rb
 - spec/fixtures/controller.rb
 - spec/fixtures/model.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/K-and-R/easy_captcha
 licenses:
@@ -107,6 +107,7 @@ test_files:
 - spec/easy_captcha/captcha_spec.rb
 - spec/easy_captcha/controller_helpers_spec.rb
 - spec/easy_captcha/espeak_spec.rb
+- spec/easy_captcha/generator/default_generator_spec.rb
 - spec/easy_captcha/generators/install_generator_spec.rb
 - spec/easy_captcha/model_helpers_spec.rb
 - spec/easy_captcha/routing_spec.rb
@@ -115,5 +116,4 @@ test_files:
 - spec/fixtures/application.rb
 - spec/fixtures/controller.rb
 - spec/fixtures/model.rb
-- spec/spec.opts
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color