virtus 0.4.0 → 0.4.1

data/lib/virtus/support/type_lookup.rb

@@ -84,7 +84,7 @@ module Virtus
       descendants.reverse_each do |descendant|
         descendant_primitive = descendant.primitive
         next unless primitive <= descendant_primitive
-        type = descendant if type.nil? || type.primitive > descendant_primitive
+        type = descendant if type.nil? or type.primitive > descendant_primitive
       end
       type
     end
@@ -100,7 +100,7 @@ module Virtus
     #
     # @api private
     def determine_type_from_string(string)
-      if string =~ TYPE_FORMAT && const_defined?(string, *EXTRA_CONST_ARGS)
+      if string =~ TYPE_FORMAT and const_defined?(string, *EXTRA_CONST_ARGS)
         const_get(string, *EXTRA_CONST_ARGS)
       end
     end

data/lib/virtus/value_object.rb

@@ -1,8 +1,3 @@
-# -*- encoding: utf-8 -*-
-
-require 'virtus'
-require 'virtus/value_object/equalizer'
-
 module Virtus
 
   # Include this Module for Value Object semantics

data/lib/virtus/version.rb

@@ -1,3 +1,3 @@
 module Virtus
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'backports'
-
 begin
   require 'rspec'  # try for RSpec 2
 rescue LoadError

data/spec/unit/virtus/attribute/default_spec.rb

@@ -11,8 +11,6 @@ describe Virtus::Attribute, '#default' do
   context 'when the default is not specified' do
     it { should be_instance_of(Virtus::Attribute::DefaultValue) }
 
-    its(:attribute) { should be(object) }
-
     its(:value) { should be_nil }
   end
 
@@ -25,8 +23,6 @@ describe Virtus::Attribute, '#default' do
 
     it { should be_instance_of(Virtus::Attribute::DefaultValue::FromClonable) }
 
-    its(:attribute) { should be(object) }
-
     its(:value) { should be(default) }
   end
 end

data/spec/unit/virtus/attribute/default_value/call_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Virtus::Attribute::DefaultValue, '#call' do
+  subject { object.call(instance) }
+
+  let(:object)    { described_class.build(value) }
+  let(:value)     { mock('value')                }
+  let(:instance)  { mock('instance')             }
+  let(:response)  { stub('response')             }
+
+  # smallest number that is Bignum across major ruby impls
+  bignum = 0x7fffffffffffffff + 1
+
+  [ nil, true, false, 0, 0.0, bignum, :symbol ].each do |value|
+    context "when the value is #{value.inspect} (#{value.class})" do
+      let(:value) { value }
+
+      it { should be(value) }
+    end
+  end
+end

data/spec/unit/virtus/attribute/default_value/class_methods/build_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Virtus::Attribute::DefaultValue, '.build' do
-  subject { described_class.build(attribute, default)  }
-
-  let(:attribute) { mock('attribute')  }
+  subject { described_class.build(default) }
 
   context 'when default is a symbol' do
     let(:default) { :symbol }

data/spec/unit/virtus/attribute/default_value/class_methods/new_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Virtus::Attribute::DefaultValue, '.new' do
-  subject { described_class.new(attribute, value) }
-
-  let(:attribute) { Virtus::Attribute::String.new(:attribute) }
+  subject { described_class.new(value) }
 
   context 'with a cloneable value' do
     let(:value) { 'something' }

data/spec/unit/virtus/attribute/default_value/from_callable/call_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Virtus::Attribute::DefaultValue::FromCallable, '#call' do
+  subject { object.call(instance) }
+
+  let(:object)    { described_class.new(value) }
+  let(:value)     { mock('value')              }
+  let(:instance)  { mock('instance')           }
+  let(:response)  { stub('response')           }
+
+  before { value.stub(:call => response) }
+
+  it { should be(response) }
+
+  it 'calls the value with the instance and attribute' do
+    value.should_receive(:call).with(instance)
+    subject
+  end
+end

data/spec/unit/virtus/attribute/default_value/from_callable/class_methods/handle_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Virtus::Attribute::DefaultValue::FromCallable, '.handle?' do
-  subject { described_class.handle?(attribute, default) }
-
-  let(:attribute) { mock('attribute') }
+  subject { described_class.handle?(default) }
 
   context 'with a callable' do
     let(:default) { Proc.new {}  }
