rucaptcha 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a2ec29d415f469e44f42688627705fea9d9fb1
-  data.tar.gz: 36a5267fa06eae4bfe53f7046a4e72db2127c610
+  metadata.gz: 7b416a66df71165fcd0c026e7aafbb858e1b3e39
+  data.tar.gz: e796e5f306d7b8a4f73bf46cf598257761caae9e
 SHA512:
-  metadata.gz: 2d1d97a3e1bffe49105835cc42c17039c90b1d32843030c79f20becfbef9c81cef0c380634df1ccca5532e727f6bcb7a2069c831799830da5ef3fc63b9d8fd5c
-  data.tar.gz: 552d3a13ff27c6a6f54ca9cbe1d4e9315ef1c469212eee210e8da7fb5d2e09f4f5fbe323ce3de593d37c9428401ad5bd01fcdc2bcd54476231acb6d3f24fa013
+  metadata.gz: 9c69ac42919fd8cdfe783f570efcbb682296e4394c1e61a9ffb211abf14796eed889d0fa0b6fbb8ee58c759af9036bb93add63c1e33c418267c4139a57b107d5
+  data.tar.gz: b60ee18e344f4ab2bc31ea6cef1e7cdbc5f69092ef93ccd860c1178e65624ed301e1e927f14ed6e0e07fd1b46f0ce4f78b6acc601558c0d772d5b8f493f6cc8e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+1.1.4
+-----
+
+- Fix #35 just give a warning message if not setup a right cache_store, only raise on :null_store.
+
 1.1.2
 -----
 

data/lib/rucaptcha/captcha.rb

@@ -3,6 +3,7 @@ require 'open3'
 module RuCaptcha
   class Captcha
     class << self
+      # Genrate ranom RGB color
       def random_color
         if RuCaptcha.config.style == :colorful
           color1 = rand(56) + 15
@@ -16,83 +17,103 @@ module RuCaptcha
         end
       end
 
+      # Genrate random Captcha code
       def random_chars
         chars = SecureRandom.hex(RuCaptcha.config.len / 2).downcase
         chars.gsub!(/[0ol1]/i, (rand(8) + 2).to_s)
         chars
       end
 
-      def rand_line_top(text_top, font_size)
-        text_top + rand(font_size * 0.7).to_i
-      end
-
       # Create Captcha image by code
       def create(code)
         chars        = code.split('')
-        all_left     = 20
-        font_size    = RuCaptcha.config.font_size
-        full_height  = font_size
-        full_width   = font_size * chars.size
+        full_width   = RuCaptcha.config.font_size * chars.size
+        full_height  = RuCaptcha.config.font_size
         size         = "#{full_width}x#{full_height}"
+
+        return convert_for_windows(size, code) if Gem.win_platform?
+
+        opts = command_line_opts(chars, full_width)
+        convert(size, opts)
+      end
+
+      private
+
+      def command_line_opts(chars, full_width)
+        font_size    = RuCaptcha.config.font_size
+        all_left     = 20
         half_width   = full_width / 2
         text_top     = 0
         text_left    = 0 - (font_size * 0.28).to_i
-        stroke_width = (font_size * 0.05).to_i + 1
         text_width   = font_size + text_left
-        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
+        opts = { text: [], line: [] }
+        rgbs = uniq_rgbs_for_each_chars(chars)
 
         chars.each_with_index do |char, i|
           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}"')
+          opts[:text] << %(-fill '#{text_color}' -draw 'text #{(text_left + text_width) * i + all_left},#{text_top} "#{char}"')
+
           left_y = rand_line_top(text_top, font_size)
           right_x = half_width + (half_width * 0.3).to_i
           right_y = rand_line_top(text_top, font_size)
-          line_opts << %(-draw 'stroke #{line_color} line #{rand(10)},#{left_y} #{right_x},#{right_y}')
+          opts[:line] << %(-draw 'stroke #{line_color} line #{rand(10)},#{left_y} #{right_x},#{right_y}')
         end
+        opts
+      end
 
+      def convert(size, opts)
+        stroke_width = (RuCaptcha.config.font_size * 0.05).to_i + 1
         command = <<-CODE
           convert -size #{size} \
           -strokewidth #{stroke_width} \
-          #{line_opts.join(' ')} \
-          -pointsize #{font_size} -weight 500 \
-          #{text_opts.join(' ')}  \
+          #{opts[:line].join(' ')} \
+          -pointsize #{RuCaptcha.config.font_size} -weight 500 \
+          #{opts[:text].join(' ')}  \
           -wave #{rand(2) + 3}x#{rand(2) + 1} \
           -rotate #{rand(10) - 5} \
           -gravity NorthWest -sketch 1x10+#{rand(2)} \
           -fill none \
           -implode #{RuCaptcha.config.implode} -trim label:- png:-
         CODE
+        command.strip!
+        out, err, _st = Open3.capture3(command)
+        warn "  RuCaptcha #{err.strip}" if err.present?
+        out
+      end
 
-        if Gem.win_platform?
-          png_file_path = Rails.root.join('tmp', 'cache', "#{code}.png")
-          command = "convert -size #{size} xc:White -gravity Center -weight 12 -pointsize 20 -annotate 0 \"#{code}\" -trim #{png_file_path}"
-          out, err, _st = Open3.capture3(command)
-          warn "  RuCaptcha #{err.strip}" if err.present?
-          png_file_path
-        else
-          command.strip!
-          out, err, _st = Open3.capture3(command)
-          warn "  RuCaptcha #{err.strip}" if err.present?
-          out
+      # Generate a simple captcha image for Windows Platform
+      def convert_for_windows(size, code)
+        png_file_path = Rails.root.join('tmp', 'cache', "#{code}.png")
+        command = "convert -size #{size} xc:White -gravity Center -weight 12 -pointsize 20 -annotate 0 \"#{code}\" -trim #{png_file_path}"
+        _out, err, _st = Open3.capture3(command)
+        warn "  RuCaptcha #{err.strip}" if err.present?
+        png_file_path
+      end
+
+      # Geneate a uniq rgba colors for each chars
+      def uniq_rgbs_for_each_chars(chars)
+        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
+        rgbs
+      end
+
+      def rand_line_top(text_top, font_size)
+        text_top + rand(font_size * 0.7).to_i
       end
 
       def warn(msg)

data/lib/rucaptcha/engine.rb

@@ -11,16 +11,21 @@ module RuCaptcha
       cache_store = RuCaptcha.config.cache_store
       store_name = cache_store.is_a?(Array) ? cache_store.first : cache_store
       if [:memory_store, :null_store, :file_store].include?(store_name)
-        raise "
+        msg = "
 
   RuCaptcha's cache_store requirements are stored across processes and machines,
   such as :mem_cache_store, :redis_store, or other distributed storage.
   But your current set is :#{store_name}.
 
   Please make config file `config/initializes/rucaptcha.rb` to setup `cache_store`.
-  More infomation please read GitHub rucaptcha README file.
+  More infomation please read GitHub RuCaptcha README file.
 
 "
+        if store_name == :null_store
+          raise msg
+        else
+          puts msg
+        end
       end
     end
   end

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = '1.1.2'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties