default_value_for 2.0.3 → 3.0.0

data/Rakefile

@@ -2,5 +2,25 @@ task :default => :test
 
 desc "Run unit tests."
 task :test do
-	ruby "test.rb"
+  ruby "test.rb"
+end
+
+['3.2', '4.0', '4.1'].each do |version|
+  dotless = version.delete('.')
+
+  namespace :bundle do
+    desc "Bundle with Rails #{version}.x"
+    task :"rails#{dotless}" do
+      ENV['BUNDLE_GEMFILE'] = "Gemfile.rails.#{version}.rb"
+      sh "bundle"
+    end
+  end
+
+  namespace :test do
+    desc "Test with Rails #{version}.x"
+    task :"rails#{dotless}" do
+      ENV['BUNDLE_GEMFILE'] = "Gemfile.rails.#{version}.rb"
+      ruby "test.rb"
+    end
+  end
 end

data/default_value_for.gemspec

@@ -1,15 +1,19 @@
 Gem::Specification.new do |s|
   s.name = %q{default_value_for}
-  s.version = "2.0.3"
+  s.version = "3.0.0"
   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{software-signing@phusion.nl}
   s.homepage = %q{https://github.com/FooBarWidget/default_value_for}
   s.authors = ["Hongli Lai"]
   s.files = ['default_value_for.gemspec',
-    'LICENSE.TXT', 'Rakefile', 'README.rdoc', 'test.rb',
+    'LICENSE.TXT', 'Rakefile', 'README.md', 'test.rb',
     'init.rb',
     'lib/default_value_for.rb',
     'lib/default_value_for/railtie.rb'
   ]
+  s.add_dependency 'activerecord', '>= 3.2.0', '< 5.0'
+  s.add_development_dependency 'railties', '>= 3.2.0', '< 5.0'
+  s.add_development_dependency 'minitest', '>= 4.2'
+  s.required_ruby_version = '>= 1.9.3'
 end

data/lib/default_value_for.rb

@@ -56,32 +56,34 @@ module DefaultValueFor
     # * <tt>value</tt> - Sets the default value.
     # * <tt>allows_nil (default: true)</tt> - Sets explicitly passed nil values if option is set to true.
     def default_value_for(attribute, options = {}, &block)
-      value = options.is_a?(Hash) && options.stringify_keys.has_key?('value') ? options.stringify_keys['value'] : options
-      allows_nil = options.is_a?(Hash) && options.stringify_keys.has_key?('allows_nil') ? options.stringify_keys['allows_nil'] : true
+      value      = options
+      allows_nil = true
+
+      if options.is_a?(Hash)
+        opts       = options.stringify_keys
+        value      = opts.fetch('value', options)
+        allows_nil = opts.fetch('allows_nil', true)
+      end
 
       if !method_defined?(:set_default_values)
         include(InstanceMethods)
 
         after_initialize :set_default_values
 
-        if respond_to?(:class_attribute)
-          class_attribute :_default_attribute_values
-          class_attribute :_default_attribute_values_not_allowing_nil
-        else
-          class_inheritable_accessor :_default_attribute_values
-          class_inheritable_accessor :_default_attribute_values_not_allowing_nil
-        end
+        class_attribute :_default_attribute_values
+        class_attribute :_default_attribute_values_not_allowing_nil
 
         extend(DelayedClassMethods)
         init_hash = true
       else
-        methods = singleton_methods(false)
-        init_hash = !methods.include?("_default_attribute_values") && !methods.include?(:_default_attribute_values)
+        init_hash = !singleton_methods(false).include?(:_default_attribute_values)
       end
+
       if init_hash
-        self._default_attribute_values = ActiveSupport::OrderedHash.new
+        self._default_attribute_values = {}
         self._default_attribute_values_not_allowing_nil = []
       end
+
       if block_given?
         container = BlockValueContainer.new(block)
       else
@@ -134,20 +136,31 @@ module DefaultValueFor
         end
       end
 
-      if ActiveRecord::VERSION::MAJOR > 3 || (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR > 0)
+      if self.class.respond_to? :protected_attributes
         super(attributes, options)
       else
         super(attributes)
       end
     end
 
+    def attributes_for_create(attribute_names)
+      attribute_names += _default_attribute_values.keys.map(&:to_s)
+      super
+    end
+
     def set_default_values
       self.class._all_default_attribute_values.each do |attribute, container|
-        next unless self.new_record? || self.class._all_default_attribute_values_not_allowing_nil.include?(attribute)
+        next unless new_record? || self.class._all_default_attribute_values_not_allowing_nil.include?(attribute)
 
         connection_default_value_defined = new_record? && respond_to?("#{attribute}_changed?") && !__send__("#{attribute}_changed?")
 
-        next unless connection_default_value_defined || self.attributes[attribute].blank?
+        column = self.class.columns.detect {|c| c.name == attribute}
+        attribute_blank = if column && column.type == :boolean
+          attributes[attribute].nil?
+        else
+          attributes[attribute].blank?
+        end
+        next unless connection_default_value_defined || attribute_blank
 
         # allow explicitly setting nil through allow nil option
         next if @initialization_attributes.is_a?(Hash) && @initialization_attributes.has_key?(attribute) && !self.class._all_default_attribute_values_not_allowing_nil.include?(attribute)

data/lib/default_value_for/railtie.rb

@@ -21,19 +21,19 @@
 # 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
+  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,35 +18,36 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-want_rails_version = '~> ' + ENV.fetch('WANT_RAILS_VERSION', '3.2.0')
+require 'bundler/setup'
+require 'minitest/autorun'
+require 'active_record'
+require 'active_support/dependencies'
+
+if ActiveSupport::VERSION::MAJOR < 4
+  require 'active_support/core_ext/logger'
+end
 
-require 'rubygems'
-gem 'rails', want_rails_version
-gem 'activerecord', want_rails_version
 begin
-  require 'rails/railtie'
-rescue LoadError
+  TestCaseClass = MiniTest::Test
+rescue NameError
+  TestCaseClass = MiniTest::Unit::TestCase
 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.dirname(__FILE__))
+
 require 'default_value_for'
-Dir.chdir(File.dirname(__FILE__))
+
+puts "\nTesting with Active Record version #{ActiveRecord::VERSION::STRING}\n\n"
 
 if RUBY_PLATFORM == "java"
   database_adapter = "jdbcsqlite3"
 else
   database_adapter = "sqlite3"
 end
-
-File.unlink('test.sqlite3') rescue nil
+ActiveRecord::Base.default_timezone = :local
 ActiveRecord::Base.logger = Logger.new(STDERR)
 ActiveRecord::Base.logger.level = Logger::WARN
 ActiveRecord::Base.establish_connection(
-  :adapter => database_adapter,
-  :database => 'test.sqlite3'
+  :adapter  => database_adapter,
+  :database => ':memory:'
 )
 ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
   t.string :username
@@ -58,6 +59,7 @@ ActiveRecord::Base.connection.create_table(:numbers, :force => true) do |t|
   t.integer :count, :null => false, :default => 1
   t.integer :user_id
   t.timestamp :timestamp
+  t.boolean :flag
 end
 
 if defined?(Rails::Railtie)
@@ -72,7 +74,7 @@ end
 class Number < ActiveRecord::Base
 end
 
-class DefaultValuePluginTest < Test::Unit::TestCase
+class DefaultValuePluginTest < TestCaseClass
   def setup
     Number.create(:number => 9876)
   end
@@ -115,10 +117,10 @@ class DefaultValuePluginTest < Test::Unit::TestCase
     define_model_class do
       default_value_for :number, 1234
     end
-    
+
     object = TestClass.create
-    assert_not_nil TestClass.find_by_number(1234)
-    
+    refute_nil TestClass.find_by_number(1234)
+
     # allows nil for existing records
     object.update_attribute(:number, nil)
     assert_nil TestClass.find_by_number(1234)
@@ -129,9 +131,9 @@ class DefaultValuePluginTest < Test::Unit::TestCase
     define_model_class do
       default_value_for(:number, :allows_nil => false) { 1234 }
     end
-    
+
     object = TestClass.create
-    
+
     # allows nil for existing records
     object.update_attribute(:number, nil)
     assert_nil TestClass.find_by_number(1234)
@@ -257,7 +259,7 @@ class DefaultValuePluginTest < Test::Unit::TestCase
       attr_accessor :hello
     end
 
-    assert_nothing_raised { TestSuperClass.new }
+    assert TestSuperClass.new
     assert !TestSuperClass._default_attribute_values.include?(:hello)
   end
 
@@ -265,7 +267,7 @@ class DefaultValuePluginTest < Test::Unit::TestCase
     define_model_class do
       default_value_for :number, 1234
     end
-    assert_equal 9876, TestClass.find(:first).number
+    assert_equal 9876, TestClass.first.number
   end
 
   def test_also_works_on_attributes_that_arent_database_columns
@@ -277,31 +279,33 @@ class DefaultValuePluginTest < Test::Unit::TestCase
     assert_equal 'hi', object.hello
   end
 
-  def test_constructor_ignores_forbidden_mass_assignment_attributes
-    define_model_class do
-      default_value_for :number, 1234
-      attr_protected :number
+  if ActiveRecord::VERSION::MAJOR < 4
+    def test_constructor_ignores_forbidden_mass_assignment_attributes
+      define_model_class do
+        default_value_for :number, 1234
+        attr_protected :number
+      end
+      object = TestClass.new(:number => 5678, :count => 987)
+      assert_equal 1234, object.number
+      assert_equal 987, object.count
     end
-    object = TestClass.new(:number => 5678, :count => 987)
-    assert_equal 1234, object.number
-    assert_equal 987, object.count
-  end
 
-  def test_constructor_respects_without_protection_option
-    define_model_class do
-      default_value_for :number, 1234
-      attr_protected :number
-      
-      def respond_to_mass_assignment_options?
-        respond_to? :mass_assignment_options
+    def test_constructor_respects_without_protection_option
+      define_model_class do
+        default_value_for :number, 1234
+        attr_protected :number
+
+        def respond_to_mass_assignment_options?
+          respond_to? :mass_assignment_options
+        end
+      end
+
+      if TestClass.new.respond_to_mass_assignment_options?
+        # test without protection feature if available in current ActiveRecord version
+        object = TestClass.create!({:number => 5678, :count => 987}, :without_protection => true)
+        assert_equal 5678, object.number
+        assert_equal 987, object.count
       end
-    end
-    
-    if TestClass.new.respond_to_mass_assignment_options?
-      # test without protection feature if available in current ActiveRecord version
-      object = TestClass.create!({:number => 5678, :count => 987}, :without_protection => true)
-      assert_equal 5678, object.number
-      assert_equal 987, object.count
     end
   end
 
@@ -413,7 +417,7 @@ class DefaultValuePluginTest < Test::Unit::TestCase
     user2 = TestClass.new
     assert_equal([1], user2.hash[1])
   end
-  
+
   def test_constructor_does_not_affect_the_hash_passed_to_it
     define_model_class do
       default_value_for :count, 5
@@ -431,6 +435,18 @@ class DefaultValuePluginTest < Test::Unit::TestCase
     end
     define_model_class("SpecialNumber", "TestClass")
     n = SpecialNumber.create
-    assert_nothing_raised { SpecialNumber.find(n.id) }
+    assert SpecialNumber.find(n.id)
+  end
+
+  def test_does_not_see_false_as_blank_at_boolean_columns_for_existing_records
+    define_model_class do
+      default_value_for(:flag, :allows_nil => false) { true }
+    end
+
+    object = TestClass.create
+
+    # allows nil for existing records
+    object.update_attribute(:flag, false)
+    assert_equal false, TestClass.find(object.id).flag
   end
 end

metadata

@@ -1,16 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: default_value_for
 version: !ruby/object:Gem::Version
-  version: 2.0.3
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
-dependencies: []
+date: 2014-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.2'
 description: The default_value_for plugin allows one to define default values for
   ActiveRecord models in a declarative manner
 email: software-signing@phusion.nl
@@ -18,36 +71,35 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- default_value_for.gemspec
 - LICENSE.TXT
+- README.md
 - Rakefile
-- README.rdoc
-- test.rb
+- default_value_for.gemspec
 - init.rb
 - lib/default_value_for.rb
 - lib/default_value_for/railtie.rb
+- test.rb
 homepage: https://github.com/FooBarWidget/default_value_for
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides a way to specify default values for ActiveRecord models
 test_files: []