acts_as_textcaptcha 4.1.2 → 4.1.3

data/Rakefile

@@ -1,29 +1,15 @@
 gem 'rdoc'
 
-# default rake
-task :default => [:test]
-
-# helpful console
-desc "Irb console that requires this gem"
-task :console do
-  require 'irb'
-  require 'irb/completion'
-  require 'acts_as_textcaptcha'
-  ARGV.clear
-  IRB.start
-end
-
-
-# bundler tasks
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-# run all tests
+require 'bundler/gem_tasks'
 require 'rake/testtask'
-Rake::TestTask.new do |t|
-  t.pattern = "test/*_test.rb"
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
+task :default => [:test]
+
 # code coverage
 namespace :test do
   desc "Run all tests and generate a code coverage report (simplecov)"

data/acts_as_textcaptcha.gemspec

@@ -1,36 +1,44 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "acts_as_textcaptcha/version"
 
 Gem::Specification.new do |s|
   s.name        = "acts_as_textcaptcha"
   s.version     = ActsAsTextcaptcha::VERSION
-  s.platform    = Gem::Platform::RUBY
   s.authors     = ["Matthew Hutchinson"]
   s.email       = ["matt@hiddenloop.com"]
   s.homepage    = "http://github.com/matthutchinson/acts_as_textcaptcha"
+  s.license     = 'MIT'
   s.summary     = %q{Spam protection for your models via logic questions and the textcaptcha.com API}
+
   s.description = %q{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.
   The questions involve human logic and are tough for spam bots to crack.
   For more reasons on why logic questions are a good idea visit; http://textcaptcha.com/why}
 
-  s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the
+  # 'allowed_push_host' to allow pushing to a single host or delete this section
+  # to allow pushing to any host.
+  if s.respond_to?(:metadata)
+    s.metadata['allowed_push_host'] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  # lock mime-types to pre 2.0 since we want to support 1.8.7/REE in tests
+  # always test against latest rails version
+  s.add_development_dependency('rails', '~> 4.2.6')
+
   s.add_development_dependency('mime-types')
-  s.add_development_dependency('rails')
   s.add_development_dependency('bundler')
   s.add_development_dependency('minitest')
   s.add_development_dependency('simplecov')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('sqlite3')
-  s.add_development_dependency('fakeweb')
-  s.add_development_dependency('strong_parameters')
+  s.add_development_dependency('webmock')
   s.add_development_dependency('coveralls')
-  s.add_development_dependency('pry')
 end

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "acts_as_textcaptcha"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# start irb
+require "irb"
+IRB.start

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -28,7 +28,7 @@ module ActsAsTextcaptcha
         begin
           self.textcaptcha_config = YAML.load(File.read("#{Rails.root ? Rails.root.to_s : '.'}/config/textcaptcha.yml"))[Rails.env].symbolize_keys!
         rescue
-          raise 'could not find any textcaptcha options, in config/textcaptcha.yml or model - run rake textcaptcha:config to generate a template config file'
+          raise ArgumentError.new('could not find any textcaptcha options, in config/textcaptcha.yml or model - run rake textcaptcha:config to generate a template config file')
         end
       end
 

data/lib/acts_as_textcaptcha/textcaptcha_api.rb

@@ -24,7 +24,7 @@ module ActsAsTextcaptcha
         end
 
         response = http.get(url.path)
-        if response.body.empty?
+        if response.body.to_s.empty?
           raise ActsAsTextcaptcha::EmptyResponseError
         else
           return parse(response.body)

data/lib/acts_as_textcaptcha/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTextcaptcha
-  VERSION = "4.1.2"
+  VERSION = "4.1.3"
 end

data/test/schema.rb

@@ -24,7 +24,11 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string :name
   end
 
-  create_table :strong_widgets, :force => true do |t|
+  create_table :strong_protected_widgets, :force => true do |t|
+    t.string :name
+  end
+
+  create_table :strong_accessible_widgets, :force => true do |t|
     t.string :name
   end
 end

data/test/test_helper.rb

@@ -19,7 +19,7 @@ elsif ENV['TRAVIS']
 end
 
 require 'minitest/autorun'
-require 'fakeweb'
+require 'webmock/minitest'
 
 require 'rails/all'
 
@@ -27,13 +27,13 @@ require 'acts_as_textcaptcha'
 require './test/test_models'
 
 # load and initialize test db schema
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'acts_as_textcaptcha.sqlite3.db')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'tmp/test_db/acts_as_textcaptcha.sqlite3.db')
 load(File.dirname(__FILE__) + "/schema.rb")
 
 # initialize a Rails.cache (use a basic memory store in tests)
-RAILS_CACHE = ActiveSupport::Cache::MemoryStore.new
+Rails.cache = ActiveSupport::Cache::MemoryStore.new
 
 # additional helper methods for use in tests
 def find_in_cache(key)
-  RAILS_CACHE.read("#{ActsAsTextcaptcha::TextcaptchaCache::CACHE_KEY_PREFIX}#{key}")
+  Rails.cache.read("#{ActsAsTextcaptcha::TextcaptchaCache::CACHE_KEY_PREFIX}#{key}")
 end

data/test/test_models.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # models for use in tests
 
 class Widget < ActiveRecord::Base
@@ -49,10 +48,19 @@ class Contact
   acts_as_textcaptcha :questions => [{ :question => 'one+1', :answers => "2,two,апельсин" }]
 end
 
-# ActiveRecord model using the strong parameters gem
-require 'strong_parameters'
+class StrongAccessibleWidget < ActiveRecord::Base
+
+  # stub out attr_accessbile interface for testing
+  def self.accessible_attributes(role = :default); end
+  def self.attr_accessible(*args); end
+
+  acts_as_textcaptcha 'questions' => [{ 'question' => '1+1', 'answers' => '2,two' }]
+end
+
+class StrongProtectedWidget < StrongAccessibleWidget
+
+  # stub out attr_protected interface for testing
+  def self.attr_protected(*args); end
 
-class StrongWidget < ActiveRecord::Base
-  include ActiveModel::ForbiddenAttributesProtection
   acts_as_textcaptcha 'questions' => [{ 'question' => '1+1', 'answers' => '2,two' }]
 end

data/test/textcaptcha_api_test.rb

@@ -2,15 +2,11 @@ require File.expand_path(File.dirname(__FILE__)+'/test_helper')
 
 describe 'TextcaptchaApi' do
 
-  after(:each) do
-    FakeWeb.clean_registry
-  end
-
   describe 'with a valid xml response' do
 
     before(:each) do
       body = "<captcha><question>1+1?</question><answer>1</answer><answer>2</answer><answer>3</answer></captcha>"
-      FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/abc|, :body => body)
+      stub_request(:get, "http://textcaptcha.com/api/abc").to_return(:body => body)
     end
 
     it 'should fetch and parse an answer from the service' do
@@ -33,18 +29,18 @@ describe 'TextcaptchaApi' do
       Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
       URI::InvalidURIError
     ].each do |error|
-       FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/xyz|, :exception => error)
+       stub_request(:get, "http://textcaptcha.com/api/xyz").to_raise(error)
        ActsAsTextcaptcha::TextcaptchaApi.fetch('xyz').must_equal nil
      end
   end
 
   it 'should return nil when body cannot be parsed as XML' do
-    FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/jibber|, :body => 'here be gibberish')
+    stub_request(:get, "http://textcaptcha.com/api/jibber").to_return(:body => 'here be gibberish')
     ActsAsTextcaptcha::TextcaptchaApi.fetch('jibber').must_equal nil
   end
 
   it 'should return nil when body is empty' do
-    FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/empty|, :body => '')
+    stub_request(:get, "http://textcaptcha.com/api/empty").to_return(:body => '')
     ActsAsTextcaptcha::TextcaptchaApi.fetch('empty').must_equal nil
   end
 end

data/test/textcaptcha_helper_test.rb

@@ -35,9 +35,9 @@ describe 'TextcaptchaHelper' do
   it 'should render question and answer fields, with hidden textcaptcha_key field' do
     html = render_template
 
-    assert_match /\<label for\=\"note_textcaptcha_answer\"\>1\+1\<\/label\>/, html
-    assert_match /\<input id\=\"note_textcaptcha_answer\" name\=\"note\[textcaptcha_answer\]\" size\=\"30\" type\=\"text\" value\=\"\" \/>/, html
-    assert_match /\<input id\=\"note_textcaptcha_key\" name\=\"note\[textcaptcha_key\]\" type\=\"hidden\" value\=\"([0-9a-f]{32})\" \/\>/, html
+    assert_match(/\<label for\=\"note_textcaptcha_answer\"\>1\+1\<\/label\>/, html)
+    assert_match(/\<input value\=\"\" type\=\"text\" name\=\"note\[textcaptcha_answer\]\" id\=\"note_textcaptcha_answer\" \/\>/, html)
+    assert_match(/\<input type\=\"hidden\" value\=\"([0-9a-f]{32})\" name\=\"note\[textcaptcha_key\]\" id\=\"note_textcaptcha_key\" \/\>/, html)
   end
 
   it 'should render hidden answer and textcaptcha_key when only answer is present' do
@@ -45,24 +45,24 @@ describe 'TextcaptchaHelper' do
     @note.textcaptcha_answer   = 2
     html = render_template
 
-    refute_match /\<label for\=\"note_textcaptcha_answer\"\>1\+1\<\/label\>/, html
-    assert_match /\<input id\=\"note_textcaptcha_answer\" name\=\"note\[textcaptcha_answer\]\" type\=\"hidden\" value\=\"2\" \/>/, html
-    assert_match /\<input id\=\"note_textcaptcha_key\" name\=\"note\[textcaptcha_key\]\" type\=\"hidden\" value\=\"([0-9a-f]{32})\" \/\>/, html
+    refute_match(/\<label for\=\"note_textcaptcha_answer\"\>1\+1\<\/label\>/, html)
+    assert_match(/\<input type\=\"hidden\" value\=\"2\" name\=\"note\[textcaptcha_answer\]\" id\=\"note_textcaptcha_answer\" \/\>/, html)
+    assert_match(/\<input type\=\"hidden\" value\=\"([0-9a-f]{32})\" name\=\"note\[textcaptcha_key\]\" id\=\"note_textcaptcha_key\" \/\>/, html)
   end
 
   it 'should not render any question or answer when perform_textcaptcha? is false' do
     @note.turn_off_captcha = true
     html = render_template
 
-    refute_match /note_textcaptcha_answer/, html
-    refute_match /note_textcaptcha_key/, html
+    refute_match(/note_textcaptcha_answer/, html)
+    refute_match(/note_textcaptcha_key/, html)
   end
 
   it 'should not render any question or answer when textcaptcha_key is missing' do
     @note.textcaptcha_key = nil
     html = render_template
 
-    refute_match /note_textcaptcha_answer/, html
-    refute_match /note_textcaptcha_key/, html
+    refute_match(/note_textcaptcha_answer/, html)
+    refute_match(/note_textcaptcha_key/, html)
   end
 end

data/test/textcaptcha_test.rb

@@ -62,24 +62,6 @@ describe 'Textcaptcha' do
     end
   end
 
-  describe 'with strong parameters' do
-
-    before(:each) do
-      @widget = StrongWidget.new
-    end
-
-    it 'should work' do
-      @widget.textcaptcha
-      @widget.textcaptcha_question.must_equal('1+1')
-      @widget.valid?.must_equal false
-      @widget.errors[:textcaptcha_answer].first.must_equal('is incorrect, try another question instead')
-
-      @widget.textcaptcha_answer = 'two'
-      @widget.valid?.must_equal true
-      @widget.errors[:textcaptcha_answer].must_be_empty
-    end
-  end
-
   describe 'with fast expiry time' do
 
     before(:each) do
@@ -99,12 +81,10 @@ describe 'Textcaptcha' do
 
   describe 'textcaptcha API' do
 
-    after(:each) do
-      FakeWeb.clean_registry
-    end
-
     it 'should generate a question from the service' do
       @review = Review.new
+      body     = "<captcha><question>Something?</question><answer>f6f7fec07f372b7bd5eb196bbca0f3f4</answer></captcha>"
+      stub_request(:get, %r{http://textcaptcha.com/api/}).and_return(:body => body)
 
       @review.textcaptcha
       @review.textcaptcha_question.wont_be_nil
@@ -120,7 +100,7 @@ describe 'Textcaptcha' do
       @review  = Review.new
       question = 'If tomorrow is Saturday, what day is today?'
       body     = "<captcha><question>#{question}</question><answer>f6f7fec07f372b7bd5eb196bbca0f3f4</answer></captcha>"
-      FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/|, :body => body)
+      stub_request(:get, %r{http://textcaptcha.com/api/}).and_return(:body => body)
 
       @review.textcaptcha
       @review.textcaptcha_question.must_equal(question)
@@ -131,7 +111,7 @@ describe 'Textcaptcha' do
       @review  = Review.new
       question = 'If tomorrow is Saturday, what day is today?'
       body     = "<captcha><question>#{question}</question><answer>1</answer><answer>2</answer><answer>3</answer></captcha>"
-      FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/|, :body => body)
+      stub_request(:get, %r{http://textcaptcha.com/api}).and_return(:body => body)
 
       @review.textcaptcha
       @review.textcaptcha_question.must_equal(question)
@@ -140,7 +120,7 @@ describe 'Textcaptcha' do
 
     it 'should fallback to a user defined question when api returns nil' do
       @review = Review.new
-      FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/|, :body => '')
+      stub_request(:get, %r{http://textcaptcha.com/api}).and_return(:body => '')
       @review.textcaptcha
       @review.textcaptcha_question.must_equal('The green hat is what color?')
       find_in_cache(@review.textcaptcha_key).wont_be_nil
@@ -149,7 +129,7 @@ describe 'Textcaptcha' do
     it 'should not generate any question or answer when no user defined questions set' do
       @comment = Comment.new
 
-      FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/|, :exception => SocketError)
+      stub_request(:get, %r{http://textcaptcha.com/api/}).to_raise(SocketError)
       @comment.textcaptcha
       @comment.textcaptcha_question.must_equal nil
       @comment.textcaptcha_key.must_equal nil
@@ -158,7 +138,7 @@ describe 'Textcaptcha' do
     it 'should not generate any question or answer when user defined questions set incorrectly' do
       @comment = MovieReview.new
 
-      FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/|, :exception => SocketError)
+      stub_request(:get, %r{http://textcaptcha.com/api/}).to_raise(SocketError)
       @comment.textcaptcha
       @comment.textcaptcha_question.must_equal nil
       @comment.textcaptcha_key.must_equal nil
@@ -173,8 +153,46 @@ describe 'Textcaptcha' do
     end
 
     it 'should be configured with textcaptcha.yml' do
-      Widget.textcaptcha_config[:api_key].must_equal '6eh1co0j12mi2ogcoggkkok4o'
-      Widget.textcaptcha_config[:questions].length.must_equal 10
+      Widget.textcaptcha_config[:api_key].must_equal('6eh1co0j12mi2ogcoggkkok4o')
+      Widget.textcaptcha_config[:questions].length.must_equal(10)
+    end
+  end
+
+  describe 'with strong parameters' do
+
+    it 'should work with accessible_attr widget ' do
+      @widget = StrongAccessibleWidget.new
+
+      @widget.textcaptcha
+      @widget.textcaptcha_question.must_equal('1+1')
+      @widget.valid?.must_equal false
+    end
+
+    it 'should work with protected_attr widget ' do
+      @widget = StrongProtectedWidget.new
+
+      @widget.textcaptcha
+      @widget.textcaptcha_question.must_equal('1+1')
+      @widget.valid?.must_equal false
+    end
+  end
+
+  describe 'when missing config' do
+
+    it 'should raise an error' do
+      YAML.stub :load, -> { raise 'some bad things happened' } do
+
+        error = assert_raises(ArgumentError) do
+          class NoConfig
+            include ActiveModel::Validations
+            include ActiveModel::Conversion
+            extend ActsAsTextcaptcha::Textcaptcha
+            acts_as_textcaptcha
+          end
+        end
+
+        error.message.must_match(/could not find any textcaptcha options/)
+      end
     end
   end
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_textcaptcha
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
-  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'
-- !ruby/object:Gem::Dependency
-  name: strong_parameters
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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.
@@ -173,19 +145,20 @@ email:
 - matt@hiddenloop.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- LICENSE
+extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
-- CHANGELOG
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
-- LICENSE
-- README.rdoc
+- LICENSE.txt
+- README.md
 - Rakefile
 - acts_as_textcaptcha.gemspec
+- bin/console
 - config/textcaptcha.yml
 - init.rb
 - lib/acts_as_textcaptcha.rb
@@ -204,8 +177,10 @@ files:
 - test/textcaptcha_helper_test.rb
 - test/textcaptcha_test.rb
 homepage: http://github.com/matthutchinson/acts_as_textcaptcha
-licenses: []
-metadata: {}
+licenses:
+- MIT
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths: