simple_captcha2 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4023b32b748c4923af4ffa42624e3f3c325b23
-  data.tar.gz: cd25c309a52d752a882c4f7438ee62cf44ac1791
+  metadata.gz: eaae4d5f2ddd3caa10ef19b27e3792fd10dfff15
+  data.tar.gz: 95060e2be4aec6e2a3cde73f811fdca235aacd1b
 SHA512:
-  metadata.gz: 0294813a816747ab51b76fd753bd7c0be3cf0492889e1bddc614401d30649d21900ed2f4754940d61a4e6b9e8c92f6947108bb22624023a0aff3c3cf972a9c8e
-  data.tar.gz: ae404e7cc38bfd4b7cefa3dc6b14d811ee786f447296c0180a62df899b0063b3bf7d4f840187caef67ff75d7e6415f6d02a5018c967af5f313b3a830b2d43013
+  metadata.gz: 41c2f4d97a08574b12fd6ab816ac180d69f0c2476f4eb31527082fe3b47cbec4aff724b399aa683e0682f9287b198f47bdadf21354cc56ea7480038c5c58f50c
+  data.tar.gz: 6c049534725511c94c2fa734265bd143dbc833e577f51004bc895956889ad46f9015b495ee6b850c76b0d383e332efe82d5f3aa1b1e8f761f2fb4576218fcd55

data/README.md

@@ -153,6 +153,7 @@ fill_in 'captcha', with: SimpleCaptcha::SimpleCaptchaData.first.value
 * ``:label`` - provides the custom text b/w the image and the text field, the default is "type the code from the image"
 * ``:object`` - the name of the object of the model class, to implement the model based captcha.
 * ``:code_type`` - return numeric only if set to 'numeric'
+* ``:multiple`` - allow to use the same captcha in multiple forms in one page. True for the first appaerance and false for the rest.
 
 ###Global options
 

data/lib/generators/templates/partial.erb

@@ -1,4 +1,4 @@
-<style type="text/CSS">
+<style type="text/css">
   .simple_captcha{border: 1px solid #ccc; padding: 5px !important;}
   .simple_captcha,
   .simple_captcha div{display: table;}
@@ -26,12 +26,16 @@
   <div class='simple_captcha_image'>
     <%%= simple_captcha_options[:image] %>
   </div>
-  
+
   <div class='simple_captcha_field'>
     <%%= simple_captcha_options[:field] %>
   </div>
-  
+
   <div class='simple_captcha_label'>
     <%%= simple_captcha_options[:label] %>
   </div>
+
+  <div class='simple_captcha_refresh_button'>
+    <%%= simple_captcha_options[:refresh_button] %>
+  </div>
 </div>

data/lib/simple_captcha.rb

@@ -14,8 +14,9 @@ module SimpleCaptcha
   autoload :FormBuilder,       'simple_captcha/form_builder'
   autoload :CustomFormBuilder, 'simple_captcha/formtastic'
 
+  autoload :ModelHelpers,      'simple_captcha/model_helpers'
+
   if defined?(ActiveRecord)
-    autoload :ModelHelpers,      'simple_captcha/active_record'
     autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data'
   else
     autoload :SimpleCaptchaData,      'simple_captcha/simple_captcha_data_mongoid.rb'

data/lib/simple_captcha/middleware.rb

@@ -2,47 +2,53 @@
 module SimpleCaptcha
   class Middleware
     include SimpleCaptcha::ImageHelpers
-    
+    include SimpleCaptcha::ViewHelper
+
     DEFAULT_SEND_FILE_OPTIONS = {
       :type         => 'application/octet-stream'.freeze,
       :disposition  => 'attachment'.freeze,
     }.freeze
-    
+
     def initialize(app, options={})
       @app = app
       self
     end
-    
+
     def call(env) # :nodoc:
       if env["REQUEST_METHOD"] == "GET" && captcha_path?(env['PATH_INFO'])
-        make_image(env)
+        request = Rack::Request.new(env)
+        if request.params.present? && request.params['code'].present?
+          make_image(env)
+        else
+          refresh_code(env)
+        end
       else
         @app.call(env)
       end
     end
-    
+
     protected
       def make_image(env, headers = {}, status = 404)
         request = Rack::Request.new(env)
         code = request.params["code"]
         body = []
-        
-        if !code.blank? && Utils::simple_captcha_value(code)
+
+        if Utils::simple_captcha_value(code)
           #status, headers, body = @app.call(env)
           #status = 200
           #body = generate_simple_captcha_image(code)
           #headers['Content-Type'] = 'image/jpeg'
-          
-          return send_file(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
+
+          send_file(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
+        else
+          [status, headers, body]
         end
-        
-        [status, headers, body]
       end
-      
+
       def captcha_path?(request_path)
         request_path.include?('/simple_captcha')
       end
-      
+
       def send_file(path, options = {})
         raise MissingFile, "Cannot read file #{path}" unless File.file?(path) and File.readable?(path)
 
@@ -51,8 +57,28 @@ module SimpleCaptcha
         status = options[:status] || 200
         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")
-        
+
         [status, headers, response_body]
       end
+
+      def refresh_code(env)
+        request = Rack::Request.new(env)
+
+        request.session.delete :captcha
+        key = simple_captcha_key(nil, request)
+        options = {}
+        options[:field_value] = set_simple_captcha_data(key, options)
+        url = simple_captcha_image_url(key, options)
+
+        status = 200
+        id = request.params['id']
+
+        body = %Q{
+                    $("##{id}").attr('src', '#{url}');
+                    $("#captcha_key").attr('value', '#{key}');
+                  }
+        headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}
+        [status, headers, [body]]
+      end
   end
 end

data/lib/simple_captcha/version.rb

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

data/lib/simple_captcha/view.rb

@@ -44,14 +44,21 @@ module SimpleCaptcha #:nodoc
     # All Feedbacks/CommentS/Issues/Queries are welcome.
     def show_simple_captcha(options={})
       key = simple_captcha_key(options[:object])
-      options[:field_value] = set_simple_captcha_data(key, options)
-      
+      if options[:multiple] === false
+        # It's not the first captcha, we only need to return the key
+        options[:field_value] = key
+      else
+        # It's the first captcha in the page, we generate a new key
+        options[:field_value] = set_simple_captcha_data(key, options)
+      end
+
       defaults = {
-         :image => simple_captcha_image(key, options),
-         :label => options[:label] || I18n.t('simple_captcha.label'),
-         :field => simple_captcha_field(options)
-         }
-         
+        :image => simple_captcha_image(key, options),
+        :label => I18n.t('simple_captcha.label'),
+        :field => simple_captcha_field(options),
+        :refresh_button => simple_captcha_refresh_button(options),
+      }.merge(options)
+
       render :partial => 'simple_captcha/simple_captcha', :locals => { :simple_captcha_options => defaults }
     end
 
@@ -60,18 +67,27 @@ module SimpleCaptcha #:nodoc
       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}"