@@ -17,4 +15,3 @@ describe Virtus::Attribute::DefaultValue::FromCallable, '.handle?' do
     it { should be(false)  }
   end
 end
-

data/spec/unit/virtus/attribute/default_value/from_clonable/call_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Virtus::Attribute::DefaultValue::FromClonable, '#call' do
+  subject { object.call(instance) }
+
+  let(:object)    { described_class.new(value) }
+  let(:value)     { mock('value')              }
+  let(:instance)  { mock('instance')           }
+  let(:response)  { mock('response')           }
+  let(:clone)     { mock('clone')              }
+
+  before { value.stub(:clone => clone) }
+
+  it { should be(clone) }
+
+  it 'clones the value' do
+    value.should_receive(:clone).with(no_args)
+    subject
+  end
+end

data/spec/unit/virtus/attribute/default_value/from_clonable/class_methods/handle_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Virtus::Attribute::DefaultValue::FromClonable, '.handle?' do
-  subject { described_class.handle?(attribute, default) }
+  subject { described_class.handle?(default) }
 
   let(:attribute) { mock('attribute') }
 
@@ -17,4 +17,3 @@ describe Virtus::Attribute::DefaultValue::FromClonable, '.handle?' do
     it { should be(false)  }
   end
 end
-

data/spec/unit/virtus/attribute/default_value/from_symbol/{evaluate_spec.rb → call_spec.rb}

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-describe Virtus::Attribute::DefaultValue::FromSymbol, '#evaluate' do
-  subject { object.evaluate(instance) }
+describe Virtus::Attribute::DefaultValue::FromSymbol, '#call' do
+  subject { object.call(instance) }
 
-  let(:object)    { described_class.new(attribute, value) }
-  let(:attribute) { mock('attribute')                       }
+  let(:object)    { described_class.new(value)              }
   let(:instance)  { mock('instance', value => retval)       }
   let(:value)     { :set_default                            }
   let(:retval)    { mock('retval')                          }

data/spec/unit/virtus/attribute/default_value/from_symbol/class_methods/handle_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Virtus::Attribute::DefaultValue::FromSymbol, '.handle?' do
-  subject { described_class.handle?(attribute, default) }
-
-  let(:attribute) { mock('attribute') }
+  subject { described_class.handle?(default) }
 
   context 'with a symbol' do
     let(:default) { :method_name  }
@@ -17,4 +15,3 @@ describe Virtus::Attribute::DefaultValue::FromSymbol, '.handle?' do
     it { should be(false)  }
   end
 end
-

data/spec/unit/virtus/attribute/default_value/value_spec.rb

@@ -3,9 +3,8 @@ require 'spec_helper'
 describe Virtus::Attribute::DefaultValue, '#value' do
   subject { object.value }
 
-  let(:object)    { described_class.new(attribute, value) }
-  let(:attribute) { mock('attribute')                     }
-  let(:value)     { mock('value')                         }
+  let(:object) { described_class.new(value) }
+  let(:value)  { mock('value')              }
 
   it { should be(value) }
 end

data/spec/unit/virtus/attributes_accessor/define_reader_method_spec.rb

@@ -33,4 +33,3 @@ describe Virtus::AttributesAccessor, '#define_reader_method' do
     its(:protected_instance_methods) { should include(method_name) }
   end
 end
-

data/spec/unit/virtus/attributes_accessor/define_writer_method_spec.rb

@@ -33,4 +33,3 @@ describe Virtus::AttributesAccessor, '#define_writer_method' do
     its(:protected_instance_methods) { should include(method_name) }
   end
 end
-

data/spec/unit/virtus/coercion/decimal/class_methods/to_decimal_spec.rb

@@ -7,4 +7,3 @@ describe Virtus::Coercion::Decimal, '.to_decimal' do
 
   it { should be(value) }
 end
-

data/spec/unit/virtus/coercion/float/class_methods/to_float_spec.rb

