defaults 0.1.0 → 0.1.1

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+.DS_Store

data/.rspec

@@ -0,0 +1 @@
+--format documentation --color

data/Gemfile

@@ -1,5 +1,2 @@
 source :rubygems
-
-gem "activerecord", "3.0.0"
-gem "sqlite3-ruby"
-gem "rspec", "2.0.0.beta.22"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: .
+  specs:
+    defaults (0.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.5)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.9)
+    builder (2.1.2)
+    columnize (0.3.2)
+    diff-lcs (1.1.2)
+    i18n (0.5.0)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.26)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.0)
+  defaults!
+  rspec (~> 2.5.0)
+  ruby-debug19
+  sqlite3-ruby

data/README.rdoc

@@ -2,11 +2,11 @@
 
 == Instalation
 
-Install the plugin with <tt>script/plugin install git://github.com/fnando/has_defaults.git</tt>
+Just run <tt>gem install defaults</tt>
 
 == Usage
 
-Add the method call +has_defaults+ to your model.
+Add the method call +defaults+ to your model.
 
   class Page < ActiveRecord::Base
     defaults :title => "New page", :body => "Put your text here"

data/Rakefile

@@ -1,28 +1,5 @@
-require "./lib/defaults/version"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new do |t|
-  t.ruby_opts = %w[ -Ilib -Ispec ]
-end
-
-begin
-  require "jeweler"
+require "bundler"
+Bundler::GemHelper.install_tasks
 
-  JEWEL = Jeweler::Tasks.new do |gem|
-    gem.name = "defaults"
-    gem.version = Defaults::Version::STRING
-    gem.summary = "Set default values for ActiveRecord attributes"
-    gem.description = "Set default values for ActiveRecord attributes"
-    gem.authors = ["Nando Vieira"]
-    gem.email = "fnando.vieira@gmail.com"
-    gem.homepage = "http://github.com/fnando/has_defaults"
-    gem.has_rdoc = false
-    gem.files = FileList["init.rb", "Gemfile", "Rakefile", "README.rdoc", "defaults.gemspec", "{lib,spec}/**/*"]
-    gem.add_development_dependency "rspec", ">= 2.0.0"
-    gem.add_dependency "activerecord"
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError => e
-  puts "You don't have Jeweler installed, so you won't be able to build gems."
-end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new

data/defaults.gemspec

@@ -1,57 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "defaults/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{defaults}
-  s.version = "0.1.0"
+  s.name        = "defaults"
+  s.version     = Defaults::Version::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Nando Vieira"]
+  s.email       = ["fnando.vieira@gmail.com"]
+  s.homepage    = "http://rubygems.org/gems/defaults"
+  s.summary     = "Set default values for ActiveRecord attributes"
+  s.description = s.summary
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nando Vieira"]
-  s.date = %q{2010-09-29}
-  s.description = %q{Set default values for ActiveRecord attributes}
-  s.email = %q{fnando.vieira@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-     "README.rdoc",
-     "Rakefile",
-     "defaults.gemspec",
-     "init.rb",
-     "lib/defaults.rb",
-     "lib/defaults/version.rb",
-     "spec/defaults_spec.rb",
-     "spec/schema.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/fnando/has_defaults}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Set default values for ActiveRecord attributes}
-  s.test_files = [
-    "spec/defaults_spec.rb",
-     "spec/schema.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_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-  end
+  s.add_development_dependency "activerecord", "~> 3.0.0"
+  s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "rspec", "~> 2.5.0"
+  s.add_development_dependency "ruby-debug19" if RUBY_VERSION >= "1.9"
 end
-

data/lib/defaults.rb

@@ -16,27 +16,31 @@ module Defaults
 
       include InstanceMethods
 
-      self.default_options = attrs
-      after_initialize :set_default_attributes
-    end
+      self.default_options ||= {}
+      self.default_options.merge!(attrs)
 
-    def has_defaults(attrs)
-      warn "[WARNING] Using has_defaults is now deprecated. Please use defaults instead."
-      defaults(attrs)
+      after_initialize :set_default_attributes
     end
   end
 
   module InstanceMethods
     def default_for(name)
-      self.class.default_options[name.to_sym]
+      value = self.class.default_options[name.to_sym]
+      value = value.arity == 1 ? value.call(self) : value.call if value.respond_to?(:call)
+      value
     end
 
     private
     def set_default_attributes
       if new_record?
-        self.class.default_options.each do |name, value|
-          value = value.arity == 1 ? value.call(self) : value.call if value.respond_to?(:call)
-          send("#{name}=", value) if send(name).blank?
+        self.class.default_options.keys.each do |name|
+          # First, retrieve default value set through database.
+          # Will use this value in order to detect if value should be set.
+          info = self.class.columns_hash[name.to_s]
+          database_default = info ? info.default : nil
+
+          value = read_attribute(name)
+          __send__ "#{name}=", default_for(name) if value.blank? || value == database_default
         end
       end
     end

data/lib/defaults/version.rb

@@ -2,7 +2,7 @@ module Defaults
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/defaults_spec.rb

@@ -7,31 +7,45 @@ class Donut < ActiveRecord::Base
   defaults :flavor => "cream",
            :name => "Cream",
            :maker => proc { "Dunkin Donuts" },
-           :class_name => proc {|donut| donut.class.name }
+           :class_name => lambda {|donut| donut.class.name }
+
+  defaults :quantity => 5
 end
 
 describe Defaults do
   before do
+    Donut.delete_all
     @donut = create_donut
     @new_donut = Donut.new
   end
 
-  it "should set defaults" do
+  it "raises when invalid argument is provided" do
+    expect {
+      Donut.defaults nil
+    }.to raise_error(ArgumentError)
+  end
+
+  it "sets default values" do
     @new_donut.flavor.should == "cream"
     @new_donut.name.should == "Cream"
     @new_donut.maker.should == "Dunkin Donuts"
     @new_donut.class_name.should == "Donut"
+    @new_donut.quantity.should == 5
   end
 
-  it "should set defaults only if attributes are blank" do
+  it "sets default values only when have blank attributes" do
     @donut.flavor.should == "vanilla"
+    @donut.quantity.should == 5
   end
 
-  it "should return default value for an attribute" do
+  it "returns default value for an attribute" do
     @donut.default_for(:flavor).should == "cream"
+    @donut.default_for(:maker).should == "Dunkin Donuts"
+    @donut.default_for(:class_name).should == "Donut"
+    @donut.default_for(:quantity).should == 5
   end
 
-  it "should not set defaults" do
+  it "does not set default values" do
     Donut.first.flavor.should == "vanilla"
   end
 

data/spec/schema.rb

@@ -1,5 +1,6 @@
 ActiveRecord::Schema.define(:version => 0) do
   create_table :donuts do |t|
     t.string :flavor, :name, :maker
+    t.integer :quantity, :default => 0, :null => false
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-require "active_record"
 require "rspec"
+require "active_record"
 require "defaults"
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: defaults
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,63 +10,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 -03:00
+date: 2011-04-04 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 3.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: sqlite3-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Set default values for ActiveRecord attributes
-email: fnando.vieira@gmail.com
+email: 
+- fnando.vieira@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .rspec
 - Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - defaults.gemspec
-- init.rb
 - lib/defaults.rb
 - lib/defaults/version.rb
 - spec/defaults_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/fnando/has_defaults
+homepage: http://rubygems.org/gems/defaults
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -78,21 +93,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Set default values for ActiveRecord attributes

data/init.rb

@@ -1 +0,0 @@
-require "defaults"