credit_card_sanitizer 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dcfef3249fbf1b18ea38db59853ab7cce1c560f
-  data.tar.gz: 29edfaa4eb3b7b7777699b5a8cfc2b408744d473
+  metadata.gz: 1106a3d83f2f106a3abb02a314dc976ec935a3b5
+  data.tar.gz: b6062a9c7731b05af090ea0745269f3a23092c86
 SHA512:
-  metadata.gz: 4e794eaeb79cdc6b7269776fdb53b80e260cab30d6de1c3dc100cbf957cb8eca15330fd078c847ce07d387e88317d724a70ff22d37abec3759daf084337b9fc6
-  data.tar.gz: 248af200a7e16640f5d9ec721c4ee2344054521c799cd7e87cbd31bdf4f0223b75fafecfa19c4a01c027b6b0d61dd5379f71ea8e9e6ea4497bb137e685e9afe5
+  metadata.gz: e64c023e0155a9701fed50c29ebab09c38a1411e83f076853ffb2baa93da6c31e14a996b9b3c192f43e017c7b3f205ae4bdcee88471d8c81b110bfb1544cd968
+  data.tar.gz: efe24ccfb1c436a86fa44912638285935b5af13f6525bf98e375c7e1a047a157fa635512edd4cd6a6b210271c60b12ad7dfa4f161f349b8367d0c87132c89c8f

data/lib/credit_card_sanitizer.rb

@@ -2,6 +2,7 @@
 
 require 'luhn_checksum'
 require 'securerandom'
+require 'scrub_rb'
 
 class CreditCardSanitizer
 
@@ -22,8 +23,8 @@ class CreditCardSanitizer
   }
   VALID_COMPANY_PREFIXES = Regexp.union(*CARD_COMPANIES.values)
   EXPIRATION_DATE = /\s(?:0?[1-9]|1[0-2])(?:\/|-)(?:\d{4}|\d{2})(?:\s|$)/
-  LINE_NOISE = /[^\w_\n,()\/:]{,5}/
-  SCHEME_OR_PLUS = /(\+|(?:[a-zA-Z][\-+.a-zA-Z\d]{,9}):\S+)/
+  LINE_NOISE = /[^\w_\n,()\/:;]{,5}/
+  SCHEME_OR_PLUS = /((?:+|\+)|(?:[a-zA-Z][\-+.a-zA-Z\d]{,9}):\S+)/
   NUMBERS_WITH_LINE_NOISE = /#{SCHEME_OR_PLUS}?\d(?:#{LINE_NOISE}\d){10,18}/
 
   attr_reader :replacement_token, :expose_first, :expose_last
@@ -59,7 +60,7 @@ class CreditCardSanitizer
   # Returns a String of the redacted text if a credit card number was detected.
   # Returns nil if no credit card numbers were detected.
   def sanitize!(text)
-    to_utf8!(text)
+    text.scrub!('�')
 
     redacted = nil
 
@@ -131,19 +132,4 @@ class CreditCardSanitizer
     yield
     text.gsub!(expiration_date_boundary, '')
   end
-
-  if ''.respond_to?(:scrub)
-    def to_utf8!(str)
-      str.force_encoding(Encoding::UTF_8)
-      str.scrub! unless str.valid_encoding?
-    end
-  else
-    def to_utf8!(str)
-      str.force_encoding(Encoding::UTF_8)
-      unless str.valid_encoding?
-        str.encode!(Encoding::UTF_16, :invalid => :replace, :replace => '�')
-        str.encode!(Encoding::UTF_8, Encoding::UTF_16)
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credit_card_sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Eric Chapweske
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -68,6 +68,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: scrub_rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 description: Credit card sanitizer
 email:
 - ggrossman@zendesk.com
@@ -96,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Credit card sanitizer