easy_captcha 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4b4cd64f6afe57557da86b631154a0b18be4cd8
-  data.tar.gz: 0e70999850af752841bd0f697d1fe5220c0f5031
+  metadata.gz: 5d677d4f711f8c85c5ad9c1eab34f214e70de508
+  data.tar.gz: 472562770ddff03f0f84fb67eb5d0ed873183114
 SHA512:
-  metadata.gz: 84896042be3aafd978e24755cbf0183ebc33bb608d9ef9774c9d984a6251500ad4a883519a8948f01feb5c14f910b19b7b1d76292b0e533a23f932beeecc8469
-  data.tar.gz: 540b371f38cc1f89d2712d5c811d8e625dd2ed726d4d718f0250ea97f5a324f73c0624ec69b0f786ebb6d785e696da37a5862959f679497c93d6c665db713069
+  metadata.gz: 90c942e04a357cf9c84ec1348af37785cc43bf60d9ea7af2f687e2ab54079f9ccec4cad2e7051aba272151936a846aa69d89375eb3a94602d374eb67edb0a832
+  data.tar.gz: db59832dcd59c726dc2de7b713a53a8570b33fc927b4621c4f258a07b3ee14ad6462591bfdb58b50ec9aa9f5fc3c817a7ca2cc987fbdb8cef406031bb505fede

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_captcha (0.6.4)
+    easy_captcha (0.6.5)
       bundler (>= 1.1.0)
       rails (>= 3.0.0)
       rmagick (>= 2.13.1)
@@ -12,98 +12,127 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.10)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
+      globalid (>= 0.3.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
     erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.4)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    minitest (4.7.5)
-    multi_json (1.7.7)
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.8.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+      railties (= 4.2.3)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rmagick (2.13.2)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    rspec-rails (2.14.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.10.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    rake (10.4.2)
+    rmagick (2.15.3)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.3)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sprockets (3.3.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.0)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.14)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    yard (0.8.6.2)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   easy_captcha!
+
+BUNDLED WITH
+   1.10.3

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 require 'yard'
-YARD::Rake::YardocTask.new
+YARD::Rake::YardocTask.new

data/lib/easy_captcha.rb

@@ -1,4 +1,3 @@
-require 'RMagick'
 require 'rails'
 require 'action_controller'
 require 'active_record'
@@ -8,7 +7,7 @@ require 'active_support'
 module EasyCaptcha
   autoload :Espeak, 'easy_captcha/espeak'
   autoload :Captcha, 'easy_captcha/captcha'
-  autoload :Controller, 'easy_captcha/controller'
+  autoload :CaptchaController, 'easy_captcha/captcha_controller'
   autoload :ModelHelpers, 'easy_captcha/model_helpers'
   autoload :ViewHelpers, 'easy_captcha/view_helpers'
   autoload :ControllerHelpers, 'easy_captcha/controller_helpers'

data/lib/easy_captcha/{controller.rb → captcha_controller.rb}

@@ -1,6 +1,6 @@
 module EasyCaptcha
   # captcha controller
-  class Controller < ActionController::Base
+  class CaptchaController < ActionController::Base
     before_filter :overwrite_cache_control
     # captcha action send the generated image to browser
     def captcha

data/lib/easy_captcha/generator/default.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module EasyCaptcha
   module Generator
 
@@ -9,7 +10,7 @@ module EasyCaptcha
       def defaults
         @font_size              = 24
         @font_fill_color        = '#333333'
-        @font		        = File.expand_path('../../../../resources/captcha.ttf', __FILE__)
+        @font                   = File.expand_path('../../../../resources/captcha.ttf', __FILE__)
         @font_stroke            = '#000000'
         @font_stroke_color      = 0
         @image_background_color = '#FFFFFF'
@@ -57,6 +58,8 @@ module EasyCaptcha
 
       # generate image
       def generate(code)
+        require 'rmagick' unless defined?(Magick)
+
         config = self
         canvas = Magick::Image.new(EasyCaptcha.image_width, EasyCaptcha.image_height) do |variable|
           self.background_color = config.image_background_color unless config.image_background_color.nil?
@@ -66,7 +69,7 @@ module EasyCaptcha
         # Render the text in the image
         canvas.annotate(Magick::Draw.new, 0, 0, 0, 0, code) {
           self.gravity     = Magick::CenterGravity
-          self.font 	   = config.font
+          self.font        = config.font
           self.font_weight = Magick::LighterWeight
           self.fill        = config.font_fill_color
           if config.font_stroke.to_i > 0
@@ -101,7 +104,7 @@ module EasyCaptcha
 
           image = background.to_blob { self.format = 'PNG' }
         else
-                image = canvas.to_blob { self.format = 'PNG' }
+          image = canvas.to_blob { self.format = 'PNG' }
         end
 
         # ruby-1.9

data/lib/easy_captcha/routes.rb

@@ -3,7 +3,7 @@ module ActionDispatch #:nodoc:
     class Mapper #:nodoc:
       # call to add default captcha root
       def captcha_route
-        match 'captcha' => EasyCaptcha::Controller, :action => :captcha, :via => :get
+        match 'captcha' => 'easy_captcha/captcha#captcha', :via => :get
       end
     end
   end

data/lib/easy_captcha/version.rb

@@ -1,3 +1,3 @@
 module EasyCaptcha
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/spec/easy_captcha_spec.rb

@@ -1,59 +1,57 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe EasyCaptcha do
-
   describe :setup do
     EasyCaptcha.setup do |config|
       # Cache
-      config.cache        = false
+      config.cache = false
 
       # 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)
+      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.length = 6
 
       # Image
       config.image_height = 40
-      config.image_width  = 140
+      config.image_width = 140
 
       # configure 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_family            = File.expand_path('../../resources/afont.ttf', __FILE__)
+        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__)
 
