cold_shoulder 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a119cbf79420849fd9744b5604596fa10cc2e2e8
-  data.tar.gz: 7dd5ea4211aa6aaa3b2cf9342d480cb259ecdad6
+  metadata.gz: 6b5c1034d690bd1bf262b7d491ff281e44b9d714
+  data.tar.gz: 655709b9dc3d1678480f920784312fffac10a1ac
 SHA512:
-  metadata.gz: 860f36380a17265e4aba35ee08fd06b9f2e22921b45ab8fdbb62f4b39964ce38c8e453d75b85014f8aae1e337dabe08313b4e2d6c55cbc8cbb36e27c6bf291f4
-  data.tar.gz: 01d83e4f04c5872d2b14e4e33e86174e3ad92529429d7a204e2924f52ab1311219257d07d410da057e3a65dd90589ec216457512b9be4cce797cf0ec27fcb0cc
+  metadata.gz: f5648f2978c4ac0a1eae514fc2d14d409a9897b0b1ba3b21869ec76bdc32000a8ad3004b7aa5523e8b03ef5609a92470b3c9af7f4aad97ce9790e8116e67a46d
+  data.tar.gz: 8aed809493caa45f827128278e383af6435201f75aaf202b706fc98d6da38824ee41fbce6160d11897c4ccfbd3874556139df23eba7d3e049fb3403a1f208209

data/lib/cold_shoulder.rb

@@ -1,8 +1,4 @@
-require 'active_model'
-require 'active_model/validations'
-
-require 'action_view'
-require 'action_view/helpers'
+require 'validator'
 
 module ColdShoulder
   if defined?(Rails)
@@ -12,70 +8,4 @@ module ColdShoulder
       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 ActionView::Helpers::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 = /(\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, ''
-
-        # Look for matches
-        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|
-
-          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
-        def validates_with_cold_shouldr(*attr_names)
-          validates_with ColdShoulderValidator, _merge_attributes(attr_names)
-        end
-      end
-
-    end
-  end
 end

data/lib/validator.rb

@@ -0,0 +1,102 @@
+# For monkeypatch
+require 'active_model'
+require 'active_model/validations'
+
+# For formatting phone numbers in errors
+require 'action_view'
+require 'action_view/helpers'
+
+# 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 ActionView::Helpers::NumberHelper if defined?(Rails)
+
+      # These are somewhat simplistic
+      # Main problem being that all of them can be sidestepped by including commas
+      TWITTER_REGEX = /(@[A-Za-z0-9_]{1,15})/i
+      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
+      URL_REGEX = /\b(\S+?\.\S+?)\b/i
+
+      def initialize(options)
+        options[:ignore_link] = true if options[:remove_links]
+
+        super
+      end
+
+      def validate_each(record, attr_name, value)
+
+        # Detect any contact methods in the value
+        detected = detect_contacts_in value
+
+        # Add errors for detected methods,  If there is a message, skip adding errors
+        errors = add_errors_to_record(record, attr_name, detected, {skip: options[:message]})
+
+        # A base mesage might be used
+        if errors and options[:message]
+          record.errors.add(:base, options[:message])
+        end
+
+        # Strip URLs from the actual saved value
+        if options[:remove_links]
+          record[attr_name] = value.gsub URL_REGEX, ''
+        end
+      end
+
+      def detect_contacts_in value
+        # Remove spaces (the most basic way to avoid these detections)
+        globbed_value = value.gsub ' ', ''
+        # Remove any characters not numbers or commas (commas are for $1,000 formatted numbers
+        bullshit_free_phone = value.gsub /[^0-9,]|\n/i, ''
+
+        # Look for matches
+        detected = {
+          twitter:  globbed_value.scan(TWITTER_REGEX),
+          email:    value.scan(EMAIL_REGEX),
+          phone:    globbed_value.scan(PHONE_REGEX).concat(
+            bullshit_free_phone.scan(PHONE_REGEX)
+          ).uniq,
+          link: value.scan(URL_REGEX)
+        }
+      end
+
+      # Returns true or fase, if there were any errors at all
+      # ops[:skip] can be used to skip adding the actual errors to the record
+      # If we just want the boolean return value
+      def add_errors_to_record record, attr_name, detected, ops={}
+        # Catchall for base
+        errors = false
+
+        # Search for 
+        [:twitter, :email, :phone, :link].each do |type|
+
+          # Were there any matches, or are we ignoring this type
+          unless detected[type].empty? or options["ignore_#{type}".to_sym]
+            errors = true
+            next if ops[:skip] # If a base message is set, don't add attr errors
+            
+            record.errors.add(attr_name, "contains_#{type}".to_sym, options.merge(
+              detected: detected[type].map{ |p|
+                # If this is a phone it gets formatted, otherwise no 
+                type == :phone && defined?(Rails) ? number_to_phone(p[0], area_code: true) : p[0]
+              }.join(', ')
+            )) 
+          end
+
+        end
+        return errors
+      end
+
+      module HelperMethods
+        def validates_with_cold_shouldr(*attr_names)
+          validates_with ColdShoulderValidator, _merge_attributes(attr_names)
+        end
+      end
+
+    end
+  end
+end

data/locales/en.yml

@@ -3,4 +3,5 @@ en:
     messages:
       contains_twitter: "contains the twitter handle: %{detected}"
       contains_phone: "contains the phone number: %{detected}"
-      contains_email: "contains the email address: %{detected}"
+      contains_email: "contains the email address: %{detected}"
+      contains_link: "contains the link: %{detected}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cold_shoulder
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dustin Hoffman
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cold_shoulder.rb
+- lib/validator.rb
 - locales/en.yml
 homepage: https://github.com/Breefield/cold_shoulder
 licenses: