despamilator_rails 1.0.1 → 1.1

data/.gitignore

@@ -0,0 +1,7 @@
+.bundle
+.idea
+coverage
+*.gem
+pkg/
+*.sqlite3
+doc/

data/Gemfile

@@ -1,17 +1,19 @@
 # A sample Gemfile
 source "http://rubygems.org"
 
-gem 'hoe', '>= 2.7.0'
-gem 'newgem', '>= 1.5.3'
-gem 'activesupport', '>= 2.3.10'
-
-# while we're fetching from git, we need to execute everything with 'bundle exec'
-#gem 'despamilator', :git => 'git://github.com/moowahaha/despamilator.git'
 gem 'despamilator', '>= 1.0'
+gem 'activemodel', '>= 3.0.0'
 
 group :test do
+  gem 'activerecord', '>= 3.0.0'
+  gem 'dm-migrations', '>= 1.0.2'
+  gem 'dm-validations', '>= 1.0.2'
+  gem 'dm-sqlite-adapter', '>= 1.0.2'
   gem 'rspec', '>= 2.4.0'
   gem 'sqlite3', '>= 0.1.1'
-  gem 'activerecord', '>= 2.3.10'
   gem 'one_hundred_percent_coverage'
 end
+
+group :development do
+  gem 'ruby-debug19'
+end

data/Gemfile.lock

@@ -1,22 +1,46 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.3)
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.3)
+    addressable (2.2.2)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.6)
+    builder (2.1.2)
+    columnize (0.3.2)
+    data_objects (0.10.2)
+      addressable (~> 2.1)
     despamilator (1.0)
     diff-lcs (1.1.2)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
+      extlib (~> 0.9.15)
+    dm-do-adapter (1.0.2)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.0.2)
+    dm-migrations (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-sqlite-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
+      do_sqlite3 (~> 0.10.2)
+    dm-validations (1.0.2)
+      dm-core (~> 1.0.2)
+    do_sqlite3 (0.10.2)
+      data_objects (= 0.10.2)
+    extlib (0.9.15)
     ffi (1.0.4)
       rake (>= 0.8.7)
-    hoe (2.8.0)
-      rake (>= 0.8.7)
-    newgem (1.5.3)
-      RedCloth (>= 4.1.1)
-      activesupport (~> 2.3.4)
-      hoe (>= 2.4.0)
-      rubigen (>= 1.5.3)
-      syntax (>= 1.0.0)
+    i18n (0.5.0)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
     one_hundred_percent_coverage (0.0.2)
       simplecov (>= 0.3.7)
     rake (0.8.7)
@@ -28,24 +52,34 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    rubigen (1.5.5)
-      activesupport (~> 2.3.5)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
     simplecov (0.3.7)
       simplecov-html (>= 0.3.7)
     simplecov-html (0.3.9)
     sqlite3 (0.1.1)
       ffi (>= 0.6.3)
-    syntax (1.0.0)
+    tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 2.3.10)
-  activesupport (>= 2.3.10)
+  activemodel (>= 3.0.0)
+  activerecord (>= 3.0.0)
   despamilator (>= 1.0)
-  hoe (>= 2.7.0)
-  newgem (>= 1.5.3)
+  dm-migrations (>= 1.0.2)
+  dm-sqlite-adapter (>= 1.0.2)
+  dm-validations (>= 1.0.2)
   one_hundred_percent_coverage
   rspec (>= 2.4.0)
+  ruby-debug19
   sqlite3 (>= 0.1.1)

data/History.txt

@@ -5,3 +5,9 @@
   * Better syntactic sugar.
   * Behaves much more like a regular ActiveRecord validation routine.
   * Load of tests.
+
+=== 1.1 2011-02-01
+
+* DataMapper support.
+* Exclusive support of Rails 3.
+* Major refactorage.

data/Manifest.txt

@@ -12,4 +12,3 @@ spec/active_record_integration_spec.rb
 spec/despamilator_rails_spec.rb
 spec/fixtures/active_record_test_class.rb
 spec/spec_helper.rb
-spec/test_db_migrations/create_test_model_table.rb

data/README.rdoc

@@ -5,18 +5,14 @@
 == DESCRIPTION:
 
 Spam detection plugin for Rails & ActiveRecord. Uses all the standard Rails conventions and
-my Despamilator gem.
+my Despamilator gem. This gem only supports Rails 3. See despamilator_rails2 for Rails 2 support.
 
 == FEATURES/PROBLEMS:
 
 * To fix the iconv error when developing with Ruby 1.9.2 and RVM,
   see: http://blog.footle.org/2010/07/29/installing-ruby-1-9-2-via-rvm-on-os-x/ .
 
-* Stuck with lower version of ActiveRecord in Gemfile until Hoe is fixed to support
-  newer versions.
-
-* DataMapper not yet supported. That's on the list!
-
+* Does not support Rails 2. See despamilator_rails2 for support.
 
 == SYNOPSIS:
 

data/Rakefile

@@ -1,23 +1,14 @@
 require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
 require 'fileutils'
 require './lib/despamilator_rails'
 
-Hoe.plugin :newgem
+task :default => [:test]
 
-$hoe = Hoe.spec 'despamilator_rails' do
-  self.developer 'Stephen Hardisty', 'moowahaha@hotmail.com'
-  self.rubyforge_name       = self.name
-  self.extra_deps         = [['despamilator','>= 1.0'], ['activerecord', '>= 2.3.2']]
+desc "Run specs"
+task :test do
+  sh "rspec spec"
 end
 
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-task :default => [:spec]
-task :test => [:spec]
-
 desc "Generate appropriate rdoc"
 task :rdoc do
   sh "rdoc README.rdoc lib/despamilator_rails.rb"
@@ -28,3 +19,8 @@ task :cultivate do
   sh "touch Manifest.txt; rake check_manifest |grep -v \"(in \" | patch"
   sh "rake debug_gem | grep -v \"(in \" > `basename \\`pwd\\``.gemspec"
 end
+
+desc "Build the gem"
+task :package do
+  sh "gem build despamilator-rails.gemspec"
+end

data/despamilator-rails.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{despamilator_rails}
-  s.version = "1.0"
+  s.version = "1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Hardisty"]
   s.date = %q{2011-01-09}
