data_cleansing 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 963a448b6c2ab7dfe313dd911f19e83a4c4688a6
-  data.tar.gz: ff312d2b3a5dfc3bc20255f909bf3376ef720188
+  metadata.gz: a24ad3a5780b445ed15310ad8776d89c122747d9
+  data.tar.gz: ab79edb935ae22415b50c51d1e1c7dc60c7a16c5
 SHA512:
-  metadata.gz: 8f899d278990a64a9ce9dcf51713b9143ba9485449ed793f4c96afe9a078dd0273308dfc2eaca41ce081c31ed2beba54173c0b6733c25ef9dfa16b4608e73b9a
-  data.tar.gz: c3d1addfece09468dc7f05981145e98f90ff46721c1b5e68e8b8b283f9b0d71485f0d63164115149b3a2dc84acece390fbbd5fa982b87c8689ad50316f2181bd
+  metadata.gz: 032ce480495e7127cd17b4b1bd39630e51573c579fda5b7cb34bb32f1f3cb6509c8e3ebd9a568b88f6f36cb694d7a7dbd7b32aad040fe6f511ce47b3d01fad3f
+  data.tar.gz: b2d7af9ad633ad5c5045c1103129d843fb5453b256cd5c3cbe3590967d950036da39ab8d6940387c36a51f1501c4b348ef5128b64b3c044b7ff01969392b6d5c

data/LICENSE.txt

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2012 Clarity Services, Inc.
+   Copyright 2012, 2013, 2014 Reid Morrison
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -1,7 +1,7 @@
 data_cleansing
 ==============
 
-Data Cleansing framework for Ruby with additional support for Rails and Mongoid
+Data Cleansing framework for Ruby, Rails, Mongoid and MongoMapper.
 
 * http://github.com/reidmorrison/data_cleansing
 
@@ -251,7 +251,7 @@ in a Rails initializer as follows:
 
 ```ruby
 SemanticLogger.default_level = Rails.logger.level
-SemanticLogger.add_appender(Rails.logger)
+SemanticLogger.add_appender(logger: Rails.logger)
 ```
 
 By changing the log level of DataCleansing itself the type of output for data
@@ -319,9 +319,9 @@ tries to convert it to an integer or float.
 
 DataCleansing requires the following dependencies
 
-* Ruby V1.8.7, V1.9.3 or V2 and greater
-* Rails V2 or greater for Rails integration ( Only if Rails is being used )
-* Mongoid V2 or greater for Mongoid integration ( Only if Mongoid is being used )
+* Ruby V1.9.3, V2 and greater
+* Rails V3.2 (Active Model) or greater for Rails integration ( Only if Rails is being used )
+* Mongoid and Mongomapper supporting Active Model V3.2 or greater ( Only if Mongoid or MongoMapper is being used )
 
 ## Meta
 
@@ -338,7 +338,7 @@ Reid Morrison :: reidmo@gmail.com :: @reidmorrison
 
 ## License
 
-Copyright 2013 Reid Morrison
+Copyright 2013, 2014, 2015, 2016 Reid Morrison
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,40 +1,27 @@
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
-require 'rubygems'
-require 'rubygems/package'
 require 'rake/clean'
 require 'rake/testtask'
-require 'date'
-require 'data_cleansing/version'
 