-        
-        tag('img', :src => url, :alt => 'captcha')
+
+        id = simple_captcha_image_id(options)
+        tag('img', :src => url, :alt => 'captcha', :id => id)
       end
-      
+
+      def simple_captcha_image_url(simple_captcha_key, options = {})
+        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}"
+      end
+
       def simple_captcha_field(options={})
         html = {:autocomplete => 'off', :required => 'required'}
         html.merge!(options[:input_html] || {})
         html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
-          
+
         if options[:object]
           text_field(options[:object], :captcha, html.merge(:value => '')) +
           hidden_field(options[:object], :captcha_key, {:value => options[:field_value]})
@@ -81,35 +97,49 @@ module SimpleCaptcha #:nodoc
         end
       end
 
+      def simple_captcha_refresh_button(options={})
+        html = {remote: true}
+        html.merge!(options[:refresh_button_html] || {})
+
+        text = options[:refresh_button_text] || I18n.t('simple_captcha.refresh_button_text', default: 'Refresh')
+
+        link_to(text, "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?id=#{simple_captcha_image_id(options)}", html)
+      end
+
+      def simple_captcha_image_id(options={})
+        "simple_captcha-#{options[:field_value][0..10]}"
+      end
+
       def set_simple_captcha_data(key, options={})
         code_type = options[:code_type]
-        
+
         value = generate_simple_captcha_data(code_type)
         data = SimpleCaptcha::SimpleCaptchaData.get_data(key)
         data.value = value
         data.save
         key
       end
-   
+
       def generate_simple_captcha_data(code)
         value = ''
-        
+
         case code
-          when 'numeric' then 
+          when 'numeric' then
             SimpleCaptcha.length.times{value << (48 + rand(10)).chr}
           else
             SimpleCaptcha.length.times{value << (65 + rand(26)).chr}
         end
-        
+
         return value
       end
-      
-      def simple_captcha_key(key_name = nil)
+
+      def simple_captcha_key(key_name = nil, request = request)
+        local_session = request.try(:session) || session
         if key_name.nil?
-          session[:captcha] ||= SimpleCaptcha::Utils.generate_key(session[:id].to_s, 'captcha')
+          local_session[:captcha] ||= SimpleCaptcha::Utils.generate_key(local_session[:id].to_s, 'captcha')
         else
-          SimpleCaptcha::Utils.generate_key(session[:id].to_s, key_name)
+          SimpleCaptcha::Utils.generate_key(local_session[:id].to_s, key_name)
         end
-      end 
+      end
   end
 end

data/lib/simple_captcha2.rb

@@ -0,0 +1 @@
+require 'simple_captcha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_captcha2
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Pavlo Galeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,6 +54,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -83,18 +97,19 @@ files:
 - lib/generators/templates/migration.rb
 - lib/generators/templates/partial.erb
 - lib/simple_captcha.rb
-- lib/simple_captcha/active_record.rb
 - lib/simple_captcha/controller.rb
 - lib/simple_captcha/engine.rb
 - lib/simple_captcha/form_builder.rb
 - lib/simple_captcha/formtastic.rb
 - lib/simple_captcha/image.rb
 - lib/simple_captcha/middleware.rb
+- lib/simple_captcha/model_helpers.rb
 - lib/simple_captcha/simple_captcha_data.rb
 - lib/simple_captcha/simple_captcha_data_mongoid.rb
 - lib/simple_captcha/utils.rb
 - lib/simple_captcha/version.rb
 - lib/simple_captcha/view.rb
+- lib/simple_captcha2.rb
 homepage: http://github.com/pludoni/simple-captcha
 licenses: []
 metadata: {}