-  s.description = %q{FIX (describe your package)}
+  s.description = %q{Adds a Rails-esque validation method for use in Rails 3 with ActiveRecord or DataMapper}
   s.email = ["moowahaha@hotmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = [".rspec", ".rvmrc", "Gemfile", "Gemfile.lock", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "despamilator-rails.gemspec", "lib/despamilator_rails.rb", "spec/active_record_integration_spec.rb", "spec/despamilator_rails_spec.rb", "spec/fixtures/active_record_test_class.rb", "spec/spec_helper.rb", "spec/test_db_migrations/create_test_model_table.rb"]
+  s.files = `git ls-files`.split("\n")
   s.homepage = %q{https://github.com/moowahaha/despamilator-rails}
-  s.rdoc_options = ["--main", "README.rdoc"]
+  s.rdoc_options = ["lib/despamilator_rails.rb", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{despamilator_rails}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{FIX (describe your package)}
+  s.summary = %q{Anti-spam validation hooks for Rails.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -24,16 +24,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<despamilator>, [">= 1.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.2"])
-      s.add_development_dependency(%q<hoe>, [">= 2.8.0"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
     else
       s.add_dependency(%q<despamilator>, [">= 1.0"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.2"])
-      s.add_dependency(%q<hoe>, [">= 2.8.0"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0"])
     end
   else
     s.add_dependency(%q<despamilator>, [">= 1.0"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.2"])
-    s.add_dependency(%q<hoe>, [">= 2.8.0"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0"])
   end
 end

data/lib/despamilator_rails.rb

@@ -1,102 +1,90 @@
 require 'despamilator'
-require 'active_record'
+require 'active_model'
 
-module DespamilatorRails
-  VERSION = "1.0.1"
+Dir.glob(File.join(File.dirname(__FILE__), 'despamilator_rails', '*.rb')) do |file|
+  require file
 end
 
-module ActiveRecord
-
-  class Base
-
-    # Somewhere (such as your environment.rb...)
-    #
-    #    require 'despamilator_rails'
-    #
-    # In your model (basic example):
-    #
-    #    class YourModel < ActiveRecord::Base
-    #      validate_with_despamilator :attributes => [:some_field]
-    #    end
-    #
-    # When "some_field" is assigned a spammy value, it will add to the errors. For example...
-    #
-    #    YourModel.new(:some_field => spammy_value).save! #=> ActiveRecord::RecordInvalid exception!
-    #
-    # Or...
-    #
-    #    your_instance = YourModel.new(:some_field => spammy_value)
-    #    your_instance.save
-    #    your_instance.errors.full_messages.should #=> ["Some field looks like spam"]
-    #
-    # If you want to configure the threshold (which defaults to 1) or add your own callback, you can do the following:
-    #
-    #    class YourModel < ActiveRecord::Base
-    #      validate_with_despamilator :attributes => [:some_field], :threshold => 1 do |field, value, despamilator|
-    #        raise "spam! field: #{field}, value: #{value}, score: #{despamailtor.score}"
-    #      end
-    #    end
-    #
-    # This example will...
-    #
-    #    your_instance = YourModel.new(:some_field => "spammy string")
-    #    your_instance.save! #=> Exception "spam! field: some_field, value: spammy string, score: 123"
-    #
-    # The callback will receive the field name, the value and the instance of the Despamilator class.
-
-    def self.validate_with_despamilator settings, &block
-      assign_despamilator_attributes settings
-      assign_despamilator_threshold settings
-      assign_despamilator_callback block
-
-      add_despamilator_validation settings
-    end
-
-    private
-
-    class << self
-
-      def add_despamilator_validation settings
-
-        send(validation_method(:save), settings) do |record|
-
-          record.despamilator_checked_attributes.each do |attribute|
-            text  = record.send(attribute)
-            dspam = Despamilator.new(text)
+class DespamilatorActiveRecordValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, text)
+    dspam = Despamilator.new(text)
+    record.despamilator_callback(attribute, text, dspam) if dspam.score >= record.despamilator_threshold
+  end
+end
 
-            record.despamilator_callback(attribute, text, dspam) if dspam.score >= record.despamilator_threshold
-          end
+module DespamilatorRails
 
-        end
+  # In your model (basic example):
+  #
+  #    class YourModel < ActiveRecord::Base
+  #      validate_with_despamilator :attributes => [:some_field]
+  #    end
+  #
+  # When "some_field" is assigned a spammy value, it will add to the errors. For example...
+  #
+  #    YourModel.new(:some_field => spammy_value).save! #=> ActiveRecord::RecordInvalid exception!
+  #
+  # Or...
+  #
+  #    your_instance = YourModel.new(:some_field => spammy_value)
+  #    your_instance.save
+  #    your_instance.errors.full_messages.should #=> ["Some field looks like spam"]
+  #
+  # Note that, by default, DataMapper behaves slightly differently in that it will not raise exceptions
+  # unless you code a callback to deal with that. Instead it will return "false" on an unsuccessful save.
+  #
+  # If you want to configure the threshold (which defaults to 1) or add your own callback, you can do the following:
+  #
+  #    class YourModel < ActiveRecord::Base
+  #      validate_with_despamilator :attributes => [:some_field], :threshold => 1 do |field, value, despamilator|
+  #        raise "spam! field: #{field}, value: #{value}, score: #{despamailtor.score}"
+  #      end
+  #    end
+  #
+  # This example will...
+  #
+  #    your_instance = YourModel.new(:some_field => "spammy string")
+  #    your_instance.save! #=> Exception "spam! field: some_field, value: spammy string, score: 123"
+  #
+  # The callback will receive the field name, the value and the instance of the Despamilator class.
+
+  def validate_with_despamilator settings, & block
+    extend(respond_to?(:validates_with_block) ? DespamilatorRails::DataMapperValidator : DespamilatorRails::ActiveRecordValidator)
+
+    assign_despamilator_threshold settings
+    assign_despamilator_callback block
+
+    add_despamilator_validation settings
+  end
 
-      end
+  private
 
-      def assign_despamilator_attributes(settings)
-        clean_attributes = settings[:attributes].reject do |attribute|
-          attribute.blank?
-        end
+  def add_despamilator_validation settings
 
-        raise('At least one attribute must be defined') if clean_attributes.empty?
+    clean_despamilator_attributes(settings).each do |attribute|
+      setup_despamilation_detection_for attribute
+    end
 
-        define_method(:despamilator_checked_attributes, lambda { clean_attributes })
-      end
+  end
 
-      def assign_despamilator_threshold(settings)
-        define_method(:despamilator_threshold, lambda { settings[:threshold] || 1 })
-      end
+  def clean_despamilator_attributes(settings)
+    clean_attributes = settings[:attributes].reject do |attribute|
+      attribute.blank?
+    end
 
-      def assign_despamilator_callback(block)
-        define_method(:despamilator_callback, block || default_despamilator_detection_response)
-      end
+    raise('At least one attribute must be defined') if clean_attributes.empty?
 
-      def default_despamilator_detection_response
-        lambda { |attribute, value, dspam|
-          errors.add(attribute, "looks like spam")
-        }
-      end
+    clean_attributes
+  end
 
-    end
+  def assign_despamilator_threshold(settings)
+    define_method(:despamilator_threshold, lambda { settings[:threshold] || 1 })
+  end
 
+  def assign_despamilator_callback(block)
+    define_method(:despamilator_callback, block || default_despamilator_detection_response)
   end
 
 end
+
+Module.send(:include, DespamilatorRails)

data/lib/despamilator_rails/active_record_validator.rb

@@ -0,0 +1,15 @@
+module DespamilatorRails
+  module ActiveRecordValidator
+
+    def setup_despamilation_detection_for attribute
+      validates attribute, :despamilator_active_record => true
+    end
+
+    def default_despamilator_detection_response
+      lambda { |attribute, value, dspam|
+        errors.add(attribute, "looks like spam")
+      }
+    end
+
+  end
+end

data/lib/despamilator_rails/data_mapper_validator.rb

@@ -0,0 +1,21 @@
+module DespamilatorRails
+  module DataMapperValidator
+
+    def setup_despamilation_detection_for attribute
+
+        validates_with_block attribute do
+          text = send(attribute)
+          dspam = Despamilator.new(text)
+          despamilator_callback(attribute, text, dspam) if dspam.score >= despamilator_threshold
+        end
+
+    end
+
+    def default_despamilator_detection_response
+      lambda { |attribute, value, dspam|
+        [false, "looks like spam"]
+      }
+    end
+
+  end
+end

data/spec/active_record_spec.rb

@@ -0,0 +1,18 @@
+describe SomeActiveRecordModel do
+
+  it_should_behave_like "a spam protected model"
+
+  it "should notify of spam detection in a railsy way" do
+
+    class SomeActiveRecordModelWithSpam < SomeActiveRecordModel
+      validate_with_despamilator :attributes => [:some_field]
+    end
+
+    some_model            = SomeActiveRecordModelWithSpam.new
+    some_model.some_field = Despamilator.gtubs_test_string
+
+    -> {some_model.save!}.should raise_error(ActiveRecord::RecordInvalid)
+    some_model.errors.full_messages.should == ["Some field looks like spam"]
+  end
+
+end

data/spec/data_mapper_spec.rb

@@ -0,0 +1,17 @@
+describe SomeDataMapperModel do
+
+  it_should_behave_like "a spam protected model"
+
+  it "should notify of spam detection in a railsy way" do
+
+    class SomeDataMapperModelWithSpam < SomeDataMapperModel
+      validate_with_despamilator :attributes => [:some_field]
+    end
+
+    some_model            = SomeDataMapperModelWithSpam.new
+    some_model.some_field = Despamilator.gtubs_test_string
+
+    some_model.save.should be_false
+    some_model.errors.first.should == ["looks like spam"]
+  end
+end

data/spec/fixtures/active_record_test_class.rb

@@ -1,5 +1,11 @@
-class SomeModel < ActiveRecord::Base
+require 'active_record'
 
-  validate_with_despamilator :attributes => [:some_field]
+class SomeActiveRecordModel < ActiveRecord::Base
+
+  establish_connection :adapter => 'sqlite3', :database => 'test.sqlite3'
+
+  connection.create_table table_name, :force => true do |t|
+    t.text :some_field
+  end
 
 end

data/spec/fixtures/data_mapper_test_class.rb

@@ -0,0 +1,15 @@
+require 'dm-migrations'
+require 'dm-validations'
+
+class SomeDataMapperModel
+
+  DataMapper.setup(:default, 'sqlite::memory:')
+
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :some_field, Text
+
+end
+
+DataMapper.auto_migrate!

data/spec/spam_protected_model_shared.rb

@@ -0,0 +1,97 @@
+shared_examples_for "a spam protected model" do
+
+  before do
+    Object.send(:remove_const, :TestClass) if Module.constants.include?(:TestClass)
+  end
+
+  it "should be just fine when no spam is passed" do
+    some_instance            = described_class.new
+    some_instance.some_field = 'hello'
+
+    some_instance.save.should be_true
+  end
+
+  it "should check for spam on save" do
+
+    class TestClass < described_class
+      validate_with_despamilator :attributes => [:some_field]
+    end
+
+    some_instance            = TestClass.new
+    some_instance.some_field = Despamilator.gtubs_test_string
+
+    some_instance.save.should be_false
+  end
+
+  describe "threshold" do
+
+    it "should default to 1" do
+
+      class TestClass < described_class
+        validate_with_despamilator :attributes => [:some_field]
+      end
+
+      some_model = TestClass.new
+      some_model.despamilator_threshold.should == 1
+    end
+
+    it "should be settable" do
+
+      class TestClass < described_class
+        validate_with_despamilator :attributes => [:some_field], :threshold => 9
+      end
+
+      some_model = TestClass.new
+      some_model.despamilator_threshold.should == 9
+
+    end
+
+  end
+
+  describe "attributes" do
+
+    it "should cause an exception when an empty array is passed" do
+
+      ->{
+      class TestClass < described_class
+        validate_with_despamilator :attributes => []
+      end
+      }.should raise_error('At least one attribute must be defined')
+
+    end
+
+    it "should cause an exception when an empty string is passed" do
+
+      -> {
+      class TestClass < described_class
+        validate_with_despamilator :attributes => ['']
+      end
+      }.should raise_error('At least one attribute must be defined')
+
+    end
+
+  end
+
+  it "should allow a block to be specified" do
+
+    class TestClass < described_class
+      def do_something field, value, despamilator
+      end
+
+      validate_with_despamilator :attributes => [:some_field] do |field, value, despamilator|
+        do_something(field, value, despamilator)
+      end
+    end
+
+    fake_despamilator = mock('despamilator')
+    Despamilator.should_receive(:new).and_return(fake_despamilator)
+    fake_despamilator.should_receive(:score).and_return(10000)
+
+    some_model = TestClass.new
+    some_model.should_receive(:do_something).with(:some_field, 'blah', fake_despamilator)
+    some_model.some_field = 'blah'
+    some_model.save
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,22 +1,9 @@
 require 'one_hundred_percent_coverage'
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'despamilator_rails')
-require 'active_record'
 
-Dir.glob(File.join(File.dirname(__FILE__), 'test_db_migrations', '*.rb')).each do |file|
-  require file
+%w{active_record_test_class data_mapper_test_class}.each do |file|
+  require File.join(File.dirname(__FILE__), 'fixtures', file)
 end
 
-db_file = 'test.sqlite3'
-
-File.unlink(db_file) if File.exists?(db_file)
-
-ActiveRecord::Base.establish_connection(
-    :adapter  => 'sqlite3',
-    :database => db_file
-)
-
-CreateSomeModel.migrate(:up)
-
-Dir.glob(File.join(File.dirname(__FILE__), 'fixtures', '*.rb')).each do |file|
-  require file
-end
+require File.join(File.dirname(__FILE__), 'spam_protected_model_shared')

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  version: "1.1"
 platform: ruby
 authors: 
 - Stephen Hardisty
@@ -32,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -40,30 +39,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 3
-        - 2
-        version: 2.3.2
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
-  type: :development
-  version_requirements: *id003
-description: |-
-  Spam detection plugin for Rails & ActiveRecord. Uses all the standard Rails conventions and
-  my Despamilator gem.
+description: Adds a Rails-esque validation method for use in Rails 3 with ActiveRecord or DataMapper
 email: 
 - moowahaha@hotmail.com
 executables: []
@@ -74,6 +56,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 files: 
+- .gitignore
 - .rspec
 - .rvmrc
 - Gemfile
@@ -84,18 +67,21 @@ files:
 - Rakefile
 - despamilator-rails.gemspec
 - lib/despamilator_rails.rb
-- spec/active_record_integration_spec.rb
-- spec/despamilator_rails_spec.rb
+- lib/despamilator_rails/active_record_validator.rb
+- lib/despamilator_rails/data_mapper_validator.rb
+- spec/active_record_spec.rb
+- spec/data_mapper_spec.rb
 - spec/fixtures/active_record_test_class.rb
+- spec/fixtures/data_mapper_test_class.rb
+- spec/spam_protected_model_shared.rb
 - spec/spec_helper.rb
-- spec/test_db_migrations/create_test_model_table.rb
 has_rdoc: true
 homepage: https://github.com/moowahaha/despamilator-rails
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
+- lib/despamilator_rails.rb
 - README.rdoc
 require_paths: 
 - lib
@@ -121,6 +107,6 @@ rubyforge_project: despamilator_rails
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Spam detection plugin for Rails & ActiveRecord
+summary: Anti-spam validation hooks for Rails.
 test_files: []
 

data/spec/active_record_integration_spec.rb

@@ -1,8 +0,0 @@
-describe "active_record integration" do
-  it "should check for spam on save" do
-    some_instance = SomeModel.new
-    some_instance.some_field = Despamilator.gtubs_test_string
-
-    -> {some_instance.save!}.should raise_error(ActiveRecord::RecordInvalid)
-  end
-end

data/spec/despamilator_rails_spec.rb

@@ -1,120 +0,0 @@
-describe "despamilator_rails" do
-
-  it "should notify of spam detection in a railsy way" do
-
-    class SomeModelWithSpam < ActiveRecord::Base
-      set_table_name 'some_models'
-      validate_with_despamilator :attributes => [:some_field]
-    end
-
-    some_model            = SomeModelWithSpam.new
-    some_model.some_field = Despamilator.gtubs_test_string
-
-    -> {some_model.save!}.should raise_error(ActiveRecord::RecordInvalid)
-    some_model.errors.full_messages.should == ["Some field looks like spam"]
-  end
-
-  describe "threshold" do
-
-    it "should default to 1" do
-
-      class SomeModelWithDefaultThreshold < ActiveRecord::Base
-        set_table_name 'some_models'
-        validate_with_despamilator :attributes => [:some_field]
-      end
-
-      some_model            = SomeModelWithDefaultThreshold.new
-      some_model.despamilator_threshold.should == 1
-    end
-
-    it "should be settable" do
-
-      class SomeModelWithDefinedThreshold < ActiveRecord::Base
-        set_table_name 'some_models'
-        validate_with_despamilator :attributes => [:some_field], :threshold => 9
-      end
-
-      some_model            = SomeModelWithDefinedThreshold.new
-      some_model.despamilator_threshold.should == 9
-
-    end
-
-  end
-
-  describe "attributes" do
-
-    it "should cause an exception when an empty array is passed" do
-
-      ->{
-      class SomeModelWithMissingAttributes < ActiveRecord::Base
-        validate_with_despamilator :attributes => []
-      end
-      }.should raise_error('At least one attribute must be defined')
-
-    end
-
-    it "should cause an exception when an empty string is passed" do
-
-      -> {
-      class SomeModelWithEmptyAttributes < ActiveRecord::Base
-        validate_with_despamilator :attributes => ['']
-      end
-      }.should raise_error('At least one attribute must be defined')
-
-    end
-
-  end
-
-  it "should allow a block to be specified" do
-
-    class SomeModelWithABlock < ActiveRecord::Base
-      set_table_name 'some_models'
-
-      def do_something field, value, despamilator
-      end
-
-      validate_with_despamilator :attributes => [:some_field] do |field, value, despamilator|
-        do_something(field, value, despamilator)
-      end
-    end
-
-    fake_despamilator = mock('despamilator')
-    Despamilator.should_receive(:new).and_return(fake_despamilator)
-    fake_despamilator.should_receive(:score).and_return(10000)
-
-    some_model = SomeModelWithABlock.new
-    some_model.should_receive(:do_something).with(:some_field, 'blah', fake_despamilator)
-    some_model.some_field = 'blah'
-    some_model.save
-
-  end
-
-  it "should work nicely with other validate methods" do
-    class SomeModelWithAnotherValidate < ActiveRecord::Base
-      set_table_name 'some_models'
-
-      validate_with_despamilator :attributes => [:some_field] do |field, value, despamilator|
-        do_something
-      end
-
-      def do_something
-      end
-
-      def do_something_else
-      end
-
-      def validate
-        do_something_else
-      end
-
-    end
-
-    some_model            = SomeModelWithAnotherValidate.new
-    some_model.should_receive(:do_something)
-    some_model.should_receive(:do_something_else)
-    some_model.some_field = Despamilator.gtubs_test_string
-    some_model.save
-
-  end
-
-end

data/spec/test_db_migrations/create_test_model_table.rb

@@ -1,10 +0,0 @@
-class CreateSomeModel < ActiveRecord::Migration
-  ActiveRecord::Migration.verbose = false
-
-  def self.up
-    create_table :some_models do |t|
-      t.text :some_field
-    end
-  end
-
-end