-desc "Build gem"
-task :gem  do |t|
-  gemspec = Gem::Specification.new do |s|
-    s.name        = 'data_cleansing'
-    s.version     = DataCleansing::VERSION
-    s.platform    = Gem::Platform::RUBY
-    s.authors     = ['Reid Morrison']
-    s.email       = ['reidmo@gmail.com']
-    s.homepage    = 'https://github.com/ClarityServices/data_cleansing'
-    s.date        = Date.today.to_s
-    s.summary     = "Data Cleansing framework for Ruby, and Ruby on Rails"
-    s.description = "Data Cleansing framework for Ruby with additional support for Rails and Mongoid"
-    s.files       = FileList["./**/*"].exclude(/.gem$/, /.log$/,/^nbproject/).map{|f| f.sub(/^\.\//, '')}
-    s.license     = "Apache License V2.0"
-    s.has_rdoc    = true
-    s.add_dependency 'thread_safe'
-    s.add_dependency 'semantic_logger'
-  end
-  Gem::Package.build gemspec
+require_relative 'lib/data_cleansing/version'
+
+task :gem do
+  system 'gem build data_cleansing.gemspec'
 end
 
-desc "Run Test Suite"
+task publish: :gem do
+  system "git tag -a v#{DataCleansing::VERSION} -m 'Tagging #{DataCleansing::VERSION}'"
+  system 'git push --tags'
+  system "gem push data_cleansing-#{DataCleansing::VERSION}.gem"
+  system "rm data_cleansing-#{DataCleansing::VERSION}.gem"
+end
+
+desc 'Run Test Suite'
 task :test do
   Rake::TestTask.new(:functional) do |t|
-    t.test_files = FileList['test/*_test.rb']
+    t.test_files = FileList['test/**/*_test.rb']
     t.verbose    = true
   end
 
   Rake::Task['functional'].invoke
 end
+
+task default: :test

data/lib/data_cleansing.rb

@@ -1,4 +1,4 @@
-require 'thread_safe'
+require 'concurrent'
 require 'semantic_logger'
 require 'data_cleansing/version'
 require 'data_cleansing/data_cleansing'

data/lib/data_cleansing/cleaners.rb

@@ -0,0 +1,137 @@
+require 'uri'
+module Cleaners
+  # Strip leading and trailing whitespace
+  module Strip
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      string.strip! || string
+    end
+  end
+  DataCleansing.register_cleaner(:strip, Strip)
+
+  # Convert to uppercase
+  module Upcase
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      string.upcase! || string
+    end
+  end
+  DataCleansing.register_cleaner(:upcase, Upcase)
+
+  # Remove all non-word characters, including whitespace
+  module RemoveNonWord
+    NOT_WORDS = Regexp.compile(/\W/)
+
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      string.gsub!(NOT_WORDS, '') || string
+    end
+  end
+  DataCleansing.register_cleaner(:remove_non_word, RemoveNonWord)
+
+  # Remove all not printable characters
+  module RemoveNonPrintable
+    NOT_PRINTABLE = Regexp.compile(/[^[:print:]]/)
+
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      string.gsub!(NOT_PRINTABLE, '') || string
+    end
+  end
+  DataCleansing.register_cleaner(:remove_non_printable, RemoveNonPrintable)
+
+  # Remove HTML Markup
+  module RemoveHTMLMarkup
+    HTML_MARKUP = Regexp.compile(/&(amp|quot|gt|lt|apos|nbsp);/in)
+
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      string.gsub!(HTML_MARKUP) do |match|
+        case match.downcase
+        when 'amp' then
+          '&'
+        when 'quot' then
+          '"'
+        when 'gt' then
+          '>'
+        when 'lt' then
+          '<'
+        when 'apos' then
+          "'"
+        when 'nbsp' then
+          ' '
+        else
+          "&#{match};"
+        end
+      end || string
+    end
+  end
+  DataCleansing.register_cleaner(:remove_html_markup, RemoveHTMLMarkup)
+
+  module ReplaceURIChars
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      URI.unescape(string)
+    end
+  end
+  DataCleansing.register_cleaner(:replace_uri_chars, ReplaceURIChars)
+
+  # Compress multiple whitespace to a single space
+  module CompressWhitespace
+    WHITESPACE = Regexp.compile(/\s+/)
+
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      string.gsub!(WHITESPACE, ' ') || string
+    end
+  end
+  DataCleansing.register_cleaner(:compress_whitespace, CompressWhitespace)
+
+  # Remove Non-Digit Chars
+  # Returns nil if no digit characters present
+  module DigitsOnly
+    DIGITS = Regexp.compile(/\D/)
+
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      string.gsub!(DIGITS, '')
+      string.length > 0 ? string : nil
+    end
+  end
+  DataCleansing.register_cleaner(:digits_only, DigitsOnly)
+
+  # Returns [Integer] after removing all non-digit characters, except '.'
+  # Returns nil if no digits are present in the string.
+  module StringToInteger
+    NUMERIC = Regexp.compile(/[^0-9\.]/)
+
+    def self.call(string)
+      return string unless string.is_a?(String)
+
+      # Remove Non-Digit Chars, except for '.'
+      string.gsub!(NUMERIC, '')
+      string.length > 0 ? string.to_i : nil
+    end
+  end
+  DataCleansing.register_cleaner(:string_to_integer, StringToInteger)
+
+  # Convert a Date to a Time at the end of day for that date (YYYY-MM-DD 23:59:59)
+  # Ex: 2015-12-31 becomes 2015-12-31 23:59:59
+  # If something other than a Date object is passed in, it just passes through.
+  module DateToTimeAtEndOfDay
+    def self.call(date)
+      return date unless date.kind_of?(Date)
+
+      date.to_time.end_of_day
+    end
+  end
+  DataCleansing.register_cleaner(:date_to_time_at_end_of_day, DateToTimeAtEndOfDay)
+end

data/lib/data_cleansing/cleanse.rb

@@ -1,3 +1,4 @@
+require 'data_cleansing/cleaners'
 module DataCleansing
   # Mix-in to add cleaner
   module Cleanse
@@ -17,7 +18,7 @@ module DataCleansing
 
         # Create shortcuts to cleaners for each attribute for use by .cleanse_attribute
         attributes.each do |attr|
-          (data_cleansing_attribute_cleaners[attr] ||= ThreadSafe::Array.new) << cleaner
+          (data_cleansing_attribute_cleaners[attr] ||= Concurrent::Array.new) << cleaner
         end
         cleaner
       end
@@ -72,17 +73,17 @@ module DataCleansing
 
       # Array of cleaners to execute against this model and it's children
       def data_cleansing_cleaners
-        @data_cleansing_cleaners ||= ThreadSafe::Array.new
+        @data_cleansing_cleaners ||= Concurrent::Array.new
       end
 
       # Array of cleaners to execute against this model and it's children
       def data_cleansing_after_cleaners
-        @data_cleansing_after_cleaners ||= ThreadSafe::Array.new
+        @data_cleansing_after_cleaners ||= Concurrent::Array.new
       end
 
       # Hash of attributes to clean with their corresponding cleaner
       def data_cleansing_attribute_cleaners
-        @data_cleansing_attribute_cleaners ||= ThreadSafe::Hash.new
+        @data_cleansing_attribute_cleaners ||= Concurrent::Hash.new
       end
 
       private
@@ -100,17 +101,22 @@ module DataCleansing
         return if cleaner_struct.nil? || value.nil?
         # Duplicate value in case cleaner uses methods such as gsub!
         new_value = value.is_a?(String) ? value.dup : value
-        cleaner_struct.cleaners.each do |cleaner|
+        cleaner_struct.cleaners.each do |name|
           # Cleaner itself could be a custom Proc, otherwise do a global lookup for it
-          proc = cleaner.is_a?(Proc) ? cleaner : DataCleansing.cleaner(cleaner.to_sym)
-          raise "No cleaner defined for #{cleaner.inspect}" unless proc
+          proc = name.is_a?(Proc) ? name : DataCleansing.cleaner(name.to_sym)
+          raise "No cleaner defined for #{name.inspect}" unless proc
 
-          new_value = if object
-            # Call the cleaner proc within the scope (binding) of the object
-            proc.arity == 1 ? object.instance_exec(new_value, &proc) : object.instance_exec(new_value, cleaner_struct.params, &proc)
+          if proc.is_a?(Proc)
+            new_value = if object
+              # Call the cleaner proc within the scope (binding) of the object
+              proc.arity == 1 ? object.instance_exec(new_value, &proc) : object.instance_exec(new_value, cleaner_struct.params, &proc)
+            else
+              proc.arity == 1 ? proc.call(new_value) : proc.call(new_value, cleaner_struct.params)
+            end
           else
-            proc.arity == 1 ? proc.call(new_value) : proc.call(new_value, cleaner_struct.params)
+            new_value = (proc.method(:call).arity == 1 ? proc.call(new_value) : proc.call(new_value, cleaner_struct.params))
           end
+
         end
         new_value
       end

data/lib/data_cleansing/data_cleansing.rb

@@ -2,14 +2,14 @@ module DataCleansing
   include SemanticLogger::Loggable
 
   # Global Data Cleansers
-  @@global_cleaners     = ThreadSafe::Hash.new
-  @@masked_attributes   = ThreadSafe::Array.new
+  @@global_cleaners     = Concurrent::Hash.new
+  @@masked_attributes   = Concurrent::Array.new
 
   # Register a new cleaner
   # Replaces any existing cleaner with the same name
-  def self.register_cleaner(cleaner, &block)
-    raise "Must supply a Proc with the cleaner" unless block
-    @@global_cleaners[cleaner.to_sym] = block
+  def self.register_cleaner(name, cleaner = nil, &block)
+    raise "Must supply a Proc with the cleaner" unless block || cleaner
+    @@global_cleaners[name.to_sym] = cleaner || block
   end
 
   # Returns the cleaner matching the supplied cleaner name

data/lib/data_cleansing/version.rb

@@ -1,3 +1,3 @@
 module DataCleansing
-  VERSION = "0.6.1"
+  VERSION = '0.8.0'
 end

data/test/active_record_test.rb

@@ -1,18 +1,5 @@
-# Allow examples to be run in-place without requiring a gem install
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-# Load ActiveRecord before loading data_cleansing so that the AR extensions
-# are loaded
+require_relative 'test_helper'
 require 'active_record'
-require 'data_cleansing'
-require 'semantic_logger'
-
-# Register an appender if one is not already registered
-SemanticLogger.default_level = :trace
-SemanticLogger.add_appender('test.log') if SemanticLogger.appenders.size == 0
 
 ActiveRecord::Base.logger = SemanticLogger[ActiveRecord::Base]
 ActiveRecord::Base.configurations = {
@@ -36,9 +23,6 @@ ActiveRecord::Schema.define :version => 0 do
   end
 end
 
-# Define a global cleaner
-DataCleansing.register_cleaner(:strip) {|string| string.strip}
-
 # Log data cleansing result
 # Set to :warn or higher to disable
 DataCleansing.logger.level = :debug
@@ -46,20 +30,6 @@ DataCleansing.logger.level = :debug
 # Set the Global list of fields to be masked
 DataCleansing.register_masked_attributes :ssn, :bank_account_number
 
-# Removes all non-digit characters, except '.' then truncates
-# the result to an integer string
-# Returns nil if no digits are present in the string
-DataCleansing.register_cleaner(:digits_to_integer) do |integer|
-  if integer.kind_of?(String)
-    # Remove Non-Digit Chars, except for '.'
-    integer = integer.gsub(/[^0-9\.]/, '')
-    integer.length > 0 ? integer.to_i : nil
-  else
-    integer
-  end
-end
-
-
 class User < ActiveRecord::Base
   include DataCleansing::Cleanse
 
@@ -73,7 +43,7 @@ class User < ActiveRecord::Base
   cleanse :address1, :address2, :instance_var, :cleaner => Proc.new {|string| "<< #{string.strip} >>"}
 
   # Custom Zip Code cleaner
-  cleanse :zip_code, :cleaner => :digits_to_integer
+  cleanse :zip_code, :cleaner => :string_to_integer
 
   # Automatically cleanse data before validation
   before_validation :cleanse_attributes!
@@ -94,20 +64,20 @@ class User2 < ActiveRecord::Base
   cleanse :first_name, :cleaner => Proc.new {|string| "$#{string}$"}
 
   # Custom Zip Code cleaner
-  cleanse :zip_code, :cleaner => :digits_to_integer
+  cleanse :zip_code, :cleaner => :string_to_integer
 
   # Automatically cleanse data before validation
   before_validation :cleanse_attributes!
 end
 
-class ActiveRecordTest < Test::Unit::TestCase
-  context "ActiveRecord Models" do
+class ActiveRecordTest < Minitest::Test
+  describe "ActiveRecord Models" do
 
-    should 'have globally registered cleaner' do
+    it 'have globally registered cleaner' do
       assert DataCleansing.cleaner(:strip)
     end
 
-    should 'Model.cleanse_attribute' do
+    it 'Model.cleanse_attribute' do
       assert_equal 'joe',                 User.cleanse_attribute(:first_name,   '    joe   ')
       assert_equal 'black',               User.cleanse_attribute(:last_name,    "\n  black\n")
       assert_equal '<< 2632 Brown St >>', User.cleanse_attribute(:address1,     "2632 Brown St   \n")
@@ -115,8 +85,8 @@ class ActiveRecordTest < Test::Unit::TestCase
       assert_equal 12345,                 User.cleanse_attribute(:zip_code,     "\n\tblah 12345badtext\n")
     end
 
-    context "with user" do
-      setup do
+    describe "with user" do
+      before do
         @user = User.new(
           :first_name   => '    joe   ',
           :last_name    => "\n  black\n",
@@ -126,30 +96,30 @@ class ActiveRecordTest < Test::Unit::TestCase
         )
       end
 
-      should 'only have 3 cleaners' do
+      it 'only have 3 cleaners' do
         assert_equal 3, User.send(:data_cleansing_cleaners).size, User.send(:data_cleansing_cleaners)
       end
 
-      should 'cleanse_attributes! using global cleaner' do
+      it 'cleanse_attributes! using global cleaner' do
         assert_equal true, @user.valid?
         assert_equal 'joe', @user.first_name
         assert_equal 'black', @user.last_name
       end
 
-      should 'cleanse_attributes! using attribute specific custom cleaner' do
+      it 'cleanse_attributes! using attribute specific custom cleaner' do
         assert_equal true, @user.valid?
         assert_equal '<< 2632 Brown St >>', @user.address1
         assert_equal '<< instance >>', @user.instance_var
       end
 
-      should 'cleanse_attributes! using global cleaner using rails extensions' do
+      it 'cleanse_attributes! using global cleaner using rails extensions' do
         @user.cleanse_attributes!
         assert_equal 12345, @user.zip_code
       end
     end
 
-    context "with user2" do
-      setup do
+    describe "with user2" do
+      before do
         @user = User2.new(
           :first_name => '    joe   ',
           :last_name  => "\n  black\n",
@@ -159,16 +129,16 @@ class ActiveRecordTest < Test::Unit::TestCase
         )
       end
 
-      should 'have 4 cleaners defined' do
+      it 'have 4 cleaners defined' do
         assert_equal 4, User2.send(:data_cleansing_cleaners).size, User2.send(:data_cleansing_cleaners)
       end
 
-      should 'have 3 attributes cleaners defined' do
+      it 'have 3 attributes cleaners defined' do
         # :all, :first_name, :zip_code
         assert_equal 3, User2.send(:data_cleansing_attribute_cleaners).size, User2.send(:data_cleansing_attribute_cleaners)
       end
 
-      should 'cleanse_attributes! clean all attributes' do
+      it 'cleanse_attributes! clean all attributes' do
         assert_equal true, @user.valid?
         assert_equal '$<< @joe@ >>$', @user.first_name, User2.send(:data_cleansing_cleaners)
         assert_equal '@black@', @user.last_name
@@ -180,4 +150,4 @@ class ActiveRecordTest < Test::Unit::TestCase
     end
 
   end
-end
+end

data/test/ruby_test.rb

@@ -1,13 +1,4 @@
-# Allow examples to be run in-place without requiring a gem install
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'data_cleansing'
-
-# Define a global cleanser
-DataCleansing.register_cleaner(:strip) {|string| string.strip}
+require_relative 'test_helper'
 
 # Non Cleansing base class
 class RubyUserBase
@@ -43,9 +34,6 @@ class RubyUserChild < RubyUser
   cleanse :gender, :cleaner => Proc.new {|gender| gender.to_s.strip.downcase}
 end
 
-# Another global cleaner, used by RubyUser2
-DataCleansing.register_cleaner(:upcase) {|string| string.upcase}
-
 class RubyUser2
   include DataCleansing::Cleanse
 
@@ -75,46 +63,46 @@ class RubyUser2
   ]
 end
 
-class RubyTest < Test::Unit::TestCase
-  context "Ruby Models" do
+class RubyTest < Minitest::Test
+  describe "Ruby Models" do
 
-    should 'have globally registered cleaner' do
+    it 'have globally registered cleaner' do
       assert DataCleansing.cleaner(:strip)
     end
 
-    should 'Model.cleanse_attribute' do
+    it 'Model.cleanse_attribute' do
       assert_equal 'male',                RubyUserChild.cleanse_attribute(:gender,     "\n   Male   \n"), RubyUserChild.send(:data_cleansing_attribute_cleaners)
       assert_equal 'joe',                 RubyUserChild.cleanse_attribute(:first_name, '    joe   '), RubyUserChild.send(:data_cleansing_attribute_cleaners)
       assert_equal 'black',               RubyUserChild.cleanse_attribute(:last_name,  "\n  black\n"), RubyUserChild.send(:data_cleansing_attribute_cleaners)
       assert_equal '<< 2632 Brown St >>', RubyUserChild.cleanse_attribute(:address1,   "2632 Brown St   \n"), RubyUserChild.send(:data_cleansing_attribute_cleaners)
     end
 
-    context "with ruby user" do
-      setup do
+    describe "with ruby user" do
+      before do
         @user = RubyUser.new
         @user.first_name = '    joe   '
         @user.last_name = "\n  black\n"
         @user.address1 = "2632 Brown St   \n"
       end
 
-      should 'cleanse_attributes! using global cleaner' do
+      it 'cleanse_attributes! using global cleaner' do
         @user.cleanse_attributes!
         assert_equal 'joe', @user.first_name
         assert_equal 'black', @user.last_name
       end
 
-      should 'cleanse_attributes! using attribute specific custom cleaner' do
+      it 'cleanse_attributes! using attribute specific custom cleaner' do
         @user.cleanse_attributes!
         assert_equal '<< 2632 Brown St >>', @user.address1
       end
 
-      should 'cleanse_attributes! not cleanse nil attributes' do
+      it 'cleanse_attributes! not cleanse nil attributes' do
         @user.first_name = nil
         @user.cleanse_attributes!
         assert_equal nil, @user.first_name
       end
 
-      should 'cleanse_attributes! call after cleaner' do
+      it 'cleanse_attributes! call after cleaner' do
         @user.first_name = 'Jack'
         @user.last_name = nil
         @user.cleanse_attributes!
@@ -123,8 +111,8 @@ class RubyTest < Test::Unit::TestCase
       end
     end
 
-    context "with ruby user child" do
-      setup do
+    describe "with ruby user child" do
+      before do
         @user = RubyUserChild.new
         @user.first_name = '    joe   '
         @user.last_name  = "\n  black\n"
@@ -132,32 +120,32 @@ class RubyTest < Test::Unit::TestCase
         @user.gender     = "\n   Male   \n"
       end
 
-      should 'cleanse_attributes! using global cleaner' do
+      it 'cleanse_attributes! using global cleaner' do
         @user.cleanse_attributes!
         assert_equal 'joe', @user.first_name
         assert_equal 'black', @user.last_name
       end
 
-      should 'cleanse_attributes! using attribute specific custom cleaner' do
+      it 'cleanse_attributes! using attribute specific custom cleaner' do
         @user.cleanse_attributes!
         assert_equal '<< 2632 Brown St >>', @user.address1
       end
 
-      should 'cleanse_attributes! not cleanse nil attributes' do
+      it 'cleanse_attributes! not cleanse nil attributes' do
         @user.first_name = nil
         @user.cleanse_attributes!
         assert_equal nil, @user.first_name
       end
 
-      should 'cleanse_attributes! clean child attributes' do
+      it 'cleanse_attributes! clean child attributes' do
         @user.cleanse_attributes!
         assert_equal 'male', @user.gender
       end
 
     end
 
-    context "with ruby user2" do
-      setup do
+    describe "with ruby user2" do
+      before do
         @user = RubyUser2.new
         @user.first_name = '    joe   '
         @user.last_name  = "\n  black\n"
@@ -166,23 +154,23 @@ class RubyTest < Test::Unit::TestCase
         @user.gender     = " Unknown  "
       end
 
-      should 'cleanse_attributes!' do
+      it 'cleanse_attributes!' do
         @user.cleanse_attributes!
         assert_equal 'joe', @user.first_name
         assert_equal 'black', @user.last_name
         assert_equal '2632 Brown St', @user.address1
       end
 
-      should 'cleanse_attributes! with multiple cleaners' do
+      it 'cleanse_attributes! with multiple cleaners' do
         @user.cleanse_attributes!
         assert_equal 'MR.', @user.title
       end
 
-      should 'cleanse_attributes! referencing other attributes' do
+      it 'cleanse_attributes! referencing other attributes' do
         @user.cleanse_attributes!
         assert_equal 'Male', @user.gender
       end
     end
 
   end
-end
+end

data/test/test_helper.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'yaml'
+require 'minitest/autorun'
+require 'minitest/reporters'
+require 'minitest/stub_any_instance'
+require 'awesome_print'
+require 'data_cleansing'
+
+MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new
+
+SemanticLogger.add_appender(file_name: 'test.log', formatter: :color)
+SemanticLogger.default_level = :debug

metadata

@@ -1,72 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: data_cleansing
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: Data Cleansing framework for Ruby with additional support for Rails and
-  Mongoid
+        version: '2.0'
+description: 
 email:
 - reidmo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/data_cleansing.rb
+- lib/data_cleansing/cleaners.rb
 - lib/data_cleansing/cleanse.rb
 - lib/data_cleansing/data_cleansing.rb
 - lib/data_cleansing/railtie.rb
 - lib/data_cleansing/version.rb
-- nbproject/private/private.properties
-- nbproject/private/private.xml
-- nbproject/private/rake-d.txt
-- nbproject/project.properties
-- nbproject/project.xml
 - test/active_record_test.rb
 - test/ruby_test.rb
 - test/test_db.sqlite3
-homepage: https://github.com/ClarityServices/data_cleansing
+- test/test_helper.rb
+homepage: http://github.com/reidmorrison/data_cleansing
 licenses:
-- Apache License V2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -74,18 +68,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Data Cleansing framework for Ruby, and Ruby on Rails
-test_files: []
+summary: Data Cleansing framework for Ruby, Rails, Mongoid and MongoMapper.
+test_files:
+- test/active_record_test.rb
+- test/ruby_test.rb
+- test/test_db.sqlite3
+- test/test_helper.rb

data/Gemfile

@@ -1,21 +0,0 @@
-source 'https://rubygems.org'
-gem 'thread_safe'
-gem 'semantic_logger'
-
-group :test do
-  gem "shoulda"
-
-  gem "activerecord"
-  gem 'sqlite3', :platform => :ruby
-
-  platforms :jruby do
-    gem 'jdbc-sqlite3'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  end
-
-  gem "mongoid"
-end
-
-group :develop do
-  gem 'awesome_print'
-end

data/Gemfile.lock

@@ -1,63 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.10)
-    awesome_print (1.1.0)
-    bson (1.9.1)
-    builder (3.1.4)
-    durran-validatable (2.0.1)
-    i18n (0.6.4)
-    leshill-will_paginate (2.3.11)
-    minitest (4.7.5)
-    mongo (1.9.1)
-      bson (~> 1.9.1)
-    mongoid (1.0.6)
-      activesupport (>= 2.2.2)
-      durran-validatable (>= 2.0.1)
-      leshill-will_paginate (>= 2.3.11)
-      mongo (>= 0.18.2)
-    multi_json (1.7.7)
-    semantic_logger (2.1.0)
-      sync_attr (>= 1.0)
-      thread_safe (>= 0.1.0)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.4)
-    shoulda-matchers (2.2.0)
-      activesupport (>= 3.0.0)
-    sqlite3 (1.3.7)
-    sync_attr (1.0.0)
-    thread_safe (0.1.0)
-      atomic
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  activerecord-jdbcsqlite3-adapter
-  awesome_print
-  jdbc-sqlite3
-  mongoid
-  semantic_logger
-  shoulda
-  sqlite3
-  thread_safe

data/nbproject/private/private.properties

@@ -1,3 +0,0 @@
-file.reference.data_cleansing-examples=/Users/rmorrison/Sandbox/data_cleansing/examples
-file.reference.data_cleansing-lib=/Users/rmorrison/Sandbox/data_cleansing/lib
-file.reference.data_cleansing-test=/Users/rmorrison/Sandbox/data_cleansing/test

data/nbproject/private/private.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-</project-private>

data/nbproject/private/rake-d.txt

@@ -1,4 +0,0 @@
-clean=Remove any temporary products.
-clobber=Remove any generated file.
-gem=Build gem
-test=Run Test Suite

data/nbproject/project.properties

@@ -1,9 +0,0 @@
-examples.dir=${file.reference.data_cleansing-examples}
-file.reference.data_cleansing-examples=examples
-file.reference.data_cleansing-lib=lib
-file.reference.data_cleansing-test=test
-main.file=
-platform.active=Ruby_1
-source.encoding=UTF-8
-src.dir=${file.reference.data_cleansing-lib}
-test.src.dir=${file.reference.data_cleansing-test}

data/nbproject/project.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ruby.rubyproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
-            <name>data_cleansing</name>
-            <source-roots>
-                <root id="src.dir"/>
-                <root id="examples.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>