attribute-defaults 0.1.1 → 0.2.0

data/LICENSE

@@ -0,0 +1,21 @@
+
+    Copyright (C) 2011 Dimitrij Denissenko
+
+	Permission is hereby granted, free of charge, to any person obtaining
+	a copy of this software and associated documentation files (the
+	"Software"), to deal in the Software without restriction, including
+	without limitation the rights to use, copy, modify, merge, publish,
+	distribute, sublicense, and/or sell copies of the Software, and to
+	permit persons to whom the Software is furnished to do so, subject to
+	the following conditions:
+
+	The above copyright notice and this permission notice shall be
+	included in all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+	LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+	OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/attribute_defaults.rb

@@ -1,3 +1,6 @@
+require 'active_record'
+require 'active_support/concern'
+
 module ActiveRecord
   module AttributesWithDefaults
     extend ActiveSupport::Concern
@@ -20,7 +23,7 @@ module ActiveRecord
 
         evaluator = "__eval_attr_default_for_#{sym}".to_sym
         setter    = "__set_attr_default_for_#{sym}".to_sym
-        block   ||= default.is_a?(Proc) ? default : Proc.new { default }
+        block   ||= default.is_a?(Proc) ? default : proc { default }
 
         after_initialize setter.to_sym
         define_method(evaluator, &block)
@@ -29,7 +32,7 @@ module ActiveRecord
           def #{setter}
             #{'return if persisted?' if options[:persisted] == false}
             return unless self.#{sym}.send(:#{options[:if] || 'nil?'})
-            value = #{evaluator}(self)
+            value = #{evaluator}#{'(self)' unless block.arity.zero?}
             self.#{sym} = value.duplicable? ? value.dup : value
           rescue ActiveModel::MissingAttributeError
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: attribute-defaults
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +01:00
+date: 2011-06-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -50,33 +50,26 @@ dependencies:
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
-description: Simple ActiveRecord plugin that allows to specify default values for attributes
+description: ActiveRecord plugin that allows to specify default values for attributes
 email: dimitrij@blacksquaremedia.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- Gemfile
-- Gemfile.lock
+- LICENSE
 - README.rdoc
-- Rakefile
-- VERSION
-- attribute-defaults.gemspec
 - lib/attribute-defaults.rb
 - lib/attribute_defaults.rb
-- spec/attribute_defaults_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/bsm/attribute-defaults
+homepage: https://github.com/bsm/attribute-defaults
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -84,26 +77,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Specify default values for attributes
-test_files: 
-- spec/attribute_defaults_spec.rb
-- spec/spec_helper.rb
+summary: Specify default values for ActiveRecord attributes
+test_files: []
+

data/.gitignore

@@ -1,2 +0,0 @@
-spec/tmp
-pkg

data/Gemfile

@@ -1,8 +0,0 @@
-source "http://rubygems.org"
-
-group :test do
-  gem 'activerecord', '3.0.0'
-  gem 'activesupport', '3.0.0'
-  gem "sqlite3-ruby"
-  gem "rspec", "~> 2.0.0.beta"
-end

data/Gemfile.lock

@@ -1,39 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    i18n (0.4.1)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    sqlite3-ruby (1.3.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.0.0)
-  activesupport (= 3.0.0)
-  rspec (~> 2.0.0.beta)
-  sqlite3-ruby

data/Rakefile

@@ -1,25 +0,0 @@
-require 'rake'
-require 'rspec/mocks/version'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-desc 'Default: run specs.'
-task :default => :spec
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "attribute-defaults"
-    gemspec.summary = "Specify default values for attributes"
-    gemspec.description = "Simple ActiveRecord plugin that allows to specify default values for attributes"
-    gemspec.email = "dimitrij@blacksquaremedia.com"
-    gemspec.homepage = "http://github.com/bsm/attribute-defaults"
-    gemspec.authors = ["Dimitrij Denissenko"]
-    gemspec.add_runtime_dependency "activerecord", ">= 3.0.0"
-    gemspec.add_runtime_dependency "activesupport", ">= 3.0.0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end

data/VERSION

@@ -1 +0,0 @@
-0.1.1

data/attribute-defaults.gemspec

