blacklist_validator 0.0.2 → 0.0.3

data/blacklist_validator.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "blacklist_validator"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Axel Vergult"]
   s.email       = ["axel.vergult@gmail.com"]
   s.homepage    = "https://github.com/episko/blacklist_validator"

data/lib/blacklist_validator.rb

@@ -1,17 +1,16 @@
 # -*- encoding: utf-8 -*-
 
 class BlacklistValidator < ActiveModel::EachValidator
-  attr_accessor :blacklist
-
-  def initialize(options)
-    load_blacklist!
-    super(options)
-  end
 
   def validate_each(record, attribute, value)
     record.errors.add(attribute, options[:message] || invalid_message(record, attribute)) if blacklisted?(value)
   end
 
+  # Lazy load and transform directly words to patterns instead of creating regexps at each matching tests
+  def blacklist
+    @blacklist ||= YAML.load_file(blacklist_file).map { |word| /(#{word})+/i }
+  end
+
   #######################
   ### Private methods ###
   #######################
@@ -25,20 +24,14 @@ class BlacklistValidator < ActiveModel::EachValidator
   end
 
   def blacklisted?(str)
-    @blacklist.each { |word| return true if greedy_match?(str, word) }
-    false
-  end
-
-  def greedy_match?(str, word)
-    str =~ /(#{word})+/i
+    blacklist.any? { |pattern| str =~ pattern }
   end
 
-  def load_blacklist!
+  def blacklist_file
     if defined?(Rails.root) && (blacklist_file_path = Rails.root.join("config", "blacklist.yml")).exist?
-      blacklist_path = blacklist_file_path
+      return blacklist_file_path
     end
-    blacklist_path ||= File.join(File.dirname(__FILE__), "../config/blacklist.yml")
-    @blacklist = YAML.load_file(blacklist_path)
+    File.join(File.dirname(__FILE__), "../config/blacklist.yml")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklist_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70349443486320 !ruby/object:Gem::Requirement
+  requirement: &70295538182100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349443486320
+  version_requirements: *70295538182100
 description: Blacklist validator for Rails 3
 email:
 - axel.vergult@gmail.com