loyal_simple_captcha 0.0.1 → 0.0.3

data/Rakefile

@@ -1,22 +1,2 @@
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
 
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the simple_captcha plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the simple_captcha plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SimpleCaptcha'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/generators/simple_captcha_generator.rb

@@ -1,8 +1,9 @@
+# -*- encoding : utf-8 -*-
 require 'rails/generators'
 
 class SimpleCaptchaGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
-                          
+
   def self.source_root
     @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates/'))
   end
@@ -10,11 +11,11 @@ class SimpleCaptchaGenerator < Rails::Generators::Base
   def self.next_migration_number(dirname)
     Time.now.strftime("%Y%m%d%H%M%S")
   end
-  
+
   def create_partial
     template "partial.erb", File.join('app/views', 'simple_captcha', "_simple_captcha.erb")
   end
-  
+
   def create_migration
     migration_template "migration.rb", File.join('db/migrate', "create_simple_captcha_data.rb")
   end

data/lib/generators/templates/migration.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class CreateSimpleCaptchaData < ActiveRecord::Migration
   def self.up
     create_table :simple_captcha_data do |t|
@@ -6,7 +7,7 @@ class CreateSimpleCaptchaData < ActiveRecord::Migration
       t.timestamps
     end
     
-    add_index :simple_captcha_data, :key, :name => "idx_key"
+    add_index :simple_captcha_data, :key
   end
 
   def self.down

data/lib/loyal_simple_captcha.rb

@@ -0,0 +1,2 @@
+# -*- encoding : utf-8 -*-
+require 'simple_captcha'

data/lib/simple_captcha.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
 
 module SimpleCaptcha
   autoload :Utils,             'simple_captcha/utils'

data/lib/simple_captcha/active_record.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha #:nodoc
   module ModelHelpers #:nodoc
     def self.included(base)
@@ -53,6 +54,10 @@ module SimpleCaptcha #:nodoc
       def valid_with_captcha?
         [valid?, is_captcha_valid?].all?
       end
+
+      def simple_captcha_valid?
+        self.errors[:captcha].empty?
+      end
       
       def is_captcha_valid?
         return true if Rails.env.test?
@@ -61,12 +66,20 @@ module SimpleCaptcha #:nodoc
           SimpleCaptcha::Utils::simple_captcha_passed!(captcha_key)
           return true
         else
-          message = simple_captcha_options[:message] || I18n.t(self.class.model_name.downcase, :scope => [:simple_captcha, :message], :default => :default)
-          simple_captcha_options[:add_to_base] ? errors.add(:base, message) : errors.add(:captcha, message)
+          message = simple_captcha_options[:message] || I18n.t(
+            self.class.model_name.downcase, :scope => [:simple_captcha, :message], :default => :default
+          )
+
+          # simple_captcha_options[:add_to_base] ? errors.add(:base, message) : errors.add(:captcha, message)
+          errors.add(:captcha, message)
           return false
         end
       end
-      
+
+      def update_attributes_with_captcha *args
+        valid_with_captcha? && update_attributes(*args)
+      end
+
       def save_with_captcha
         valid_with_captcha? && save(:validate => false)
       end

data/lib/simple_captcha/controller.rb

@@ -1,28 +1,57 @@
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha #:nodoc 
   module ControllerHelpers #:nodoc
-    # This method is to validate the simple captcha in controller.
-    # It means when the captcha is controller based i.e. :object has not been passed to the method show_simple_captcha.
-    #
-    # *Example*
-    #
-    # If you want to save an object say @user only if the captcha is validated then do like this in action...
-    #
-    #  if simple_captcha_valid?
-    #   @user.save
-    #  else
-    #   flash[:notice] = "captcha did not match"
-    #   redirect_to :action => "myaction"
-    #  end
-    def simple_captcha_valid?
-      return true if Rails.env.test?
-      
-      if params[:captcha]
-        data = SimpleCaptcha::Utils::simple_captcha_value(params[:captcha_key] || session[:captcha])
-        result = data == params[:captcha].delete(" ").upcase
-        SimpleCaptcha::Utils::simple_captcha_passed!(session[:captcha]) if result
-        return result
-      else
-        return false
+    def self.included base
+      base.class_eval do
+        include InstanceMethods
+        helper_method :generate_simple_captcha_options
+      end
+    end
+
+    module InstanceMethods
+      # This method is to validate the simple captcha in controller.
+      # It means when the captcha is controller based i.e. :object has not been passed to the method show_simple_captcha.
+      #
+      # *Example*
+      #
+      # If you want to save an object say @user only if the captcha is validated then do like this in action...
+      #
+      #  if simple_captcha_valid?
+      #   @user.save
+      #  else
+      #   flash[:notice] = "captcha did not match"
+      #   redirect_to :action => "myaction"
+      #  end
+      def simple_captcha_valid?
+        return true if Rails.env.test?
+
+        if params[:captcha]
+          data = SimpleCaptcha::Utils::simple_captcha_value(params[:captcha_key] || session[:captcha])
+          result = data == params[:captcha].delete(" ").upcase
+          SimpleCaptcha::Utils::simple_captcha_passed!(session[:captcha]) if result
+          return result
+        else
+          return false
+        end
+      end
+
+      # 生成验证的信息
+      # options:
+      #   - object
+      def generate_simple_captcha_options *args
+        options = args.extract_options!
+
+        key = SimpleCaptcha::Utils.generate_key_use_session(
+          session, options[:object]
+        )
+
+        {
+          :image_url   => ::SimpleCaptcha::Utils.generate_image_url(key, request.base_url, options),
+          :label       => options[:label] || I18n.t('simple_captcha.label'),
+          :captcha_key => ::SimpleCaptcha::Utils.set_simple_captcha_data(key, options),
+          :object      => options[:object]
+        }
+
       end
     end
   end

data/lib/simple_captcha/engine.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
 require 'rails'
 require 'simple_captcha'
 
@@ -14,6 +14,8 @@ module SimpleCaptcha
       ActionView::Base.send(:include, SimpleCaptcha::ViewHelper)
       ActionView::Helpers::FormBuilder.send(:include, SimpleCaptcha::FormBuilder)
 
+      ActionController::Base.send :include, ::SimpleCaptcha::ControllerHelpers
+
       if Object.const_defined?("Formtastic")
         if Formtastic.const_defined?("Helpers")
           Formtastic::Helpers::FormHelper.builder = SimpleCaptcha::CustomFormBuilder

data/lib/simple_captcha/form_builder.rb

@@ -1,11 +1,12 @@
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha
   module FormBuilder
     def self.included(base)
       base.send(:include, SimpleCaptcha::ViewHelper)
       base.send(:include, SimpleCaptcha::FormBuilder::ClassMethods)
       base.send(:include, ActionView::Helpers)
-      base.send(:include, Sprockets::Helpers::RailsHelper)
-      base.send(:include, Sprockets::Helpers::IsolatedHelper)
+      # base.send(:include, Sprockets::Helpers::RailsHelper)
+      # base.send(:include, Sprockets::Helpers::IsolatedHelper)
       
       base.delegate :render, :session, :to => :template
     end
@@ -34,7 +35,7 @@ module SimpleCaptcha
           html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
           
           text_field(:captcha, html) +
-          hidden_field(:captcha_key, {:value => options[:field_value]})
+          hidden_field(:captcha_key, {:value => options[:captcha_key], :class => 'captcha-key'})
         end
     end
   end

data/lib/simple_captcha/formtastic.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha
   class CustomFormBuilder < Formtastic::FormBuilder
 

data/lib/simple_captcha/image.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'tempfile'
 module SimpleCaptcha #:nodoc
   module ImageHelpers #:nodoc

data/lib/simple_captcha/middleware.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha
   class Middleware
     include SimpleCaptcha::ImageHelpers

data/lib/simple_captcha/simple_captcha_data.rb

@@ -1,10 +1,15 @@
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha
   class SimpleCaptchaData < ::ActiveRecord::Base
     def self.rails3?
       ::ActiveRecord::VERSION::MAJOR == 3
     end
 
-    if rails3?
+    def self.rails4?
+      ::ActiveRecord::VERSION::MAJOR == 4
+    end
+
+    if rails3? || rails4?
       # Fixes deprecation warning in Rails 3.2:
       # DEPRECATION WARNING: Calling set_table_name is deprecated. Please use `self.table_name = 'the_name'` instead.
       self.table_name = "simple_captcha_data"

data/lib/simple_captcha/simple_captcha_data_mongoid.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha
   class SimpleCaptchaData
     include Mongoid::Document

data/lib/simple_captcha/utils.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'digest/sha1'
 
 module SimpleCaptcha #:nodoc
@@ -32,5 +33,50 @@ module SimpleCaptcha #:nodoc
       args << Time.now.to_s
       Digest::SHA1.hexdigest(args.join)
     end
+
+    def self.set_simple_captcha_data(key, options={})
+      code_type = options[:code_type]
+
+      data = SimpleCaptcha::SimpleCaptchaData.get_data(key)
+      data.value = generate_simple_captcha_data(code_type)
+      data.save
+      key
+    end
+
+    def self.generate_simple_captcha_data(code)
+      value = ''
+
+      case code
+      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 self.generate_image_url key, *args
+      options = args.extract_options!
+
+      defaults = {}
+      defaults[:time] = options[:time] || Time.now.to_i
+
+      base_url = args.first || ENV['RAILS_RELATIVE_URL_ROOT']
+
+      url = "#{base_url}/simple_captcha?code=#{key}&#{defaults.to_query}"
+    end
+
+    def self.generate_key_use_session session, *args
+      options = args.extract_options!
+      key_name = args.first
+
+      if key_name.nil?
+        session[:captcha] ||= SimpleCaptcha::Utils.generate_key(session[:id].to_s, 'captcha')
+      else
+        SimpleCaptcha::Utils.generate_key(session[:id].to_s, key_name)
+      end
+    end
   end
 end

data/lib/simple_captcha/version.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.3".freeze
 end

data/lib/simple_captcha/view.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module SimpleCaptcha #:nodoc
   module ViewHelper #:nodoc
 
@@ -42,29 +43,35 @@ module SimpleCaptcha #:nodoc
     # Find more detailed examples with sample images here on my blog http://EXPRESSICA.com
     #
     # 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)
+    #
+    #
+    # eg. show_simple_captcha :label => '', :captcha_key => '', :image_url => ''
+    def show_simple_captcha(*args)
+      options = args.extract_options!
+
+      options[:captcha_key] ||= set_simple_captcha_data(
+        (
+          args.first || simple_captcha_key(options[:object])
+        ),
+          options
+      )
+
+      key = options[:captcha_key]
       
       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 => options[:label] || I18n.t('simple_captcha.label'),
+        :field => simple_captcha_field(options)
+      }
+
       render :partial => 'simple_captcha/simple_captcha', :locals => { :simple_captcha_options => defaults }
     end
 
     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}"
-        
-        tag('img', :src => url, :alt => 'captcha')
+      def simple_captcha_image(key, options = {})
+        url = options[:image_url] || ::SimpleCaptcha::Utils.generate_image_url(key, options)
+        tag('img', :src => url, :alt => 'captcha', :class => 'captcha-image')
       end
       
       def simple_captcha_field(options={})
@@ -74,42 +81,19 @@ module SimpleCaptcha #:nodoc
           
         if options[:object]
           text_field(options[:object], :captcha, html.merge(:value => '')) +
-          hidden_field(options[:object], :captcha_key, {:value => options[:field_value]})
+          hidden_field(options[:object], :captcha_key, {:value => options[:captcha_key], :class => 'captcha-key'})
         else
           text_field_tag(:captcha, nil, html) +
-          hidden_field_tag(:captcha_key, options[:field_value])
+          hidden_field_tag(:captcha_key, options[:captcha_key], :class => 'captcha-key')
         end
       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
+        ::SimpleCaptcha::Utils.set_simple_captcha_data key, options
       end
-   
-      def generate_simple_captcha_data(code)
-        value = ''
-        
-        case code
-          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)
-        if key_name.nil?
-          session[:captcha] ||= SimpleCaptcha::Utils.generate_key(session[:id].to_s, 'captcha')
-        else
-          SimpleCaptcha::Utils.generate_key(session[:id].to_s, key_name)
-        end
+        SimpleCaptcha::Utils.generate_key_use_session session, key_name
       end 
   end
 end

metadata

@@ -1,24 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: loyal_simple_captcha
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
-- Pavlo Galeta
-- Igor Galeta
+- happy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies: []
-description: SimpleCaptcha is available to be used with Rails 3 or above and also
-  it provides the backward compatibility with previous versions of Rails.
-email: galeta.igor@gmail.com
+description: LoyalSimpleCaptcha is available to be used with Rails 3 or above and
+  also it provides the backward compatibility with previous versions of Rails.
+email: andywang7259@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
 - lib/simple_captcha.rb
 - lib/simple_captcha/view.rb
@@ -33,13 +31,14 @@ files:
 - lib/simple_captcha/controller.rb
 - lib/simple_captcha/image.rb
 - lib/simple_captcha/middleware.rb
+- lib/loyal_simple_captcha.rb
 - lib/generators/USAGE
 - lib/generators/simple_captcha_generator.rb
 - lib/generators/templates/partial.erb
 - lib/generators/templates/migration.rb
 - Rakefile
-- README.rdoc
-homepage: http://github.com/izzm/simple-captcha
+- README.md
+homepage: http://github.com/xiuxian123/loyals
 licenses: []
 post_install_message: 
 rdoc_options: []