@@ -7,4 +7,3 @@ describe Virtus::Coercion::Float, '.to_float' do
 
   it { should be(value) }
 end
-

data/spec/unit/virtus/coercion/integer/class_methods/to_integer_spec.rb

@@ -7,4 +7,3 @@ describe Virtus::Coercion::Integer, '.to_integer' do
 
   it { should be(value) }
 end
-

data/spec/unit/virtus/coercion/numeric/class_methods/to_decimal_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Virtus::Coercion::Numeric, '.to_decimal' do
+  subject { object.to_decimal(numeric) }
+
+  let(:object)  { described_class }
+  let(:numeric) { Rational(2, 2)  }
+
+  it { should eql(BigDecimal('1.0')) }
+end

data/spec/unit/virtus/coercion/numeric/class_methods/to_float_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Virtus::Coercion::Numeric, '.to_float' do
+  subject { object.to_float(numeric) }
+
+  let(:object)  { described_class }
+  let(:numeric) { Rational(2, 2)  }
+
+  it { should eql(1.0) }
+end

data/spec/unit/virtus/coercion/numeric/class_methods/to_integer_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Virtus::Coercion::Numeric, '.to_integer' do
+  subject { object.to_integer(numeric) }
+
+  let(:object)  { described_class }
+  let(:numeric) { Rational(2, 2)  }
+
+  it { should eql(1) }
+end

data/spec/unit/virtus/coercion/numeric/class_methods/to_string_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Virtus::Coercion::Numeric, '.to_string' do
+  subject { object.to_string(numeric) }
+
+  let(:object)  { described_class }
+  let(:numeric) { Rational(2, 2)  }
+
+  let(:coerced_value) { RUBY_VERSION < '1.9' ? '1' : '1/1' }
+
+  it { should eql(coerced_value) }
+end

data/spec/unit/virtus/coercion/string/class_methods/to_symbol_spec.rb

@@ -7,4 +7,3 @@ describe Virtus::Coercion::String, '.to_symbol' do
 
   it { should be(:value) }
 end
-

data/spec/unit/virtus/coercion/time/class_methods/to_integer_spec.rb

@@ -8,4 +8,3 @@ describe Virtus::Coercion::Time, '.to_integer' do
 
   it { should eql(time.to_i) }
 end
-

data/spec/unit/virtus/coercion/time_coercions/to_date_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Virtus::Coercion::TimeCoercions, '.to_date' do
+  subject { object.to_date(value) }
+
+  let(:object) { Class.new(Virtus::Coercion::Object) }
+  let(:value)  { mock('value')                       }
+
+  context 'when the value responds to #to_date' do
+    before do
+      object.extend Virtus::Coercion::TimeCoercions
+
+      value.should_receive(:to_date).and_return(Date.new(2011, 1, 1))
+    end
+
+    it { should be_instance_of(Date) }
+
+    it { should eql(Date.new(2011, 1, 1)) }
+  end
+
+  context 'when the value does not respond to #to_date' do
+    before do
+      object.extend Virtus::Coercion::TimeCoercions
+
+      # use a string that Date.parse can handle
+      value.should_receive(:to_s).and_return('2011-01-01')
+    end
+
+    it { should be_instance_of(Date) }
+
+    it { should eql(Date.new(2011, 1, 1)) }
+  end
+end

data/spec/unit/virtus/coercion/time_coercions/to_datetime_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Virtus::Coercion::TimeCoercions, '.to_datetime' do
+  subject { object.to_datetime(value) }
+
+  let(:object) { Class.new(Virtus::Coercion::Object) }
+  let(:value)  { mock('value')                       }
+
+  context 'when the value responds to #to_datetime' do
+    before do
+      object.extend Virtus::Coercion::TimeCoercions
+
+      value.should_receive(:to_datetime).and_return(DateTime.new(2011, 1, 1, 0, 0, 0))
+    end
+
+    it { should be_instance_of(DateTime) }
+
+    it { should eql(DateTime.new(2011, 1, 1, 0, 0, 0)) }
+  end
+
+  context 'when the value does not respond to #to_datetime' do
+    before do
+      object.extend Virtus::Coercion::TimeCoercions
+
+      # use a string that DateTime.parse can handle
+      value.should_receive(:to_s).and_return('2011-01-01T00:00:00+00:00')
+    end
+
+    it { should be_instance_of(DateTime) }
+
+    it { should eql(DateTime.new(2011, 1, 1, 0, 0, 0)) }
+  end
+end

