virtus 1.0.0.rc2 → 1.0.0

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 24
-total_score: 439
+total_score: 437

data/lib/virtus.rb

@@ -243,6 +243,7 @@ require 'virtus/instance_methods'
 
 require 'virtus/value_object'
 
+require 'virtus/coercer'
 require 'virtus/attribute_set'
 
 require 'virtus/attribute/default_value'

data/lib/virtus/attribute.rb

@@ -67,10 +67,7 @@ module Virtus
 
     # @api private
     def self.build_coercer(type, options = {})
-      Coercer.new(
-        options.fetch(:configured_coercer) { Virtus.coercer },
-        type.coercion_method
-      )
+      Coercer.new(type, options.fetch(:configured_coercer) { Virtus.coercer })
     end
 
     # @api private

data/lib/virtus/attribute/coercer.rb

@@ -4,8 +4,10 @@ module Virtus
     # Coercer accessor wrapper
     #
     # @api private
-    class Coercer
-      attr_reader :method
+    class Coercer < Virtus::Coercer
+
+      # @api private
+      attr_reader :method, :coercers
 
       # Initialize a new coercer object
       #
@@ -15,9 +17,10 @@ module Virtus
       # @return [undefined]
       #
       # @api private
-      def initialize(coercers, method)
+      def initialize(type, coercers)
+        super(type)
+        @method   = type.coercion_method
         @coercers = coercers
-        @method   = method
       end
 
       # Coerce given value
@@ -26,23 +29,14 @@ module Virtus
       #
       # @api private
       def call(value)
-        self[value.class].public_send(@method, value)
+        coercers[value.class].public_send(method, value)
       rescue ::Coercible::UnsupportedCoercion
         value
       end
 
       # @api public
       def success?(primitive, value)
-        self[primitive].coerced?(value)
-      end
-
-      # Return coercer object for the given type
-      #
-      # @return [Object]
-      #
-      # @api private
-      def [](type)
-        @coercers[type]
+        coercers[primitive].coerced?(value)
       end
 
     end # class Coercer

data/lib/virtus/attribute/embedded_value.rb

@@ -6,23 +6,11 @@ module Virtus
     class EmbeddedValue < Attribute
       TYPES = [Struct, OpenStruct, Virtus, Model::Constructor].freeze
 
-      # Abstract EV coercer class
-      #
-      # @private
-      class Coercer
-        attr_reader :primitive
-
-        def initialize(primitive)
-          @primitive = primitive
-        end
-
-      end # Coercer
-
       # Builds Struct-like instance with attributes passed to the constructor as
       # a list of args rather than a hash
       #
       # @private
-      class FromStruct < Coercer
+      class FromStruct < Virtus::Coercer
 
         # @api public
         def call(input)
@@ -39,7 +27,7 @@ module Virtus
       # as a hash
       #
       # @private
-      class FromOpenStruct < Coercer
+      class FromOpenStruct < Virtus::Coercer
 
         # @api public
         def call(input)
@@ -67,9 +55,9 @@ module Virtus
         primitive = type.primitive
 
         if primitive < Virtus || primitive < Model::Constructor || primitive <= OpenStruct
-          FromOpenStruct.new(primitive)
+          FromOpenStruct.new(type)
         elsif primitive < Struct
-          FromStruct.new(primitive)
+          FromStruct.new(type)
         end
       end
 

data/lib/virtus/coercer.rb

@@ -0,0 +1,40 @@
+module Virtus
+
+  # Abstract coercer class
+  #
+  class Coercer
+
+    # @api private
+    attr_reader :primitive, :type
+
+    # @api private
+    def initialize(type)
+      @type      = type
+      @primitive = type.primitive
+    end
+
+    # Coerce input value into expected primitive type
+    #
+    # @param [Object] input
+    #
+    # @return [Object] coerced input
+    #
+    # @api public
+    def call(input)
+      NotImplementedError.new("#{self.class}#call must be implemented")
+    end
+
+    # Return if the input value was successfuly coerced
+    #
+    # @param [Object] input
+    #
+    # @return [Object] coerced input
+    #
+    # @api public
+    def success?(primitive, input)
+      input.kind_of?(primitive)
+    end
+
+  end # Coercer
+
+end # Virtus

data/lib/virtus/version.rb

@@ -1,3 +1,3 @@
 module Virtus
-  VERSION = '1.0.0.rc2'
+  VERSION = '1.0.0'
 end

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

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe Virtus::Attribute::EmbeddedValue, '#coerce' do
   subject { object.coerce(input) }
 
-  let(:object) { described_class.build(model) }
+  let(:object)  { described_class.build(model, options) }
+  let(:options) { {} }
 
   context 'when primitive is OpenStruct' do
     let(:model)  { OpenStruct }
@@ -54,4 +55,23 @@ describe Virtus::Attribute::EmbeddedValue, '#coerce' do
       it { should be(input) }
     end
   end
+
+  context 'when :strict mode is enabled' do
+    let(:model)   { Struct.new(:name) }
+    let(:options) { { :strict => true } }
+
+    context 'when input is coercible' do
+      let(:input) { ['Piotr'] }
+
+      it { should eql(model.new('Piotr')) }
+    end
+
+    context 'when input is not coercible' do
+      let(:input) { nil }
+
+      it 'raises error' do
+        expect { subject }.to raise_error(Virtus::CoercionError)
+      end
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
@@ -126,6 +126,7 @@ files:
 - lib/virtus/builder/hook_context.rb
 - lib/virtus/class_inclusions.rb
 - lib/virtus/class_methods.rb
+- lib/virtus/coercer.rb
 - lib/virtus/configuration.rb
 - lib/virtus/const_missing_extensions.rb
 - lib/virtus/extensions.rb
@@ -218,9 +219,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23