default_value_for 1.0.1 → 1.0.3

data/README.rdoc

@@ -20,10 +20,22 @@ section. Please read on.
 
 == Installation
 
+=== Rails 2
+
 Install with:
 
   ./script/plugin install git://github.com/FooBarWidget/default_value_for.git
 
+=== Rails 3
+
+You can either install it as a plugin:
+
+  rails plugin install git://github.com/FooBarWidget/default_value_for.git
+
+or install it by adding it to your Gemfile:
+
+  gem "default_value_for"
+
 
 == The default_value_for method
 
@@ -84,9 +96,13 @@ The difference is purely aesthetic.  If you have lots of default values which ar
 
 As a side note, due to specifics of Ruby's parser, you cannot say,
 
-  default_value :uuid { UuidGenerator.new.generate_uuid }
+  default_value_for :uuid { UuidGenerator.new.generate_uuid }
+
+because it will not parse. One needs to write
+
+  default_value_for(:uuid) { UuidGenerator.new.generate_uuid }
 
-because it will not parse.  This is in part the inspiration for the +default_values+ syntax.
+instead. This is in part the inspiration for the +default_values+ syntax.
 
 == Rules
 
@@ -290,7 +306,7 @@ And if schema defaults don't provide the flexibility that you need, then
 you could specify a per-environment default:
 
   class User < ActiveRecord::Base
-    if RAILS_ENV == "development"
+    if Rails.env == "development"
       default_value_for :is_admin, true
     end
   end

data/default_value_for.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{default_value_for}
-  s.version = "1.0.1"
+  s.version = "1.0.3"
   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}
@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
     'LICENSE.TXT', 'Rakefile', 'README.rdoc', 'test.rb',
     'init.rb',
     'lib/default_value_for.rb',
-    'lib/default_value_for/railtie.rb',
-    'lib/rails.rb'
+    'lib/default_value_for/railtie.rb'
   ]
 end

data/init.rb

@@ -19,5 +19,4 @@
 # THE SOFTWARE.
 
 # Rails 2 initialization
-require "default_value_for"
-ActiveRecord::Base.extend(DefaultValueForPlugin::ClassMethods)
+ActiveRecord::Base.extend(DefaultValueFor::ClassMethods)

data/lib/default_value_for.rb

@@ -1,99 +1,107 @@
-# Copyright (c) 2008, 2009, 2010 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.
-
-require "default_value_for/railtie"
-
-module DefaultValueForPlugin
-	class NormalValueContainer
-		def initialize(value)
-			@value = value
-		end
-
-		def evaluate(instance)
-			if @value.duplicable?
-				return @value.dup
-			else
-				return @value
-			end
-		end
-	end
-
-	class BlockValueContainer
-		def initialize(block)
-			@block = block
-		end
-
-		def evaluate(instance)
-			return @block.call(instance)
-		end
-	end
-
-	module ClassMethods
-		def default_value_for(attribute, value = nil, &block)
-			if !method_defined?(:initialize_with_defaults)
-				include(InstanceMethods)
-				alias_method_chain :initialize, :defaults
-				class_inheritable_accessor :_default_attribute_values
-				self._default_attribute_values = ActiveSupport::OrderedHash.new
-			end
-			if block_given?
-				container = BlockValueContainer.new(block)
-			else
-				container = NormalValueContainer.new(value)
-			end
-			_default_attribute_values[attribute.to_s] = container
-		end
-
-		def default_values(values)
-			values.each_pair do |key, value|
-				if value.kind_of? Proc
-					default_value_for(key, &value)
-				else
-					default_value_for(key, value)
-				end
-			end
-		end
-	end
-
-	module InstanceMethods
-		def initialize_with_defaults(attrs = nil)
-			initialize_without_defaults(attrs) do
-				if attrs
-					stringified_attrs = attrs.stringify_keys
-					safe_attrs = if respond_to? :sanitize_for_mass_assignment
-						sanitize_for_mass_assignment(stringified_attrs)
-					else
-						remove_attributes_protected_from_mass_assignment(stringified_attrs)
-					end
-					safe_attribute_names = safe_attrs.keys.map do |x|
-						x.to_s
-					end
-				end
-				self.class._default_attribute_values.each do |attribute, container|
-					if safe_attribute_names.nil? || !safe_attribute_names.any? { |attr_name| attr_name =~ /^#{attribute}($|\()/ }
-						__send__("#{attribute}=", container.evaluate(self))
-						changed_attributes.delete(attribute)
-					end
-				end
-				yield(self) if block_given?
-			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.
+
+require 'default_value_for/railtie' if defined?(Rails::Railtie)
+
+module DefaultValueFor
+	class NormalValueContainer
+		def initialize(value)
+			@value = value
+		end
+
+		def evaluate(instance)
+			if @value.duplicable?
+				return @value.dup
+			else
+				return @value
+			end
+		end
+	end
+
+	class BlockValueContainer
+		def initialize(block)
+			@block = block
+		end
+
+		def evaluate(instance)
+			if @block.arity == 0
+				return @block.call
+			else
+				return @block.call(instance)
+			end
+		end
+	end
+
+	module ClassMethods
+		def default_value_for(attribute, value = nil, &block)
+			if !method_defined?(:initialize_with_defaults)
+				include(InstanceMethods)
+				alias_method_chain :initialize, :defaults
+				if respond_to?(:class_attribute)
+					class_attribute :_default_attribute_values
+				else
+					class_inheritable_accessor :_default_attribute_values
+				end
+				self._default_attribute_values = ActiveSupport::OrderedHash.new
+			end
+			if block_given?
+				container = BlockValueContainer.new(block)
+			else
+				container = NormalValueContainer.new(value)
+			end
+			_default_attribute_values[attribute.to_s] = container
+		end
+
+		def default_values(values)
+			values.each_pair do |key, value|
+				if value.kind_of? Proc
+					default_value_for(key, &value)
+				else
+					default_value_for(key, value)
+				end
+			end
+		end
+	end
+
+	module InstanceMethods
+		def initialize_with_defaults(attrs = nil, *args)
+			initialize_without_defaults(attrs, *args) do
+				if attrs
+					stringified_attrs = attrs.stringify_keys
+					safe_attrs = if respond_to? :sanitize_for_mass_assignment
+						sanitize_for_mass_assignment(stringified_attrs)
+					else
+						remove_attributes_protected_from_mass_assignment(stringified_attrs)
+					end
+					safe_attribute_names = safe_attrs.keys.map do |x|
+						x.to_s
+					end
+				end
+				self.class._default_attribute_values.each do |attribute, container|
+					if safe_attribute_names.nil? || !safe_attribute_names.any? { |attr_name| attr_name =~ /^#{attribute}($|\()/ }
+						__send__("#{attribute}=", container.evaluate(self))
+						changed_attributes.delete(attribute)
+					end
+				end
+				yield(self) if block_given?
+			end
+		end
+	end
+end

data/lib/default_value_for/railtie.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2009, 2010 Phusion
+# 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
@@ -19,14 +19,11 @@
 # THE SOFTWARE.
 
 # Rails 3 initialization
-module DefaultValueForPlugin
-	if defined? Rails::Railtie
-		require 'rails'
-		class Railtie < Rails::Railtie
-			initializer 'default_value_for.insert_into_active_record' do
-				ActiveSupport.on_load :active_record do
-					ActiveRecord::Base.extend(DefaultValueForPlugin::ClassMethods)
-				end
+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

data/test.rb

@@ -19,10 +19,12 @@
 # THE SOFTWARE.
 
 require 'rubygems'
+gem 'activerecord', '~> 3.1.0.rc1'
 require 'active_record'
 require 'test/unit'
 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'
 Dir.chdir(File.dirname(__FILE__))
 
@@ -222,7 +224,8 @@ class DefaultValuePluginTest < Test::Unit::TestCase
 	def test_default_values
 		define_model_class do
 			default_values :type => "normal",
-			               :number => lambda { 10 + 5 }
+											: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: 21
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Hongli Lai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +01:00
+date: 2011-07-18 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -36,7 +36,6 @@ files:
 - init.rb
 - lib/default_value_for.rb
 - lib/default_value_for/railtie.rb
-- lib/rails.rb
 has_rdoc: true
 homepage: http://github.com/FooBarWidget/default_value_for
 licenses: []
@@ -67,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Provides a way to specify default values for ActiveRecord models

data/lib/rails.rb

@@ -1,23 +0,0 @@
-# Copyright (c) 2008, 2009, 2010 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 2 initialization
-require "default_value_for"
-ActiveRecord::Base.extend(DefaultValueForPlugin::ClassMethods)