acts_as_textcaptcha 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a05fc4f158974110a4488b74394b3b7fbd8085f
-  data.tar.gz: 818abaed769b20d11370add99665c726f504a48e
+  metadata.gz: d0ed524bfc8d05da4dcdf2fb6a8b86a3f5d8e687
+  data.tar.gz: 60b3dcfd3c6fb65c71d5d096000b7c61c155e569
 SHA512:
-  metadata.gz: 0d1efdc637a9a5ea7975bb342bff97868aae57969c5b8a4aed6450278a4fa26c977303bee4a92aa5e240f6d7ee391440e8b11ec527589cd4488cb3b1e35842a0
-  data.tar.gz: be6d33e348f483bdb4c2711979b750209e3bf5132188ccf38273b035a1b67b83b4f7fd4c26989cd6c713082e8f8b1d1bb2541cf85dd79680f4cf7e47cdcf283a
+  metadata.gz: 6342b17c8d96acfe3cc00c1880ce041bcda55859c133099ecea51d3ec26b4c4ef11f3b92fbc8e5a67616c9f86a93152d1bf03d097af272da0fa40c30bc16326e
+  data.tar.gz: 3ec376171d993c203a4c13b463feb8fb815cfb5adc0ba9897cb79b58e8a105cfe6e85ca213a6d828490bd86e6d8cee5232fafec05a30e0fed81e9953b611b2e9

data/.travis.yml

@@ -2,4 +2,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ree
+  - rbx

data/Gemfile

@@ -1,2 +1,2 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gemspec

data/README.rdoc

