glebtv-simple_captcha 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 449ca80c41d5dedc86f12d03538f9645a9dd7e45
-  data.tar.gz: 1a903f97a8f9101aeb807985ba229a252cf9969d
+  metadata.gz: 47a8b5c8bb484cd2b5022fb384db818731ab3c93
+  data.tar.gz: 101a1df32291dee59eaead58a01f95da12569ac2
 SHA512:
-  metadata.gz: bd15460ff8d8ae922861b09fd920cf3fc4d6f8b6dd62ff9a3043085aeb11fae2157ffe89436e6e8ccaff26a1e17193d2cceaa7440a3b37d19c176ea057d946ed
-  data.tar.gz: 25670d30d876c24d618c04513a1ee6955e4a4338e5c79a89dc7306783517c10e90e0f904b9f533b134a97c20e33ffd0172d159f8893c64cfe4b3ccd2df2a8c86
+  metadata.gz: e668d2c8def78e544e9f8513fc8b027f84e3189cb99a409a8202c87696038f0fa856193f18887c6026a60f85e93c077dcf01242109096c6ef215af07279a27f1
+  data.tar.gz: a082ea8c8e449b34d729ca537b22161cdb367b46fad9c702e9e675c85a0090501bee291c32e999adb7e4187c12532c8b6e1f937e0bff51c814083ef4cc8d1f79

data/lib/simple_captcha/image.rb

@@ -10,7 +10,7 @@ module SimpleCaptcha #:nodoc
       'red'          => ['-alpha set', '-fill \#A5A5A5', '-background \#800E19', '-size 245x60', 'xc:\#800E19'],
     }
 
-    DISTORTIONS = ['low', 'medium', 'high']
+    DISTORTIONS = ['none', 'low', 'medium', 'high']
 
     class << self
 
@@ -38,6 +38,7 @@ module SimpleCaptcha #:nodoc
           DISTORTIONS[rand(DISTORTIONS.length)] :
           DISTORTIONS.include?(key) ? key : 'low'
         case key.to_s
+          when 'none' then return [0, 100]
           when 'low' then return [0 + rand(2), 80 + rand(20)]
           when 'medium' then return [2 + rand(2), 50 + rand(20)]
           when 'high' then return [4 + rand(2), 30 + rand(20)]
@@ -56,6 +57,9 @@ module SimpleCaptcha #:nodoc
     end
 
     private
+      def letter_width
+        SimpleCaptcha.pointsize * 0.7
+      end
 
       def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         amplitude, frequency = ImageHelpers.distortion(SimpleCaptcha.distortion)
@@ -75,17 +79,24 @@ module SimpleCaptcha #:nodoc
 
         dst = Tempfile.new(RUBY_VERSION < '1.9' ? 'simple_captcha.png' : ['simple_captcha', '.png'], SimpleCaptcha.tmp_path)
         dst.binmode
-        text.split(//).each_with_index do |letter, index|
-          i = -(2  * psz) + (index * 0.7 * psz) + rand(-3..3)
-          params << "-draw \"translate #{i},#{rand(-3..3)} skewX #{rand(-15..15)} gravity center text 0,0 '#{letter}'\" "
+        
+        letters = text.split(//)
+        text_width = letters.size * letter_width
+        
+        letters.each_with_index do |letter, index|
+          translate = SimpleCaptcha.distortion == 'none' ? '' : "translate #{rand(-3..3)},#{rand(-3..3)} skewX #{rand(-15..15)}"
+          offset = index * letter_width - ( text_width - letter_width ) / 2
+          params << "-draw \"#{translate} gravity center text #{offset},0 '#{letter}'\" "
         end
 
-        params << "-wave #{amplitude}x#{frequency}"
+        unless SimpleCaptcha.distortion == 'none'
+          params << "-wave #{amplitude}x#{frequency}"
 
-        unless params.join(' ').index('-size').nil?
-          size = params.join(' ').match '-size (\d+)x(\d+)'
-          (1..SimpleCaptcha.wave_count).each do |i|
-            params << "-draw \"polyline #{rand(size[1].to_i)},#{rand(size[2].to_i)} #{rand(size[1].to_i)},#{rand(size[2].to_i)}\""
+          unless params.join(' ').index('-size').nil?
+            size = params.join(' ').match '-size (\d+)x(\d+)'
+            (1..SimpleCaptcha.wave_count).each do |i|
+              params << "-draw \"polyline #{rand(size[1].to_i)},#{rand(size[2].to_i)} #{rand(size[1].to_i)},#{rand(size[2].to_i)}\""
+            end
           end
         end
 

data/lib/simple_captcha/model_helpers.rb

@@ -54,6 +54,8 @@ module SimpleCaptcha #:nodoc
       end
       
       def is_captcha_valid?
+        return true if captcha.present? && Rails.env.test?
+
         v = SimpleCaptcha::Utils::simple_captcha_value(captcha_key)
         if captcha && !v.nil? && captcha.upcase.delete(" ") == v.upcase
           SimpleCaptcha::Utils::simple_captcha_passed!(captcha_key)

data/lib/simple_captcha/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module SimpleCaptcha
-  VERSION = "0.6.1".freeze
+  VERSION = "0.6.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-simple_captcha
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - GlebTv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,27 +31,27 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- lib/simple_captcha.rb
-- lib/generators/simple_captcha_generator.rb
+- README.rdoc
+- Rakefile
 - lib/generators/USAGE
+- lib/generators/simple_captcha_generator.rb
 - lib/generators/templates/migration.rb
 - lib/generators/templates/partial.erb
-- lib/simple_captcha/version.rb
+- lib/glebtv-simple_captcha.rb
+- lib/simple_captcha.rb
+- lib/simple_captcha/controller.rb
 - lib/simple_captcha/engine.rb
-- lib/simple_captcha/utils.rb
-- lib/simple_captcha/storage/active_record.rb
-- lib/simple_captcha/storage/mongoid.rb
+- lib/simple_captcha/hooks/form_builder.rb
+- lib/simple_captcha/hooks/formtastic.rb
+- lib/simple_captcha/hooks/simple_form.rb
 - lib/simple_captcha/image.rb
-- lib/simple_captcha/view.rb
 - lib/simple_captcha/middleware.rb
 - lib/simple_captcha/model_helpers.rb
-- lib/simple_captcha/controller.rb
-- lib/simple_captcha/hooks/simple_form.rb
-- lib/simple_captcha/hooks/form_builder.rb
-- lib/simple_captcha/hooks/formtastic.rb
-- lib/glebtv-simple_captcha.rb
-- Rakefile
-- README.rdoc
+- lib/simple_captcha/storage/active_record.rb
+- lib/simple_captcha/storage/mongoid.rb
+- lib/simple_captcha/utils.rb
+- lib/simple_captcha/version.rb
+- lib/simple_captcha/view.rb
 homepage: http://github.com/glebtv/simple-captcha
 licenses: []
 metadata: {}
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A fork of a fork of a fork of simple_captcha.