defaults 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc734e69238d4fda99df26e36a733e7de84045f0
-  data.tar.gz: 533d486e9367b67eb614bdd128c9ca078a0c5c60
+  metadata.gz: fdb962c44035215d7f9a294c3b93800900435a90
+  data.tar.gz: 1d295f223bc4589cd84ceee8ddf5ca9cb0c3840e
 SHA512:
-  metadata.gz: 7ffda37edf3c7f3524b5176bc5dea771fc417032e6fd5a68b4758fdcef5adb290b172ff16d7dd4a18847025c143e09353b0b597fb624c4918e904248ad5c0bdd
-  data.tar.gz: ca9666b46363045ab7f43232ea3aeea29547b0f2624771e05a069d34eb0b0c8ca0256bcdc61586e00f229178efa850efac092ec96e09b74868e54ce0e036bc16
+  metadata.gz: fbbfbfd01d488914ec07f17fcd2728c6aa0eae45d3777fdeee2aac29e765b3c6db630374d4d053f88269d57af30505e7c628869655b8596147b46a011af5ca09
+  data.tar.gz: cb4819922cc36be60ce1a352317af35a7fac8a5adbca2aaf24fb54eb4b003ffee1ab66b563f1b9a9eb294c64c84470c55fb731a9b3d01e69b7d275810ea879d3

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-script: bundle exec rspec
+script: bundle exec rake
 sudo: false
 cache: bundler
 addons:
@@ -7,6 +7,9 @@ addons:
     repo_token:
       secure: "aViiP4wSO11Sq/7aXMeoo4ksDj3/wPs3do+cP79jSFiF/ZyBnETWOG4BQoO+UWT1IctnlEN/jrAceZZ9VTbxrtkPbJriO4X8AZDweOq4TOvrRa+6jPfuAqh5QZeSbXucrTU54DWCyPDu404bIz+9yh1vFMBtstKQF1mx4MJVXY4="
 rvm:
-- '2.0'
-- '2.1'
-- '2.2'
+  - '2.0'
+  - '2.1'
+  - '2.2'
+  - '2.3.0'
+notifications:
+  email: false

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec

data/README.md

@@ -10,6 +10,11 @@ Just run `gem install defaults`.
 
 ## Usage
 
