simple_captcha2 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaae4d5f2ddd3caa10ef19b27e3792fd10dfff15
-  data.tar.gz: 95060e2be4aec6e2a3cde73f811fdca235aacd1b
+  metadata.gz: 82daa59541bc47e50ecfb13d95b1672d953b0b79
+  data.tar.gz: 217de8368d88deb6720440ee8a69124ddbbcef83
 SHA512:
-  metadata.gz: 41c2f4d97a08574b12fd6ab816ac180d69f0c2476f4eb31527082fe3b47cbec4aff724b399aa683e0682f9287b198f47bdadf21354cc56ea7480038c5c58f50c
-  data.tar.gz: 6c049534725511c94c2fa734265bd143dbc833e577f51004bc895956889ad46f9015b495ee6b850c76b0d383e332efe82d5f3aa1b1e8f761f2fb4576218fcd55
+  metadata.gz: 0885a9d47688ebeb81930e1cb7716ad3c7aa3c453f67c067961985f05b232ee8b53c930709899c340ec3c172d921388cdd93410aafbdfaaa155db5f1fac57cba
+  data.tar.gz: f293939ccb2a80ce257ea200ed711fcfbbfd13bd5ed2cf526136d23b25187ac63a86a7b439b228140cbe13e2fac15845539c3dcec846901dde1b7887b7194d89

data/README.md

@@ -45,7 +45,7 @@ After installation, follow these simple steps to setup the plugin. The setup wil
 
 ```bash
 rails generate simple_captcha
-rake db:migrate
+rake db:migrate # Mongoid: skip this step and remove the migration
 ```
 
 ## Usage
@@ -96,6 +96,23 @@ class User < ActiveRecord::Base
 end
 ```
 
+Mongoid:
+
+```ruby
+class User
+  include SimpleCaptcha::ModelHelpers
+  apply_simple_captcha
+end
+```
+
+#### Strong parameters (Rails 4.x)
+
+Must add them:
+
+```ruby
+:captcha, :captcha_key
+```
+
 ####Form-Builder helper
 
 ```erb
@@ -174,6 +191,8 @@ You can also specify 'random' to select the random image style.
 
 * ``:distortion`` - handles the complexity of the image. The :distortion can be set to 'low', 'medium' or 'high'. Default is 'low'.
 
+* ``:implode`` - handles the complexity of the image. The :implode can be set to 'none', 'low', 'medium' or 'high'. Default is 'medium'.
+
 Create "./config/initializers/simple_captcha.rb"
 
 ```ruby
@@ -200,6 +219,10 @@ SimpleCaptcha.setup do |sc|
   # default: low
   # possible values: 'low', 'medium', 'high', 'random'
   sc.distortion = 'medium'
+
+  # default: medium
+  # possible values: 'none', 'low', 'medium', 'high'
+  sc.implode = 'low'
 end
 ```
 
@@ -281,6 +304,7 @@ en:
   simple_captcha:
     placeholder: "Enter the image value"
     label: "Enter the code in the box:"
+    refresh_button_text: "Refresh"
     message:
       default: "Secret Code did not match with the Image"
       user: "The secret Image and code were different"

data/lib/simple_captcha.rb

@@ -47,6 +47,10 @@ module SimpleCaptcha
   mattr_accessor :distortion
   @@distortion = 'low'
 
+  # 'none', 'low', 'medium', 'high'
+  mattr_accessor :implode
+  @@implode = SimpleCaptcha::ImageHelpers::DEFAULT_IMPLODE
+
   # command path
   mattr_accessor :image_magick_path
   @@image_magick_path = ''
@@ -55,6 +59,10 @@ module SimpleCaptcha
   mattr_accessor :tmp_path
   @@tmp_path = nil
 
+  # additive noise
+  mattr_accessor :noise
+  @@noise = 0
+
   def self.add_image_style(name, params = [])
     SimpleCaptcha::ImageHelpers.image_styles.update(name.to_s => params)
   end

data/lib/simple_captcha/image.rb

@@ -16,6 +16,9 @@ module SimpleCaptcha #:nodoc
 
     DISTORTIONS = ['low', 'medium', 'high']
 