@@ -1,57 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{attribute-defaults}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dimitrij Denissenko"]
-  s.date = %q{2010-09-15}
-  s.description = %q{Simple ActiveRecord plugin that allows to specify default values for attributes}
-  s.email = %q{dimitrij@blacksquaremedia.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "attribute-defaults.gemspec",
-     "lib/attribute-defaults.rb",
-     "lib/attribute_defaults.rb",
-     "spec/attribute_defaults_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/bsm/attribute-defaults}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Specify default values for attributes}
-  s.test_files = [
-    "spec/attribute_defaults_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-  end
-end
-

data/spec/attribute_defaults_spec.rb

@@ -1,78 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe ActiveRecord::AttributesWithDefaults do
-
-  def foo(options = {})
-    @foo ||= Foo.new options.reverse_merge(:age => 30)
-  end
-
-  def bar(options = {})
-    @bar ||= Bar.new options.reverse_merge(:age => 30)
-  end
-
-  def baz(options = {})
-    @baz ||= Baz.new
-  end
-
-  it 'should initialize records setting defaults' do
-    foo.description.should == '(no description)'
-    foo.locale.should == 'en'
-    foo.birth_year.should == 30.years.ago.year
-  end
-
-  it 'should allow to set custom value conditions' do
-    foo(:locale => '', :description => '')
-    foo.locale.should == ''
-    foo.description.should == '(no description)'
-
-    Bar.new(:some_arr => nil).some_arr.should == [1, 2, 3]
-    Bar.new(:some_arr => []).some_arr.should == [1, 2, 3]
-    Bar.new(:some_arr => [:A, :B]).some_arr.should == [:A, :B]
-  end
-
-  it 'should not override attributes that were set manually' do
-    foo(:locale => 'en-GB').locale.should == 'en-GB'
-  end
-
-  it 'should respect :persisted => false option' do
-    persisted = Foo.first
-    persisted.description.should == '(no description)'
-    persisted.locale.should be_nil
-  end
-
-  it 'should work with protected attributes' do
-    foo(:description => 'Custom').description.should == '(no description)'
-  end
-
-  it 'should correctly apply defaults in subclasses' do
-    bar.description.should == '(no description)'
-    bar.locale.should == 'en'
-    bar.birth_year.should == 30.years.ago.year
-  end
-
-  it 'should allow mass-assignment' do
-    baz.description.should == 'Please set ...'
-    baz.locale.should == 'en-US'
-    baz.age.should == 18
-
-    persisted = Baz.first
-    persisted.age.should be_nil
-  end
-
-  it 'should allow Hashes as default values' do
-    bar.some_hash.should == {}
-  end
-
-  it 'should ensure default values are duplicated' do
-    bar.some_hash[:a] = 'A'
-    bar.some_hash.should == {:a => 'A'}
-    Bar.new.some_hash.should == {}
-  end
-
-  it 'should handle missing attributes (e.g. in case of Base#exists?)' do
-    lambda { Foo.exists? }.should_not raise_error
-    lambda { Foo.select(:locale).first }.should_not raise_error
-  end
-
-
-end

data/spec/spec_helper.rb

@@ -1,59 +0,0 @@
-$: << File.dirname(__FILE__) + '/../lib'
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-Bundler.require :default, :test
-
-require 'active_support'
-require 'active_record'
-require 'rspec'
-require 'fileutils'
-require 'attribute_defaults'
-
-SPEC_DATABASE = File.dirname(__FILE__) + '/tmp/test.sqlite3'
-
-RSpec.configure do |c|
-
-  c.before do
-    FileUtils.mkdir_p File.dirname(SPEC_DATABASE)
-    base = ActiveRecord::Base
-    base.establish_connection('adapter' => 'sqlite3', 'database' => SPEC_DATABASE)
-    base.connection.create_table :foos do |t|
-      t.string   :name
-      t.integer  :age
-      t.string   :locale
-      t.string   :description
-      t.timestamps
-    end
-    Foo.create!(:name => 'Bogus') {|f| f.description = nil; f.locale = nil }
-  end
-
-  c.after do
-    FileUtils.rm_f(SPEC_DATABASE)
-  end
-
-end
-
-class Foo < ActiveRecord::Base
-  attr_accessible :name, :age, :locale
-  attr_accessor   :birth_year
-
-  attr_default    :description, "(no description)", :if => :blank?
-  attr_default    :locale, "en", :persisted => false
-  attr_default    :birth_year do |f|
-    f.age ? Time.now.year - f.age : nil
-  end
-end
-
-class Bar < Foo
-  attr_accessor   :some_hash, :some_arr
-  attr_accessible :some_arr
-
-  attr_default    :some_hash, :default => {}
-  attr_default    :some_arr, :default => [1, 2, 3], :if => :blank?
-end
-
-class Baz < ActiveRecord::Base
-  set_table_name 'foos'
-  attr_defaults :description => "Please set ...", :age => { :default => 18, :persisted => false }, :locale => lambda { 'en-US' }
-end