nullify 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/nullify.rb

@@ -6,27 +6,20 @@ module LaserLemon
 
     module ClassMethods
       def nullify(*columns)
-        write_inheritable_array :nullified_columns, columns.map(&:to_sym)
-        class_inheritable_reader :nullified_columns
-
-        columns.each do |column|
-          define_method "#{column}=" do |value|
-            write_attribute(column, value.blank? ? nil : value)
-          end
-        end
+        class_inheritable_array :nullified_columns
+        self.nullified_columns = columns.map(&:to_s)
 
         include InstanceMethods
-
-        before_validation :nullify_columns
-        before_save :nullify_columns
+        alias_method_chain :write_attribute, :nullify
       end
     end
 
     module InstanceMethods
-      def nullify_columns
-        self.class.nullified_columns.each do |column|
-          value = read_attribute(column)
-          write_attribute(column, nil) if !value.nil? && value.blank?
+      def write_attribute_with_nullify(attr_name, value)
+        if nullified_columns.include?(attr_name.to_s)
+          write_attribute_without_nullify(attr_name, value.blank? ? nil : value)
+        else
+          write_attribute_without_nullify(attr_name, value)
         end
       end
     end

data/nullify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nullify}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["laserlemon"]
-  s.date = %q{2009-10-07}
+  s.date = %q{2009-10-08}
   s.description = %q{Nuke blank values in ActiveRecord models}
   s.email = %q{steve@laserlemon.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "nullify.gemspec",
      "tasks/nullify_tasks.rake",
      "test/nullify_test.rb",
+     "test/schema.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/laserlemon/nullify}
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Nuke blank values in ActiveRecord models}
   s.test_files = [
     "test/nullify_test.rb",
+     "test/schema.rb",
      "test/test_helper.rb"
   ]
 

data/tasks/nullify_tasks.rake

@@ -1,21 +1,8 @@
-def get_class
-  klass = ENV['CLASS'] || ENV['class']
-  raise 'Must specify CLASS' unless klass
-  @class = Object.const_get(klass)
-end
-
-def get_columns
-  raise "Class #{@class.name} has no nullified columns" unless @class.respond_to?(:nullified_columns)
-  @columns = if column = ENV['COLUMN'] || ENV['column']
-    raise "Class #{@class.name} has no nullified column #{column}" unless @class.nullified_columns.include?(column.to_sym)
-    [column.to_sym]
-  else @class.nullified_columns
-  end
-end
-
 desc 'Sets blank columns to nil for a given CLASS (and optional COLUMN)'
 task :nullify => :environment do
-  get_class and get_columns
+  get_class
+  get_columns
+
   @class.all.each do |instance|
     @columns.each do |column|
       value = instance[column]
@@ -24,3 +11,21 @@ task :nullify => :environment do
     instance.save
   end
 end
+
+def get_class
+  raise 'Must specify CLASS' unless ENV['CLASS']
+  begin
+    @class = ENV['CLASS'].classify.constantize
+  rescue NameError
+    raise "Class #{ENV['CLASS'].classify} does not exist"
+  end
+end
+
+def get_columns
+  raise "Class #{@class.name} has no nullified columns" unless @class.respond_to?(:nullified_columns) && !@class.nullified_columns.empty?
+  @columns = if ENV['COLUMN']
+    raise "Class #{@class.name} has no nullified column #{ENV['COLUMN']}" unless @class.nullified_columns.include?(column.to_s)
+    [column.to_s]
+  else @class.nullified_columns
+  end
+end

data/test/nullify_test.rb

@@ -1,86 +1,70 @@
-require 'test/unit'
-require 'rubygems'
-require 'active_record'
+require 'test_helper'
 
-require File.join(File.dirname(__FILE__), '..', 'init')
-
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
-
-def setup_db
-  ActiveRecord::Schema.define(:version => 1) do
-    create_table :addresses do |t|
-      t.string :street_1, :null => false
-      t.string :street_2, :null => true
-      t.string :city, :null => false
-      t.string :state, :null => false
-      t.string :zip, :null => false
-      t.string :zip_4, :null => true
+class ChangesTest < Test::Unit::TestCase
+  context 'A nullified model' do
+    setup do
+      @irs = Address.create(
+        :street_1 => 'Department of the Teasury',
+        :street_2 => 'Internal Revenue Service',
+        :city => 'Kansas City',
+        :state => 'Missouri',
+        :zip => '64999',
+        :zip_4 => '0102'
+      )
+      @apple = Address.create(
+        :street_1 => '1 Infinite Loop',
+        :city => 'Cupertino',
+        :state => 'California',
+        :zip => '95014'
+      )
     end
-  end
-end
 
