nilify_blanks 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 406a558d296d89cadd2f2e3a1b73ca9730757571
-  data.tar.gz: c7df79461bf71561220e6f2820365e23f6a859a3
+SHA256:
+  metadata.gz: 117e4a499e7f6e4ca67ca960c463175898f34f06c017549b0d4838ab5d6c2be9
+  data.tar.gz: 3d0dfb25b9c1868a3f14ebb2a04e3ba53d0242fe33c3621fc5233d51e264611b
 SHA512:
-  metadata.gz: 43f5d7c175b34385ae119e513cdc0915d0bb1357d9cdd6ddf7a54659bcbac59d30c36069d8aa88f3104ca260e097c2df8191e75ce998255811dcf891aeef7841
-  data.tar.gz: 49303614f425476f5621ac72d2ef7b94fc25b2480de1f460b610aafc366ec146808437514b2abd27b98c616204f49f4076f43eb243f24715843d2b25bbc5ce9a
+  metadata.gz: f0a0e775623407760b8db4d7d1fbedaad402621e0b57cef64ed3f5a6479948170128493e9c47e9217d1a8d72a1c96eb0a37b4cdbe81a4c3b10b3ce0c09ff8add
+  data.tar.gz: 51f6507d4af29105bc808a2e7a91275538bb26334acabdcaf7bd0682034e4e754d1211cfc51257d8eaca9e2bbbfcaf7cb4617ec58904974f5e61b17f05246884

data/Appraisals

@@ -1,15 +1,3 @@
-appraise "3.0" do
-  gem "rails", "~> 3.0.9"
-end
-
-appraise "3.1" do
-  gem "rails", "~> 3.1.6"
-end
-
-appraise "3.2" do
-  gem "rails", "~> 3.2.6"
-end
-
 appraise "4.0" do
   gem "rails", "~> 4.0.12"
 end
@@ -21,3 +9,11 @@ end
 appraise "4.2" do
   gem "rails", "~> 4.2.0"
 end
+
+appraise "5.2" do
+  gem "rails", "~> 5.2.0"
+end
+
+appraise "6.0" do
+  gem "rails", "~> 6.0.2"
+end

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== [2020-04-18] 1.4.0
+
+* Internally restructure NilifyBlanks, use modern tooling like ActiveSupport::Concern
+* Drop support for Rails 3, expand Appraisals to include Rails 6
+* Change default before callback to :validation (from :save)
+
 == [2017-12-23] 1.3.0
 
 * Use all columns (not just content_columns)

data/Gemfile

@@ -3,6 +3,6 @@ source "http://rubygems.org"
 gem 'rubysl', '~> 2.0', :platforms => [:rbx]
 
 gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
-gem 'sqlite3', :platforms => [:ruby]
+gem 'sqlite3', '~> 1.3.6', :platforms => [:ruby]
 
 gemspec

data/Gemfile.lock

@@ -1,45 +1,49 @@
 PATH
   remote: .
   specs:
-    nilify_blanks (1.2.1)
-      activerecord (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    nilify_blanks (1.3.0)
+      activerecord (>= 4.0.0)
+      activesupport (>= 4.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
-      arel (~> 8.0)
-    activesupport (5.1.4)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (1.0.2)
+      zeitwerk (~> 2.2)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (8.0.0)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.2.1)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
     ffi2-generators (0.1.1)
-    i18n (0.9.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    minitest (5.10.3)
-    rake (10.0.3)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rubysl (2.0.15)
+    minitest (5.14.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubysl (2.2.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -73,7 +77,7 @@ GEM
       rubysl-io-nonblock (~> 2.0)
       rubysl-io-wait (~> 2.0)
       rubysl-ipaddr (~> 2.0)
-      rubysl-irb (~> 2.0)
+      rubysl-irb (~> 2.1)
       rubysl-logger (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-matrix (~> 2.0)
@@ -102,7 +106,6 @@ GEM
       rubysl-pstore (~> 2.0)
       rubysl-pty (~> 2.0)
       rubysl-rational (~> 2.0)
-      rubysl-readline (~> 2.0)
       rubysl-resolv (~> 2.0)
       rubysl-rexml (~> 2.0)
       rubysl-rinda (~> 2.0)
@@ -125,6 +128,7 @@ GEM
       rubysl-tmpdir (~> 2.0)
       rubysl-tsort (~> 2.0)
       rubysl-un (~> 2.0)
+      rubysl-unicode_normalize (~> 2.0)
       rubysl-uri (~> 2.0)
       rubysl-weakref (~> 2.0)
       rubysl-webrick (~> 2.0)
@@ -136,22 +140,22 @@ GEM
     rubysl-benchmark (2.0.1)
     rubysl-bigdecimal (2.0.2)
     rubysl-cgi (2.0.1)
-    rubysl-cgi-session (2.0.1)
+    rubysl-cgi-session (2.1.0)
     rubysl-cmath (2.0.0)
     rubysl-complex (2.0.0)
     rubysl-continuation (2.0.0)
-    rubysl-coverage (2.0.3)
+    rubysl-coverage (2.1)
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
-    rubysl-date (2.0.6)
+    rubysl-date (2.0.9)
     rubysl-delegate (2.0.1)
-    rubysl-digest (2.0.3)
+    rubysl-digest (2.0.8)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
     rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.1)
+    rubysl-erb (2.0.2)
     rubysl-etc (2.0.3)
       ffi2-generators (~> 0.1)
     rubysl-expect (2.0.0)
@@ -169,19 +173,18 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.0.4)
+    rubysl-irb (2.1.1)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
-      rubysl-readline (~> 2.0)
       rubysl-thread (~> 2.0)
-    rubysl-logger (2.0.0)
+    rubysl-logger (2.1.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
-    rubysl-mkmf (2.0.1)
+    rubysl-mkmf (2.1)
       rubysl-fileutils (~> 2.0)
       rubysl-shellwords (~> 2.0)
-    rubysl-monitor (2.0.0)
+    rubysl-monitor (2.1)
     rubysl-mutex_m (2.0.0)
     rubysl-net-ftp (2.0.1)
     rubysl-net-http (2.0.4)
@@ -197,21 +200,20 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.1.0)
+    rubysl-openssl (2.10)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
-    rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.0.0)
+    rubysl-ostruct (2.1.0)
+    rubysl-pathname (2.3)
     rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
-    rubysl-profiler (2.0.1)
+    rubysl-profiler (2.1)
     rubysl-pstore (2.0.0)
-    rubysl-pty (2.0.2)
+    rubysl-pty (2.0.3)
     rubysl-rational (2.0.1)
-    rubysl-readline (2.0.2)
-    rubysl-resolv (2.1.0)
-    rubysl-rexml (2.0.2)
+    rubysl-resolv (2.1.2)
+    rubysl-rexml (2.0.4)
     rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
@@ -219,14 +221,15 @@ GEM
     rubysl-set (2.0.1)
     rubysl-shellwords (2.0.0)
     rubysl-singleton (2.0.0)
-    rubysl-socket (2.0.1)
-    rubysl-stringio (2.0.0)
+    rubysl-socket (2.2.1)
+      rubysl-fcntl (~> 2.0)
+    rubysl-stringio (2.3)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
-    rubysl-syslog (2.0.1)
+    rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.2)
+    rubysl-thread (2.1)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
@@ -235,29 +238,31 @@ GEM
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
       rubysl-optparse (~> 2.0)
+    rubysl-unicode_normalize (2.0)
     rubysl-uri (2.0.0)
     rubysl-weakref (2.0.0)
     rubysl-webrick (2.0.0)
     rubysl-xmlrpc (2.0.0)
-    rubysl-yaml (2.0.4)
+    rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
     sqlite3 (1.3.13)
-    thor (0.19.1)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
-  appraisal (~> 1.0.2)
+  appraisal (>= 1.0.2)
   nilify_blanks!
-  rake (~> 10.0.3)
-  rspec (~> 2.13)
+  rake (~> 13.0.1)
+  rspec (>= 3.8.0)
   rubysl (~> 2.0)
-  sqlite3
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.15.4
+   1.17.3

data/README.rdoc

@@ -1,6 +1,4 @@
 {<img src="https://secure.travis-ci.org/rubiety/nilify_blanks.png?branch=master" alt="Build Status" />}[http://travis-ci.org/rubiety/nilify_blanks]
-{<img src="https://gemnasium.com/rubiety/nilify_blanks.png" alt="Dependency Status" />}[https://gemnasium.com/rubiety/nilify_blanks]
-{<img src="https://codeclimate.com/github/rubiety/nilify_blanks.png" />}[https://codeclimate.com/github/rubiety/nilify_blanks]
 
 == Nilify Blanks
 
@@ -12,10 +10,7 @@ Only attributes responding to blank? with a value of true will be converted to n
 
 == Requirements
 
-Rails 3.0 or later is required (ActiveRecord implementation is very different in Rails 2 and not easy to support both).
-
-Due to issues maintaining backwards compatibility, as of v1.2.0 this gem requires ruby 1.9.3 or higher. 
-If you are still using 1.8.7 or 1.9.2, please use the v1.1.0 release.
+As of v1.4.0, this gem requires Rails 4 and Ruby 2.2 or higher.
 
 == Install
 
@@ -32,22 +27,22 @@ Include the gem using bundler in your Gemfile:
 
   # Checks and converts only text fields in the model
   class Post < ActiveRecord::Base
-    nilify_blanks :types => [:text]
+    nilify_blanks types: [:text]
   end
-  
+
   # Checks and converts only the title and author fields
   class Post < ActiveRecord::Base
-    nilify_blanks :only => [:author, :title]
+    nilify_blanks only: [:author, :title]
   end
-  
+
   # Checks and converts all fields except for title and author
   class Post < ActiveRecord::Base
-    nilify_blanks :except => [:author, :title]
+    nilify_blanks except: [:author, :title]
   end
 
-  # Checks and converts any fields, regardless of thier null constraint
+  # Checks and converts any fields, regardless of their null constraint
   class Post < ActiveRecord::Base
-    nilify_blanks :nullables_only => false
+    nilify_blanks nullables_only: false
   end
 
 == Global Usage
@@ -62,14 +57,14 @@ Or perhaps just a model namespace base class:
 
 == Specifying a Callback
 
-Checking uses an ActiveRecord before_save filter by default, but you can specify a different filter with the :before option.  Any filter will work - just first remove the "before_" prefix from the name.
+Checking uses an ActiveRecord before_validation callback by default, but you can specify a different callback with the :before option.  Any callback will work - just first remove the "before_" prefix from the name.
 
   class Post < ActiveRecord::Base
-    nilify_blanks :before => :create
+    nilify_blanks before: :create
   end
-  
-  class Post < ActiveRecord::Before
-    nilify_blanks :before => :validation_on_update
+
+  class Post < ActiveRecord::Base
+    nilify_blanks before: :validation_on_update
   end
 
 == RSpec Matcher
@@ -93,15 +88,16 @@ To ensure for all applicable content columns:
 You can optionally match on options also:
 
   describe City do
-    it { should nilify_blanks_for(:name, :before => :create) }
+    it { should nilify_blanks_for(:name, before: :create) }
   end
 
   describe City do
-    it { should nilify_blanks(:before => :create) }
+    it { should nilify_blanks(before: :create) }
   end
 
 == Running Tests
 
 This gem uses appraisal to test with different versions of the dependencies. See Appraisal first for which versions are tested, then run to test all appraisals:
 
+  $ rake appraisal install
   $ rake appraisal test

data/Rakefile

@@ -1,17 +1,37 @@
-require 'rubygems'
+require 'bundler/gem_tasks'
+require 'appraisal'
+require 'rspec/core/rake_task'
+
 require 'bundler/setup'
 
 require 'rake'
 require 'rspec/core/rake_task'
 
-desc 'Default: run unit tests.'
-task :default => [:clean, :test]
+desc "Default: run unit tests."
+task default: [:clean, :all]
 
-desc "Run Specs"
-RSpec::Core::RakeTask.new(:spec) do |t|
+task test: :spec
+
+desc "Test this plugin under all supported Rails versions."
+task :all do |t|
+  if ENV['BUNDLE_GEMFILE']
+    exec('rake spec && cucumber')
+  else
+    exec("rm -f gemfiles/*.lock")
+    Rake::Task["appraisal:gemfiles"].execute
+    Rake::Task["appraisal:install"].execute
+    exec('rake appraisal')
+  end
 end
 
-task :test => :spec
+desc "Run Specs"
+RSpec::Core::RakeTask.new(:spec)
+
+desc "Start an IRB session within this plugin"
+task :shell do |t|
+  chdir File.dirname(__FILE__)
+  exec 'irb -I lib/ -I lib/paperclip -r rubygems -r active_record -r tempfile -r init'
+end
 
 desc "Clean up files."
 task :clean do |t|
@@ -19,21 +39,3 @@ task :clean do |t|
   Dir.glob("nilify_blanks-*.gem").each {|f| FileUtils.rm f }
   Dir.glob("spec/db/*.sqlite3").each {|f| FileUtils.rm f }
 end
-
-begin
-  require 'rdoc/task'
-
-  desc "Generate documentation for the plugin."
-  Rake::RDocTask.new(:rdoc) do |rdoc|
-    rdoc.rdoc_dir = "rdoc"
-    rdoc.title    = "nilify_blanks"
-    rdoc.options << "--line-numbers" << "--inline-source"
-    rdoc.rdoc_files.include('README')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-  end
-rescue LoadError
-  puts 'RDocTask is not supported for this platform'
-end
-
-Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load ext }
-

data/lib/nilify_blanks.rb

@@ -1,10 +1,16 @@
+require "active_support/concern"
+
 module NilifyBlanks
-  def self.included(base)
-    base.extend ClassMethods
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :nilify_blanks_columns, instance_writer: false, default: []
+    class_attribute :nilify_blanks_options, instance_writer: false, default: nil
   end
 
   module ClassMethods
     DEFAULT_TYPES = [:string, :text, :citext]
+    DEFAULT_CALLBACK = :validation
 
     @@define_nilify_blank_methods_lock = Mutex.new
 
@@ -17,78 +23,53 @@ module NilifyBlanks
       end
     end
 
-    def inherited(child_class)
-      if instance_variable_get(:@_nilify_blanks_options) and !child_class.instance_variable_get(:@_nilify_blanks_options)
-        child_class.nilify_blanks @_nilify_blanks_options
-      end
-
-      super
-    end
-
     def nilify_blanks(options = {})
-      return if @_nilify_blanks_options
-
-      unless included_modules.include?(NilifyBlanks::InstanceMethods)
-        include NilifyBlanks::InstanceMethods
-      end
-
-      @_nilify_blanks_options = options
+      self.nilify_blanks_options = options
 
       # Normally we wait for rails to define attribute methods, but we could be calling this after this has already been done.
       # If so, let's just immediately generate nilify blanks methods.
       #
-      if @attribute_methods_generated
-        define_nilify_blank_methods
-      end
-
-      descendants.each do |subclass|
-        subclass.nilify_blanks @_nilify_blanks_options
-      end
+      define_nilify_blank_methods if @attribute_methods_generated
     end
 
 
     private
 
     def define_nilify_blank_methods
-      return unless @_nilify_blanks_options
-      return if @nilify_blank_methods_generated
+      return unless nilify_blanks_options
 
       @@define_nilify_blank_methods_lock.synchronize do
-        options = @_nilify_blanks_options
+        options = nilify_blanks_options.dup
 
+        options[:before] ||= DEFAULT_CALLBACK
         options[:only] = Array.wrap(options[:only]).map(&:to_s) if options[:only]
         options[:except] = Array.wrap(options[:except]).map(&:to_s) if options[:except]
         options[:types] = options[:types] ? Array.wrap(options[:types]).map(&:to_sym) : DEFAULT_TYPES
 
-        cattr_accessor :nilify_blanks_columns
-
         if options[:only]
-          self.nilify_blanks_columns = options[:only].clone
+          columns_to_nilify = options[:only].clone
         elsif options[:nullables_only] == false
-          self.nilify_blanks_columns = self.columns.select {|c| options[:types].include?(c.type) }.map(&:name).map(&:to_s)
+          columns_to_nilify = self.columns.select {|c| options[:types].include?(c.type) }.map(&:name).map(&:to_s)
         else
-          self.nilify_blanks_columns = self.columns.select(&:null).select {|c| options[:types].include?(c.type) }.map(&:name).map(&:to_s)
+          columns_to_nilify = self.columns.select(&:null).select {|c| options[:types].include?(c.type) }.map(&:name).map(&:to_s)
         end
 
-        self.nilify_blanks_columns -= options[:except] if options[:except]
-        self.nilify_blanks_columns = self.nilify_blanks_columns.map(&:to_s)
+        columns_to_nilify -= options[:except] if options[:except]
+
+        self.nilify_blanks_columns = columns_to_nilify.map(&:to_s)
 
-        options[:before] ||= :save
         send("before_#{options[:before]}", :nilify_blanks)
-        @nilify_blanks_methods_generated = true
       end
     end
   end
 
-  module InstanceMethods
-    def nilify_blanks
-      (self.nilify_blanks_columns || []).each do |column|
-        value = read_attribute(column)
-        next unless value.is_a?(String)
-        next unless value.respond_to?(:blank?)
+  def nilify_blanks
+    (nilify_blanks_columns || []).each do |column|
+      value = read_attribute(column)
+      next unless value.is_a?(String)
+      next unless value.respond_to?(:blank?)
 
-        write_attribute(column, nil) if value.blank?
-      end
+      write_attribute(column, nil) if value.blank?
     end
   end
 end

data/lib/nilify_blanks/matchers.rb

@@ -20,10 +20,10 @@ Kernel.const_get(rspec_module)::Matchers.define :nilify_blanks_for do |column_na
   match do |model_instance|
     model_class = model_instance.class
     model_class.define_attribute_methods
-    model_class.included_modules.include?(NilifyBlanks::InstanceMethods) &&
+    model_class.included_modules.include?(NilifyBlanks) &&
     model_class.respond_to?(:nilify_blanks_columns) &&
     model_class.nilify_blanks_columns.include?(column_name.to_s) &&
-    options.all? {|k, v| model_class.instance_variable_get(:@_nilify_blanks_options)[k] == v }
+    (options || {}).all? {|k, v| model_class.nilify_blanks_options[k] == v }
   end
 
   send(failure_message_method) do |_|
@@ -37,14 +37,14 @@ end
 
 Kernel.const_get(rspec_module)::Matchers.define :nilify_blanks do |options = {}|
   match do |model_instance|
-    options[:types] = options[:types] ? Array.wrap(options[:types]).map(&:to_sym) : NilifyBlanks::ClassMethods::DEFAULT_TYPES
+    expected_types = options[:types] ? Array.wrap(options[:types]).map(&:to_sym) : NilifyBlanks::ClassMethods::DEFAULT_TYPES
 
     model_class = model_instance.class
     model_class.define_attribute_methods
-    model_class.included_modules.include?(NilifyBlanks::InstanceMethods) &&
+    model_class.included_modules.include?(NilifyBlanks) &&
     model_class.respond_to?(:nilify_blanks_columns) &&
-    model_class.nilify_blanks_columns == model_class.content_columns.select(&:null).select {|c| options[:types].include?(c.type) }.map(&:name).map(&:to_s) &&
-    options.all? {|k, v| model_class.instance_variable_get(:@_nilify_blanks_options)[k] == v }
+    model_class.nilify_blanks_columns == model_class.columns.select(&:null).select {|c| expected_types.include?(c.type) }.map(&:name).map(&:to_s) &&
+    (options || {}).all? {|k, v| model_class.nilify_blanks_options[k] == v }
   end
 
   send(failure_message_method) do |_|

data/lib/nilify_blanks/railtie.rb

@@ -1,7 +1,7 @@
 module NilifyBlanks
   if defined?(Rails::Railtie)
     require "rails"
-    
+
     class Railtie < Rails::Railtie
       initializer "nilify_blanks.extend_active_record" do
         ActiveSupport.on_load(:active_record) do
@@ -10,7 +10,7 @@ module NilifyBlanks
       end
     end
   end
-  
+
   class Railtie
     def self.insert
       ActiveRecord::Base.send(:include, NilifyBlanks)

data/lib/nilify_blanks/version.rb

@@ -1,3 +1,3 @@
 module NilifyBlanks
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/spec/examples.txt

@@ -0,0 +1,30 @@
+example_id                              | status | run_time        |
+--------------------------------------- | ------ | --------------- |
+./spec/nilify_blanks_spec.rb[1:1:1]     | passed | 0.00172 seconds |
+./spec/nilify_blanks_spec.rb[1:1:2]     | passed | 0.00248 seconds |
+./spec/nilify_blanks_spec.rb[1:1:3]     | passed | 0.00081 seconds |
+./spec/nilify_blanks_spec.rb[1:1:4]     | passed | 0.00052 seconds |
+./spec/nilify_blanks_spec.rb[1:1:5]     | passed | 0.00158 seconds |
+./spec/nilify_blanks_spec.rb[1:2:1]     | passed | 0.00014 seconds |
+./spec/nilify_blanks_spec.rb[1:3:1]     | passed | 0.00037 seconds |
+./spec/nilify_blanks_spec.rb[1:3:2]     | passed | 0.00026 seconds |
+./spec/nilify_blanks_spec.rb[1:3:3]     | passed | 0.00033 seconds |
+./spec/nilify_blanks_spec.rb[1:4:1]     | passed | 0.00032 seconds |
+./spec/nilify_blanks_spec.rb[1:4:2]     | passed | 0.00016 seconds |
+./spec/nilify_blanks_spec.rb[1:4:3]     | passed | 0.00022 seconds |
+./spec/nilify_blanks_spec.rb[1:5:1]     | passed | 0.0002 seconds  |
+./spec/nilify_blanks_spec.rb[1:5:2]     | passed | 0.00016 seconds |
+./spec/nilify_blanks_spec.rb[1:5:3]     | passed | 0.00028 seconds |
+./spec/nilify_blanks_spec.rb[1:6:1:1]   | passed | 0.00091 seconds |
+./spec/nilify_blanks_spec.rb[1:6:2:1]   | passed | 0.00023 seconds |
+./spec/nilify_blanks_spec.rb[1:6:3:1]   | passed | 0.00047 seconds |
+./spec/nilify_blanks_spec.rb[1:6:4:1]   | passed | 0.00041 seconds |
+./spec/nilify_blanks_spec.rb[1:7:1:1]   | passed | 0.00067 seconds |
+./spec/nilify_blanks_spec.rb[1:7:1:2]   | passed | 0.00072 seconds |
+./spec/nilify_blanks_spec.rb[1:7:1:3]   | passed | 0.00072 seconds |
+./spec/nilify_blanks_spec.rb[1:7:1:4]   | passed | 0.00087 seconds |
+./spec/nilify_blanks_spec.rb[1:7:1:5]   | passed | 0.00051 seconds |
+./spec/nilify_blanks_spec.rb[1:7:1:6]   | passed | 0.00036 seconds |
+./spec/nilify_blanks_spec.rb[1:7:1:7]   | passed | 0.00041 seconds |
+./spec/nilify_blanks_spec.rb[1:7:1:8]   | passed | 0.00171 seconds |
+./spec/nilify_blanks_spec.rb[1:7:2:1:1] | passed | 0.00149 seconds |

data/spec/nilify_blanks_spec.rb

@@ -1,7 +1,6 @@
-require "spec_helper"
-
-describe NilifyBlanks do
+require "nilify_blanks/matchers"
 
+RSpec.describe NilifyBlanks do
   context "Model with nilify_blanks" do
     before(:all) do
       class Post < ActiveRecord::Base
@@ -13,24 +12,28 @@ describe NilifyBlanks do
     end
 
     it "should recognize all non-null string, text, citext columns" do
-      Post.nilify_blanks_columns.should == ['first_name', 'title', 'summary', 'body', 'slug', 'blog_id']
+      expect(Post.nilify_blanks_columns).to eq(['first_name', 'title', 'summary', 'body', 'slug', 'blog_id'])
     end
 
     it "should convert all blanks to nils" do
-      @post.first_name.should be_nil
-      @post.title.should be_nil
-      @post.summary.should be_nil
-      @post.body.should be_nil
-      @post.slug.should be_nil
-      @post.blog_id.should be_nil
+      expect(@post.first_name).to be_nil
+      expect(@post.title).to be_nil
+      expect(@post.summary).to be_nil
+      expect(@post.body).to be_nil
+      expect(@post.slug).to be_nil
+      expect(@post.blog_id).to be_nil
     end
 
     it "should leave not-null last name field alone" do
-      @post.last_name.should == ""
+      expect(@post.last_name).to eq("")
     end
 
     it "should leave integer views field alone" do
-      @post.views.should == 0
+      expect(@post.views).to eq(0)
+    end
+
+    it "should not nilify non-null column" do
+      expect(@post.class.nilify_blanks_columns).to_not include('last_name')
     end
   end
 
@@ -45,7 +48,7 @@ describe NilifyBlanks do
     end
 
     it "should recognize all (even null) string, text, citext columns" do
-      PostWithNullables.nilify_blanks_columns.should == ['first_name', 'last_name', 'title', 'summary', 'body', 'slug', 'blog_id']
+      expect(PostWithNullables.nilify_blanks_columns).to eq(['first_name', 'last_name', 'title', 'summary', 'body', 'slug', 'blog_id'])
     end
   end
 
@@ -67,20 +70,20 @@ describe NilifyBlanks do
     it "should recognize all non-null text only columns" do
       expected_types = ['summary', 'body']
       expected_types << 'slug' unless citext_supported
-      PostOnlyText.nilify_blanks_columns.should == expected_types
+      expect(PostOnlyText.nilify_blanks_columns).to eq(expected_types)
     end
 
     it "should convert all blanks to nils" do
-      @post.summary.should be_nil
-      @post.body.should be_nil
-      @post.slug.should be_nil unless citext_supported
+      expect(@post.summary).to be_nil
+      expect(@post.body).to be_nil
+      expect(@post.slug).to be_nil unless citext_supported
     end
 
     it "should leave not-null string fields alone" do
-      @post.first_name.should == ""
-      @post.last_name.should == ""
-      @post.title.should == ""
-      @post.slug.should == "" if citext_supported
+      expect(@post.first_name).to eq("")
+      expect(@post.last_name).to eq("")
+      expect(@post.title).to eq("")
+      expect(@post.slug).to eq("") if citext_supported
     end
   end
 
@@ -96,18 +99,18 @@ describe NilifyBlanks do
     end
 
     it "should recognize only first_name and title" do
-      PostOnlyFirstNameAndTitle.nilify_blanks_columns.should == ['first_name', 'title']
+      expect(PostOnlyFirstNameAndTitle.nilify_blanks_columns).to eq(['first_name', 'title'])
     end
 
     it "should convert first_name and title blanks to nils" do
-      @post.first_name.should be_nil
-      @post.title.should be_nil
+      expect(@post.first_name).to be_nil
+      expect(@post.title).to be_nil
     end
 
     it "should leave other fields alone" do
-      @post.summary.should == ""
-      @post.body.should == ""
-      @post.slug.should == ""
+      expect(@post.summary).to eq("")
+      expect(@post.body).to eq("")
+      expect(@post.slug).to eq("")
     end
   end
 
@@ -123,18 +126,18 @@ describe NilifyBlanks do
     end
 
     it "should recognize only summary, body, and views" do
-      PostExceptFirstNameAndTitle.nilify_blanks_columns.should == ['summary', 'body', 'slug']
+      expect(PostExceptFirstNameAndTitle.nilify_blanks_columns).to eq(['summary', 'body', 'slug'])
     end
 
     it "should convert summary and body blanks to nils" do
-      @post.summary.should be_nil
-      @post.body.should be_nil
-      @post.slug.should be_nil
+      expect(@post.summary).to be_nil
+      expect(@post.body).to be_nil
+      expect(@post.slug).to be_nil
     end
 
     it "should leave other fields alone" do
-      @post.first_name.should == ""
-      @post.title.should == ""
+      expect(@post.first_name).to eq("")
+      expect(@post.title).to eq("")
     end
   end
 
@@ -158,7 +161,7 @@ describe NilifyBlanks do
       end
 
       it "should convert all blanks to nils" do
-        @post.first_name.should be_nil
+        expect(@post.first_name).to be_nil
       end
     end
 
@@ -181,7 +184,7 @@ describe NilifyBlanks do
       end
 
       it "should convert all blanks to nils" do
-        @post.first_name.should be_nil
+        expect(@post.first_name).to be_nil
       end
     end
 
@@ -198,9 +201,64 @@ describe NilifyBlanks do
       end
 
       it "should convert all blanks to nils" do
-        @post.first_name.should be_nil
+        expect(@post.first_name).to be_nil
       end
     end
 
+    context "Namespaced Base Class with nilify_blanks with overrides applied after definition" do
+      before(:all) do
+        ActiveRecord::Base.nilify_blanks
+
+        class InheritedPost < ActiveRecord::Base
+          self.table_name = "posts"
+
+          nilify_blanks except: [:first_name]
+        end
+
+        @post = InheritedPost.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0)
+        @post.save
+      end
+
+      it "should convert all blanks to nils" do
+        expect(@post.first_name).to_not be_nil
+        expect(@post.title).to be_nil
+      end
+    end
+  end
+
+  describe "matchers" do
+    describe "nilify_blanks_for" do
+      subject { Post.new }
+
+      before(:all) do
+        class Post < ActiveRecord::Base
+          nilify_blanks
+        end
+      end
+
+      it { is_expected.to nilify_blanks_for(:first_name) }
+      it { is_expected.to nilify_blanks_for(:title) }
+      it { is_expected.to nilify_blanks_for(:summary) }
+      it { is_expected.to nilify_blanks_for(:body) }
+      it { is_expected.to nilify_blanks_for(:slug) }
+      it { is_expected.to nilify_blanks_for(:blog_id) }
+
+      it { is_expected.to_not nilify_blanks_for(:id) }
+      it { is_expected.to_not nilify_blanks_for(:last_name) }
+    end
+
+    describe "nilify_blanks" do
+      subject { Post.new }
+
+      before(:all) do
+        class Post < ActiveRecord::Base
+          nilify_blanks
+        end
+      end
+
+      context "foreign key column is nilified" do
+        it { is_expected.to nilify_blanks }
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -13,3 +13,28 @@ ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'
 load(File.dirname(__FILE__) + "/db/schema.rb")
 
 require File.dirname(__FILE__) + '/../init'
+
+RSpec.configure do |config|
+  config.define_derived_metadata do |meta|
+    meta[:aggregate_failures] = true unless meta.key?(:aggregate_failures)
+  end
+
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+  config.filter_run_when_matching :focus
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # config.order = :random
+  # Kernel.srand config.seed
+
+  # config.warnings = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nilify_blanks
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,82 +16,82 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
 description: Often times you'll end up with empty strings where you really want nil
@@ -117,6 +117,7 @@ files:
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/db/test.sqlite3
+- spec/examples.txt
 - spec/nilify_blanks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rubiety/nilify_blanks
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: nilify_blanks
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Auto-convert blank fields to nil.