@@ -4,9 +4,9 @@
 
 ActsAsTextcaptcha provides spam protection for your Rails models using logic questions from the excellent {Text CAPTCHA}[http://textcaptcha.com/] web service (by {Rob Tuley}[http://openknot.com/me/] of {Openknot}[http://openknot.com/]).  It is also possible to configure your own questions and answers instead of using this API (or as a fall back in the unlikely event of the web service being unavailable)
 
-The gem makes use of {bcrypt}[http://bcrypt-ruby.rubyforge.org/] encryption when comparing a guess with the correct answer(s).  This gem is actively maintained, has good test coverage and is compatible with Rails 2.3.* and 3.  If you have any issues {please report them here}[https://github.com/matthutchinson/acts_as_textcaptcha/issues].
+The gem makes use of {bcrypt}[http://bcrypt-ruby.rubyforge.org/] encryption when comparing a guess with the correct answer(s).  This gem is actively maintained, has good test coverage and is compatible with Rails 2.3.*, Rails 3 and 4.  If you have any issues {please report them here}[https://github.com/matthutchinson/acts_as_textcaptcha/issues].
 
-Text CAPTCHA's logic questions are aimed at a child's age of 7, so can be solved easily by all but the most cognitively impaired users. As they involve human logic, such questions cannot be solved by a robot.  There are both advantages and disadvantages for using logic questions over image based captchas, {find out more at Text CAPTCHA}[http://textcaptcha.com/why].
+Text CAPTCHA's logic questions are aimed at a child's age of 7, so they can be solved easily by even the most cognitively impaired users. As they involve human logic, questions cannot be solved by a robot.  There are both advantages and disadvantages for using logic questions over image based captchas, {find out more at Text CAPTCHA}[http://textcaptcha.com/why].
 
 == Demo
 
@@ -14,7 +14,7 @@ Here's a {fully working demo on heroku}[http://textcaptcha.heroku.com]!
 
 == Installing
 
-=== Rails 3
+=== Rails
 
 Just add the following to your Gemfile, then `bundle install`;
 
@@ -26,13 +26,7 @@ Add this to your environment.rb file, then `gem install acts_as_textcaptcha`;
 
   config.gem 'acts_as_textcaptcha'
 
-=== As a plugin
-
-Or install as a plugin with;
-
-  rails plugin install git@github.com:matthutchinson/acts_as_textcaptcha.git
-  OR
-  script/plugin install git@github.com:matthutchinson/acts_as_textcaptcha.git
+=== Or as a plugin
 
 If you do decide to install this as a Rails plugin, you'll have to manually include the bcrypt-ruby gem in your Gemfile or environment config. Like so;
 
@@ -40,15 +34,21 @@ If you do decide to install this as a Rails plugin, you'll have to manually incl
   OR
   config.gem 'bcrypt-ruby', :lib => 'bcrypt'
 
+Then install the plugin with rails or script/rails as follows;
+
+  rails plugin install git@github.com:matthutchinson/acts_as_textcaptcha.git
+  OR
+  script/plugin install git@github.com:matthutchinson/acts_as_textcaptcha.git
+
 == Setting up
 
 *NOTE:* The procedure for configuring your app *changed significantly* from v2.* to v3.*  If you are having problems please carefully check the instructions below.
 
-First {grab an API key for your website}[http://textcaptcha.com/api] then open Rails console (or any irb session) and generate a new BCrypt salt by typing;
+First {grab an API key for your website}[http://textcaptcha.com/api] then open you Rails console (or any irb session) and generate a new BCrypt salt by typing;
 
   require 'bcrypt';BCrypt::Engine.generate_salt
 
-Next configure which models are to be spam protected like so;
+Next add the following code to models you'd like to spam protect;
 
   class Comment < ActiveRecord::Base
     # (this is the most basic way to configure the gem, with an API key and Salt only)
@@ -81,7 +81,7 @@ Finally, in your form view add the spam question and answer fields using the tex
     </div>
   <% end %>
 
-*NOTE:* If you'd rather NOT use this helper and prefer to write all your own view code, see the html produced from the textcaptcha_fields method in the gem source code.
+*NOTE:* If you'd rather NOT use this helper and prefer to write your own view code, see the html produced from the textcaptcha_fields method in the source code.
 
 === Toggling Textcaptcha
 
@@ -173,8 +173,8 @@ For more details on the code please check the {documentation}[http://rdoc.info/p
 
 What do you need?
 
-* {Rails}[http://github.com/rails/rails] >= 2.3.2  (including Rails 3)
-* {Ruby}[http://ruby-lang.org/] >= 1.8.7 (also tested with REE and Ruby 1.9.2)
+* {Rails}[http://github.com/rails/rails] >= 2.3.2  (including Rails 3 and 4)
+* {Ruby}[http://ruby-lang.org/] >= 1.8.7 (also tested with REE, RBX, 1.9.2, 1.9.3, 2.0.0)
 * {bcrypt-ruby}[http://bcrypt-ruby.rubyforge.org/] gem (to securely encrypt spam answers)
 * {Text CAPTCHA API key}[http://textcaptcha.com/register] (_optional_, since you can define your own logic questions)
 * {MiniTest}[https://rubygems.org/gems/minitest] (_optional_ if you want to run the tests, built into Ruby 1.9)
@@ -199,14 +199,13 @@ What do you need?
 == Todo
 
 * Achieve 100% test coverage, currently at 93%
+* Remove support for Rails 2.3.* in a future gem release (clean code and tests for this)
 
 == Usage
 
-This gem is used in a number of production websites and apps. It was originally extracted from code developed for {Bugle}[http://bugleblogs.com]
+This gem is used in a number of production websites and apps. It was originally extracted from code developed for {Bugle}[http://bugleblogs.com].  If you're happily using acts_as_textcaptcha in production, let me know and I'll add you to this list!
 
 * {matthewhutchinson.net}[http://matthewhutchinson.net]
 * {pmFAQtory.com}[http://pmfaqtory.com]
 * {The FAQtory}[http://faqtory.heroku.com]
 * {DPT Watch, San Francisco}[http://www.dptwatch.com]
-
-(if you're happily using acts_as_textcaptcha in production, let me know and I'll add you to this list)

data/acts_as_textcaptcha.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency('bcrypt-ruby')
+  s.add_dependency('bcrypt-ruby', '~> 3.0.1')
 
   s.add_development_dependency('rails')
   s.add_development_dependency('bundler')
@@ -30,4 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rdoc')
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('fakeweb')
+  s.add_development_dependency('strong_parameters')
 end

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -35,10 +35,10 @@ module ActsAsTextcaptcha
       attr_accessor  :spam_question, :spam_answers, :spam_answer, :skip_textcaptcha
 
       if respond_to?(:accessible_attributes)
-        if accessible_attributes.nil?
+        if accessible_attributes.nil? && respond_to?(:attr_protected)
           attr_protected :spam_question
           attr_protected :skip_textcaptcha
-        else
+        elsif respond_to?(:attr_accessible)
           attr_accessible :spam_answer, :spam_answers
         end
       end

data/lib/acts_as_textcaptcha/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTextcaptcha
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 end

data/test/schema.rb

@@ -19,4 +19,8 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :notes, :force => true do |t|
     t.string :name
   end
+
+  create_table :strong_widgets, :force => true do |t|
+    t.string :name
+  end
 end

data/test/test_helper.rb

@@ -16,8 +16,7 @@ end
 require 'minitest/autorun'
 require 'fakeweb'
 
-require 'active_record'
-require 'rails'
+require 'rails/all'
 
 require 'acts_as_textcaptcha'
 require './test/test_models'

data/test/test_models.rb

@@ -49,3 +49,12 @@ class Contact
   acts_as_textcaptcha :questions   => [{ :question => 'one+1', :answers => "2,two,апельсин" }],
                       :bcrypt_salt => '$2a$10$j0bmycH.SVfD1b5mpEGPpe'
 end
+
+# ActiveRecord model using the strong parameters gem
+require 'strong_parameters'
+
+class StrongWidget < ActiveRecord::Base
+  include ActiveModel::ForbiddenAttributesProtection
+  acts_as_textcaptcha 'questions'   => [{ 'question' => '1+1', 'answers' => '2,two' }],
+                      'bcrypt_salt' => '$2a$10$j0bmycH.SVfD1b5mpEGPpe'
+end

data/test/textcaptcha_test.rb

@@ -73,6 +73,25 @@ describe 'Textcaptcha' do
     end
   end
 
+  describe 'with strong parameters' do
+
+    before(:each) do
+      @widget = StrongWidget.new
+    end
+
+    it 'should work' do
+      @widget.spam_answers.must_be_nil
+      @widget.textcaptcha
+      @widget.spam_question.must_equal('1+1')
+      @widget.valid?.must_equal false
+      @widget.errors[:spam_answer].first.must_equal('is incorrect, try another question instead')
+
+      @widget.spam_answer = 'two'
+      @widget.valid?.must_equal true
+      @widget.errors[:spam_answer].must_be_empty
+    end
+  end
+
   describe 'encryption' do
 
     before(:each) do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_textcaptcha
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: strong_parameters
+  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'
 description: |-
   Simple question/answer based spam protection for your Rails models.
     You can define your own logic questions and/or fetch questions from the textcaptcha.com API.

checksums.yaml.gz.asc

@@ -1,12 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iQEcBAABAgAGBQJRQyWJAAoJEN3AtSzXeMK41+oH/iiYyOzTRe+jd2tcUvxBREtX
-WEPaup/YfTYZ5lXcYC5fq8CCyFnHHf9cCypoRXkWTKFXicZ9je3I3P0aKohx94wO
-yYhvBGIPrh0ZtEAGGgXIzOT3oFoqyFUqk+Bdzdig2jBmC1RMLnN6Eyk9YE+YMe6G
-BFwKFeMyqtSL2i7Ch0L1VUX3u9UqkcOYiNnDp2viabkX7wF+tYVazjM5pD2e25Hh
-/tH5xg7shsB7s48uf/JFzuTHyK/K5xim8T2ymkSfrFslnN5ipqgypK0NJIehTDK0
-nxAPkKEj8LWVmy81xnYtA0iIY6VgzgLmbB/ynzK2kNLi3Q1tqYIqntmG6hFJR9I=
-=R7cK
------END PGP SIGNATURE-----

data.tar.gz.asc

@@ -1,12 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iQEcBAABAgAGBQJRQyWJAAoJEN3AtSzXeMK4Ga4H/1nZEp/Bm2PYFsajQYVq725o
-J25M5G9KjBdLjBqtxSCHUWpSO9ZUDpjdju211WQ95H79PrnUiNKRkJd7U7+cGLtm
-hG1PjYn/xVqsY35enpQFnkTMHYElCUIOwxOsXygh137f810UWJ9Ekcfzaj7SAHXi
-mN/qtQ5Nzl4wfWXDLeAJArBQ8lwPcevqmZ6L0ChPsOywJkpWFa/X+apB5dCwe+GY
-Ri+lnU7ffHc/XM2evBXF710FxiEfjLkpuAu+ZHJsCM4ji46kcJ5ONqi7LF64WX/z
-2jCayartkWVme9d/Ol5F75Cp7Jhqr9V4yU41zuOUK7CPaeUcGAEDVC3svsIQ+Z0=
-=VZFb
------END PGP SIGNATURE-----

metadata.gz.asc

@@ -1,12 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iQEcBAABAgAGBQJRQyWJAAoJEN3AtSzXeMK4NZQH/0AYiZyO5bS/K5/u6AvRmOaY
-kCaEPuBI3kSHT55R89+4V3JKVo28UwRXK8OdbNHeiq3TSNyl/goWNPYXHoVrG8UW
-Am/SF7VPsxJGgzov/IlSMy3iRBD4ZXdV8rF75ngku5gB4/SXigHMB//Ni0IshLWY
-t0Q34TSFY1Tj3uH4PwXRPWG/H7nB0T48NH4qy2xheKIzzq5dK+sD7Qy2PYm4JRc/
-ZkjwZmBZNLzCR9GS8VwK/g9fvMLGwezsHz4UaXnFDY8iubq3CtWBbvrszvwss8/t
-kgiSsLrM7vMrkKlLIZghWpHPVj27N5YZTFFfn6anhBFZ89h5PIVrr2FF9iSPcTk=
-=wDji
------END PGP SIGNATURE-----