-def teardown_db
-  ActiveRecord::Base.connection.tables.each do |table|
-    ActiveRecord::Base.connection.drop_table(table)
-  end
-end
-
-class Address < ActiveRecord::Base
-  nullify :street_2, :zip_4
-
-  validates_presence_of :street_1, :city, :zip
-  validates_format_of :zip, :with => /^\d{5}$/, :allow_nil => false
-  validates_format_of :zip_4, :with => /^\d{4}/, :allow_nil => true
-end
-
-class AddressTest < Test::Unit::TestCase
-  def setup
-    setup_db
-    Address.create!(
-      :street_1 => 'Department of the Teasury',
-      :street_2 => 'Internal Revenue Service',
-      :city => 'Kansas City',
-      :state => 'Missouri',
-      :zip => '64999',
-      :zip_4 => '0102'
-    )
-    Address.create!(
-      :street_1 => '1 Infinite Loop',
-      :city => 'Cupertino',
-      :state => 'California',
-      :zip => '95014'
-    )
-  end
-
-  def irs
-    Address.first
-  end
+    should 'return nullified_columns as an array of strings' do
+      [Address, Address.new].each do |model|
+        assert_respond_to model, :nullified_columns
+        assert_kind_of Array, model.nullified_columns
+        assert model.nullified_columns.all?{|c| c.is_a?(String) }
+      end
+    end
 
-  def apple
-    Address.last
-  end
+    should 'should nuke blank values in nullified columns' do
+      assert_not_nil @irs.street_2
+      [nil, '', ' ', "\n", false].each do |value|
+        @irs.street_2 = value
+        assert_nil @irs.street_2
+        assert @irs.save
+        assert_nil @irs.street_2
+      end
+    end
 
-  def teardown
-    teardown_db
-  end
+    should 'not nuke blank values in non-nullified columns' do
+      assert_not_nil @irs.state
+      [nil, '', ' ', "\n", false].each do |value|
+        @irs.state = value
+        assert_equal value, @irs.state
+        assert @irs.save
+        assert_equal value, @irs.state
+      end
+    end
 
-  def test_no_nullification_needed
-    before = irs.attributes
-    irs.save
-    after = irs.attributes
-    assert_equal(before, after)
-    before = apple.attributes
-    apple.save
-    after = apple.attributes
-    assert_equal(before, after)
-  end
+    should 'not nuke non-blank values in nullified columns' do
+      assert_not_nil @irs.zip_4
+      %w(1234 2345 3456 4567).each do |value|
+        @irs.zip_4 = value
+        assert_equal value, @irs.zip_4
+        assert @irs.save
+        assert_equal value, @irs.zip_4
+      end
+    end
 
-  def test_nullification_needed
-    assert(irs.update_attributes(:zip_4 => ''))
-    assert_nil(irs.zip_4)
-    assert(irs.update_attributes(:zip_4 => ' '))
-    assert_nil(irs.zip_4)
-    assert(irs.update_attributes(:zip_4 => '1939'))
-    assert_equal('1939', irs.zip_4)
+    should 'not nuke non-blank values in non-nullified columns' do
+      assert_not_nil @irs.street_1
+      %w(T E S T).each do |value|
+        @irs.street_1 = value
+        assert_equal value, @irs.street_1
+        assert @irs.save
+        assert_equal value, @irs.street_1
+      end
+    end
   end
 end

data/test/schema.rb

@@ -0,0 +1,29 @@
+ActiveRecord::Base.establish_connection(
+  :adapter => defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' ? 'jdbcsqlite3' : 'sqlite3',
+  :database => File.join(File.dirname(__FILE__), 'test.db')
+)
+
+class CreateSchema < ActiveRecord::Migration
+  def self.up
+    create_table :addresses, :force => true do |t|
+      t.string :street_1
+      t.string :street_2
+      t.string :city
+      t.string :state
+      t.string :zip
+      t.string :zip_4
+    end
+  end
+end
+
+CreateSchema.suppress_messages do
+  CreateSchema.migrate(:up)
+end
+
+class Address < ActiveRecord::Base
+  nullify :street_2, :zip_4
+
+  validates_presence_of :street_1, :city, :zip
+  validates_format_of :zip,   :with => /^\d{5}$/, :allow_nil => false
+  validates_format_of :zip_4, :with => /^\d{4}/,  :allow_nil => true
+end

data/test/test_helper.rb

@@ -1,3 +1,10 @@
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+$: << File.dirname(__FILE__)
+
 require 'rubygems'
-require 'active_support'
-require 'active_support/test_case'
+require 'test/unit'
+require 'activerecord'
+require 'shoulda'
+require 'nullify'
+require 'schema'
+begin; require 'redgreen'; rescue LoadError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nullify
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - laserlemon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -04:00
+date: 2009-10-08 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - nullify.gemspec
 - tasks/nullify_tasks.rake
 - test/nullify_test.rb
+- test/schema.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/laserlemon/nullify
@@ -64,4 +65,5 @@ specification_version: 3
 summary: Nuke blank values in ActiveRecord models
 test_files: 
 - test/nullify_test.rb
+- test/schema.rb
 - test/test_helper.rb