nilify_blanks 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 104027ca97e31a737161c1c4af5c61a2bcf69242
-  data.tar.gz: 5e623701c93fd3a53ea116165b07aa2e83249fb9
+  metadata.gz: 406a558d296d89cadd2f2e3a1b73ca9730757571
+  data.tar.gz: c7df79461bf71561220e6f2820365e23f6a859a3
 SHA512:
-  metadata.gz: aca3952cac7d12a89986c78f964e245624fe80ba4bf4e27aee3106b4a66e68f2234422f8c421876234f02b323347a2620d607416226520b01df5101745934069
-  data.tar.gz: ba4a2adc8b2e106186f0723000cfbd2bf81b25205b1565419d710c66af0a5f57cc24c5726920507f5af6baa323a78195a44d456c827d65c662c3e9f4fb611066
+  metadata.gz: 43f5d7c175b34385ae119e513cdc0915d0bb1357d9cdd6ddf7a54659bcbac59d30c36069d8aa88f3104ca260e097c2df8191e75ce998255811dcf891aeef7841
+  data.tar.gz: 49303614f425476f5621ac72d2ef7b94fc25b2480de1f460b610aafc366ec146808437514b2abd27b98c616204f49f4076f43eb243f24715843d2b25bbc5ce9a

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== [2017-12-23] 1.3.0
+
+* Use all columns (not just content_columns)
+* Allow nullables_only: false option for including columns that don't allow NULLs
+* Support citext columns
+
 == [2015-04-12] 1.2.1
 
 * Fix inconsistency in nilify_blanks RSpec matcher: should filter by type

data/Gemfile.lock

@@ -1,37 +1,35 @@
 PATH
   remote: .
   specs:
-    nilify_blanks (1.2.0)
+    nilify_blanks (1.2.1)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
-      builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
-      arel (~> 6.0)
-    activesupport (4.2.0)
+    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)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.0)
-    builder (3.2.2)
+    arel (8.0.0)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.2.1)
     ffi2-generators (0.1.1)
-    i18n (0.7.0)
-    json (1.8.1)
-    minitest (5.5.0)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.10.3)
     rake (10.0.3)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -243,10 +241,10 @@ GEM
     rubysl-xmlrpc (2.0.0)
     rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.13)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -260,3 +258,6 @@ DEPENDENCIES
   rspec (~> 2.13)
   rubysl (~> 2.0)
   sqlite3
+
+BUNDLED WITH
+   1.15.4

data/README.rdoc

@@ -4,9 +4,11 @@
 
 == Nilify Blanks
 
-In Rails when saving a model from a form and values are not provided by the user, an empty string is recorded to the database instead of a NULL as many would prefer (mixing blanks and NULLs can become confusing).  This plugin allows you to specify a list of attributes (or exceptions from all the attributes) that will be converted to nil if they are blank before a model is saved.  
+In Rails when saving a model from a form and values are not provided by the user, an empty string is recorded to the database instead of a NULL as many would prefer (mixing blanks and NULLs can become confusing).  This plugin allows you to specify a list of attributes (or exceptions from all the attributes) that will be converted to nil if they are blank before a model is saved.
 
-Only attributes responding to empty? with a value of true will be converted to nil.  Therefore, this does not work with integer fields with the value of 0, for example.  Usage is best shown through examples:
+By default, columns set as NOT NULL will not be nilified, since that value cannot be persisted, and it might be better to catch that with a validation. If you want to nilify those columns anyway, you can use `only:` (see below) to explicitly mention them.
+
+Only attributes responding to blank? with a value of true will be converted to nil.  Therefore, this does not work with integer fields with the value of 0, for example.  Usage is best shown through examples:
 
 == Requirements
 
@@ -43,9 +45,14 @@ Include the gem using bundler in your Gemfile:
     nilify_blanks :except => [:author, :title]
   end
 
+  # Checks and converts any fields, regardless of thier null constraint
+  class Post < ActiveRecord::Base
+    nilify_blanks :nullables_only => false
+  end
+
 == Global Usage
 
-You can also apply nilify_blanks to all models inhering from ActiveRecord::Base:
+You can also apply nilify_blanks to all models inheriting from ActiveRecord::Base:
 
   ActiveRecord::Base.nilify_blanks
 

data/lib/nilify_blanks.rb

@@ -4,7 +4,7 @@ module NilifyBlanks
   end
 
   module ClassMethods
-    DEFAULT_TYPES = [:string, :text]
+    DEFAULT_TYPES = [:string, :text, :citext]
 
     @@define_nilify_blank_methods_lock = Mutex.new
 
@@ -64,8 +64,10 @@ module NilifyBlanks
 
         if options[:only]
           self.nilify_blanks_columns = 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)
         else
-          self.nilify_blanks_columns = self.content_columns.select(&:null).select {|c| options[:types].include?(c.type) }.map(&:name).map(&:to_s)
+          self.nilify_blanks_columns = 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]

data/lib/nilify_blanks/version.rb

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

data/spec/db/schema.rb

@@ -1,12 +1,15 @@
 ActiveRecord::Schema.define(:version => 0) do
-  
+
   create_table :posts, :force => true do |t|
     t.string :first_name
     t.string :last_name, :null => false
     t.string :title
     t.text :summary
     t.text :body
+    t.column :slug, :citext
     t.integer :views
+    t.integer :category_id
+    t.string :blog_id
   end
-  
-end
+
+end

data/spec/nilify_blanks_spec.rb

@@ -1,116 +1,143 @@
 require "spec_helper"
 
 describe NilifyBlanks do
-  
+
   context "Model with nilify_blanks" do
     before(:all) do
       class Post < ActiveRecord::Base
         nilify_blanks
       end
-      
-      @post = Post.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :views => 0)
+
+      @post = Post.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0, :blog_id => '')
       @post.save
     end
-    
-    it "should recognize all non-null string, text columns" do
-      Post.nilify_blanks_columns.should == ['first_name', 'title', 'summary', 'body']
+
+    it "should recognize all non-null string, text, citext columns" do
+      Post.nilify_blanks_columns.should == ['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
     end
-    
+
     it "should leave not-null last name field alone" do
       @post.last_name.should == ""
     end
-    
+
     it "should leave integer views field alone" do
       @post.views.should == 0
     end
   end
 
+  context "Model with nilify_blanks :nullables_only => false" do
+    before(:all) do
+      class PostWithNullables < ActiveRecord::Base
+        self.table_name = "posts"
+        nilify_blanks :nullables_only => false
+      end
+
+      @post = PostWithNullables.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0, :blog_id => '')
+    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']
+    end
+  end
+
   context "Model with nilify_blanks :types => [:text]" do
+    def citext_supported
+      PostOnlyText.content_columns.detect {|c| c.type == :citext}
+    end
+
     before(:all) do
       class PostOnlyText < ActiveRecord::Base
         self.table_name = "posts"
         nilify_blanks :types => [:text]
       end
-      
-      @post = PostOnlyText.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :views => 0)
+
+      @post = PostOnlyText.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0)
       @post.save
     end
-    
+
     it "should recognize all non-null text only columns" do
-      PostOnlyText.nilify_blanks_columns.should == ['summary', 'body']
+      expected_types = ['summary', 'body']
+      expected_types << 'slug' unless citext_supported
+      PostOnlyText.nilify_blanks_columns.should == 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
     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
     end
   end
-  
+
   context "Model with nilify_blanks :only => [:first_name, :title]" do
     before(:all) do
       class PostOnlyFirstNameAndTitle < ActiveRecord::Base
         self.table_name = "posts"
         nilify_blanks :only => [:first_name, :title]
       end
-      
-      @post = PostOnlyFirstNameAndTitle.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :views => 0)
+
+      @post = PostOnlyFirstNameAndTitle.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0)
       @post.save
     end
-    
+
     it "should recognize only first_name and title" do
       PostOnlyFirstNameAndTitle.nilify_blanks_columns.should == ['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
     end
-    
+
     it "should leave other fields alone" do
       @post.summary.should == ""
       @post.body.should == ""
+      @post.slug.should == ""
     end
   end
-  
+
   context "Model with nilify_blanks :except => [:first_name, :title]" do
     before(:all) do
       class PostExceptFirstNameAndTitle < ActiveRecord::Base
         self.table_name = "posts"
-        nilify_blanks :except => [:first_name, :title]
+        nilify_blanks :except => [:first_name, :title, :blog_id]
       end
-      
-      @post = PostExceptFirstNameAndTitle.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :views => 0)
+
+      @post = PostExceptFirstNameAndTitle.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0)
       @post.save
     end
-    
+
     it "should recognize only summary, body, and views" do
-      PostExceptFirstNameAndTitle.nilify_blanks_columns.should == ['summary', 'body']
+      PostExceptFirstNameAndTitle.nilify_blanks_columns.should == ['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
     end
-    
+
     it "should leave other fields alone" do
       @post.first_name.should == ""
       @post.title.should == ""
     end
   end
-  
+
 
   context "Global Usage" do
     context "Namespaced Base Class with nilify_blanks inline" do
@@ -126,7 +153,7 @@ describe NilifyBlanks do
           self.table_name = "posts"
         end
 
-        @post = Admin1::Post.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :views => 0)
+        @post = Admin1::Post.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0)
         @post.save
       end
 
@@ -149,7 +176,7 @@ describe NilifyBlanks do
 
         Admin2::Base.nilify_blanks
 
-        @post = Admin2::Post.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :views => 0)
+        @post = Admin2::Post.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0)
         @post.save
       end
 
@@ -166,7 +193,7 @@ describe NilifyBlanks do
           self.table_name = "posts"
         end
 
-        @post = InheritedPost.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :views => 0)
+        @post = InheritedPost.new(:first_name => '', :last_name => '', :title => '', :summary => '', :body => '', :slug => '', :views => 0)
         @post.save
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nilify_blanks
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,7 +120,8 @@ files:
 - spec/nilify_blanks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rubiety/nilify_blanks
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -138,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: nilify_blanks
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Auto-convert blank fields to nil.
 test_files: []
-has_rdoc: