virtus 1.0.0.beta5 → 1.0.0.beta6

data/README.md

@@ -18,8 +18,8 @@ API](http://rubydoc.info/github/datamapper/dm-core/master/DataMapper/Property)
 with various modifications and improvements. The goal is to provide a common API
 for defining attributes on a model so all ORMs/ODMs could use it instead of
 reinventing the wheel all over again. It is also suitable for any other
-usecase where you need to extend your ruby objects with attributes that require
-data type coercions.
+use case where you need to extend your ruby objects with attributes that require
+data-type coercions.
 
 Installation
 ------------
@@ -39,7 +39,7 @@ Examples
 
 ### Using Virtus with Classes
 
-You can create classes extended with virtus and define attributes:
+You can create classes extended with Virtus and define attributes:
 
 ``` ruby
 class User
@@ -103,7 +103,7 @@ user.attributes = { :name => 'John' }
 user.attributes
 # => {:name => 'John'}
 
-# starting from virtus 1.0.0 preffered way to do this is to use module builder
+# starting from virtus 1.0.0 preferred way to do this is to use module builder
 MyModel = Virtus.model(:constructor => false, :mass_assignment => false)
 
 class User
@@ -113,7 +113,7 @@ end
 
 ### Using Virtus with Modules
 
-You can create modules extended with virtus and define attributes for later
+You can create modules extended with Virtus and define attributes for later
 inclusion in your classes:
 
 ```ruby
@@ -478,9 +478,9 @@ end
 
 ## Strict Coercion Mode
 
-By default virtus returns input value even when it couldn't coerce it to expected type.
+By default Virtus returns the input value even when it couldn't coerce it to the expected type.
 If you want to catch such cases in a noisy way you can use the strict mode in which
-virtus raises an exception when it failed to coerce an input value.
+Virtus raises an exception when it failed to coerce an input value.
 
 ``` ruby
 class User

data/lib/virtus/attribute/embedded_value.rb

@@ -23,7 +23,7 @@ module Virtus
     #     :street => 'Street 1/2', :zipcode => '12345', :city => 'NYC' })
     #
     class EmbeddedValue < Attribute
-      TYPES = [Struct, OpenStruct, Virtus].freeze
+      TYPES = [Struct, OpenStruct, Virtus, Model::Constructor].freeze
 
       class FromStruct < self
 
@@ -56,7 +56,7 @@ module Virtus
 
       # @api private
       def self.determine_type(klass)
-        if klass < Virtus || klass <= OpenStruct
+        if klass < Virtus || klass < Model::Constructor || klass <= OpenStruct
           FromOpenStruct
         elsif klass < Struct
           FromStruct

data/lib/virtus/version.rb

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

data/spec/integration/embedded_value_spec.rb

@@ -4,13 +4,13 @@ describe 'embedded values' do
   before do
     module Examples
       class City
-        include Virtus
+        include Virtus.model
 
         attribute :name, String
       end
 
       class Address
-        include Virtus
+        include Virtus.model
 
         attribute :street,  String
         attribute :zipcode, String
@@ -18,7 +18,7 @@ describe 'embedded values' do
       end
 
       class User
-        include Virtus
+        include Virtus.model
 
         attribute :name,    String
         attribute :address, Address

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

@@ -3,7 +3,15 @@ require 'spec_helper'
 describe Virtus::Attribute::EmbeddedValue, '.build' do
   subject { described_class.build(type) }
 
-  context 'when type is a virtus model' do
+  context 'when type is a Virtus.model' do
+    let(:type) { Class.new { include Virtus.model } }
+
+    it { should be_frozen }
+
+    it { should be_instance_of(Virtus::Attribute::EmbeddedValue::FromOpenStruct) }
+  end
+
+  context 'when type includes Virtus' do
     let(:type) { Class.new { include Virtus } }
 
     it { should be_frozen }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta5
+  version: 1.0.0.beta6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descendants_tracker