humanizer 1.0.0 → 2.0.0

data/CHANGELOG.md

@@ -1,7 +1,15 @@
-### 2010-06-27
+### Humanizer 2.0.0 (2010-06-30)
+
+Rewrite.
+Database and mapper agnosticism.
+Use locale YAML files for storage.
+
+
+### Humanizer 1.0.0 (2010-06-27)
 
 Released to public.
 
-### 2010-06-26
+
+### Humanizer 0.0.1 (2010-06-26)
 
 First version created.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Antti Akonniemi, Kisko Labs
+Copyright (c) 2010 Antti Akonniemi, Joao Carlos Cardoso, Kisko Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,30 +1,30 @@
-Humanizer is a very simple CAPTCHA method. It has a table with questions and answers which is used to validate that the user is an actual human. Currently only Mysql an Sqlite3 are supported. Tested only on Rails 3.
+Humanizer is a very simple CAPTCHA method. It has a localized YAML file with questions and answers which is used to validate that the user is an actual human. Any model that includes ActiveModel::Validations should work. Our aim is to be database and mapper agnostic, so if it doesn't work for you, open an issue. Humanizer only works with Rails 3.
 
 ### Installation
 
 1. gem install humanizer
 2. rails g humanizer
-3. rake db:migrate
 
 ### Usage
 
-1. In your model add require_human_on method, example:
+1. In your model, include Humanizer and add the #require_human_on method, example:
 
           class User < ActiveRecord::Base
+            include Humanizer
             require_human_on :create
           end
 
 2. Ask the question in the form, example:
 
-          <%= f.label :humanizer_question_answer, HumanizerQuestion.find(@user.humanizer_question_id).question, :class => "required" %>
-          <%= f.text_field :humanizer_question_answer %>
-          <%= f.hidden_field :humanizer_question_id, :value => @user.humanizer_question_id %>
+          <%= f.label :humanizer_answer, @model.humanizer_question %>
+          <%= f.text_field :humanizer_answer %>
+          <%= f.hidden_field :humanizer_question_id %>
 
 ### Configuration
 
 Default translations can be found from config/locales/humanizer.en.yml
 
-You might want to add / change question and answer pairs. This can be easily done by adding / modifying entries in HumanizerQuestion model
+You might want to add / change question and answer pairs. This can be easily done by adding / modifying entries in locales file.
 
 ### Live sites
 

data/lib/generators/humanizer_generator.rb

@@ -1,26 +1,7 @@
-class HumanizerGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
-  
+class HumanizerGenerator < Rails::Generators::Base  
   LOCALE_FILE = File.join(File.dirname(__FILE__) , "templates", "en.yml")
-  MIGRATIONS_FILE = File.join(File.dirname(__FILE__) , "templates", "create_humanizer_questions.rb")
   
-  def add_my_initializer
+  def add_locale
     template LOCALE_FILE, "config/locales/humanizer.en.yml"
-
-  end
-
-  class_option :"skip-migration", :type => :boolean, :desc => "Don't generate a migration for the humanizer questions table"
-
-  def copy_files(*args)
-    migration_template MIGRATIONS_FILE, "db/migrate/create_humanizer_questions.rb" unless options["skip-migration"]
   end
-
-  def self.next_migration_number(dirname) #:nodoc:
-    if ActiveRecord::Base.timestamped_migrations
-      Time.now.utc.strftime("%Y%m%d%H%M%S")
-    else
-      "%.3d" % (current_migration_number(dirname) + 1)
-    end
-  end
-  
 end

data/lib/generators/templates/en.yml

@@ -1,4 +1,43 @@
 en:
   humanizer:
     validation:
-      error: "You're not a human"
+      error: You're not a human
+    questions:
+      - question: Two plus two?
+        answers: ["4", "four"]
+      - question: Jack and Jill went up the...
+        answer: hill
+      - question: What is the number before twelve?
+        answers: ["11", "eleven"]
+      - question: Five times two is what?
+        answers: ["10", "ten"]
+      - question: "Insert the next number in this sequence: 10, 11, 12, 13, 14, .."
+        answers: ["15", "fifteen"]
+      - question: "What is five times five?"
+        answers: ["25", "twentyfive"]
+      - question: "Ten divided by two is what?"
+        answers: ["5", "five"]
+      - question: What day comes after Monday?
+        answer: "tuesday"
+      - question: What is the last month of the year?
+        answer: "december"
+      - question: How many minutes are in an hour?
+        answers: ["60", "sixty"]
+      - question: What is the opposite of down?
+        answer: "up"
+      - question: What is the opposite of north?
+        answer: "south"
+      - question: What is the opposite of bad?
+        answer: "good"
+      - question: What is 4 times four?
+        answers: ["16", "sixteen"]
+      - question: What number comes after 20?
+        answers: ["21", "twentyone"]
+      - question: What month comes before July?
+        answer: "june"
+      - question: What is fifteen divided by three?
+        answer: "five"
+      - question: What is 14 minus 4?
+        answers: ["10", "ten"]
+      - question: "What comes next? Monday, Tuesday, Wednesday.."
+        answer: "Thursday"

data/lib/humanizer.rb

@@ -1,33 +1,45 @@
-require 'humanizer_question'
 module Humanizer
+  
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+  
+  attr_accessor :humanizer_answer
+  attr_writer :humanizer_question_id
 
-    def require_human_on(validate_on)
-        class_eval do
-          validate :humanizer_answer, :on => validate_on
-          attr_accessor :humanizer_question_answer, :humanizer_question_id
+  def humanizer_question
+    humanizer_questions[humanizer_question_id.to_i]["question"]
+  end
+  
+  def humanizer_question_id
+    @humanizer_question_id ||= Kernel.rand(humanizer_questions.count)
+  end
+  
+  def humanizer_correct_answer?
+    humanizer_answer && humanizer_answers_for_id(humanizer_question_id).include?(humanizer_answer.downcase)
+  end
+
+  private
+  
+  def humanizer_questions
+    @humanizer_questions ||= I18n.translate("humanizer.questions")
+  end
+
+  def humanizer_answers_for_id(id)
+    question = humanizer_questions[id.to_i]
+    Array(question["answer"] || question["answers"]).map { |a| a.to_s.downcase }
+  end
 
-          def initialize(attributes = {})
-            super
-            case ActiveRecord::Base.connection.adapter_name
-            when 'MySQL'
-              random_sql='rand()'
-            when 'SQLite'
-              random_sql='random()'
-            end
-            self.humanizer_question_id = HumanizerQuestion.find(:first, :order => random_sql).id if self.humanizer_question_id.nil?
-          end
-          
-          
-          def humanizer_answer
-            if humanizer_question_answer.nil? or humanizer_question_answer.downcase != HumanizerQuestion.find(humanizer_question_id).answer.downcase
-              errors[:base] << (I18n::t("humanizer.validation.error"))
-              
-            end
-          end
-        end
-      
+  def humanizer_check_answer
+    errors[:base] << I18n.translate("humanizer.validation.error") unless humanizer_correct_answer?
+  end
+  
+  module ClassMethods
+    
+    def require_human_on(validate_on)
+      validate :humanizer_check_answer, :on => validate_on
     end
     
-end
-
-ActiveRecord::Base.extend Humanizer
+  end
+  
+end

data/lib/humanizer/version.rb

@@ -1,3 +1,3 @@
 module Humanizer
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -3,24 +3,26 @@ name: humanizer
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
+  - 2
   - 0
   - 0
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Antti Akonniemi
+- Joao Carlos Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 +03:00
+date: 2010-06-30 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
 description: Recaptcha was too much for us, so we created this. Shout-out to brain_busters
 email: 
 - antti@kiskolabs.com
+- joao@kiskolabs.com
 executables: []
 
 extensions: []
@@ -29,14 +31,11 @@ extra_rdoc_files: []
 
 files: 
 - lib/generators/humanizer_generator.rb
-- lib/generators/templates/create_humanizer_questions.rb
 - lib/humanizer/version.rb
 - lib/humanizer.rb
-- lib/humanizer_question.rb
 - LICENSE
 - CHANGELOG.md
 - README.md
-- ROADMAP.md
 - lib/generators/templates/en.yml
 has_rdoc: true
 homepage: http://github.com/kiskolabs/humanizer
@@ -48,6 +47,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -55,6 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: humanizer
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A really simple captcha solution

data/ROADMAP.md

@@ -1 +0,0 @@
--

data/lib/generators/templates/create_humanizer_questions.rb

@@ -1,37 +0,0 @@
-class CreateHumanizerQuestions < ActiveRecord::Migration
-  
-  def self.up
-    create_table :humanizer_questions, :force => true do |t|
-      t.column :question, :string
-      t.column :answer, :string
-    end
-    
-    create "What is two plus two?", "4"
-    create "What is the number before twelve?", "11"
-    create "Five times two is what?", "10"
-    create "Insert the next number in this sequence: 10, 11, 12, 13, 14, ??", "15"
-    create "What is five times five?", "25"
-    create "Ten divided by two is what?", "5"
-    create "What day comes after Monday?", "tuesday"
-    create "What is the last month of the year?", "december"
-    create "How many minutes are in an hour?", "60"
-    create "What is the opposite of down?", "up"
-    create "What is the opposite of north?", "south"
-    create "What is the opposite of bad?", "good"
-    create "Complete the following: 'Jack and Jill went up the ???", "hill"
-    create "What is 4 times four?", "16"
-    create "What number comes after 20?", "21"
-    create "What month comes before July?", "june"
-    create "What is fifteen divided by three?", "5"
-    create "What is 14 minus 4?", "10"
-    create "What comes next? 'Monday Tuesday Wednesday ?????'", "Thursday"
-  end
-
-  def self.down
-    drop_table :humanizer_questions
-  end
-  
-  def self.create(question, answer)
-    HumanizerQuestion.create(:question => question, :answer => answer.downcase)
-  end
-end

data/lib/humanizer_question.rb

@@ -1,4 +0,0 @@
-class HumanizerQuestion < ActiveRecord::Base
-  validates_presence_of :question
-  validates_presence_of :answer
-end