virtus 1.0.0.rc1 → 1.0.0.rc2

data/.travis.yml

@@ -11,7 +11,6 @@ rvm:
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx-19mode
 notifications:
   email:
     - piotr.solnica@gmail.com

data/Changelog.md

@@ -15,6 +15,7 @@ This release no longer works with Ruby 1.8.7.
 * [changed] A meaningful error will be raised if a reserved name is used as an attribute name (solnic)
 * [changed] Default value can be set via private and protected methods now (solnic)
 * [changed] New syntax for value objects (solnic)
+* [changed] Default values are now set in the constructor for non-lazy attributes (solnic)
 * [deprecated] `Virtus::Attribute.coerce` in favor of `Virtus.coerce` or a customized configured module (solnic)
 * [deprecated] `include Virtus` in favor of `include Virtus.model` (for classes) or `Virtus.module` (for modules) (solnic)
 * [deprecated] `include Virtus::ValueObject` in favor of `include Virtus.value_object` (solnic)

data/Gemfile

@@ -3,9 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'bogus', '~> 0.1'
-
-gem 'axiom-types', :git => 'https://github.com/dkubb/axiom-types'
-
 gem 'devtools', :git => 'https://github.com/rom-rb/devtools', branch: 'master'
 
 eval_gemfile 'Gemfile.devtools'

data/lib/virtus/attribute/accessor.rb

@@ -26,6 +26,14 @@ module Virtus
       # @api private
       attr_reader :instance_variable_name
 
+      # @api private
+      def self.extended(descendant)
+        super
+        name = descendant.options.fetch(:name).to_sym
+        descendant.instance_variable_set('@name', name)
+        descendant.instance_variable_set('@instance_variable_name', "@#{name}")
+      end
+
       # Return value of the attribute
       #
       # @param [Object] instance
@@ -78,13 +86,6 @@ module Virtus
         options[:writer] == :public
       end
 
-      # @api private
-      def finalize
-        @name                   = options.fetch(:name).to_sym
-        @instance_variable_name = "@#{@name}"
-        super
-      end
-
     end # Accessor
 
   end # Attribute

data/lib/virtus/attribute/coercible.rb

@@ -1,8 +1,14 @@
 module Virtus
   class Attribute
 
+    # Attribute extension providing coercion when setting an attribute value
+    #
     module Coercible
 
+      # Coerce value before setting
+      #
+      # @see Accessor#set
+      #
       # @api public
       def set(instance, value)
         super(instance, coerce(value))

data/lib/virtus/attribute/collection.rb

@@ -1,14 +1,14 @@
 module Virtus
   class Attribute
 
-    # Abstract superclass for collection Attributes.
+    # Collection attribute handles enumerable-like types
     #
     # Handles coercing members to the designated member type.
     #
-    # @abstract
     class Collection < Attribute
-      default Proc.new { |_, attribute| attribute.type.primitive.new }
+      default Proc.new { |_, attribute| attribute.primitive.new }
 
+      # @api private
       attr_reader :member_type
 
       # FIXME: temporary hack, remove when Axiom::Type works with EV as member_type

data/lib/virtus/attribute/embedded_value.rb

@@ -1,26 +1,7 @@
 module Virtus
   class Attribute
 
-    # EmbeddedValue
-    #
-    # @example
-    #
-    #   class Address
-    #     include Virtus
-    #
-    #     attribute :street,  String
-    #     attribute :zipcode, String
-    #     attribute :city,    String
-    #   end
-    #
-    #   class User
-    #     include Virtus
-    #
-    #     attribute :address, Address
-    #   end
-    #
-    #   user = User.new(:address => {
-    #     :street => 'Street 1/2', :zipcode => '12345', :city => 'NYC' })
+    # EmbeddedValue handles virtus-like objects, OpenStruct and Struct
     #
     class EmbeddedValue < Attribute
       TYPES = [Struct, OpenStruct, Virtus, Model::Constructor].freeze

data/lib/virtus/attribute/hash.rb

@@ -1,25 +1,18 @@
 module Virtus
   class Attribute
 
-    # Hash
-    #
-    # @example
-    #   class Post
-    #     include Virtus
-    #
-    #     attribute :meta, Hash
-    #   end
-    #
-    #   Post.new(:meta => { :tags => %w(foo bar) })
+    # Handles attributes with Hash type
     #
     class Hash < Attribute
       primitive ::Hash
       default   primitive.new
 
-      attr_reader :key_type
-      attr_reader :value_type
+      # @api private
+      attr_reader :key_type, :value_type
 
       # FIXME: remove this once axiom-types supports it
+      #
+      # @private
       Type = Struct.new(:key_type, :value_type) do
         def self.infer(type)
           if axiom_type?(type)
@@ -33,14 +26,17 @@ module Virtus
           end
         end
 
+        # @api private
         def self.pending?(primitive)
           primitive.is_a?(String) || primitive.is_a?(Symbol)
         end
 
+        # @api private
         def self.axiom_type?(type)
           type.is_a?(Class) && type < Axiom::Types::Type
         end
 
+        # @api private
         def self.determine_type(type)
           return type if pending?(type)
 
@@ -51,6 +47,7 @@ module Virtus
           end
         end
 
+        # @api private
         def self.infer_key_and_value_types(type)
           return {} unless type.kind_of?(::Hash)
 
@@ -77,10 +74,12 @@ module Virtus
           end
         end
 
+        # @api private
         def coercion_method
           :to_hash
         end
 
+        # @api private
         def primitive
           ::Hash
         end
@@ -97,6 +96,10 @@ module Virtus
         options[:value_type] ||= Attribute.build(type.value_type)
       end
 
+      # Coerce members
+      #
+      # @see [Attribute#coerce]
+      #
       # @api public
       def coerce(*)
         coerced = super
@@ -122,5 +125,6 @@ module Virtus
       end
 
     end # class Hash
+
   end # class Attribute
 end # module Virtus

data/lib/virtus/attribute/strict.rb

@@ -1,8 +1,14 @@
 module Virtus
   class Attribute
 
+    # Attribute extension which raises CoercionError when coercion failed
+    #
     module Strict
 
+      # @see [Attribute#coerce]
+      #
+      # @raises [CoercionError] when coercer failed
+      #
       # @api public
       def coerce(*)
         output = super

data/lib/virtus/version.rb

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

data/spec/unit/virtus/class_methods/finalize_spec.rb

@@ -6,6 +6,7 @@ describe Virtus, '.finalize' do
       class Person
         include Virtus.model(:finalize => false)
 
+        attribute :name,     String
         attribute :articles, Array['Examples::Article']
         attribute :address,  :'Examples::Address'
       end
@@ -39,6 +40,11 @@ describe Virtus, '.finalize' do
     Virtus.finalize
   end
 
+  it "sets attributes that don't require finalization" do
+    expect(Examples::Person.attribute_set[:name]).to be_instance_of(Virtus::Attribute)
+    expect(Examples::Person.attribute_set[:name].primitive).to be(String)
+  end
+
   it 'it finalizes member type for a collection attribute' do
     expect(Examples::Person.attribute_set[:address].primitive).to be(Examples::Address)
   end

data/virtus.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency('descendants_tracker', '~> 0.0.1')
   gem.add_dependency('equalizer',           '~> 0.0.7')
   gem.add_dependency('coercible',           '~> 0.2')
-  gem.add_dependency('axiom-types',         '~> 0.0.4')
+  gem.add_dependency('axiom-types',         '~> 0.0.5')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 description: Attributes on Steroids for Plain Old Ruby Objects
 email:
 - piotr.solnica@gmail.com