virtus 0.4.0 → 0.4.1

data/spec/unit/virtus/equalizer/class_method/new_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Virtus::Equalizer, '.new' do
+  let(:object) { described_class }
+  let(:name)   { 'User'          }
+
+  let(:klass) do
+    klass = ::Class.new
+    klass.send(:include, subject)
+    klass
+  end
+
+  context 'with a name' do
+    subject { object.new(name) }
+
+    let(:instance) { klass.new }
+
+    it { should be_instance_of(object) }
+
+    describe '#eql?' do
+      context 'when the objects are similar' do
+        let(:other) { instance.dup }
+
+        it { instance.eql?(other).should be(true) }
+      end
+
+      context 'when the objects are different' do
+        let(:other) { stub('other') }
+
+        it { instance.eql?(other).should be(false) }
+      end
+    end
+
+    describe '#==' do
+      context 'when the objects are similar' do
+        let(:other) { instance.dup }
+
+        it { (instance == other).should be(true) }
+      end
+
+      context 'when the objects are different' do
+        let(:other) { stub('other') }
+
+        it { (instance == other).should be(false) }
+      end
+    end
+
+    describe '#hash' do
+      it { instance.hash.should eql(klass.hash) }
+    end
+
+    describe '#inspect' do
+      it { instance.inspect.should eql('#<User>') }
+    end
+  end
+
+  context 'with a name and keys' do
+    subject { object.new(name, keys) }
+
+    let(:keys)       { [ :first_name ].freeze }
+    let(:first_name) { 'John'                 }
+
+    let(:instance) do
+      instance = klass.new
+      instance.first_name = first_name
+      instance
+    end
+
+    before do
+      klass.send(:attr_accessor, *keys)
+    end
+
+    it { should be_instance_of(object) }
+
+    describe '#eql?' do
+      context 'when the objects are similar' do
+        let(:other) { instance.dup }
+
+        it { instance.eql?(other).should be(true) }
+      end
+
+      context 'when the objects are different' do
+        let(:other) { stub('other') }
+
+        it { instance.eql?(other).should be(false) }
+      end
+    end
+
+    describe '#==' do
+      context 'when the objects are similar' do
+        let(:other) { instance.dup }
+
+        it { (instance == other).should be(true) }
+      end
+
+      context 'when the objects are different' do
+        let(:other) { stub('other') }
+
+        it { (instance == other).should be(false) }
+      end
+    end
+
+    describe '#hash' do
+      it { instance.hash.should eql(klass.hash ^ first_name.hash) }
+    end
+
+    describe '#inspect' do
+      it { instance.inspect.should eql('#<User first_name="John">') }
+    end
+  end
+end

data/spec/unit/virtus/equalizer/methods/eql_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Virtus::Equalizer::Methods, '#eql?' do
+  subject { object.eql?(other) }
+
+  let(:object) { described_class.new }
+
+  let(:described_class) do
+    Class.new do
+      include Virtus::Equalizer::Methods
+
+      def cmp?(comparator, other)
+        !!(comparator and other)
+      end
+    end
+  end
+
+  context 'with the same object' do
+    let(:other) { object }
+
+    it { should be(true) }
+
+    it 'is symmetric' do
+      should eql(other.eql?(object))
+    end
+  end
+
+  context 'with an equivalent object' do
+    let(:other) { object.dup }
+
+    it { should be(true) }
+
+    it 'is symmetric' do
+      should eql(other.eql?(object))
+    end
+  end
+
+  context 'with an equivalent object of a subclass' do
+    let(:other) { Class.new(described_class).new }
+
+    it { should be(false) }
+
+    it 'is symmetric' do
+      should eql(other.eql?(object))
+    end
+  end
+end

data/spec/unit/virtus/equalizer/methods/equal_value_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Virtus::Equalizer::Methods, '#==' do
+  subject { object == other }
+
+  let(:object) { described_class.new }
+
+  let(:described_class) do
+    Class.new do
+      include Virtus::Equalizer::Methods
+
+      def cmp?(comparator, other)
+        !!(comparator and other)
+      end
+    end
+  end
+
+  context 'with the same object' do
+    let(:other) { object }
+
+    it { should be(true) }
+
+    it 'is symmetric' do
+      should eql(other == object)
+    end
+  end
+
+  context 'with an equivalent object' do
+    let(:other) { object.dup }
+
+    it { should be(true) }
+
+    it 'is symmetric' do
+      should eql(other == object)
+    end
+  end
+
+  context 'with an equivalent object of a subclass' do
+    let(:other) { Class.new(described_class).new }
+
+    it { should be(true) }
+
+    it 'is symmetric' do
+      should eql(other == object)
+    end
+  end
+
+  context 'with an object of another class' do
+    let(:other) { Class.new.new }
+
+    it { should be(false) }
+
+    it 'is symmetric' do
+      should eql(other == object)
+    end
+  end
+end

data/spec/unit/virtus/type_lookup/class_methods/extended_spec.rb

@@ -7,4 +7,3 @@ describe Virtus::TypeLookup, '.extended' do
     type.instance_variable_get('@type_lookup_cache').should eql({})
   end
 end
-

data/spec/unit/virtus/value_object/class_methods/attribute_spec.rb

@@ -1,16 +1,23 @@
 require 'spec_helper'
 
 describe Virtus::ValueObject, '.attribute' do
-  subject { model.attributes[name] }
+  subject { object.attribute(name, type) }
 
-  let(:model) { Class.new { include Virtus::ValueObject } }
-  let(:name)  { :lat  }
-  let(:type)  { Float }
+  let(:object)    { Class.new { include Virtus::ValueObject } }
+  let(:name)      { :latitude                                 }
+  let(:type)      { Float                                     }
+  let(:attribute) { object.attributes[name]                   }
 
-  before { model.attribute(name, type) }
+  it { should be(object) }
 
-  it { should be_instance_of(Virtus::Attribute::Float) }
+  it 'adds the attribute to the equalizer' do
+    object.new.inspect.should_not match(/\b#{name}=\b/)
+    subject
+    object.new.inspect.should match(/\b#{name}=\b/)
+  end
 
-  specify { subject.options[:writer].should be(:private) }
+  it 'sets the writer to be private' do
+    subject
+    attribute.options[:writer].should be(:private)
+  end
 end
-

data/spec/unit/virtus/value_object/class_methods/equalizer_spec.rb

@@ -11,7 +11,7 @@ describe Virtus::ValueObject, '.equalizer' do
     end
   end
 
-  specify { subject.should be_instance_of(Virtus::ValueObject::Equalizer) }
+  specify { subject.should be_instance_of(Virtus::Equalizer) }
   specify { described_class.included_modules.should include(subject)      }
 
   context 'when equalizer is already initialized' do

data/spec/unit/virtus/value_object/{with_spec.rb → instance_methods/with_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Virtus::ValueObject, '#with' do
+describe Virtus::ValueObject::InstanceMethods, '#with' do
   subject { object.with(attributes) }
 
   let(:described_class) do

data/tasks/metrics/heckle.rake

@@ -110,7 +110,7 @@ begin
         spec_file = spec_prefix.join('class_methods').join(map.file_name(method, mod.name))
 
         unless spec_file.file?
-          warn "No spec file #{spec_file} for #{mod}.#{method}"
+          raise "No spec file #{spec_file} for #{mod}.#{method}"
           next
         end
 
@@ -125,7 +125,7 @@ begin
         spec_file = spec_prefix.join(map.file_name(method, mod.name))
 
         unless spec_file.file?
-          warn "No spec file #{spec_file} for #{mod}##{method}"
+          raise "No spec file #{spec_file} for #{mod}##{method}"
           next
         end
 

data/virtus.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |gem|
   gem.test_files       = `git ls-files -- {spec}/*`.split("\n")
   gem.extra_rdoc_files = %w[LICENSE README.md TODO]
 
+  gem.add_runtime_dependency('backports', '~> 2.5.1')
+
   gem.add_development_dependency('rake',        '~> 0.9.2')
-  gem.add_development_dependency('backports',   '~> 2.3.0')
   gem.add_development_dependency('rspec',       '~> 1.3.2')
   gem.add_development_dependency('guard-rspec', '~> 0.6.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70209603947640 !ruby/object:Gem::Requirement
+  name: backports
+  requirement: &70192524867680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
+        version: 2.5.1
+  type: :runtime
   prerelease: false
-  version_requirements: *70209603947640
+  version_requirements: *70192524867680
 - !ruby/object:Gem::Dependency
-  name: backports
-  requirement: &70209603947040 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70192524866640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70209603947040
+  version_requirements: *70192524866640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209603934620 !ruby/object:Gem::Requirement
+  requirement: &70192524865200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70209603934620
+  version_requirements: *70192524865200
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70209603933940 !ruby/object:Gem::Requirement
+  requirement: &70192524861780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70209603933940
+  version_requirements: *70192524861780
 description: Attributes on Steroids for Plain Old Ruby Objects
 email:
 - piotr.solnica@gmail.com
@@ -126,10 +126,10 @@ files:
 - lib/virtus/coercion/true_class.rb
 - lib/virtus/instance_methods.rb
 - lib/virtus/support/descendants_tracker.rb
+- lib/virtus/support/equalizer.rb
 - lib/virtus/support/options.rb
 - lib/virtus/support/type_lookup.rb
 - lib/virtus/value_object.rb
-- lib/virtus/value_object/equalizer.rb
 - lib/virtus/version.rb
 - spec/integration/collection_member_coercion_spec.rb
 - spec/integration/custom_attributes_spec.rb
@@ -173,16 +173,15 @@ files:
 - spec/unit/virtus/attribute/date_time/coerce_spec.rb
 - spec/unit/virtus/attribute/decimal/coerce_spec.rb
 - spec/unit/virtus/attribute/default_spec.rb
-- spec/unit/virtus/attribute/default_value/attribute_spec.rb
+- spec/unit/virtus/attribute/default_value/call_spec.rb
 - spec/unit/virtus/attribute/default_value/class_methods/build_spec.rb
 - spec/unit/virtus/attribute/default_value/class_methods/new_spec.rb
-- spec/unit/virtus/attribute/default_value/evaluate_spec.rb
+- spec/unit/virtus/attribute/default_value/from_callable/call_spec.rb
 - spec/unit/virtus/attribute/default_value/from_callable/class_methods/handle_spec.rb
-- spec/unit/virtus/attribute/default_value/from_callable/evaluate_spec.rb
+- spec/unit/virtus/attribute/default_value/from_clonable/call_spec.rb
 - spec/unit/virtus/attribute/default_value/from_clonable/class_methods/handle_spec.rb
-- spec/unit/virtus/attribute/default_value/from_clonable/evaluate_spec.rb
+- spec/unit/virtus/attribute/default_value/from_symbol/call_spec.rb
 - spec/unit/virtus/attribute/default_value/from_symbol/class_methods/handle_spec.rb
-- spec/unit/virtus/attribute/default_value/from_symbol/evaluate_spec.rb
 - spec/unit/virtus/attribute/default_value/value_spec.rb
 - spec/unit/virtus/attribute/define_accessor_methods_spec.rb
 - spec/unit/virtus/attribute/define_reader_method_spec.rb
@@ -270,9 +269,17 @@ files:
 - spec/unit/virtus/coercion/symbol/class_methods/to_string_spec.rb
 - spec/unit/virtus/coercion/time/class_methods/to_integer_spec.rb
 - spec/unit/virtus/coercion/time/class_methods/to_time_spec.rb
+- spec/unit/virtus/coercion/time_coercions/to_date_spec.rb
+- spec/unit/virtus/coercion/time_coercions/to_datetime_spec.rb
+- spec/unit/virtus/coercion/time_coercions/to_string_spec.rb
+- spec/unit/virtus/coercion/time_coercions/to_time_spec.rb
 - spec/unit/virtus/coercion/true_class/class_methods/to_string_spec.rb
 - spec/unit/virtus/descendants_tracker/add_descendant_spec.rb
 - spec/unit/virtus/descendants_tracker/descendants_spec.rb
+- spec/unit/virtus/equalizer/append_spec.rb
+- spec/unit/virtus/equalizer/class_method/new_spec.rb
+- spec/unit/virtus/equalizer/methods/eql_spec.rb
+- spec/unit/virtus/equalizer/methods/equal_value_spec.rb
 - spec/unit/virtus/instance_methods/attributes_spec.rb
 - spec/unit/virtus/instance_methods/element_reference_spec.rb
 - spec/unit/virtus/instance_methods/element_set_spec.rb
@@ -287,9 +294,8 @@ files:
 - spec/unit/virtus/value_object/class_methods/allowed_writer_methods_spec.rb
 - spec/unit/virtus/value_object/class_methods/attribute_spec.rb
 - spec/unit/virtus/value_object/class_methods/equalizer_spec.rb
-- spec/unit/virtus/value_object/equalizer/append_spec.rb
 - spec/unit/virtus/value_object/initialize_spec.rb
-- spec/unit/virtus/value_object/with_spec.rb
+- spec/unit/virtus/value_object/instance_methods/with_spec.rb
 - tasks/metrics/ci.rake
 - tasks/metrics/flay.rake
 - tasks/metrics/flog.rake

data/lib/virtus/value_object/equalizer.rb

@@ -1,125 +0,0 @@
-module Virtus
-  module ValueObject
-
-    # A type of Module for dynamically defining and hosting equality methods
-    class Equalizer < Module
-
-      # Initialize an Equalizer with the given keys
-      #
-      # Will use the keys with which it is initialized to define #eql?, #==,
-      #   and #hash
-      #
-      # @api private
-      def initialize(host_name, keys = [])
-        @host_name, @keys = host_name, keys
-      end
-
-      # Append a key and compile the equality methods
-      #
-      # @return [Equalizer] self
-      #
-      # @api private
-      def <<(key)
-        @keys << key
-        compile
-      end
-
-    private
-
-      # Compile the equalizer methods based on #keys
-      #
-      # @return [self]
-      #
-      # @api private
-      def compile
-        define_inspect_method
-        define_eql_method
-        define_equivalent_method
-        define_hash_method
-        self
-      end
-
-      # Define an inspect method that reports the values of the instance's keys
-      #
-      # @return [undefined]
-      #
-      # @api private
-      def define_inspect_method
-        module_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def inspect
-            "#<#{@host_name} #{compile_keys { |key| "#{key}=\#{#{key}.inspect}" }}>"
-          end
-        RUBY
-      end
-
-      # Define an #eql? method based on the instance's values identified by #keys
-      #
-      # @return [undefined]
-      #
-      # @api private
-      def define_eql_method
-        module_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def eql?(other)
-            return true if equal?(other)
-            instance_of?(other.class) &&
-            #{compile_keys(' && ') { |key| "#{key}.eql?(other.#{key})" }}
-          end
-        RUBY
-      end
-
-      # Define an #== method based on the instance's values identified by #keys
-      #
-      # @return [undefined]
-      #
-      # @api private
-      def define_equivalent_method
-        respond_to, equivalent = compile_strings_for_equivalent_method
-        module_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def ==(other)
-            return true if equal?(other)
-            return false unless kind_of?(other.class) || other.kind_of?(self.class)
-            #{respond_to.join(' && ')} && #{equivalent.join(' && ')}
-          end
-        RUBY
-      end
-
-      # Define a #hash method based on the instance's values identified by #keys
-      #
-      # @return [undefined]
-      #
-      # @api private
-      def define_hash_method
-        module_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def hash
-            self.class.hash ^ #{compile_keys(' ^ ') { |key| "#{key}.hash" }}
-          end
-        RUBY
-      end
-
-      # Return a list of strings containing ruby code for method generation
-      #
-      # @return [Array(Array<String>, Array<String>)]
-      #
-      # @api private
-      def compile_strings_for_equivalent_method
-        respond_to = []
-        equivalent = []
-
-        @keys.each do |key|
-          respond_to << "other.respond_to?(#{key.inspect})"
-          equivalent << "#{key} == other.#{key}"
-        end
-
-        [ respond_to, equivalent ]
-      end
-
-      # @api private
-      def compile_keys(separator = ' ', &block)
-        keys_map = @keys.map { |key| yield(key) }
-        keys_map.join(separator)
-      end
-
-    end # class Equalizer
-  end # module ValueObject
-end # module Virtus
-