ar_default_values 0.2.0 → 0.3.0

data/Gemfile

@@ -5,8 +5,8 @@ source "http://rubygems.org"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-gem "activesupport"
-gem "activerecord"
+gem "activesupport", ">= 3.0.0"
+gem "activerecord", ">= 3.0.0"
 
 group :development do
   gem "rspec"

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/ar_default_values.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ar_default_values"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["masarakki"]
-  s.date = "2012-04-02"
+  s.date = "2013-01-08"
   s.description = "ActiveRecord with default values"
   s.email = "masaki@hisme.net"
   s.extra_rdoc_files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -35,23 +34,23 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/masarakki/ar_default_values"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "ActiveRecord with default values"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -59,8 +58,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/lib/ar_default_values.rb

@@ -45,11 +45,15 @@ module ActiveRecord
         define_method(:initialize_with_default_values) do |*attributes, &inner_block|
           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)
+          authorizer = self.mass_assignment_authorizer(nil)
+
+          parted_defaults = defaults.partition do |key, value|
+            authorizer.deny?(key)
           end
 
+          sanitized_defaults = Hash[parted_defaults[1]]
+          protected_defaults = Hash[parted_defaults[0]]
+
           attributes[0] = sanitized_defaults.merge(attributes.first || {})
           initialize_without_default_values(*attributes, &inner_block)
           protected_defaults.each_pair do |key, value|

data/spec/ar_default_values_spec.rb

@@ -8,56 +8,81 @@ end
 
 class Book2 < ActiveRecord::Base
   self.table_name = :books
-
-  default_values price: 0 do
+  attr_protected :edition
+  default_values price: 0, edition: 1 do
     t = Time.now
     {:released_at => t }
   end
 end
 
+class Book3 < ActiveRecord::Base
+  self.table_name = :books
+  attr_accessible :price
+  default_values price: 0, edition: 1, released_at: -> { Time.now }
+end
+
 describe "ArDefaultValues" do
   subject { @sample }
-  before do
-    @now = Time.at(Time.now.to_i)
-    Time.stub(:now).and_return(@now)
-  end
-  context :without_attributes do
+  describe :fixed_default_values do
     before do
-      @sample = Book.new
+      @now = Time.at(Time.now.to_i)
+      Time.stub(:now).and_return(@now)
     end
-    its(:title) { should be_nil }
-    its(:price) { should == 0 }
-    its(:edition) { should == 1 }
-    its(:released_at) { should == @now }
-  end
-  context :with_attributes do
-    before do
-      @sample = Book.new(:price => 100)
+    context :without_attributes do
+      before do
+        @sample = Book.new
+      end
+      its(:title) { should be_nil }
+      its(:price) { should == 0 }
+      its(:edition) { should == 1 }
+      its(:released_at) { should == @now }
+    end
+    context :with_attributes do
+      before do
+        @sample = Book.new(:price => 100)
+      end
+      its(:title) { should be_nil }
+      its(:price) { should == 100 }
+      its(:edition) { should == 1 }
+      its(:released_at) { should == @now }
+    end
+    context :with_block do
+      before do
+        @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 = Book.new(:edition => 3)
+      end
+      its(:title) { should be_nil }
+      its(:price) { should == 0 }
+      its(:edition) { should == 1 }
+      its(:released_at) { should == @now }
     end
-    its(:title) { should be_nil }
-    its(:price) { should == 100 }
-    its(:edition) { should == 1 }
-    its(:released_at) { should == @now }
   end
-  context :with_block do
+
+  describe :instance_values_with_block do
     before do
-      @sample = Book.new do |t|
-        t.title = 'foo'
-      end
+      @sample = Book2.new
+      sleep 1
+      @target = Book2.new
     end
-    its(:title) { should == 'foo' }
-    its(:price) { should == 0 }
-    its(:edition) { should == 1 }
-    its(:released_at) { should == @now }
+    its(:released_at) { should_not eq @target.released_at }
   end
 
-  context :consider_attr_protected do
+  describe :both_attr_accessible_and_attr_protected do
     before do
-      @sample = Book2.new(:edition => 3)
+      @sample = Book3.new(:price => 150)
     end
-    its(:title) { should be_nil }
-    its(:price) { should == 0 }
-    its(:edition) { should == 3 }
-    its(:released_at) { should == @now }
+    its(:price) { should == 150 }
+    its(:edition) { should == 1 }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_default_values
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14593180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14593180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &14592420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14592420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14591840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14591840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &14590760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14590760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14589540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14589540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14588180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14588180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &14587200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14587200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveRecord with default values
 email: masaki@hisme.net
 executables: []
@@ -99,7 +134,6 @@ files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -125,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2739708549048950196
+      hash: 1043313969
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord with default values

data/Gemfile.lock

@@ -1,51 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.2)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.6.5)
-    multi_json (1.1.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    sqlite3 (1.3.5)
-    tzinfo (0.3.32)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  activesupport
-  bundler
-  jeweler
-  rdoc
-  rspec
-  sqlite3