validates_decency_of 1.5.0 → 1.5.1

data/Rakefile

@@ -10,7 +10,8 @@ begin
     gem.email = "seamus@abshere.net"
     gem.homepage = "http://github.com/seamusabshere/validates_decency_of"
     gem.authors = ["Seamus Abshere"]
-    gem.add_dependency 'activerecord', '~>2.3.4'
+    gem.add_dependency 'activesupport', '>=2.3.4'
+    gem.add_dependency 'activerecord', '>=2.3.4'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/lib/validates_decency_of.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_record'
+
 # Uses George Carlin's list of "seven dirty words" to "check for decency" (ahem)
 # http://en.wikipedia.org/wiki/Seven_dirty_words
 # Future versions will support adding/removing from this list
@@ -10,7 +13,6 @@
 # Configuration Options
 #
 # [<tt>:message</tt>] A custom error message (default is: "is invalid")
-#
 module ValidatesDecencyOf
   INDECENT_WORDS = %w(shit piss fuck cunt cocksucker motherfucker tits)
   def self.indecent?(str)
@@ -18,14 +20,36 @@ module ValidatesDecencyOf
     INDECENT_WORDS.any? { |c| essence.include? c }
   end
   
-  def validates_decency_of(*attribute_names)
-    options = { :message => 'is invalid' }
-    options.merge!(attribute_names.pop) if attribute_names.last.kind_of?(Hash)
-    options.merge! :on => :save
-    validates_each(attribute_names, options) do |record, attribute_name, value|
-      record.errors.add attribute_name, options[:message] if ValidatesDecencyOf.indecent? value
+  if ActiveRecord::VERSION::MAJOR == 2
+    module ClassMethods
+      def validates_decency_of(*attribute_names)
+        options = { :message => 'is indecent' }
+        options.merge!(attribute_names.pop) if attribute_names.last.kind_of?(Hash)
+        options.merge! :on => :save
+        validates_each(attribute_names, options) do |record, attribute_name, value|
+          record.errors.add attribute_name, options[:message] if ValidatesDecencyOf.indecent? value
+        end
+      end
+    end
+  elsif ActiveRecord::VERSION::MAJOR == 3
+    class DecencyValidator < ActiveModel::EachValidator
+      def validate(record)
+        message = options[:message] || 'is indecent'
+        attributes.each do |name|
+          if ValidatesDecencyOf.indecent? record.send(name)
+            record.errors.add name, message
+          end
+        end
+      end
+    end
+    module ClassMethods
+      def validates_decency_of(*attr_names)
+        validates_with DecencyValidator, _merge_attributes(attr_names)
+      end
     end
+  else
+    raise "Needs activerecord 2 or 3"
   end
 end
 
-ActiveRecord::Base.extend ValidatesDecencyOf
+ActiveRecord::Base.extend ValidatesDecencyOf::ClassMethods

data/test/test_validates_decency_of.rb

@@ -28,7 +28,14 @@ class TestValidatesDecencyOf < Test::Unit::TestCase
   
   def test_should_disallow_indecent_strings
     assert_equal false, @indecent.valid?
-    assert @indecent.errors.on(:title)
-    assert @indecent.errors.on(:description)
+    if ActiveRecord::VERSION::MAJOR == 2
+      assert @indecent.errors.on(:title).present?
+      assert @indecent.errors.on(:description).present?
+    elsif ActiveRecord::VERSION::MAJOR == 3
+      assert @indecent.errors[:title].present?
+      assert @indecent.errors[:description].present?
+    else
+      raise "don't know what to do"
+    end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: validates_decency_of
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -9,19 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -04:00
+date: 2010-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Rails plugin that uses George Carlin's list of seven dirty words (aka swear words, aka cuss words) to check for decency on ActiveRecord model attributes.
 email: seamus@abshere.net
 executables: []
@@ -36,14 +59,10 @@ files:
 - README
 - Rakefile
 - VERSION
-- init.rb
-- install.rb
 - lib/validates_decency_of.rb
-- rails/init.rb
 - tasks/validates_decency_of_tasks.rake
 - test/test_helper.rb
 - test/test_validates_decency_of.rb
-- uninstall.rb
 has_rdoc: true
 homepage: http://github.com/seamusabshere/validates_decency_of
 licenses: []
@@ -57,18 +76,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails plugin that uses George Carlin's list of seven dirty words (aka swear words, aka cuss words) to check for decency on ActiveRecord model attributes.

data/init.rb

@@ -1 +0,0 @@
-require 'validates_decency_of'

data/install.rb

@@ -1 +0,0 @@
-# Install hook code here

data/rails/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'init')

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here