virtus 0.5.3 → 0.5.4

data/Changelog.md

@@ -1,4 +1,13 @@
-# v0.5.3 2012-09-01 2012-12-13
+# v0.5.4 2012-12-20
+
+* [feature] Allow *any* enumerable to be a collection attribute (aptinio)
+* [feature] Add Integer.to_datetime and Float.to_datetime coercion (brutuscat)
+* [fixed] Fixed a regression with Hash attribute introduced by key/member coercion (shingara)
+* [fixed] Change leading non-significant digit type coercion to be coerced (maskact)
+
+[Compare v0.5.3..v0.5.4](https://github.com/solnic/virtus/compare/v0.5.3...v0.5.4)
+
+# v0.5.3 2012-12-13
 
 * [feature] Added Hash member type coercion [example](https://github.com/solnic/virtus#hash-attributes-coercion) (greyblake)
 * [fixed] Fixed issues with String=>Integer coercion and e-notation (greyblake)

data/Gemfile.devtools

@@ -1,5 +1,5 @@
 group :development do
-  gem 'rake',    '~> 0.9.2'
+  gem 'rake',    '~> 10.0'
   gem 'rspec',   '~> 2.12.0'
   gem 'yard',    '~> 0.8.3'
 end
@@ -27,7 +27,7 @@ group :metrics do
   gem 'reek',      '~> 1.2.8', :git => 'https://github.com/dkubb/reek.git'
   gem 'roodi',     '~> 2.1.0'
   gem 'yardstick', '~> 0.8.0'
-  gem 'mutant',    '~> 0.2.0'
+  gem 'mutant',    '~> 0.2.6'
 
   platforms :ruby_18, :ruby_19 do
     # this indirectly depends on ffi which does not build on ruby-head

data/lib/virtus/attribute.rb

@@ -83,7 +83,9 @@ module Virtus
       case class_or_name
       when ::Class
         Attribute::EmbeddedValue.determine_type(class_or_name) || super
-      when ::Array, ::Set, ::Hash
+      when ::String
+        super
+      when ::Enumerable
         super(class_or_name.class)
       else
         super

data/lib/virtus/attribute/hash.rb

@@ -75,12 +75,10 @@ module Virtus
       # @api private
       def initialize(*)
         super
-        if @options.has_key?(:key_type) && @options.has_key?(:value_type)
-          @key_type   = @options[:key_type]
-          @value_type = @options[:value_type]
-          @key_type_instance   = Attribute.build(@name, @key_type)
-          @value_type_instance = Attribute.build(@name, @value_type)
-        end
+        @key_type   = @options[:key_type] || Object
+        @value_type = @options[:value_type] || Object
+        @key_type_instance   = Attribute.build(@name, @key_type)
+        @value_type_instance = Attribute.build(@name, @value_type)
       end
 
       # Coerce a hash with keys and values
@@ -93,10 +91,8 @@ module Virtus
       def coerce(value)
         coerced = super
         return coerced unless coerced.respond_to?(:each_with_object)
-        coerced.each_with_object({}) do |key_and_value, hash|
-          key   = @key_type_instance.coerce(key_and_value[0])
-          value = @value_type_instance.coerce(key_and_value[1])
-          hash[key] = value
+        coerced.each_with_object({}) do |(key, value), hash|
+          hash[@key_type_instance.coerce(key)] = @value_type_instance.coerce(value)
         end
       end
 

data/lib/virtus/coercion/float.rb

@@ -19,6 +19,21 @@ module Virtus
         value
       end
 
+      # Coerce given value to a DateTime
+      #
+      # @example
+      #   datetime = Virtus::Coercion::Float.to_datetime(1000000000.999)  # => Sun, 09 Sep 2001 01:46:40 +0000
+      #   datetime.to_f  # => 1000000000.999
+      #
+      # @param [Float] value
+      #
+      # @return [DateTime]
+      #
+      # @api public
+      def self.to_datetime(value)
+        ::DateTime.strptime((value * 10**3).to_s, "%Q")
+      end
+
     end # class Float
   end # class Coercion
 end # module Virtus

data/lib/virtus/coercion/integer.rb

@@ -55,6 +55,29 @@ module Virtus
         end
       end
 
+      # Coerce given value to a DateTime
+      #
+      # @example
+      #   Virtus::Coercion::Fixnum.to_datetime(0)  # => Thu, 01 Jan 1970 00:00:00 +0000
+      #
+      # @param [Integer] value
+      #
+      # @return [DateTime]
+      #
+      # @api public
+      def self.to_datetime(value)
+        # FIXME: Remove after Rubinius 2.0 is released
+        if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+          datetime_format = '%Q'
+          value = "#{value * 10**3}"
+        else
+          datetime_format = '%s'
+          value = "#{value}"
+        end
+
+        ::DateTime.strptime(value, datetime_format)
+      end
+
     end # class Fixnum
   end # class Coercion
 end # module Virtus

data/lib/virtus/coercion/string.rb

@@ -9,7 +9,7 @@ module Virtus
       FALSE_VALUES = %w[ 0 off f false n no  ].freeze
       BOOLEAN_MAP  = ::Hash[ TRUE_VALUES.product([ true ]) + FALSE_VALUES.product([ false ]) ].freeze
 
-      INTEGER_REGEXP    = /[-+]?(?:0|[1-9]\d*)/.freeze
+      INTEGER_REGEXP    = /[-+]?(?:[0-9]\d*)/.freeze
       EXPONENT_REGEXP   = /(?:[eE][-+]?\d+)/.freeze
       FRACTIONAL_REGEXP = /(?:\.\d+)/.freeze
 

data/lib/virtus/version.rb

@@ -1,3 +1,3 @@
 module Virtus
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/spec/unit/virtus/attribute/class_methods/determine_type_spec.rb

@@ -72,4 +72,46 @@ describe Virtus::Attribute, '.determine_type' do
 
     it { should equal(Virtus::Attribute::Set) }
   end
+
+  context 'with an instance of an enumerable' do
+    before do
+      module Examples
+        class EnumerableClass
+          include Enumerable
+
+          def self.[](*args)
+            new
+          end
+        end
+
+        class EnumerableAttribute < Virtus::Attribute::Collection
+          primitive EnumerableClass
+        end
+      end
+    end
+
+    subject { object.determine_type(primitive) }
+
+    let(:primitive) { Examples::EnumerableClass[String] }
+
+    it { should equal(Examples::EnumerableAttribute) }
+  end
+
+  context 'with an instance of an array subclass' do
+    before do
+      module Examples
+        ArraySubclass = Class.new(Array)
+
+        class ArraySubclassAttribute < Virtus::Attribute::Collection
+          primitive ArraySubclass
+        end
+      end
+    end
+
+    subject { object.determine_type(primitive) }
+
+    let(:primitive) { Examples::ArraySubclass[String] }
+
+    it { should equal(Examples::ArraySubclassAttribute) }
+  end
 end

data/spec/unit/virtus/attribute/date_time/coerce_spec.rb

@@ -60,6 +60,18 @@ describe Virtus::Attribute::DateTime, '#coerce' do
     end
   end
 
+  context 'with an integer with the seconds since the Unix Epoch' do
+    let(:value) { 1302139609 }
+
+    it_should_behave_like 'a correct date time'
+  end
+
+  context 'with a float with the seconds and milliseconds since the Unix Epoch' do
+    let(:value) { 1302139609.664 }
+
+    it_should_behave_like 'a correct date time'
+  end
+
   context 'with a on-date value' do
     let(:value) { 'non-date' }
 

data/spec/unit/virtus/attribute/decimal/coerce_spec.rb

@@ -59,6 +59,12 @@ describe Virtus::Attribute::Decimal, '#coerce' do
     it { should eql(BigDecimal('0.41')) }
   end
 
+  context 'with a positive string float and leading non-significant digits' do
+    let (:value) { '00.0' }
+
+    it { should eql(BigDecimal('0.0')) }
+  end
+
   context 'with a zero integer' do
     let(:value) { 0 }
 
@@ -107,7 +113,7 @@ describe Virtus::Attribute::Decimal, '#coerce' do
     it { should eql(BigDecimal('-24.35')) }
   end
 
-  [ Object.new, true, '00.0', '0.', '-.0', 'string' ].each do |non_num_value|
+  [ Object.new, true, '0.', '-.0', 'string' ].each do |non_num_value|
     context 'with a non-numeric value = #{non_num_value.inspect}' do
       let(:value) { non_num_value }
 

data/spec/unit/virtus/attribute/float/coerce_spec.rb

@@ -59,6 +59,12 @@ describe Virtus::Attribute::Float, '#coerce' do
     it { should eql(0.41) }
   end
 
+  context 'with a positive string float and leading non-significant digits' do
+    let (:value) { '00.0' }
+
+    it { should eql(0.0) }
+  end
+
   context 'with a zero integer' do
     let(:value) { 0 }
 
@@ -107,7 +113,7 @@ describe Virtus::Attribute::Float, '#coerce' do
     it { should eql(-24.35) }
   end
 
-  [ Object.new, true, '00.0', '0.', '-.0', 'string' ].each do |non_num_value|
+  [ Object.new, true, '0.', '-.0', 'string' ].each do |non_num_value|
     context 'does not coerce non-numeric value #{non_num_value.inspect}' do
       let(:value) { non_num_value }
 

data/spec/unit/virtus/attribute/hash/coerce_spec.rb

@@ -17,4 +17,12 @@ describe Virtus::Attribute::Hash, '#coerce' do
 
     it { should be(:symbol) }
   end
+
+  context "without Hash Coerce type define" do
+    let(:options) { { } }
+    let(:input_value) { { :one => '1', 'two' => 2 } }
+
+    it { should eq(:one => '1', 'two' => 2) }
+
+  end
 end

data/spec/unit/virtus/attribute/integer/coerce_spec.rb

@@ -59,6 +59,12 @@ describe Virtus::Attribute::Integer, '#coerce' do
     it { should eql(0) }
   end
 
+  context 'with a positive string float and leading non-significant digits' do
+    let (:value) { '00.0' }
+
+    it { should eql(0) }
+  end
+
   context 'with a zero float' do
     let(:value) { 0.0 }
 
@@ -101,7 +107,7 @@ describe Virtus::Attribute::Integer, '#coerce' do
     it { should eql(value.to_i) }
   end
 
-  [ Object.new, true, false, '00.0', '0.', '-.0', 'string' ].each do |non_num_value|
+  [ Object.new, true, false, '0.', '-.0', 'string' ].each do |non_num_value|
     context 'does not coerce non-numeric value #{non_num_value.inspect}' do
       let(:value) { non_num_value }
 

data/virtus.gemspec

@@ -18,7 +18,4 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('backports',           '~> 2.6.1')
   gem.add_dependency('descendants_tracker', '~> 0.0.1')
-
-  gem.add_development_dependency('rake',  '~> 0.9.2')
-  gem.add_development_dependency('rspec', '~> 2.12')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
@@ -43,38 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
 description: Attributes on Steroids for Plain Old Ruby Objects
 email:
 - piotr.solnica@gmail.com