ar_default_values 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f378b412d241888efe1989d935604e0f2bf1ad0
-  data.tar.gz: 6568b728fa614d3d08572ba593522bfc57d6eebf
+  metadata.gz: d55e9df77a2a59d4cc1a067eb18ea9415fd32cfc
+  data.tar.gz: 7d0d006e65dd9b081bbbadb88683d0fa71519508
 SHA512:
-  metadata.gz: 4714919c1bdc29890ac0e72bffb6e6d09a0168010f8f8543844f4538e848f15a698b768923a6eda5ee55fd6c5d942c582c079af3a8c5fc819b796a58e002fde1
-  data.tar.gz: 2c3d44bf0989fc5863853c4a84b883902b899fb889afa4a77d351d2a69289d2c8b9116382360cbd2c41effcbd6ec98c44ead679a3842b45576a4ce6f4be1c2e8
+  metadata.gz: 2978528bc59894e319565b9344dac52b555fb2a39da7912b0f79180026509f403ac48ec7cfede0fe57a8d98f7d44913c201441abb0c78ea6a569d857f6b7ece3
+  data.tar.gz: e1dc8a6d6aff438d737195281b762138a46ab95239271971c60c6d7c134aedde4be4e547607aa1ab8fa5f3d694ea1911518b3b53887ed0e3bc220f3a0439b3bd

data/README.md

@@ -1,3 +1,8 @@
+[![Build Status](https://travis-ci.org/masarakki/ar_default_values.svg?branch=master)](https://travis-ci.org/masarakki/ar_default_values)
+[![Dependency Status](https://gemnasium.com/masarakki/ar_default_values.svg)](https://gemnasium.com/masarakki/ar_default_values)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/masarakki/ar_default_values/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/masarakki/ar_default_values/?branch=master)
+[![Coverage Status](https://coveralls.io/repos/masarakki/ar_default_values/badge.png?branch=master)](https://coveralls.io/r/masarakki/ar_default_values?branch=master)
+
 # DefaultValues
 
 initialize with default_values

data/ar_default_values.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-bundler'
   spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'rdoc'
+  spec.add_development_dependency 'coveralls'
 end

data/lib/default_values/dsl.rb

@@ -5,12 +5,13 @@ module DefaultValues
     module ClassMethods
       def default_values(defaults = {}, &block)
         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.is_a?(Proc) ? value.call : value] }]
+          values = defaults
+          values = values.merge(block.call) if block_given?
+          values = Hash[values.each_pair.map { |key, value| [key, value.is_a?(Proc) ? value.call : value] }]
 
           initialize_without_default_values(*attributes, &inner_block)
 
-          defaults.each_pair do |key, value|
+          values.each_pair do |key, value|
             write_attribute(key, value) unless attribute_present?(key)
           end
         end

data/lib/default_values/version.rb

@@ -1,3 +1,3 @@
 module DefaultValues
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/spec/ar_default_values_spec.rb

@@ -7,7 +7,6 @@ class Book1 < Book
 end
 
 class Book2 < Book
-  self.table_name = :books
   attr_protected :edition if Rails.version.to_i < 4
   default_values price: 0, edition: 1 do
     t = Time.now
@@ -16,17 +15,20 @@ class Book2 < Book
 end
 
 class Book3 < Book
-  self.table_name = :books
   attr_accessible :price if Rails.version.to_i < 4
   default_values price: 0, edition: 1, released_at: -> { Time.now }
 end
 
+class Book4 < Book
+  default_values released_at: Time.now
+end
+
 describe DefaultValues do
   let!(:now) { Time.at(Time.now.to_i) }
 
-  subject { @sample }
   describe 'fixed default_values' do
     before { allow(Time).to receive(:now).and_return(now) }
+
     context 'without attributes' do
       subject { Book1.new }
       its(:title) { is_expected.to be_nil }
@@ -42,6 +44,7 @@ describe DefaultValues do
       its(:edition) { is_expected.to eq 1 }
       its(:released_at) { is_expected.to eq now }
     end
+
     context 'with block' do
       subject do
         Book1.new do |t|
@@ -66,12 +69,23 @@ describe DefaultValues do
   end
 
   describe 'instance values with block' do
-    subject { Book2.new }
-    before do
-      sleep 1
-      @target = Book2.new
+    context 'released_at: -> { Time.now }' do
+      subject { Book2.new }
+      before do
+        @target = Book2.new
+        sleep 1
+      end
+      its(:released_at) { is_expected.not_to eq @target.released_at }
+    end
+
+    context 'released_at: Time.now' do
+      subject { Book4.new }
+      before do
+        @target = Book4.new
+        sleep 1
+      end
+      its(:released_at) { is_expected.to eq @target.released_at }
     end
-    its(:released_at) { is_expected.not_to eq @target.released_at }
   end
 
   context 'both attr_accessible and attr_protected' do

data/spec/rails_helper.rb

@@ -2,6 +2,8 @@ ENV['RAILS_ENV'] = 'test'
 require 'spec_helper'
 require 'rspec/its'
 require 'pry'
+require 'coveralls'
+Coveralls.wear!
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_default_values
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveRecord with default values
 email:
 - masaki@hisme.net