ankh 0.1.3 → 0.2.0

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+spec/dummy/log/*

data/.rvmrc

@@ -0,0 +1 @@
+rvm use default@ankh --create

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in ..gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2009 Dan Pickett
+Copyright (c) 2011 Dan Pickett
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +19,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -2,12 +2,23 @@
 
 Ankh is the ancient Egyptian sign of life. 
 
-Use Ankh in your Rails (2.3.x or 3.0) projects to protect against bots and other spam producers. It asks a simple
+Use Ankh in your Rails (>= 3.0) projects to protect against bots and other spam producers. It asks a simple
 arithmatic question to verify that the poster is human.
 
-In your model:
+In your activerecord model:
 
-    validates_human :on => :create
+    class Post < ActiveRecord::Base
+      validates_human :on => :create
+    end
+
+Ankh is also available for ActiveModel objects:
+
+    class Foo
+      include ActiveModel::Validations
+      extend Ankh::Model
+      validates_human :on => :create
+    end
+      
 
 In your view (Rails 2 syntax shown below):
 
@@ -22,7 +33,6 @@ In your view (Rails 2 syntax shown below):
 
 * Nice form helpers
 * I18n support
-* automated testing of Rails 2.3.x vs. 3.0
  
 == Note on Patches/Pull Requests
  
@@ -36,4 +46,4 @@ In your view (Rails 2 syntax shown below):
 
 == Copyright
 
-Copyright (c) 2010 Dan Pickett. See LICENSE for details.
+Copyright (c) 2011 Dan Pickett. See LICENSE for details.

data/Rakefile

@@ -1,91 +1,13 @@
-require 'rubygems'
-require 'rake'
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ankh"
-    gem.summary = %Q{Protect against bots and other spam producers with simple mathematical questions}
-    gem.description = %Q{Use Ankh in your Rails (2.3.x or 3.0) projects to protect against bots and other spam producers. It asks a simple
-    arithmatic question to verify that the poster is human.}
-    gem.email = "dpickett@enlightsolutions.com"
-    gem.homepage = "http://github.com/dpickett/ankh"
-    gem.authors = ["Dan Pickett"]
-    gem.add_dependency "activerecord", ">= 2.3.4"
-    gem.add_dependency "activesupport", ">= 2.3.4"
-    gem.add_dependency "configatron", "2.6.3"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem.add_development_dependency "yard", ">= 0"
-    gem.add_development_dependency "cucumber", ">= 0"
-    gem.add_development_dependency "mocha"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-begin
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.spec_files = FileList['spec/**/*_spec.rb']
-  end
-
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
-  end
-rescue LoadError
-  puts "Rspec (or a dependency) not available. gem install rspec"
-end
-
-  task :spec => :check_dependencies
-
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
-end
+  require 'rspec/core/rake_task'
 
-begin
-  require 'reek/adapters/rake_task'
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
+  desc "Run specs"
+  RSpec::Core::RakeTask.new do |t|
   end
-end
 
-begin
-  require 'roodi'
-  require 'roodi_task'
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
 rescue LoadError
-  task :roodi do
-    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
-  end
-end
-
-task :default => :spec
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
+  puts "RSpec is not installed"
 end

data/ankh.gemspec

@@ -1,74 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/ankh/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{ankh}
-  s.version = "0.1.3"
+Gem::Specification.new do |gem|
+  gem.authors       = ["Dan Pickett"]
+  gem.email         = ["dpickett@enlightsolutions.com"]
+  gem.description   = %q{Protect against bots and other spam producers}
+  gem.summary       = %q{Asks simple randomized questions to detect humans}
+  gem.homepage      = ""
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dan Pickett"]
-  s.date = %q{2011-10-23}
-  s.description = %q{Use Ankh in your Rails (2.3.x or 3.0) projects to protect against bots and other spam producers. It asks a simple
-    arithmatic question to verify that the poster is human.}
-  s.email = %q{dpickett@enlightsolutions.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "ankh.gemspec",
-    "features/ankh.feature",
-    "features/step_definitions/ankh_steps.rb",
-    "features/support/env.rb",
-    "lib/ankh.rb",
-    "lib/ankh/model.rb",
-    "lib/ankh/question.rb",
-    "lib/ankh/rails/legacy.rb",
-    "lib/ankh/validations/human.rb",
-    "spec/ankh/model_spec.rb",
-    "spec/ankh/question_spec.rb",
-    "spec/ankh_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "spec/support/active_record_spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/dpickett/ankh}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{Protect against bots and other spam producers with simple mathematical questions}
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = "ankh"
+  gem.require_paths = ["lib"]
+  gem.version       = Ankh::VERSION
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.add_dependency "activesupport", "> 3.0"
+  gem.add_dependency "configatron"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<configatron>, ["= 2.6.3"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 2.3.4"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<configatron>, ["= 2.6.3"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 2.3.4"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<configatron>, ["= 2.6.3"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
+  gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rails"
+  gem.add_development_dependency "rspec", "> 1.2.9"
+  gem.add_development_dependency "mocha"
 end
 

data/lib/..rb

@@ -0,0 +1,5 @@
+require "./version"
+
+module .
+  # Your code goes here...
+end

data/lib/ankh.rb

@@ -1,14 +1,12 @@
-require "rubygems"
-require "active_record"
 require "digest/sha1"
 require "configatron"
 
-require "ankh/rails/legacy"
-
 require "ankh/question"
-require "ankh/validations/human"
+
+require "ankh/validations/human_validator"
 
 require "ankh/model"
+require "ankh/railtie" if defined?(Rails)
 
 module Ankh
   def self.salt=(salt)
@@ -22,4 +20,4 @@ module Ankh
   def self.encrypt(item_to_encrypt)
     Digest::SHA1.hexdigest("--#{salt}--#{item_to_encrypt}")
   end
-end
+end

data/lib/ankh/model.rb

@@ -1,17 +1,25 @@
 module Ankh
   module Model
-    def self.included(base)
-      base.send(:attr_accessor, :human_answer)
-      base.send(:attr_reader, :human_question)
-      base.send(:attr_accessor, :salted_human_answer)
+    def validates_human(options = {})
+      include Ankh::Model::HelperMethods
+      validates_with Ankh::Validations::HumanValidator, options
     end
-    
-    def generate_human_question
-      question = Ankh::Question.generate
-      @human_question = question.question
-      self.salted_human_answer = Ankh.encrypt(question.answer)
+
+    module HelperMethods
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :human_answer
+        attr_accessor :human_question
+        attr_accessor :salted_human_answer
+      end
+   
+      def generate_human_question
+        question = Ankh::Question.generate
+        @human_question = question.question
+        self.salted_human_answer = Ankh.encrypt(question.answer)
+      end
     end
   end
 end
 
-ActiveRecord::Base.extend(Ankh::Validations::HelperMethods)

data/lib/ankh/question.rb

@@ -20,4 +20,4 @@ module Ankh
       new
     end
   end
-end
+end

data/lib/ankh/railtie.rb

@@ -0,0 +1,8 @@
+module Ankh
+  class Railtie < Rails::Railtie
+    initializer "ankh" do
+      ActiveRecord::Base.extend Ankh::Model
+    end
+  end
+end
+

data/lib/ankh/validations/{human.rb → human_validator.rb}

@@ -17,17 +17,5 @@ module Ankh
         record.salted_human_answer.present? && Ankh.encrypt(record.human_answer) != record.salted_human_answer
       end
     end
-    
-    module HelperMethods
-      def validates_human(options = {})
-        self.send(:include, Ankh::Model) unless probably_included_already?
-        validates_with HumanValidator, options
-      end
-      
-      private
-      def probably_included_already?
-        self.respond_to?(:human_question) && self.respond_to?(:human_answer)
-      end
-    end
   end
 end

data/lib/ankh/version.rb

@@ -0,0 +1,3 @@
+module Ankh
+  VERSION = "0.2.0"
+end

data/spec/ankh/model_spec.rb

@@ -2,7 +2,9 @@ require "spec_helper"
 
 describe Ankh::Model do
   INVALID_ANSWER = "3241235" #this answer will never be valid due to constraints
-  class Post < ActiveRecord::Base
+  class Post
+    include ActiveModel::Validations
+    extend Ankh::Model
     validates_human
     attr_accessor :name
     validates_presence_of :name
@@ -26,19 +28,19 @@ describe Ankh::Model do
   
   it "should not save if I do not specify a human answer" do
     subject.human_answer = ""
-    subject.save.should be_false
+    subject.should_not be_valid
     subject.errors[:human_answer].should_not be_nil
   end
   
   it "should clear out the human answer if validation fails" do
     subject.human_answer = INVALID_ANSWER
-    subject.save.should be_false
+    subject.should_not be_valid
     subject.human_answer.should be_blank
   end
   
   it "should not save if I do not match the intended answer" do
     subject.human_answer = INVALID_ANSWER
-    subject.save.should be_false
+    subject.should_not be_valid
     subject.errors[:human_answer].should_not be_nil
   end
   
@@ -47,7 +49,7 @@ describe Ankh::Model do
     Ankh::Question.expects(:generate).returns(question)
     
     subject.human_answer = question.answer
-    subject.save.should be_true
+    subject.should be_valid
   end
   
   it "should clear the human answer if the model is not valid" do
@@ -55,7 +57,8 @@ describe Ankh::Model do
     Ankh::Question.expects(:generate).returns(question)
     subject.name = nil
     subject.human_answer = question.answer
-    subject.save.should be_false
+    subject.should_not be_valid
     subject.human_answer.should be_blank
   end
-end
+end
+

data/spec/dummy/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks