ar_default_values 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb2ebcc362d9a7af3e6fe45f4f0abba93245d43a
-  data.tar.gz: db72b094fa7f00e1d0ce1b4880bdc570b78f0dd1
+  metadata.gz: 5e377838e48ccad8237c57909a67c15cc5e43223
+  data.tar.gz: 8ac4024d5e11a96f357f4ba25c20f4b071338bbf
 SHA512:
-  metadata.gz: 6529ca967259cf03e8f439c2dec27912ca1b18f3e771e333ce382301e30b1e9ebd199ca346ce10ebce1bc95df26571bca8cb4636cf7a4ba71c1f893731f8e3de
-  data.tar.gz: 212f1e3dfa7f3de2d928214c68d96fa0253f9a9f4e87154848772dcb139a3adb8f62f224713196ef32f77742a7e327eee7eca2a46442df9b4ed2f15c8d38cb3d
+  metadata.gz: 1ebfcad27fdbf3b80067629dc4ab04c54bf59ab5167b1a8755356e67ebf17ebc9b3b8053a827258f929fbb06cbc4e90ec5393f750bba8c46db1cc0d3945ba607
+  data.tar.gz: a8d0969fee54980e33627d707b577c70ca0fe10ff2e619012b40a7ae084fe2e8f0c9ba3afd82f16ffce1dd7686f587c6b29269d36d3d32a4bafcc7894e04a09e

data/.travis.yml

@@ -1,4 +1,6 @@
 rvm:
   - 1.9.3
   - 2.0.0
-
+env:
+  - rails='~> 3.2'
+  - rails='~> 4.0'

data/Gemfile

@@ -2,6 +2,9 @@ source "http://rubygems.org"
 
 gemspec
 
+ENV['rails'] ||= '~> 4.0'
+gem "rails", ENV['rails']
+
 group :development do
   gem "pry"
   gem "rspec"

data/ar_default_values.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", ">= 3.0.0", '< 4'
-  spec.add_runtime_dependency "activesupport", ">= 3.0.0", '< 4'
+  spec.add_runtime_dependency "activerecord", ">= 3.2"
+  spec.add_runtime_dependency "activesupport", ">= 3.2"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/ar_default_values/version.rb

@@ -1,3 +1,3 @@
 module DefaultValues
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/ar_default_values.rb

@@ -45,19 +45,11 @@ module DefaultValues
       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]}]
-        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|
-          self.send("#{key}=", value)
+
+        defaults.each_pair do |key, value|
+          write_attribute(key, value) unless attribute_present?(key)
         end
       end
 

data/spec/ar_default_values_spec.rb

@@ -1,14 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 class Book < ActiveRecord::Base
-  attr_protected :edition
+  attr_protected :edition if Rails.version.to_i < 4
 
   default_values price: 0, edition: 1, released_at: lambda { Time.now }
 end
 
 class Book2 < ActiveRecord::Base
   self.table_name = :books
-  attr_protected :edition
+  attr_protected :edition if Rails.version.to_i < 4
   default_values price: 0, edition: 1 do
     t = Time.now
     {:released_at => t }
@@ -17,17 +17,16 @@ end
 
 class Book3 < ActiveRecord::Base
   self.table_name = :books
-  attr_accessible :price
+  attr_accessible :price if Rails.version.to_i < 4
   default_values price: 0, edition: 1, released_at: -> { Time.now }
 end
 
 describe "ArDefaultValues" do
+  let!(:now) { Time.at(Time.now.to_i) }
+
   subject { @sample }
   describe :fixed_default_values do
-    before do
-      @now = Time.at(Time.now.to_i)
-      Time.stub(:now).and_return(@now)
-    end
+    before { Time.stub(:now) { now } }
     context :without_attributes do
       before do
         @sample = Book.new
@@ -35,7 +34,7 @@ describe "ArDefaultValues" do
       its(:title) { should be_nil }
       its(:price) { should == 0 }
       its(:edition) { should == 1 }
-      its(:released_at) { should == @now }
+      its(:released_at) { should == now }
     end
     context :with_attributes do
       before do
@@ -44,7 +43,7 @@ describe "ArDefaultValues" do
       its(:title) { should be_nil }
       its(:price) { should == 100 }
       its(:edition) { should == 1 }
-      its(:released_at) { should == @now }
+      its(:released_at) { should == now }
     end
     context :with_block do
       before do
@@ -55,17 +54,19 @@ describe "ArDefaultValues" do
       its(:title) { should == 'foo' }
       its(:price) { should == 0 }
       its(:edition) { should == 1 }
-      its(:released_at) { should == @now }
+      its(:released_at) { should == now }
     end
 
-    context :consider_attr_protected do
-      before do
-        @sample = Book.new(:edition => 3)
+    if Rails.version.to_i < 4
+      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 == 0 }
-      its(:edition) { should == 1 }
-      its(:released_at) { should == @now }
     end
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+require 'rails'
 require 'ar_default_values'
 
 # Requires supporting files with custom matchers and macros, etc,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_default_values
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +16,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement