attr_default 0.5.7 → 0.6.0

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
-# gem 'hobosupport',           '0.9.103', :path => '../web/vendor/gems/hobosupport-0.9.103'
-# gem 'hobofields',            '0.9.103', :path => '../web/vendor/gems/hobofields-0.9.103'
-
-# Specify your gem's dependencies in attr_default.gemspec
 gemspec

data/Rakefile

@@ -1,9 +1,12 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'appraisal'
+require 'rubygems'
+require 'bundler/setup'
 
 task :default => :test
 
 desc "Run unit tests."
 task :test do
-  ruby "test/test_attr_default.rb"
+  ruby "test/attr_default_test.rb"
 end

data/attr_default.gemspec

@@ -1,9 +1,9 @@
 require File.expand_path('../lib/attr_default/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_development_dependency 'rack', '~> 1.1.0'
+  gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'rake', '~>0.9'
-  gem.add_development_dependency 'rails', '2.3.14'
+  gem.add_development_dependency 'pry'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'hobofields', '0.9.103'
   gem.authors       = ["Colin Kelley", "Nick Burwell"]

data/lib/attr_default.rb

@@ -9,7 +9,7 @@ module AttrDefault
       _attr_defaults[attr_name] = default
 
       define_method(attr_name) do
-        if new_record? && !@_attr_defaults_set_from_clone && !_attr_default_set[attr_name]
+        if new_record? && !@_attr_defaults_set_from_dup && !_attr_default_set[attr_name]
           reset_to_default_value(attr_name)
         end
         read_attribute_with_fixups(attr_name)
@@ -89,16 +89,30 @@ module AttrDefault
       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)
+    if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
+      def dup
+        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_dup, true)
+        end
+        result
+      end
+    else
+      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_dup, true)
+        end
+        result
       end
-      result
     end
   end
 end

data/lib/attr_default/version.rb

@@ -1,3 +1,3 @@
 module AttrDefault
-  VERSION = "0.5.7"
+  VERSION = "0.6.0"
 end

data/test/{test_attr_default.rb → attr_default_test.rb}

@@ -17,6 +17,20 @@ else
   database_adapter = "sqlite3"
 end
 
+SAVE_NO_VALIDATE =
+  if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.0')
+    {:validate => false}
+  else
+    false
+  end
+
+DUP_METHOD =
+  if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
+    :dup
+  else
+    :clone
+  end
+
 File.unlink('test.sqlite3') rescue nil
 ActiveRecord::Base.logger = Logger.new(STDERR)
 ActiveRecord::Base.logger.level = Logger::WARN
@@ -29,6 +43,7 @@ ActiveRecord::Base.connection.create_table(:test_users, :force => true) do |t|
   t.string :first_name, :default => ''
   t.string :last_name
   t.string :domain, :default => 'example.com'
+  t.string :password
   t.timestamp :timestamp
 end
 
@@ -120,11 +135,11 @@ class AttrDefaultTest < Test::Unit::TestCase
 
   def test_return_the_ActiveRecord_native_type_not_the_lambda_type
     u = TestUser.new
-    assert_equal 'ActiveSupport::TimeWithZone', u.timestamp.class.name
+    assert_equal ActiveSupport::TimeWithZone, u.timestamp.class
     begin
       old_time_zone, Time.zone = Time.zone, 'Central Time (US & Canada)'
       u = TestUser.new
-      assert_equal 'ActiveSupport::TimeWithZone', u.timestamp.class.name
+      assert_equal ActiveSupport::TimeWithZone, u.timestamp.class
       assert_match /Central Time/, u.timestamp.time_zone.to_s
     ensure
       Time.zone = old_time_zone
@@ -203,24 +218,24 @@ class AttrDefaultTest < Test::Unit::TestCase
     assert_equal "initial.com", domain.domain
   end
 
-  def test_clone_touched_state_when_cloned_before_save_new_record_true
+  def test_dup_touched_state_when_duped_before_save_new_record_true
     u = TestUser.new :first_name => 'John', :last_name => 'Doe'
     u.last_name = 'overridden'
-    u2 = u.clone
+    u2 = u.send(DUP_METHOD)
     assert_equal 'overridden', u2.read_attribute(:last_name)
     assert_equal 'overridden', u2.last_name
   end
 
-  def test_clone_touched_state_when_cloned_after_save_new_record_false
-    u = TestUser.new :first_name => 'John', :last_name => 'Doe'
+  def test_dup_touched_state_when_duped_after_save_new_record_false
+    u = TestUser.new(:first_name => 'John', :last_name => 'Doe')
     u.last_name = 'overridden'
-    u2 = u.clone
+    u2 = u.send(DUP_METHOD)
     u2.save!
     u.save!
-    assert u.clone.instance_variable_get(:@_attr_defaults_set_from_clone)
-    assert_equal 'overridden', u.clone.last_name
+    assert u.send(DUP_METHOD).instance_variable_get(:@_attr_defaults_set_from_dup)
+    assert_equal 'overridden', u.send(DUP_METHOD).last_name
     ufind = TestUser.find(u.id)
-    u3 = ufind.clone
+    u3 = ufind.send(DUP_METHOD)
     assert_equal 'overridden', u3.read_attribute(:last_name), u3.attributes.inspect
     assert_equal 'overridden', u3.last_name
     u3.save!
@@ -237,7 +252,7 @@ class AttrDefaultTest < Test::Unit::TestCase
     # not touched or saved yet, still SQL default
     assert_equal "domain.com", domain.read_attribute(:domain)
 
-    domain.save(false)
+    domain.save(SAVE_NO_VALIDATE)
 
     # now it should be set to Ruby default
     assert_equal "initial.com", domain.read_attribute(:domain)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attr_default
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,21 +45,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.14
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.14
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ files:
 - lib/attr_default.rb
 - lib/attr_default/railtie.rb
 - lib/attr_default/version.rb
-- test/test_attr_default.rb
+- test/attr_default_test.rb
 homepage: https://github.com/RingRevenue/attr_default
 licenses: []
 post_install_message: 
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3904188318678435227
+      hash: -1415476952422739747
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3904188318678435227
+      hash: -1415476952422739747
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -143,4 +143,4 @@ summary: ! 'Dynamic Ruby defaults for ActiveRecord attributes. These are lazy ev
   dynamic defaults to depend on attributes that are assigned after initialization,
   or on other dynamic defaults.'
 test_files:
-- test/test_attr_default.rb
+- test/attr_default_test.rb