rucaptcha 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fe1a21f8a2142b7b430c62264738016bf803c48
-  data.tar.gz: de11fac7290c95d9e5b6a137bd88f9a9225ac8bd
+  metadata.gz: 0b8fc53f553af82a9e3c1ea5ff203058d1c94220
+  data.tar.gz: 675808db49191ce5c2396fa390fd764084557de6
 SHA512:
-  metadata.gz: 2177bdc67c19738d3a953c73cc0891680500ed7492b7fa59d4f0f873d7d82f2df47175afd90310c9245b8230376fc6143985c6e488bfbee8388d4d48168a9ff6
-  data.tar.gz: 0d69113ab3343156f6a74a860239f3cc9da6434aa3e3289b3f40804ab3cccb0f156c3c8bdaade59a10ad1cfe0be365d8fc30d8e332314f040e00e00ec0c7c5c0
+  metadata.gz: 579416c175a280721232673ac4cc619fa76c9dd77b39d39cf4e0c203f31866b8476afe5ab00e3e53d711b0195b0c7e2080b77b6051aaa8bddb1efd5708a5080d
+  data.tar.gz: 5c8f783af7b9ef4909bf5fab282e35727d2c879c48021a2d5ec7cf3cae5bfd67edc1e72dc619f8f61cfbf24c0e6487aedb6157a3f88286f9586039ec2cfa3730

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+1.0.0
+-----
+
+- Adjust to avoid lighter colors.
+- Avoid continuous chars have same color.
+- Use same color for each chars in :black_white mode.
+
 0.5.1
 -----
 

data/lib/rucaptcha/captcha.rb

@@ -5,19 +5,17 @@ module RuCaptcha
     class << self
       def random_color
         if RuCaptcha.config.style == :colorful
-          color = [random_color_seed, random_color_seed, random_color_seed]
-          color[rand(3)] = 0.to_s(8)
+          color1 = rand(56) + 15
+          color2 = rand(10) + 140
+          color = [color1, color2, rand(15)]
+          color.shuffle!
           color
         else
-          color_seed = rand(50).to_s(8)
+          color_seed = rand(40) + 10
           [color_seed, color_seed, color_seed]
         end
       end
 
-      def random_color_seed
-        (rand(150) + 10).to_s(8)
-      end
-
       def random_chars
         chars = SecureRandom.hex(RuCaptcha.config.len / 2).downcase
         chars.gsub!(/[0ol1]/i, (rand(8) + 2).to_s)
@@ -44,8 +42,23 @@ module RuCaptcha
         text_opts    = []
         line_opts    = []
 
+        rgbs = []
+        chars.count.times do |i|
+          color = random_color
+          if i > 0
+            preview_color = rgbs[i - 1]
+            # Avoid color same as preview color
+            if color.index(color.min) == preview_color.index(preview_color.min) &&
+               color.index(color.max) == preview_color.index(preview_color.max)
+              # adjust RGB order
+              color = [color[1], color[2], color[0]]
+            end
+          end
+          rgbs << color
+        end
+
         chars.each_with_index do |char, i|
-          rgb = random_color
+          rgb = RuCaptcha.config.style == :colorful ? rgbs[i] : rgbs[0]
           text_color = "rgba(#{rgb.join(',')}, 1)"
           line_color = "rgba(#{rgb.join(',')}, 0.6)"
           text_opts << %(-fill '#{text_color}' -draw 'text #{(text_left + text_width) * i + all_left},#{text_top} "#{char}"')

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = '0.5.1'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -47,7 +47,8 @@ files:
 - lib/rucaptcha/version.rb
 - lib/rucaptcha/view_helpers.rb
 homepage: https://github.com/huacnlee/rucaptcha
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -57,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: This is a Captcha gem for Rails Application. It run ImageMagick command to