+    IMPLODES = { 'none' => 0, 'low' => 0.1, 'medium' => 0.2, 'high' => 0.3 }
+    DEFAULT_IMPLODE = 'medium'
+
     class << self
 
       def image_params(key = 'simply_blue')
@@ -43,6 +46,10 @@ module SimpleCaptcha #:nodoc
           when 'high' then return [4 + rand(2), 30 + rand(20)]
         end
       end
+
+      def implode
+        IMPLODES[SimpleCaptcha.implode] || IMPLODES[DEFAULT_IMPLODE]
+      end
     end
 
     if RUBY_VERSION < '1.9'
@@ -64,23 +71,14 @@ module SimpleCaptcha #:nodoc
         params = ImageHelpers.image_params(SimpleCaptcha.image_style).dup
         params << "-size #{SimpleCaptcha.image_size}"
         params << "-wave #{amplitude}x#{frequency}"
-        #params << "-gravity 'Center'"
-        params << "-gravity \"Center\""
+        params << "-gravity Center"
         params << "-pointsize 22"
-        params << "-implode 0.2"
-
-        dst = Tempfile.new(RUBY_VERSION < '1.9' ? 'simple_captcha.jpg' : ['simple_captcha', '.jpg'], SimpleCaptcha.tmp_path)
-        dst.binmode
-
-        #params << "label:#{text} '#{File.expand_path(dst.path)}'"
-        params << "label:#{text} \"#{File.expand_path(dst.path)}\""
+        params << "-implode #{ImageHelpers.implode}"
+        params << "label:#{text}"
+        params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
+        params << "jpeg:-"
 
         SimpleCaptcha::Utils::run("convert", params.join(' '))
-
-        dst.close
-
-        File.expand_path(dst.path)
-        #dst
       end
   end
 end

data/lib/simple_captcha/middleware.rb

@@ -39,7 +39,7 @@ module SimpleCaptcha
           #body = generate_simple_captcha_image(code)
           #headers['Content-Type'] = 'image/jpeg'
 
-          send_file(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
+          send_data(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
         else
           [status, headers, body]
         end
@@ -61,6 +61,13 @@ module SimpleCaptcha
         [status, headers, response_body]
       end
 
+      def send_data(response_body, options = {})
+        status = options[:status] || 200
+        headers = {"Content-Disposition" => "#{options[:disposition]}; filename='#{options[:filename]}'", "Content-Type" => options[:type], 'Content-Transfer-Encoding' => 'binary', 'Cache-Control' => 'private'}
+
+        [status, headers, [response_body]]
+      end
+
       def refresh_code(env)
         request = Rack::Request.new(env)
 

data/lib/simple_captcha/version.rb

@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

data/lib/simple_captcha/view.rb

@@ -65,12 +65,7 @@ module SimpleCaptcha #:nodoc
     private
 
       def simple_captcha_image(simple_captcha_key, options = {})
-        defaults = {}
-        defaults[:time] = options[:time] || Time.now.to_i
-
-        query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        url = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
-
+        url = simple_captcha_image_url simple_captcha_key, options: options
         id = simple_captcha_image_id(options)
         tag('img', :src => url, :alt => 'captcha', :id => id)
       end
@@ -79,8 +74,13 @@ module SimpleCaptcha #:nodoc
         defaults = {}
         defaults[:time] = options[:time] || Time.now.to_i
 
-        query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        query = defaults.to_query
+        path = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        if defined?(request) && request
+          "#{request.protocol}#{request.host_with_port}#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
+        else
+          "#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
+        end
       end
 
       def simple_captcha_field(options={})
@@ -133,8 +133,8 @@ module SimpleCaptcha #:nodoc
         return value
       end
 
-      def simple_captcha_key(key_name = nil, request = request)
-        local_session = request.try(:session) || session
+      def simple_captcha_key(key_name = nil, prequest = request)
+        local_session = prequest.try(:session) || session
         if key_name.nil?
           local_session[:captcha] ||= SimpleCaptcha::Utils.generate_key(local_session[:id].to_s, 'captcha')
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_captcha2
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Pavlo Galeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails