cold_shoulder 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efab1138b6ecea26248018be6a3305c651baf921
-  data.tar.gz: e0ff443163907137a03f601bfab640437cb00158
+  metadata.gz: 0cbec9bba312d384496203bbeb9946d896eafd07
+  data.tar.gz: 9b7b35ac23b8c35ed887d9243158bfee7853abeb
 SHA512:
-  metadata.gz: 683e992fcb063d1ca72c615b2deb0c40509f32e293914052e2b8deab14f4ead981ae538db7a17a3b442ab9805d2533bd0de512891c3ab5bd935c32a6e9992968
-  data.tar.gz: 48478725e4be4bb00a9a23db244ef4ef433ef32b75de0f91bf13523d8adb52585ae830bb68a5eb23bfa87a9f16ff0a99939c927f1d2666adee1da95ada85a1c9
+  metadata.gz: 5fd912a4e3a1c5f828f2c3646fbaf6315c27465ee19bb8562ae162d1f9890fe538e4dab8729cdec292f5cf702e33894c75dda2c9df527080fec18db10424c221
+  data.tar.gz: bbd5360fb97cf23eb6695a0d64a415d4f48f13e671801633a9d983eaa00a4c91c378c9fd1d557aceff6a437bf1b7c25befa1e50ed2690707e0534431e2239620

data/lib/cold_shoulder.rb

@@ -1,37 +1,71 @@
 require 'active_model'
 require 'active_model/validations'
+require 'active_support'
+require 'active_support/number_helper'
 
+module ColdShoulder
+  if defined?(Rails)
+    class Railtie < Rails::Railtie
+      config.before_configuration do
+        I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
+      end
+    end
+  end
+end
+
+# The validations
+# TODO require in another file? This was failing when actually deployed through rubygems
 module ActiveModel
   module Validations
 
     # Extend the rails each validator so that this can be used like any Rails validator
     class ColdShoulderValidator < EachValidator
+      include ActiveSupport::NumberHelper if defined?(Rails)
+
       def validate_each(record, attr_name, value)
 
         # These are somewhat simplistic
         # Main problem being that all of them can be sidestepped by including commas
         # TODO: Move this outside the validate_each method so we don't define it over and over
-        twitter_regex = /@([A-Za-z0-9_]{1,15})/i
-        formatted_phone_regex = /(?:\+?(\d{1,3}))?[- (]*(\d{3})[- )]*(\d{3})[- ]*(\d{4})(?: *x(\d+))?\b/i
-        email_regex = /.+(\@|a\s*t).+\..+/i
+        twitter_regex = /(@[A-Za-z0-9_]{1,15})/i
+        formatted_phone_regex = /((?:\+?(\d{1,3}))?[- (]*(\d{3})[- )]*(\d{3})[- ]*(\d{4})(?: *x(\d+))?\b)/i
+        email_regex = /(\b[^\s]+?\s*(@|at)\s*[^\s]+?\.[^\s]+?\b)/i # Very general so as to catch BS
 
+        # Remove spaces (the most basic way to avoid these detections)
         globbed_value = value.gsub ' ', ''
         bullshit_free_phone = value.gsub /[^0-9,]|\n/i, ''
 
-        # Twitter handles
-        if twitter_regex.match(globbed_value) && !options[:ignore_twitter]
-          record.errors.add(attr_name, :contains_twitter_handle, options)
-        end
+        # Look for matches
+        twitter_handles = globbed_value.scan twitter_regex
+        email_addresses = value.scan email_regex
+        phone_numbers = globbed_value.scan(formatted_phone_regex).concat(
+          bullshit_free_phone.scan(formatted_phone_regex)
+        ).uniq
 
-        # Phone numbers with bullshit
-        if (formatted_phone_regex.match(globbed_value) && !options[:ignore_phone]) or
-          (formatted_phone_regex.match(bullshit_free_phone) && !options[:ignore_phone])
-          record.errors.add(attr_name, :contains_phone_number, options)
+        # Phone numbers
+        unless phone_numbers.empty? or options[:ignore_phone]
+          record.errors.add(attr_name, :contains_phone_number, options.merge(
+            phone_numbers: phone_numbers.map{ |p| 
+              defined?(Rails) ? number_to_phone(p[0]) : p[0]
+            }.join(', ')
+          ))
         end
 
         # Email addys
-        if email_regex.match(value) && !options[:ignore_email]
-          record.errors.add(attr_name, :contains_email_address)
+        unless email_addresses.empty? or options[:ignore_email]
+          record.errors.add(attr_name, :contains_email_address, options.merge(
+            email_addresses: email_addresses.map{|p| p[0] }.join(', ')
+          ))
+        else
+
+          # Twitter handles
+          # Any email address is going to register twitter handles as well
+          unless twitter_handles.empty? or options[:ignore_twitter]
+            record.errors.add(attr_name, :contains_twitter_handle, options.merge(
+              handles: twitter_handles.map{|p| p[0] }.join(', ')
+            ))
+          end
+
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cold_shoulder
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Dustin Hoffman
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement