cold_shoulder 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0236f2cbf906291b1a1060bc38bcd398a0e4f0b0
-  data.tar.gz: 46482c7b989aaa556044286ee901cd3125b1b09e
+  metadata.gz: a119cbf79420849fd9744b5604596fa10cc2e2e8
+  data.tar.gz: 7dd5ea4211aa6aaa3b2cf9342d480cb259ecdad6
 SHA512:
-  metadata.gz: 9758533a6bd4d2a0ea08e6ac9b2146cca1c93ac0b154a9dea91259e27dd1e55ceef72163091699df840b3aed5eb3063338ebd58d052d3f4afd7da845e9063af3
-  data.tar.gz: d389c0ca4f0e828515537658b0465524a610bbf0a75bf5963a90789d882093896dc90859ec7bc4b30bd113ddf6cda3a27c076e61f9449c1b7da82039410be6e0
+  metadata.gz: 860f36380a17265e4aba35ee08fd06b9f2e22921b45ab8fdbb62f4b39964ce38c8e453d75b85014f8aae1e337dabe08313b4e2d6c55cbc8cbb36e27c6bf291f4
+  data.tar.gz: 01d83e4f04c5872d2b14e4e33e86174e3ad92529429d7a204e2924f52ab1311219257d07d410da057e3a65dd90589ec216457512b9be4cce797cf0ec27fcb0cc

data/lib/cold_shoulder.rb

@@ -1,7 +1,8 @@
 require 'active_model'
 require 'active_model/validations'
-require 'active_support'
-require 'active_support/number_helper'
+
+require 'action_view'
+require 'action_view/helpers'
 
 module ColdShoulder
   if defined?(Rails)
@@ -20,7 +21,7 @@ module ActiveModel
 
     # Extend the rails each validator so that this can be used like any Rails validator
     class ColdShoulderValidator < EachValidator
-      include ActiveSupport::NumberHelper if defined?(Rails)
+      include ActionView::Helpers::NumberHelper if defined?(Rails)
 
       def validate_each(record, attr_name, value)
 
@@ -36,47 +37,40 @@ module ActiveModel
         bullshit_free_phone = value.gsub /[^0-9,]|\n/i, ''
 
         # 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
-        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
+        detected = {
+          twitter:  globbed_value.scan(twitter_regex),
+          email:    value.scan(email_regex),
+          phone:    globbed_value.scan(formatted_phone_regex).concat(
+            bullshit_free_phone.scan(formatted_phone_regex)
+          ).uniq
+        }
+
+        # Catchall for base
+        errors = false
+
+        [:twitter, :email, :phone].each do |type|
 
-        # Email addys
-        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(', ')
-            ))
+          unless detected[type].empty? or options["ignore_#{type}".to_sym]
+            errors = true
+            next if options[:message]
+            
+            record.errors.add(attr_name, "contains_#{type}".to_sym, options.merge(
+              detected: detected[type].map{ |p| 
+                type == :phone && defined?(Rails) ? number_to_phone(p[0], area_code: true) : p[0]
+              }.join(', ')
+            )) 
           end
 
         end
+
+        # A base mesage might be used
+        if errors and options[:message]
+          record.errors.add(:base, options[:message])
+        end
+
       end
 
       module HelperMethods
-        # Validates that the specified attributes do not contain contact information. 
-        # Happens by default on save.
-        #
-        #   class Message < ActiveRecord::Base
-        #     validates_no_contact_in :body
-        #   end
-
         def validates_with_cold_shouldr(*attr_names)
           validates_with ColdShoulderValidator, _merge_attributes(attr_names)
         end

data/locales/en.yml

@@ -1,6 +1,6 @@
 en:
   errors:
     messages:
-      contains_twitter_handle: "contains the twitter handle: %{handles}"
-      contains_phone_number: "contains the phone number: %{phone_numbers}"
-      contains_email_address: "contains the email address: %{email_addresses}"
+      contains_twitter: "contains the twitter handle: %{detected}"
+      contains_phone: "contains the phone number: %{detected}"
+      contains_email: "contains the email address: %{detected}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cold_shoulder
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Dustin Hoffman
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='