data/spec/unit/virtus/coercion/time_coercions/to_string_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Virtus::Coercion::TimeCoercions, '.to_string' do
+  subject { object.to_string(value) }
+
+  let(:object) { Class.new(Virtus::Coercion::Object) }
+  let(:value)  { mock('value')                       }
+
+  before do
+    object.extend Virtus::Coercion::TimeCoercions
+
+    value.should_receive(:to_s).and_return('2011-01-01')
+  end
+
+  it { should be_instance_of(String) }
+
+  it { should eql('2011-01-01') }
+end

data/spec/unit/virtus/coercion/time_coercions/to_time_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Virtus::Coercion::TimeCoercions, '.to_time' do
+  subject { object.to_time(value) }
+
+  let(:object) { Class.new(Virtus::Coercion::Object) }
+  let(:value)  { mock('value')                       }
+
+  context 'when the value responds to #to_time' do
+    before do
+      object.extend Virtus::Coercion::TimeCoercions
+
+      value.should_receive(:to_time).and_return(Time.utc(2011, 1, 1))
+    end
+
+    it { should be_instance_of(Time) }
+
+    it { should eql(Time.utc(2011, 1, 1)) }
+  end
+
+  context 'when the value does not respond to #to_time' do
+    before do
+      object.extend Virtus::Coercion::TimeCoercions
+
+      # use a string that Time.parse can handle
+      value.should_receive(:to_s).and_return('Sat Jan 01 00:00:00 UTC 2011')
+    end
+
+    it { should be_instance_of(Time) }
+
+    it { should eql(Time.utc(2011, 1, 1)) }
+  end
+end

data/spec/unit/virtus/equalizer/append_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Virtus::Equalizer, '#<<' do
+  subject { object << :last_name }
+
+  let(:object)     { described_class.new(name, attributes) }
+  let(:name)       { 'User'                                }
+  let(:attributes) { [ :first_name ].freeze                }
+  let(:first_name) { 'John'                                }
+  let(:last_name)  { 'Doe'                                 }
+
+  let(:klass) do
+    klass = Class.new { attr_accessor :first_name, :last_name }
+    klass.send(:include, object)
+    klass
+  end
+
+  let(:instance) do
+    klass.new.tap do |instance|
+      instance.first_name = first_name
+      instance.last_name  = last_name
+    end
+  end
+
+  describe '#eql?' do
+    context 'when the objects are similar' do
+      let(:other) { instance.dup }
+
+      it 'adds a key to the comparison' do
+        expect { subject }.to_not change { instance.eql?(other) }.from(true)
+      end
+    end
+
+    context 'when the objects are different' do
+      let(:other) { instance.dup }
+
+      before do
+        other.last_name = 'Smith'
+      end
+
+      it 'adds a key to the comparison' do
+        expect { subject }.to change { instance.eql?(other) }.
+          from(true).to(false)
+      end
+    end
+  end
+
+  describe '#==' do
+    context 'when the objects are similar' do
+      let(:other) { instance.dup }
+
+      it 'adds a key to the comparison' do
+        expect { subject }.to_not change { instance == other }.from(true)
+      end
+    end
+
+    context 'when the objects are different' do
+      let(:other) { instance.dup }
+
+      before do
+        other.last_name = 'Smith'
+      end
+
+      it 'adds a key to the comparison' do
+        expect { subject }.to change { instance == other }.
+          from(true).to(false)
+      end
+    end
+  end
+
+  it 'adds a new to #hash' do
+    expect { subject }.to change(instance, :hash).
+      from(klass.hash ^ first_name.hash).
+      to(klass.hash ^ first_name.hash ^ last_name.hash)
+  end
+
+  it 'adds a new to #inspect' do
+    expect { subject }.to change(instance, :inspect).
+      from('#<User first_name="John">').
+      to('#<User first_name="John" last_name="Doe">')
+  end
+end