default_value_for 1.0.4 → 1.0.5

data/default_value_for.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{default_value_for}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
   s.summary = %q{Provides a way to specify default values for ActiveRecord models}
   s.description = %q{The default_value_for plugin allows one to define default values for ActiveRecord models in a declarative manner}
   s.email = %q{info@phusion.nl}

data/lib/default_value_for/railtie.rb

@@ -1,30 +1,39 @@
-# Copyright (c) 2008, 2009, 2010, 2011 Phusion
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Rails 3 initialization
-module DefaultValueFor
-	class Railtie < Rails::Railtie
-		initializer 'default_value_for.insert_into_active_record' do
-			ActiveSupport.on_load :active_record do
-				ActiveRecord::Base.extend(DefaultValueFor::ClassMethods)
-			end
-		end
-	end
-end
+# Copyright (c) 2008, 2009, 2010, 2011 Phusion
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# Rails 3 initialization
+
+module DefaultValueFor
+	def self.initialize_railtie
+		ActiveSupport.on_load :active_record do
+			DefaultValueFor.initialize_active_record_extensions
+		end
+	end
+	
+	def self.initialize_active_record_extensions
+		ActiveRecord::Base.extend(DefaultValueFor::ClassMethods)
+	end
+	
+	class Railtie < Rails::Railtie
+		initializer 'default_value_for.insert_into_active_record' do
+			DefaultValueFor.initialize_railtie
+		end
+	end
+end

data/test.rb

@@ -18,14 +18,21 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+want_rails_version = '~> 3.1.0.rc1'
+
 require 'rubygems'
-gem 'activerecord', '~> 3.1.0.rc1'
+gem 'rails', want_rails_version
+gem 'activerecord', want_rails_version
+begin
+	require 'rails/railtie'
+rescue LoadError
+end
 require 'active_record'
 require 'test/unit'
+require 'active_support/dependencies'
 require 'active_support/core_ext/logger'
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require File.dirname(__FILE__) + '/lib/default_value_for'
-require File.dirname(__FILE__) + '/init'
+$LOAD_PATH.unshift File.expand_path("lib", File.dirname(__FILE__))
+require 'default_value_for'
 Dir.chdir(File.dirname(__FILE__))
 
 if RUBY_PLATFORM == "java"
@@ -53,6 +60,11 @@ ActiveRecord::Base.connection.create_table(:numbers, :force => true) do |t|
 	t.timestamp :timestamp
 end
 
+if defined?(Rails::Railtie)
+	DefaultValueFor.initialize_railtie
+	DefaultValueFor.initialize_active_record_extensions
+end
+
 class User < ActiveRecord::Base
 	has_many :numbers, :class_name => 'TestClass'
 end
@@ -208,24 +220,25 @@ class DefaultValuePluginTest < Test::Unit::TestCase
 		assert_same object, $instance
 	end
 
-	def test_can_specify_default_value_via_association
-		user = User.create(:username => 'Kanako', :default_number => 123)
-		define_model_class do
-			belongs_to :user
-
-			default_value_for :number do |n|
-				n.user.default_number
-			end
-		end
-		object = user.numbers.create
-		assert_equal 123, object.number
-	end
+	# This is no longer supported starting from Rails 3.1 thanks to ActiveRecord changes.
+	# def test_can_specify_default_value_via_association
+	# 	user = User.create(:username => 'Kanako', :default_number => 123)
+	# 	define_model_class do
+	# 		belongs_to :user
+	# 
+	# 		default_value_for :number do |n|
+	# 			n.user.default_number
+	# 		end
+	# 	end
+	# 	object = user.numbers.create
+	# 	assert_equal 123, object.number
+	# end
 
 	def test_default_values
 		define_model_class do
 			default_values :type => "normal",
-											:number => lambda { 10 + 5 },
-											:timestamp => lambda {|_| Time.now }
+				:number => lambda { 10 + 5 },
+				:timestamp => lambda {|_| Time.now }
 		end
 
 		object = TestClass.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: default_value_for
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Hongli Lai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 +02:00
+date: 2011-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: []