glebtv-simple_captcha 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c317ffb46efc02b32a774729631923802e597047
-  data.tar.gz: 38ddb5ce01cbdbc4bb626dfe13c999543e04cff1
+  metadata.gz: 449ca80c41d5dedc86f12d03538f9645a9dd7e45
+  data.tar.gz: 1a903f97a8f9101aeb807985ba229a252cf9969d
 SHA512:
-  metadata.gz: 4a3f9a98aed2cb7e3d8135d5516e7d7daec23285d85586cfe06ab3463c3d53046e304b0bef5fa1612db48be05d9c4b226ba47b5a8422904cf1112c243c1e74db
-  data.tar.gz: f20894ec31d8450f4d6ce6fbd1bd2fc286981e8424bf49a79af2890c2ea3a9703e68b893232365d65e51bd89fb6e460bbbf0b5effe6b6a1e937d39b0619dd1b6
+  metadata.gz: bd15460ff8d8ae922861b09fd920cf3fc4d6f8b6dd62ff9a3043085aeb11fae2157ffe89436e6e8ccaff26a1e17193d2cceaa7440a3b37d19c176ea057d946ed
+  data.tar.gz: 25670d30d876c24d618c04513a1ee6955e4a4338e5c79a89dc7306783517c10e90e0f904b9f533b134a97c20e33ffd0172d159f8893c64cfe4b3ccd2df2a8c86

data/lib/simple_captcha/image.rb

@@ -4,14 +4,10 @@ module SimpleCaptcha #:nodoc
 
     mattr_accessor :image_styles
     @@image_styles = {
-      'embosed_silver'  => ['-fill darkblue', '-shade 20x60', '-background white'],
-      'simply_red'      => ['-fill darkred', '-background white'],
-      'simply_green'    => ['-fill darkgreen', '-background white'],
-      'simply_blue'     => ['-fill darkblue', '-background white'],
-      'distorted_black' => ['-fill darkblue', '-edge 10', '-background white'],
-      'all_black'       => ['-fill darkblue', '-edge 2', '-background white'],
-      'charcoal_grey'   => ['-fill darkblue', '-charcoal 5', '-background white'],
-      'almost_invisible' => ['-fill red', '-solarize 50', '-background white']
+      'simply_red'   => ['-alpha set', '-fill darkred', '-background white', '-size 200x50', 'xc:white'],
+      'simply_green' => ['-alpha set', '-fill darkgreen', '-background white', '-size 200x50', 'xc:white'],
+      'simply_blue'  => ['-alpha set', '-fill darkblue', '-background white', '-size 200x50', 'xc:white'],
+      'red'          => ['-alpha set', '-fill \#A5A5A5', '-background \#800E19', '-size 245x60', 'xc:\#800E19'],
     }
 
     DISTORTIONS = ['low', 'medium', 'high']
@@ -68,10 +64,10 @@ module SimpleCaptcha #:nodoc
           params = ImageHelpers.image_params(SimpleCaptcha.image_style).dup
         else
           params = ImageHelpers.image_params_from_color(SimpleCaptcha.image_color).dup
+          params << "-size #{SimpleCaptcha.image_size} xc:transparent"
         end
-
-        params << "-size #{SimpleCaptcha.image_size} xc:transparent"
         params << "-gravity \"Center\""
+
         psz = SimpleCaptcha.pointsize
         if params.join(' ').index('-pointsize').nil?
           params << "-pointsize #{psz}"
@@ -80,24 +76,26 @@ 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 = -(1.5  * psz) + (index * 0.75 * psz) + rand(-3..3)
+          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}'\" "
         end
 
         params << "-wave #{amplitude}x#{frequency}"
 
-        (1..10).each do |i|
-          params << "-draw \"polyline #{rand(160)},#{rand(61)} #{rand(160)},#{rand(62)}\""
+        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
 
         params << "\"#{File.expand_path(dst.path)}\""
-        # puts "convert " + params.join(' ')
+
         SimpleCaptcha::Utils::run("convert", params.join(' '))
 
         dst.close
 
         File.expand_path(dst.path)
-                                                            #dst
       end
   end
 end

data/lib/simple_captcha/middleware.rb

@@ -46,7 +46,12 @@ module SimpleCaptcha
         options[:filename] ||= File.basename(path) unless options[:url_based_filename]
 
         status = options[:status] || 200
-        headers = {"Content-Disposition" => "#{options[:disposition]}; filename='#{options[:filename]}'", "Content-Type" => options[:type], 'Content-Transfer-Encoding' => 'binary', 'Cache-Control' => 'private'}
+        headers = {
+          "Content-Disposition" => "#{options[:disposition]}; filename='#{options[:filename]}'",
+          # "Content-Type" => options[:type],
+          'Content-Transfer-Encoding' => 'binary',
+          'Cache-Control' => 'private'
+        }
         response_body = [File.open(path, "rb").read]
         File.delete(path)
         

data/lib/simple_captcha/version.rb

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

data/lib/simple_captcha.rb

@@ -65,6 +65,9 @@ module SimpleCaptcha
   mattr_accessor :pointsize
   @@pointsize = 30
 
+  mattr_accessor :wave_count
+  @@wave_count = 10
+
   def self.add_image_style(name, params = [])
     SimpleCaptcha::ImageHelpers.image_styles.update(name.to_s => params)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-simple_captcha
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - GlebTv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport