dalli_captcha 0.0.2 → 0.0.3

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright 2013 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2013 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,127 +1,129 @@
-dalli_captcha
-=============
-
-DalliCaptcha is a captcha engine base on Dalli for Rails 3.2. It provides simple captcha that can be read by human.
-
-
-## Features
-
-* DalliCaptcha is easy to setup, easy to use.
-* DalliCaptcha provides simple captcha that can be read by human.
-* You don't have to manage image files because they will be removed by Tempfile.
-* You can set option `locked_times` and `locked_time` to avoid someone who want to attack.
-* The Captcha will be Expired automatically by setting `expired_time`.
-* ......
-
-
-## Requirements
-
-* Ruby >= 1.9
-* Rails > 3.2
-* Dalli > 2.4
-* ImageMagick
-
-*I haven't tried lower version yet.*
-
-## Getting started
-
-**1. Add DalliCaptcha to your gemfile**
-
-```ruby
-  gem 'dalli_captcha'
-or
-  gem 'dalli_captcha',:git =>"git://github.com/javyliu/dalli_captcha.git"
-```
-
-**2. Generate initializer**
-
-    rails g dalli_captcha:install
-
-It'll generate `config/initializers/dalli_captcha.rb`, and you can configure all options here.
-
-**3. Mount DalliCaptcha::Engine in your router.rb**
-
-```ruby
-mount DalliCaptcha::Engine => '/captcha', :as => :captcha
-```
-
-
-**4. Add before_filter to your controller**
-
-```ruby
-class PostsController < ApplicationController
-    before_filter :generate_captcha_key, :only => [:new, :edit]
-    ......
-end
-```
-
-**4. Add module to your model**
-
-```ruby
-class Post < ActiveRecord::Base
-    include DalliCaptcha::Model
-end
-```
-
-if you set `config.active_record.whitelist_attributes = true` in `config/application.rb`, remember to add attr_accessible to your model:
-
-```ruby
-attr_accessible :captcha, :captcha_key
-```
-
-to your model.
-
-**5. Use DalliCaptcha in your view**
-
-```erb
-<%= image_tag(captcha_path(:timestamp => Time.now.to_i), :alt => "captcha") %>
-<%= f.text_field :captcha %>
-<%= f.hidden_field :captcha_key, :value => session[:captcha_key] %>
-```
-
-**6. Use DalliCaptcha in your controller**
-
-```ruby
-    # Initialize a post
-    @post = Post.new(:title => "test")
-
-    # valid with captcha
-    @post.valid?
-
-    # save with captcha
-    @post.save
-
-    # valid without captcha
-    @post.valid_without_captcha?
-
-    # save without captcha
-    @post.save_without_captcha
-```
-
-
-Enjoy it!
-
-
-## Todo list
-
-* To add a simple site
-* To write tests
-
-
-## History
-
-**0.0.1**
-
-First Version
-
-
-## Author
-
-* javyquan@gmail.com
-* http://hi.baidu.com/javyquan
-
-
-## License
-
-This project rocks and uses MIT-LICENSE.
-
+dalli_captcha
+=============
+
+DalliCaptcha is a captcha engine base on Dalli for Rails 3.2. It provides simple captcha that can be read by human.
+
+
+## Features
+
+* DalliCaptcha is easy to setup, easy to use.
+* DalliCaptcha provides simple captcha that can be read by human.
+* You don't have to manage image files because they will be removed by Tempfile.
+* The Captcha will be Expired automatically by setting `expired_time`.
+* ......
+
+
+## Requirements
+
+* Ruby = ree
+* Rails > 3.2
+* Dalli > 2.4
+* ImageMagick
+* Memcache
+
+*I haven't tried lower version yet.*
+
+## Getting started
+
+**1. Add DalliCaptcha to your gemfile**
+
+```ruby
+  gem 'dalli_captcha'
+or
+  gem 'dalli_captcha',:git =>"git://github.com/javyliu/dalli_captcha.git"
+```
+
+**2. Generate initializer**
+
+```shell
+    rails g dalli_captcha:install
+```
+
+It'll generate `config/initializers/dalli_captcha.rb`, and you can configure all options here.
+
+**3. Mount DalliCaptcha::Engine in your router.rb**
+
+```ruby
+mount DalliCaptcha::Engine => '/captcha', :as => :captcha
+```
+
+
+**4. Add before_filter to your controller**
+
+```ruby
+class PostsController < ApplicationController
+    before_filter :generate_captcha_key, :only => [:new, :edit]
+    ......
+end
+```
+
+**4. Add module to your model**
+
+```ruby
+class Post < ActiveRecord::Base
+    include DalliCaptcha::Model
+end
+```
+
+if you set `config.active_record.whitelist_attributes = true` in `config/application.rb`, remember to add attr_accessible to your model:
+
+```ruby
+attr_accessible :captcha, :captcha_key
+```
+
+to your model.
+
+**5. Use DalliCaptcha in your view**
+
+```erb
+<%= image_tag(captcha_path(:timestamp => Time.now.to_i), :alt => "captcha") %>
+<%= f.text_field :captcha %>
+<%= f.hidden_field :captcha_key, :value => session[:captcha_key] %>
+```
+
+**6. Use DalliCaptcha in your controller**
+
+```ruby
+    # Initialize a post
+    @post = Post.new(:title => "test")
+
+    # valid with captcha
+    @post.valid?
+
+    # save with captcha
+    @post.save
+
+    # valid without captcha
+    @post.valid_without_captcha?
+
+    # save without captcha
+    @post.save_without_captcha
+```
+
+
+Enjoy it!
+
+
+## Todo list
+
+* To add a simple site
+* To write tests
+
+
+## History
+
+**0.0.1**
+
+First Version
+
+
+## Author
+
+* javy_liu@163.com
+* http://hi.baidu.com/javyquan
+
+
+## License
+
+This project rocks and uses MIT-LICENSE.
+

data/Rakefile

@@ -1,40 +1,40 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'DalliCaptcha'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'DalliCaptcha'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task :default => :test

data/app/assets/javascripts/dalli_captcha/application.js

@@ -1,15 +1,15 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/app/assets/stylesheets/dalli_captcha/application.css

@@ -1,13 +1,13 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/app/controllers/dalli_captcha/application_controller.rb

@@ -1,4 +1,4 @@
-module DalliCaptcha
-  class ApplicationController < ActionController::Base
-  end
-end
+module DalliCaptcha
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/controllers/dalli_captcha/captcha_controller.rb

@@ -1,13 +1,13 @@
-module DalliCaptcha
-  class CaptchaController < ApplicationController
-    def show
-      captcha = DalliCaptcha::Image.new(session[:captcha_key])
-      tempfile = captcha.generate
-      if tempfile
-        send_file(tempfile.path, :type => captcha.content_type, :disposition => 'inline', :filename => captcha.filename)
-      else
-        render :nothing => true
-      end
-    end
-  end
-end
+module DalliCaptcha
+  class CaptchaController < ApplicationController
+    def show
+      captcha = DalliCaptcha::Image.new(session[:captcha_key])
+      tempfile = captcha.generate
+      if tempfile
+        send_file(tempfile.path, :type => captcha.content_type, :disposition => 'inline', :filename => captcha.filename)
+      else
+        render :nothing => true
+      end
+    end
+  end
+end