bellmyer-validates_blacklist 0.1.5 → 0.1.6

data/lib/bellmyer/validates_blacklist.rb

@@ -11,6 +11,8 @@ module Bellmyer
       unless included_modules.include? InstanceMethods
         class_inheritable_accessor :options
         class_inheritable_accessor :model
+        class_inheritable_accessor :blacklist_file
+        class_inheritable_accessor :blacklist_attributes
         
         extend ClassMethods
         include InstanceMethods
@@ -20,17 +22,37 @@ module Bellmyer
       end
       
       self.options = options
-        self.model = self.to_s.underscore
+      self.model = self.to_s.underscore
+      self.blacklist_file = "#{RAILS_ROOT}/config/blacklists/#{self.to_s.underscore}_blacklist.yml"
     end
     
     module ClassMethods
-      def blacklist
-        puts "blacklisted!"
+      def blacklist(attribute, value, message = nil)
+        attribute = attribute.to_s
+
+        load_blacklist
+        self.blacklist_attributes[attribute] ||= []
+        if message.nil?
+          self.blacklist_attributes[attribute].reject!{|a| a.is_a?(Array) ? a.first == value : a == value}
+          self.blacklist_attributes[attribute] << value
+        else
+          self.blacklist_attributes[attribute].reject!{|a| a.is_a?(Array) ? a.first == value : a == value}
+          self.blacklist_attributes[attribute] << [value, message]
+        end
+        save_blacklist
       end
       
       def unblacklist
         puts "Removed from blacklist."
       end
+      
+      def load_blacklist
+        self.blacklist_attributes = YAML.load_file(self.blacklist_file) || {}
+      end
+      
+      def save_blacklist
+        File.open(self.blacklist_file, 'w'){|f| YAML.dump(self.blacklist_attributes, f)}
+      end
     end
     
     module InstanceMethods
@@ -39,10 +61,8 @@ module Bellmyer
       protected
       
       def model_blacklists
-        blacklist = "#{RAILS_ROOT}/config/blacklists/#{self.class.to_s.underscore}_blacklist.yml"
-        
         # Load blacklist #
-        if attributes = File.open(blacklist){|f| YAML::load(f)}
+        if attributes = self.class.load_blacklist
           # Cycle through attributes #
           attributes.each do |attribute, stops|
             attribute = attribute.to_sym

data/test/config/blacklists/template.yml

@@ -0,0 +1,11 @@
+name:
+ - Stinky Pete
+ - [Vanessa, is not allowed after ditching my b-day party]
+ 
+email:
+ - stinky_pete@gmail.com
+ - [/@aol\.com$/, is banned until they stop sending me CD\'s]
+ 
+age:
+ - < 14
+ - [\> 25, is too old and pervy!exit]

data/test/validates_blacklist_test.rb

@@ -1,8 +1,10 @@
 require 'test/unit'
 require 'rubygems'
 require 'active_record'
+require 'ftools'
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
-require File.dirname(__FILE__) + '/../init'
+require File.dirname(__FILE__) + '/../lib/validates_blacklist'
  
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
  
@@ -176,3 +178,73 @@ class FriendWithBlankBlacklistTest < Test::Unit::TestCase
     assert friend.valid?
   end
 end
+
+class FriendUpdateable < Friend
+  validates_blacklist
+end
+
+class FriendUpdateableTest < Test::Unit::TestCase
+  def setup
+    setup_db
+    File.copy("#{RAILS_ROOT}/config/blacklists/template.yml", "#{RAILS_ROOT}/config/blacklists/friend_updateable_blacklist.yml")
+  end
+  
+  def teardown
+    teardown_db
+    File.unlink("#{RAILS_ROOT}/config/blacklists/friend_updateable_blacklist.yml")
+  end
+  
+  def test_should_add_a_new_blacklist_item_without_message
+    FriendUpdateable.blacklist(:name, 'terrible')
+    
+    friend = FriendUpdateable.new(:name => 'terrible')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?('is not allowed.')
+  end
+  
+  def test_should_add_a_new_blacklist_item_with_message
+    FriendUpdateable.blacklist(:name, 'terrible', "is terrible.")
+
+    friend = FriendUpdateable.new(:name => 'terrible')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?('is terrible.')
+  end
+  
+  def test_should_update_an_existing_blacklist_item_changing_message_without_adding_item
+    FriendUpdateable.blacklist(:name, 'Vanessa', "is terrible.")
+
+    friend = FriendUpdateable.new(:name => 'Vanessa')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?('is terrible.')
+    
+    list = FriendUpdateable.load_blacklist
+    assert_equal 1, list['name'].select{|node| node.is_a?(Array) ? node.first == 'Vanessa' : node == 'Vanessa'}.size
+  end
+  
+  def test_should_update_an_existing_blacklist_item_adding_message_without_adding_item
+    FriendUpdateable.blacklist(:name, 'Stinky Pete', "is terrible.")
+
+    friend = FriendUpdateable.new(:name => 'Stinky Pete')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?('is terrible.')
+    
+    list = FriendUpdateable.load_blacklist
+    assert_equal 1, list['name'].select{|node| node.is_a?(Array) ? node.first == 'Stinky Pete' : node == 'Stinky Pete'}.size
+  end
+  
+  def test_should_update_an_existing_blacklist_item_removing_message_without_adding_item
+    FriendUpdateable.blacklist(:name, 'Vanessa')
+
+    friend = FriendUpdateable.new(:name => 'Vanessa')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?('is not allowed.')
+    
+    list = FriendUpdateable.load_blacklist
+    assert_equal 1, list['name'].select{|node| node.is_a?(Array) ? node.first == 'Vanessa' : node == 'Vanessa'}.size
+  end
+end

data/validates_blacklist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'validates_blacklist'
-  s.version = '0.1.5'
+  s.version = '0.1.6'
   s.date = '2009-08-26'
   
   s.summary = "Allows models to be validated against yaml-based blacklists"
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "test/config/blacklists/friend_with_blacklist_blacklist.yml",
     "test/config/blacklists/friend_with_blank_blacklist_blacklist.yml",
     "test/config/blacklists/friend_with_custom_message_blacklist.yml",
+    "test/config/blacklists/template.yml",
     "test/test_helper.rb",
     "test/validates_blacklist_test.rb"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bellmyer-validates_blacklist
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jaime Bellmyer
@@ -43,6 +43,7 @@ files:
 - test/config/blacklists/friend_with_blacklist_blacklist.yml
 - test/config/blacklists/friend_with_blank_blacklist_blacklist.yml
 - test/config/blacklists/friend_with_custom_message_blacklist.yml
+- test/config/blacklists/template.yml
 - test/test_helper.rb
 - test/validates_blacklist_test.rb
 has_rdoc: true