+Here are the rules:
+
+1. Assigned attributes have precedence over default values
+2. Default values have precedence over database defaults
+
 Add the method call `defaults` to your model.
 
 ```ruby
@@ -40,7 +45,7 @@ Page.default_options = {title: "Here's your new page", body: "Write your page te
 
 ## Maintainer
 
-* Nando Vieira - http://simplesideias.com.br
+* Nando Vieira - http://nandovieira.com
 
 ## License
 

data/Rakefile

@@ -1,5 +1,10 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
+require "bundler/gem_tasks"
+require "rake/testtask"
 
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.warning = false
+end
+
+task default: :test

data/defaults.gemspec

@@ -9,14 +9,17 @@ Gem::Specification.new do |s|
   s.homepage    = "http://rubygems.org/gems/defaults"
   s.summary     = "Set default values for ActiveRecord attributes"
   s.description = s.summary
+  s.licenses    = ["MIT"]
 
   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.executables   = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_development_dependency "activerecord", ">= 3.0.0"
   s.add_development_dependency "sqlite3-ruby"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "minitest-utils"
   s.add_development_dependency "codeclimate-test-reporter"
+  s.add_development_dependency "pry-meta"
 end

data/lib/defaults.rb

@@ -1,5 +1,5 @@
 module Defaults
-  autoload :Version, "defaults/version"
+  require "defaults/version"
 
   def self.included(base)
     base.extend ClassMethods
@@ -25,23 +25,26 @@ module Defaults
 
   module InstanceMethods
     def default_for(name)
-      value = self.class.default_options[name.to_sym]
-      value = value.arity == 1 ? value.call(self) : value.call if value.respond_to?(:call)
+      if self.class.default_options.key?(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)
+      else
+        column_info = self.class.columns_hash[name.to_s]
+        value = column_info.type_cast_from_user(column_info.default) if column_info
+      end
+
       value
     end
 
     private
     def set_default_attributes
-      if new_record?
-        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
+      return unless new_record?
+
+      self.class.default_options.keys.each do |name|
+        value = read_attribute(name) if changes[name]
+        value = default_for(name) if value.blank?
+
+        __send__ "#{name}=", value
       end
     end
   end

data/lib/defaults/version.rb

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

data/test/defaults/defaults_test.rb

@@ -0,0 +1,69 @@
+require "test_helper"
+
+class Donut < ActiveRecord::Base
+  attr_accessor :class_name
+
+  defaults flavor: "cream",
+           name: "Cream",
+           maker: proc { "Dunkin Donuts" },
+           class_name: -> donut { donut.class.name }
+
+  defaults quantity: 5
+  defaults available: false
+end
+
+class DefaultsTest < Minitest::Test
+  let(:donut) { create_donut }
+  let(:new_donut) { Donut.new }
+
+  setup do
+    Donut.delete_all
+  end
+
+  test "considers detabase defaults with type casting" do
+    assert_equal 0.00, new_donut.default_for(:price)
+  end
+
+  test "has precedence over database defaults" do
+    refute new_donut.available?
+  end
+
+  test "raises when invalid argument is provided" do
+    assert_raises(ArgumentError) { Donut.defaults nil }
+  end
+
+  test "sets default values" do
+    assert_equal "cream", new_donut.flavor
+    assert_equal "Cream", new_donut.name
+    assert_equal "Dunkin Donuts", new_donut.maker
+    assert_equal "Donut", new_donut.class_name
+    assert_equal 5, new_donut.quantity
+  end
+
+  test "sets default values only when have blank attributes" do
+    assert_equal "vanilla", donut.flavor
+    assert_equal 5, donut.quantity
+  end
+
+  test "returns default value for an attribute" do
+    assert_equal "cream", donut.default_for(:flavor)
+    assert_equal "Dunkin Donuts", donut.default_for(:maker)
+    assert_equal "Donut", donut.default_for(:class_name)
+    assert_equal 5, donut.default_for(:quantity)
+  end
+
+  test "does not set default values" do
+    assert_equal donut, Donut.first
+    assert_equal "vanilla", Donut.first.flavor
+  end
+
+  private
+
+  def create_donut(options = {})
+    Donut.create({
+      flavor: "vanilla",
+      name: "Vanilla Sky",
+      maker: "Mr. Baker"
+    }.merge(options))
+  end
+end

data/test/schema.rb

@@ -0,0 +1,8 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :donuts do |t|
+    t.string :flavor, :name, :maker
+    t.integer :quantity, null: false
+    t.float :price, default: 0.00, null: false
+    t.boolean :available, default: true, null: false
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
+require "bundler/setup"
+require "active_record"
+require "defaults"
+
+require "minitest/utils"
+require "minitest/autorun"
+
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+load File.dirname(__FILE__) + "/schema.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defaults
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: minitest-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-meta
+  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: Set default values for ActiveRecord attributes
 email:
 - fnando.vieira@gmail.com
@@ -74,7 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -82,11 +109,12 @@ files:
 - defaults.gemspec
 - lib/defaults.rb
 - lib/defaults/version.rb
-- spec/defaults_spec.rb
-- spec/schema.rb
-- spec/spec_helper.rb
+- test/defaults/defaults_test.rb
+- test/schema.rb
+- test/test_helper.rb
 homepage: http://rubygems.org/gems/defaults
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -104,11 +132,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Set default values for ActiveRecord attributes
 test_files:
-- spec/defaults_spec.rb
-- spec/schema.rb
-- spec/spec_helper.rb
+- test/defaults/defaults_test.rb
+- test/schema.rb
+- test/test_helper.rb

data/.rspec

@@ -1 +0,0 @@
---color

data/spec/defaults_spec.rb

@@ -1,60 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-
-class Donut < ActiveRecord::Base
-  attr_accessor :class_name
-
-  defaults :flavor => "cream",
-           :name => "Cream",
-           :maker => proc { "Dunkin Donuts" },
-           :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 "raises when invalid argument is provided" do
-    expect {
-      Donut.defaults nil
-    }.to raise_error(ArgumentError)
-  end
-
-  it "sets default values" do
-    expect(@new_donut.flavor).to eq("cream")
-    expect(@new_donut.name).to eq("Cream")
-    expect(@new_donut.maker).to eq("Dunkin Donuts")
-    expect(@new_donut.class_name).to eq("Donut")
-    expect(@new_donut.quantity).to eq(5)
-  end
-
-  it "sets default values only when have blank attributes" do
-    expect(@donut.flavor).to eq("vanilla")
-    expect(@donut.quantity).to eq(5)
-  end
-
-  it "returns default value for an attribute" do
-    expect(@donut.default_for(:flavor)).to eq("cream")
-    expect(@donut.default_for(:maker)).to eq("Dunkin Donuts")
-    expect(@donut.default_for(:class_name)).to eq("Donut")
-    expect(@donut.default_for(:quantity)).to eq(5)
-  end
-
-  it "does not set default values" do
-    expect(Donut.first.flavor).to eq("vanilla")
-  end
-
-  private
-  def create_donut(options={})
-    Donut.create({
-      :flavor => "vanilla",
-      :name => "Vanilla Sky",
-      :maker => "Mr. Baker"
-    }.merge(options))
-  end
-end

data/spec/schema.rb

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

data/spec/spec_helper.rb

@@ -1,9 +0,0 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
-require 'bundler/setup'
-require 'active_record'
-require 'defaults'
-
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-load File.dirname(__FILE__) + "/schema.rb"