attr_default 0.5.2 → 0.5.3

data/attr_default.gemspec

@@ -1,10 +1,11 @@
 require File.expand_path('../lib/attr_default/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'rake'
-  gem.add_dependency 'rails'
+  gem.add_development_dependency 'rack', '~> 1.1.0'
+  gem.add_development_dependency 'rake', '~>0.9'
+  gem.add_development_dependency 'rails', '2.3.14'
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'hobofields'
+  gem.add_development_dependency 'hobofields', '0.9.103'
   gem.authors       = ["Colin Kelley", "Nick Burwell"]
   gem.email         = ["colindkelley@gmail.com"]
   gem.description   = %q{Dynamic Ruby defaults for ActiveRecord attributes}

data/lib/attr_default/version.rb

@@ -1,3 +1,3 @@
 module AttrDefault
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/attr_default.rb

@@ -2,21 +2,22 @@ module AttrDefault
   module ClassMethods
     def attr_default attr_name, default
       if !method_defined?(:_attr_default_set)
-        include AttrDefault
+        include AttrDefault::InstanceMethods
       end
 
       attr_name = attr_name.to_s
-      define_method attr_name do
+      _attr_defaults[attr_name] = default
+
+      define_method(attr_name) do
         if new_record? && !@_attr_defaults_set_from_clone && !_attr_default_set[attr_name]
-          default_value = Proc === default ? instance_eval(&default) : default.dup
-          send "#{attr_name}=", default_value
+          reset_to_default_value(attr_name)
         end
-        read_attribute_with_fixups( attr_name )
+        read_attribute_with_fixups(attr_name)
       end
 
-      define_method "#{attr_name}=" do |*args|
+      define_method("#{attr_name}=") do |*args|
         _attr_default_set[attr_name] = true
-        write_attribute_with_fixups( attr_name, args )
+        write_attribute_with_fixups(attr_name, args)
       end
 
       touch_proc = lambda { |obj| obj.send(attr_name); true }
@@ -26,57 +27,79 @@ module AttrDefault
 
     # Hobo Fields field declaration
     def field_added(name, type, args, options)
-      if (default = options[:ruby_default]) && Proc === default
+      if (default = options[:ruby_default])
         attr_default name, default
-      elsif (default = options[:default]) && Proc === default
+      elsif (default = options[:default]) && default.is_a?(Proc)
+        ActiveSupport::Deprecation.warn(':default => Proc has been deprecated. Use :ruby_default.', caller)
         attr_default name, default
         options.delete(:default)
         options[:ruby_default] = default
       end
     end
-  end
 
-  def _attr_default_set
-    @_attr_default_set ||= {}
+    def _attr_defaults
+      @_attr_defaults ||= {}
+    end
   end
 
-  def read_attribute_with_fixups(attr_name)
-    if needs_time_zone_fixup?(attr_name)
-      cached = @attributes_cache[attr_name] and return cached
-      time = read_attribute(attr_name)
-      @attributes_cache[attr_name] = time.acts_like?(:time) ? time.in_time_zone : time
-    else
-      read_attribute(attr_name)
+  module InstanceMethods
+    def default_value_for(attr_name)
+      attr_name = attr_name.to_s
+      if self.class._attr_defaults.has_key?(attr_name)
+        attr_default = self.class._attr_defaults[attr_name]
+        attr_default.is_a?(Proc) ? instance_eval(&attr_default) : (attr_default.dup rescue attr_default)
+      else
+        column_data = self.class.columns_hash[attr_name] or raise ArgumentError, "#{self.class.name}##{attr_name} not found"
+        column_data.default
+      end
+    end
+
+    def reset_to_default_value(attr_name)
+      send("#{attr_name}=", default_value_for(attr_name))
+    end
+
+    def _attr_default_set
+      @_attr_default_set ||= {}
     end
-  end
 
-  def write_attribute_with_fixups(attr_name, args)
-    if needs_time_zone_fixup?(attr_name)
-      time = args.first
-      unless time.acts_like?(:time)
-        time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time
+    def read_attribute_with_fixups(attr_name)
+      if needs_time_zone_fixup?(attr_name)
+        cached = @attributes_cache[attr_name] and return cached
+        time = read_attribute(attr_name)
+        @attributes_cache[attr_name] = time.acts_like?(:time) ? time.in_time_zone : time
+      else
+        read_attribute(attr_name)
       end
-      time = time.in_time_zone rescue nil if time
-      write_attribute(attr_name, time)
-    else
-      write_attribute(attr_name, *args)
     end
-  end
 
-  def needs_time_zone_fixup?(attr_name)
-    self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
-  end
+    def write_attribute_with_fixups(attr_name, args)
+      if needs_time_zone_fixup?(attr_name)
+        time = args.first
+        unless time.acts_like?(:time)
+          time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time
+        end
+        time = time.in_time_zone rescue nil if time
+        write_attribute(attr_name, time)
+      else
+        write_attribute(attr_name, *args)
+      end
+    end
+
+    def needs_time_zone_fixup?(attr_name)
+      self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
+    end
 
-  def clone
-    result = super
-    result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
-    result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
-    if self.new_record?
-      result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
-    else
-      result.instance_variable_set(:@_attr_defaults_set_from_clone, true)
+    def clone
+      result = super
+      result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
+      result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
+      if self.new_record?
+        result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
+      else
+        result.instance_variable_set(:@_attr_defaults_set_from_clone, true)
+      end
+      result
     end
-    result
   end
 end
 

data/test/test_attr_default.rb

@@ -1,16 +1,9 @@
-WANT_RAILS_VERSION = "~> #{ENV.fetch('WANT_RAILS_VERSION', '3.0.15')}"
-
 require 'rubygems'
-gem 'rails', WANT_RAILS_VERSION
-gem 'activerecord', WANT_RAILS_VERSION
-begin
-  require 'rails/railtie'
-rescue LoadError
-end
+require 'active_support'
+require 'active_support/dependencies'
 require 'active_record'
 ActiveRecord::ActiveRecordError # work-around from https://rails.lighthouseapp.com/projects/8994/tickets/2577-when-using-activerecordassociations-outside-of-rails-a-nameerror-is-thrown
 require 'test/unit'
-require 'active_support/dependencies'
 require 'active_support/core_ext/logger'
 require 'hobofields' if ENV['INCLUDE_HOBO']
 
@@ -33,9 +26,9 @@ ActiveRecord::Base.establish_connection(
 )
 
 ActiveRecord::Base.connection.create_table(:test_users, :force => true) do |t|
-  t.string :first_name
+  t.string :first_name, :default => ''
   t.string :last_name
-  t.boolean :managed
+  t.boolean :managed, :default => false
   t.timestamp :timestamp
 end
 
@@ -58,8 +51,8 @@ class TestUser < ActiveRecord::Base
 
   if ENV['INCLUDE_HOBO']
     fields do
-      first_name    :string, :default => '', :ruby_default => 'John'
-      last_name     :string, :default => 'Doe'
+      first_name    :string, :default => '', :ruby_default => lambda { 'John' }
+      last_name     :string, :ruby_default => 'Doe'
       timestamp     :timestamp, :default => lambda { (Time.zone || ActiveSupport::TimeZone['Pacific Time (US & Canada)']).now }
     end
   else
@@ -112,7 +105,7 @@ class AttrDefaultTest < Test::Unit::TestCase
 
   def test_use_default_if_not_set
     u = TestUser.new
-    assert_equal nil, u.read_attribute(:last_name)
+    assert_equal '', u.read_attribute(:first_name)
     assert_equal "Doe", u.last_name
   end
 
@@ -130,15 +123,45 @@ class AttrDefaultTest < Test::Unit::TestCase
   end
 
   def test_allow_an_override_to_be_specified
-    u = TestUser.new( :last_name => "override" )
+    u = TestUser.new(:last_name => "override")
     assert_equal "override", u.read_attribute(:last_name)
     assert_equal "override", u.last_name
   end
 
+  def test_proc_default_value_for_string_and_symbol
+    u = TestUser.new(:first_name => "override")
+    u.save!
+    assert_equal "override", u.first_name
+    assert_equal "John", u.default_value_for("first_name")
+    assert_equal "John", u.default_value_for(:first_name)
+  end
+
+  def test_nonproc_default_value_for_string_and_symbol
+    u = TestUser.new(:managed => true)
+    u.save!
+    assert_equal true, u.managed
+    assert_equal false, u.default_value_for("managed")
+    assert_equal false, u.default_value_for(:managed)
+  end
+
+  def test_reset_to_default_value_string
+    u = TestUser.create!(:last_name => "override")
+    assert_equal "override", u.last_name
+    u.reset_to_default_value("last_name")
+    assert_equal "Doe", u.last_name
+  end
+
+  def test_reset_to_default_value_symbol
+    u = TestUser.create!(:last_name => "override")
+    assert_equal "override", u.last_name
+    u.reset_to_default_value(:last_name)
+    assert_equal "Doe", u.last_name
+  end
+
   if ENV['INCLUDE_HOBO']
     def test_hobo_allow_default_and_ruby_default
       u = TestUser.new
-      assert_equal nil, u.read_attribute(:first_name)
+      assert_equal "", u.read_attribute(:first_name)
       assert_equal "", TestUser.field_specs['first_name'].options[:default]
       assert_equal "John", TestUser.field_specs['first_name'].options[:ruby_default].call
       assert_equal "John", u.first_name
@@ -149,11 +172,15 @@ class AttrDefaultTest < Test::Unit::TestCase
     u = TestUser.new
     u2 = TestUser.new
 
+    assert_equal "John", u2.first_name
     assert_equal "Doe", u2.last_name
+    u.first_name.upcase!
     u.last_name.upcase!
+    assert_equal "John", u2.first_name # should not be JOHN
     assert_equal "Doe", u2.last_name  # should not be DOE
 
     u3 = TestUser.new
+    assert_equal "John", u2.first_name
     assert_equal "Doe", u3.last_name
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: attr_default
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Colin Kelley
@@ -16,49 +16,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-22 00:00:00 Z
+date: 2013-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        version: "0"
+        version: 1.1.0
   prerelease: false
-  type: :runtime
-  name: rake
+  type: :development
+  name: rack
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 0
-        version: "0"
+        - 9
+        version: "0.9"
   prerelease: false
-  type: :runtime
-  name: rails
+  type: :development
+  name: rake
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 14
+        version: 2.3.14
   prerelease: false
   type: :development
-  name: sqlite3
+  name: rails
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
@@ -72,8 +77,24 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  name: hobofields
+  name: sqlite3
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 245
+        segments: 
+        - 0
+        - 9
+        - 103
+        version: 0.9.103
+  prerelease: false
+  type: :development
+  name: hobofields
+  version_requirements: *id005
 description: Dynamic Ruby defaults for ActiveRecord attributes
 email: 
 - colindkelley@gmail.com