humanizer 2.1.1 → 2.2.0

data/CHANGELOG.md

@@ -1,14 +1,20 @@
+### Humanizer 2.2.0 (2010-11-18)
+
+Added translations: French, Russian.
+Added real_human attribute to skip validation.
+
+
 ### Humanizer 2.1.1 (2010-09-09)
 
-Updated changelog
+Updated changelog.
 
 
 ### Humanizer 2.1.0 (2010-09-09)
 
-Minor polishing
-Support for Formtastic inline errors
-Added flexibility to validations
-Added translations: Dutch, Brazilian Portuguese
+Minor polishing.
+Support for Formtastic inline errors.
+Added flexibility to validations.
+Added translations: Dutch, Brazilian Portuguese.
 
 
 ### Humanizer 2.0.0 (2010-06-30)

data/README.md

@@ -34,6 +34,10 @@ Default translations can be found in config/locales/
 
 You might want to add/change question and answer pairs. This can be easily done by adding/modifying entries in locales file.
 
+## Skipping validation
+
+Set the attribute 'real_human' to true on the object you want to skip the Humanizer validation. Handy for testing or console use.
+
 ## Live sites
 
 * [ArcticStartup.com](http://arcticstartup.com/) - signup form
@@ -48,6 +52,7 @@ Humanizer is licensed under the MIT License, for more details see the LICENSE fi
 * German by [Sven Schwyn](http://github.com/svoop)
 * Dutch by [Joren De Groof](http://github.com/joren)
 * Brazilian Portuguese by [Britto](http://github.com/britto)
+* Russian by [Shark](http://github.com/Serheo)
 
 ## Contributors
 

data/lib/generators/templates/locales/fr.yml

@@ -0,0 +1,43 @@
+fr:
+  humanizer:
+    validation:
+      error: Vous n'êtes pas humain
+    questions:
+      - question: Deux plus deux font?
+        answers: ["4", "quatre"]
+      - question: "Liberté, Égalité,..."
+        answer: fraternité
+      - question: Quel est le chiffre qui précède douze?
+        answers: ["11", "onze"]
+      - question: Cinq fois deux font?
+        answers: ["10", "dix"]
+      - question: "Quel chiffre qui suivra? 10, 11, 12, 13, 14, .."
+        answers: ["15", "quinze"]
+      - question: "Cinq fois cinq ne font pas dix mais?"
+        answers: ["25", "vingt-cinq"]
+      - question: "Dix divisé par deux fait?"
+        answers: ["5", "cinq"]
+      - question: Le jour de la semaine qui succède au dimanche est le...?
+        answer: ["lundi", "le lundi"]
+      - question: Quel est le dernier mois de l'année'?
+        answer: "décembre"
+      - question: L'heure correspond à combien de minutes?
+        answers: ["60", "soixante"]
+      - question: Le contraire de 'haut' est?
+        answer: "bas"
+      - question: Le sens inverse du Nord?
+        answer: ["sud", "le sud"]
+      - question: Quel est le contraire du bien?
+        answer: ["mal", "le mal"]
+      - question: Que font 4 fois quatre?
+        answers: ["16", "seize"]
+      - question: Quel chiffre suit 20?
+        answers: ["21", "vingt-et-un"]
+      - question: Quel mois précède Juillet?
+        answer: "juin"
+      - question: Quinze divisé par 3 font?
+        answer: ["cinq", "5"]
+      - question: Quatorze moins 4 font?
+        answers: ["10", "dix"]
+      - question: "Le suivant est? lundi, mardi, mercredi.."
+        answer: "jeudi"

data/lib/generators/templates/locales/ru.yml

@@ -0,0 +1,43 @@
+ru:
+  humanizer:
+    validation:
+      error: Вы робот
+    questions:
+      - question: Два плюс два?
+        answers: ["4", "четыре"]
+      - question: В лесу родилась...
+        answer: елочка
+      - question: Какое число идет до девяти?
+        answers: ["8", "восемь"]
+      - question: Пять раз по два?
+        answers: ["10", "десять"]
+      - question: "Продолжите последовательность: 10, 11, 12, 13, 14, .."
+        answers: ["15", "пятьнадцать"]
+      - question: "Пять раз по пять?"
+        answers: ["25", "двадцать пять"]
+      - question: "Десять делить на два?"
+        answers: ["5", "пять"]
+      - question: Какой день идет после понедельника?
+        answer: "вторник"
+      - question: Какой последний месяц в году?
+        answer: "декабрь"
+      - question: Сколько минут в одном часе?
+        answers: ["60", "шестьдесят"]
+      - question: Слово обратное слову Вниз?
+        answer: "вверх"
+      - question: Слово обратное слову Север?
+        answer: "юг"
+      - question: Слово обратное слову Плохой?
+        answer: "хороший"
+      - question: Четыре раза по четыре?
+        answers: ["16", "шестнадцать"]
+      - question: Какое число идет после 20?
+        answers: ["21", "двадцать один"]
+      - question: Месяц идущий перед Июлем?
+        answer: "июнь"
+      - question: Пятнадцать делить на три?
+        answer: ["пять", "5"]
+      - question: 14 минус 4?
+        answers: ["10", "десять"]
+      - question: "Продолжите. Понедельник, Вторник, Среда.."
+        answer: "четверг"

data/lib/humanizer.rb

@@ -4,7 +4,7 @@ module Humanizer
     base.extend(ClassMethods)
   end
   
-  attr_accessor :humanizer_answer
+  attr_accessor :humanizer_answer, :real_human
   attr_writer :humanizer_question_id
 
   def humanizer_question
@@ -37,8 +37,8 @@ module Humanizer
   module ClassMethods
     
     def require_human_on(validate_on, opts = {})
-      opts[:on] = validate_on
-      validate :humanizer_check_answer,  opts
+      validates :humanizer_check_answer, :presence => {:on => validate_on,
+                                                       :unless  => proc {|obj|  obj.real_human}}
     end
     
   end

data/lib/humanizer/version.rb

@@ -1,3 +1,3 @@
 module Humanizer
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Antti Akonniemi
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +03:00
+date: 2010-11-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,10 +32,10 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +45,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,10 +61,10 @@ dependencies:
         - beta
         version: 2.0.0.beta
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rails
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,7 +76,6 @@ dependencies:
         - 0
         version: 3.0.0
   type: :development
-  prerelease: false
   version_requirements: *id004
 description: reCAPTCHA was too much for us, so we created this. Simplest captcha ever.
 email: 
@@ -97,9 +97,11 @@ files:
 - lib/generators/templates/locales/de.yml
 - lib/generators/templates/locales/en.yml
 - lib/generators/templates/locales/fi.yml
+- lib/generators/templates/locales/fr.yml
 - lib/generators/templates/locales/nl.yml
 - lib/generators/templates/locales/pt-BR.yml
 - lib/generators/templates/locales/pt-PT.yml
+- lib/generators/templates/locales/ru.yml
 has_rdoc: true
 homepage: http://github.com/kiskolabs/humanizer
 licenses: []
@@ -114,7 +116,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1206748496174217247
       segments: 
       - 0
       version: "0"