-        generator.image_background_color = "#FFFFFF"
+        generator.image_background_color = '#FFFFFF'
 
         # Wave
-        generator.wave                   = true
-        generator.wave_length            = (60..100)
-        generator.wave_amplitude         = (3..5)
+        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
+        generator.sketch = true
+        generator.sketch_radius = 3
+        generator.sketch_sigma = 1
 
         # Implode
-        generator.implode                = 0.1
+        generator.implode = 0.1
 
         # Blur
-        generator.blur                   = true
-        generator.blur_radius            = 1
-        generator.blur_sigma             = 2
+        generator.blur = true
+        generator.blur_radius = 1
+        generator.blur_sigma = 2
       end
     end
 
-    it "sould not cache" do
+    it 'sould not cache' do
       EasyCaptcha.cache?.should be_false
     end
 
-    it "should have default generator" do
+    it 'should have default generator' do
       EasyCaptcha.generator.should be_an(EasyCaptcha::Generator::Default)
     end
 
@@ -61,56 +59,56 @@ describe EasyCaptcha do
       before do
         EasyCaptcha.setup do |config|
           # Length
-          config.length                 = 6
+          config.length = 6
 
           # Image
-          config.image_height           = 40
-          config.image_width            = 140
-
-          # Font
-          config.font_size              = 24
-          config.font_fill_color        = '#333333'
-          config.font_stroke_color      = '#000000'
-          config.font_stroke            = 0
-          config.font_family            = File.expand_path('../../resources/afont.ttf', __FILE__)
-
-          config.image_background_color = "#FFFFFF"
-
-          # Wave
-          config.wave                   = true
-          config.wave_length            = (60..100)
-          config.wave_amplitude         = (3..5)
-
-          # Sketch
-          config.sketch                 = true
-          config.sketch_radius          = 3
-          config.sketch_sigma           = 1
-
-          # Implode
-          config.implode                = 0.1
-
-          # Blur
-          config.blur                   = true
-          config.blur_radius            = 1
-          config.blur_sigma             = 2
+          config.image_height = 40
+          config.image_width = 140
+
+          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_family = File.expand_path('../../resources/afont.ttf', __FILE__)
+
+            generator.image_background_color = '#FFFFFF'
+
+            # 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
+          end
         end
       end
 
-      it "get config" do
+      it 'get config' do
         [
-            :font_size, :font_fill_color, :font_family, :font_stroke, :font_stroke_color,
-            :image_background_color, :sketch, :sketch_radius, :sketch_sigma, :wave,
-            :wave_length, :wave_amplitude, :implode, :blur, :blur_radius, :blur_sigma
+          :font_size, :font_fill_color, :font_family, :font_stroke, :font_stroke_color,
+          :image_background_color, :sketch, :sketch_radius, :sketch_sigma, :wave,
+          :wave_length, :wave_amplitude, :implode, :blur, :blur_radius, :blur_sigma
         ].each do |method|
-          EasyCaptcha.send("#{method}").should_not be_nil
+          EasyCaptcha.generator.send(method).should_not be_nil
         end
       end
 
-      it "method_missing should call normal on non depracations" do
-        lambda { EasyCaptcha.send("a_missing_method") }.should raise_error 
+      it 'method_missing should call normal on non depracations' do
+        -> { EasyCaptcha.send('a_missing_method') }.should raise_error
       end
     end
-
   end
-
 end

data/spec/espeak_spec.rb

@@ -2,23 +2,22 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe EasyCaptcha::Espeak do
-  context "check default values" do
+  context 'check default values' do
     subject { EasyCaptcha::Espeak.new }
 
-    its(:amplitude) { (80..120).to_a.should include(subject) }
-    its(:pitch) { (30..70).to_a.should include(subject) }
+    its(:amplitude) { (80..120).should include(subject.amplitude) }
+    its(:pitch) { (30..70).should include(subject.pitch) }
     its(:gap) { should eq 80 }
     its(:voice) { should be_nil }
-
   end
 
-  context "check config: voices" do
+  context 'check config: voices' do
     let(:voices) { ['german', 'german+m1'] }
     subject do
       EasyCaptcha::Espeak.new do |config|
         config.voice = voices
       end
     end
-    its(:voice) { voices.should include(subject) }
+    it { voices.should include(subject.voice) }
   end
 end

data/spec/spec_helper.rb

@@ -5,13 +5,8 @@ begin
   SimpleCov.start 'rails'
 rescue LoadError
 end
-require 'rspec'
 require 'easy_captcha'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-RSpec.configure do |config|
-
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_captcha
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Marco Scholl
@@ -15,84 +15,84 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.1
 description: Captcha-Plugin for Rails
@@ -103,8 +103,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -114,7 +114,7 @@ files:
 - init.rb
 - lib/easy_captcha.rb
 - lib/easy_captcha/captcha.rb
-- lib/easy_captcha/controller.rb
+- lib/easy_captcha/captcha_controller.rb
 - lib/easy_captcha/controller_helpers.rb
 - lib/easy_captcha/espeak.rb
 - lib/easy_captcha/generator.rb
@@ -141,17 +141,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Captcha-Plugin for Rails