ar_default_values 0.1.1 → 0.2.0

data/README.rdoc

@@ -1,9 +1,24 @@
 = ar_default_values
+initialize with default_values
 
-Description goes here.
+== sample
+you can specify default values with hash:
+
+  class Book < ActiveRecord::Base
+    default_values rating: 'r18', type: 'comic' do
+      t = Time.now
+      { :released_at => t, :edition_updated_at => t }
+    end
+  end
+
+  book = Book.new
+  book.rating # => "r18"
+  book.type # => "comic"
+  book.title # => nil
+  book.released_at == book.edition_updated_at # => true
 
 == Contributing to ar_default_values
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.
@@ -14,6 +29,6 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2012 Yamada Masaki. See LICENSE.txt for
+Copyright (c) 2012 masarakki. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/ar_default_values.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ar_default_values"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["masarakki"]
-  s.date = "2012-03-24"
+  s.date = "2012-04-02"
   s.description = "ActiveRecord with default values"
   s.email = "masaki@hisme.net"
   s.extra_rdoc_files = [

data/lib/ar_default_values.rb

@@ -9,12 +9,7 @@ require 'active_record'
 # you can specify default values with hash:
 #
 #  class Book < ActiveRecord::Base
-#    default_values do
-#      {
-#        :rating => 'r18',
-#        :type => 'comic'
-#      }
-#    end
+#    default_values rating: 'r18', type: 'comic'
 #  end
 #
 #  book = Book.new
@@ -23,15 +18,15 @@ require 'active_record'
 #  book.title # => nil
 #
 # you can use instance values with lambda:
+#  class Book < ActiveRecord::Base
+#    default_values type: 'comic', released_at: lambda { Time.now }
+#  end
 #
+# or with block:
 #  class Book < ActiveRecord::Base
-#    default_values do
-#      lambda do
-#        {
-#          :type => 'comic',
-#          :released_at => Time.now
-#        }
-#      end
+#    default_values type: 'comic' do
+#      t = Time.now
+#      {released_at: t, edition_updated_at: t}
 #    end
 #  end
 #
@@ -39,19 +34,29 @@ require 'active_record'
 #  # wait 10 sec
 #  book2 = Book.new
 #  book1.release_at == book2.release_at # => false
+#  book1.released_at == book1.edition_updated_at # => true
 #
 module ActiveRecord
   module DefaultValue
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def default_values(&block)
+      def default_values(defaults = {}, &block)
         define_method(:initialize_with_default_values) do |*attributes, &inner_block|
-          hash_or_lambda = block.call
-          hash_or_lambda = hash_or_lambda.call if hash_or_lambda.is_a? Proc
-          attributes[0] = hash_or_lambda.merge(attributes.first || {})
+          defaults = defaults.merge(block.call) if block_given?
+          defaults = Hash[defaults.each_pair.map{ |key, value| [key, value.kind_of?(Proc) ? value.call : value]}]
+          sanitized_defaults = sanitize_for_mass_assignment(defaults)
+          protected_defaults = defaults.reject do |key, value|
+            sanitized_defaults.has_key?(key)
+          end
+
+          attributes[0] = sanitized_defaults.merge(attributes.first || {})
           initialize_without_default_values(*attributes, &inner_block)
+          protected_defaults.each_pair do |key, value|
+            self.send("#{key}=", value)
+          end
         end
+
         alias_method_chain :initialize, :default_values
       end
     end

data/spec/ar_default_values_spec.rb

@@ -1,22 +1,24 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-
 class Book < ActiveRecord::Base
-  default_values do
-    lambda do
-      {
-        :price => 0,
-        :edition => 1,
-        :released_at => Time.now
-      }
-    end
+  attr_protected :edition
+
+  default_values price: 0, edition: 1, released_at: lambda { Time.now }
+end
+
+class Book2 < ActiveRecord::Base
+  self.table_name = :books
+
+  default_values price: 0 do
+    t = Time.now
+    {:released_at => t }
   end
 end
 
 describe "ArDefaultValues" do
   subject { @sample }
   before do
-    @now = Time.now
+    @now = Time.at(Time.now.to_i)
     Time.stub(:now).and_return(@now)
   end
   context :without_attributes do
@@ -39,12 +41,22 @@ describe "ArDefaultValues" do
   end
   context :with_block do
     before do
-      @sample = Book.new(:edition => 3) do |t|
+      @sample = Book.new do |t|
         t.title = 'foo'
       end
     end
     its(:title) { should == 'foo' }
     its(:price) { should == 0 }
+    its(:edition) { should == 1 }
+    its(:released_at) { should == @now }
+  end
+
+  context :consider_attr_protected do
+    before do
+      @sample = Book2.new(:edition => 3)
+    end
+    its(:title) { should be_nil }
+    its(:price) { should == 0 }
     its(:edition) { should == 3 }
     its(:released_at) { should == @now }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_default_values
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &12866580 !ruby/object:Gem::Requirement
+  requirement: &14593180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12866580
+  version_requirements: *14593180
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &12861600 !ruby/object:Gem::Requirement
+  requirement: &14592420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12861600
+  version_requirements: *14592420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12873500 !ruby/object:Gem::Requirement
+  requirement: &14591840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12873500
+  version_requirements: *14591840
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12870120 !ruby/object:Gem::Requirement
+  requirement: &14590760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12870120
+  version_requirements: *14590760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12867500 !ruby/object:Gem::Requirement
+  requirement: &14589540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12867500
+  version_requirements: *14589540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12881540 !ruby/object:Gem::Requirement
+  requirement: &14588180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12881540
+  version_requirements: *14588180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &12879380 !ruby/object:Gem::Requirement
+  requirement: &14587200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12879380
+  version_requirements: *14587200
 description: ActiveRecord with default values
 email: masaki@hisme.net
 executables: []
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2944734096084027538
+      hash: -2739708549048950196
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: