virtus 0.4.2 → 0.5.0

data/.gitignore

@@ -33,5 +33,6 @@ measurements
 ## BUNDLER
 .bundle
 Gemfile.lock
+bin/
 
 ## PROJECT::SPECIFIC

data/Changelog.md

@@ -1,4 +1,14 @@
-# v0.4.1 2012-05-08
+# v0.5.0 2012-06-08
+
+* [feature] Support for extending objects (solnic)
+* [feature] Support for defining attributes in modules (solnic)
+* [feature] Support for Struct as an EmbeddedValue or ValueObject attribute (solnic)
+* [changed] Allow any input for EmbeddedValue and ValueObject constructors (solnic)
+* [changed] ValueObject instances cannot be duped or cloned (senny)
+
+[Compare v0.4.2..master](https://github.com/solnic/virtus/compare/v0.4.2...master)
+
+# v0.4.2 2012-05-08
 
 * [updated] Bump backports dep to ~> 2.5.3 (solnic)
 

data/README.md

@@ -41,7 +41,7 @@ class User
 end
 
 user = User.new(:name => 'Piotr', :age => 28)
-user.attributes # => { :name => "Piotr", :age => 28 }
+user.attribute_set # => { :name => "Piotr", :age => 28 }
 
 user.name # => "Piotr"
 
@@ -51,8 +51,48 @@ user.age.class # => Fixnum
 user.birthday = 'November 18th, 1983' # => #<DateTime: 1983-11-18T00:00:00+00:00 (4891313/2,0/1,2299161)>
 ```
 
+### Using Virtus With Modules
 
-**Default values**
+You can create modules extended with virtus and define attributes for later
+inclusion in your classes:
+
+```ruby
+module Name
+  include Virtus
+
+  attribute :name, String
+end
+
+module Age
+  include Virtus
+
+  attribute :age, Integer
+end
+
+class User
+  include Name, Age
+end
+
+user = User.new(:name => 'John', :age => '30')
+```
+
+### Dynamically Extending Instances
+
+It's also possible to dynamically extend an object with Virtus:
+
+```ruby
+class User
+  # nothing here
+end
+
+user = User.new
+user.extend(Virtus)
+user.attribute :name, String
+user.name = 'John'
+user.name # => 'John'
+```
+
+### Default Values
 
 ``` ruby
 class Page
@@ -84,7 +124,7 @@ page.published    # => false
 page.editor_title # => "UNPUBLISHED: Virtus README"
 ```
 
-**Embedded Value**
+### Embedded Value
 
 ``` ruby
 class City
@@ -115,7 +155,7 @@ user.address.street # => "Street 1/2"
 user.address.city.name # => "NYC"
 ```
 
-**Collection Member Coercions**
+### Collection Member Coercions
 
 ``` ruby
 # Support "primitive" classes
@@ -163,7 +203,7 @@ user.phone_numbers # => [#<PhoneNumber:0x007fdb2d3bef88 @number="212-555-1212">,
 user.addresses # => #<Set: {#<Address:0x007fdb2d3be448 @address="1234 Any St.", @locality="Anytown", @region="DC", @postal_code="21234">}>
 ```
 
-**Value Objects**
+### Value Objects
 
 ``` ruby
 class GeoLocation
@@ -196,7 +236,7 @@ venue_other = Venue.new(
 venue.location === venue_other.location # => true
 ```
 
-**Adding Coercions**
+### Adding Coercions
 
 Virtus comes with a builtin coercion library.
 It's super easy to add your own coercion classes.
@@ -235,7 +275,7 @@ user.name # => 'Piotr'
 user.password # => '3858f62230ac3c915f300c664312c63f'
 ```
 
-**Custom Attributes**
+### Custom Attributes
 
 ``` ruby
 require 'json'
@@ -265,7 +305,6 @@ user.info = '{"email":"john@domain.com"}' # => {"email"=>"john@domain.com"}
 user.info.class # => Hash
 ```
 
-
 Credits
 -------
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 19
-total_score: 365
+total_score: 385

data/lib/virtus.rb

@@ -16,21 +16,35 @@ module Virtus
   # Represents an undefined parameter used by auto-generated option methods
   Undefined = Object.new.freeze
 
-  # Extends base class with class and instance methods
+  # Extends base class or a module with virtus methods
   #
   # @param [Class] descendant
   #
   # @return [undefined]
   #
   # @api private
-  def self.included(descendant)
+  def self.included(object)
     super
-    descendant.extend(ClassMethods)
-    descendant.send(:include, InstanceMethods)
+    if Class === object
+      object.send(:include, ClassInclusions)
+    else
+      object.extend(ModuleExtensions)
+    end
   end
-
   private_class_method :included
 
+  # Extends an object with virtus extensions
+  #
+  # @param [Object] object
+  #
+  # @return [undefined]
+  #
+  # @api private
+  def self.extended(object)
+    object.extend(Extensions)
+  end
+  private_class_method :extended
+
 end # module Virtus
 
 require 'virtus/support/descendants_tracker'
@@ -38,6 +52,10 @@ require 'virtus/support/type_lookup'
 require 'virtus/support/options'
 require 'virtus/support/equalizer'
 
+require 'virtus/extensions'
+require 'virtus/class_inclusions'
+require 'virtus/module_extensions'
+
 require 'virtus/attributes_accessor'
 require 'virtus/class_methods'
 require 'virtus/instance_methods'
@@ -86,3 +104,5 @@ require 'virtus/attribute/symbol'
 require 'virtus/attribute/string'
 require 'virtus/attribute/time'
 require 'virtus/attribute/embedded_value'
+require 'virtus/attribute/embedded_value/from_struct'
+require 'virtus/attribute/embedded_value/from_open_struct'

data/lib/virtus/attribute.rb

@@ -81,11 +81,7 @@ module Virtus
     def self.determine_type(class_or_name)
       case class_or_name
       when ::Class
-        if class_or_name <= Virtus
-          Attribute::EmbeddedValue
-        else
-          super
-        end
+        Attribute::EmbeddedValue.determine_type(class_or_name) || super
       when ::Array, ::Set
         super(class_or_name.class)
       else

data/lib/virtus/attribute/embedded_value.rb

@@ -35,6 +35,24 @@ module Virtus
         options.merge(:primitive => type)
       end
 
+      # Determine type based on class
+      #
+      # Virtus::EmbeddedValue.determine_type(Struct) # => Virtus::EmbeddedValue::FromStruct
+      # Virtus::EmbeddedValue.determine_type(VirtusClass) # => Virtus::EmbeddedValue::FromOpenStruct
+      #
+      # @param [Class] klass
+      #
+      # @return [Virtus::Attribute::EmbeddedValue]
+      #
+      # @api public
+      def self.determine_type(klass)
+        if klass <= Virtus || klass <= OpenStruct
+          FromOpenStruct
+        elsif klass <= Struct
+          FromStruct
+        end
+      end
+
       # Coerce attributes into a virtus object
       #
       # @param [Hash,Virtus]
@@ -42,14 +60,8 @@ module Virtus
       # @return [Virtus]
       #
       # @api private
-      def coerce(attributes_or_object)
-        value = if attributes_or_object.kind_of?(::Hash)
-                  @primitive.new(attributes_or_object)
-                else
-                  attributes_or_object
-                end
-
-        super(value)
+      def coerce(value)
+        value if value.kind_of?(@primitive)
       end
 
     end # class EmbeddedValue

data/lib/virtus/attribute/embedded_value/from_open_struct.rb

@@ -0,0 +1,17 @@
+module Virtus
+  class Attribute
+    class EmbeddedValue < Object
+
+      # EmbeddedValue attribute handling OpenStruct primitive or Virtus object
+      #
+      class FromOpenStruct < EmbeddedValue
+
+        # @api private
+        def coerce(attributes)
+          super or @primitive.new(attributes)
+        end
+
+      end # class FromOpenStruct
+    end # class EmbeddedValue
+  end # class Attribute
+end # module Virtus

data/lib/virtus/attribute/embedded_value/from_struct.rb

@@ -0,0 +1,17 @@
+module Virtus
+  class Attribute
+    class EmbeddedValue < Object
+
+      # EmbeddedValue attribute handling Struct primitive
+      #
+      class FromStruct < EmbeddedValue
+
+        # @api private
+        def coerce(attributes)
+          super or @primitive.new(*attributes)
+        end
+
+      end # class FromStruct
+    end # class EmbeddedValue
+  end # class Attribute
+end # module Virtus

data/lib/virtus/class_inclusions.rb

@@ -0,0 +1,41 @@
+module Virtus
+
+  # Class-level extensions
+  module ClassInclusions
+
+    # Extends a descendant with class and instance methods
+    #
+    # @param [Class] descendant
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def self.included(descendant)
+      super
+      descendant.extend(ClassMethods)
+      descendant.send(:include, InstanceMethods)
+    end
+    private_class_method :included
+
+  private
+
+    # Return class' attribute set
+    #
+    # @return [Virtus::AttributeSet]
+    #
+    # @api private
+    def attribute_set
+      self.class.attribute_set
+    end
+
+    # Return a list of allowed writer method names
+    #
+    # @return [Set]
+    #
+    # @api private
+    def allowed_writer_methods
+      self.class.allowed_writer_methods
+    end
+
+  end # module ClassInclusions
+end # module Virtus

data/lib/virtus/class_methods.rb

@@ -2,8 +2,7 @@ module Virtus
 
   # Class methods that are added when you include Virtus
   module ClassMethods
-    WRITER_METHOD_REGEXP   = /=\z/.freeze
-    INVALID_WRITER_METHODS = %w[ == != === []= attributes= ].to_set.freeze
+    include Extensions
 
     # Hook called when module is extended
     #
@@ -22,39 +21,6 @@ module Virtus
 
     private_class_method :extended
 
-    # Defines an attribute on an object's class
-    #
-    # @example
-    #    class Book
-    #      include Virtus
-    #
-    #      attribute :title,        String
-    #      attribute :author,       String
-    #      attribute :published_at, DateTime
-    #      attribute :page_count,   Integer
-    #    end
-    #
-    # @param [Symbol] name
-    #   the name of an attribute
-    #
-    # @param [Class] type
-    #   the type class of an attribute
-    #
-    # @param [#to_hash] options
-    #   the extra options hash
-    #
-    # @return [self]
-    #
-    # @see Attribute.build
-    #
-    # @api public
-    def attribute(*args)
-      attribute = Attribute.build(*args)
-      attribute.define_accessor_methods(virtus_attributes_accessor_module)
-      virtus_add_attribute(attribute)
-      self
-    end
-
     # Returns all the attributes defined on a Class
     #
     # @example
@@ -72,27 +38,22 @@ module Virtus
     # @return [AttributeSet]
     #
     # @api public
-    def attributes
-      return @attributes if defined?(@attributes)
+    def attribute_set
+      return @attribute_set if defined?(@attribute_set)
       superclass  = self.superclass
       method      = __method__
       parent      = superclass.public_send(method) if superclass.respond_to?(method)
-      @attributes = AttributeSet.new(parent)
+      @attribute_set = AttributeSet.new(parent)
     end
 
-    # The list of writer methods that can be mass-assigned to in #attributes=
+    # @see Virtus::ClassMethods.attribute_set
     #
-    # @return [Set]
+    # @deprecated
     #
-    # @api private
-    def allowed_writer_methods
-      @allowed_writer_methods ||=
-        begin
-          allowed_writer_methods  = public_instance_methods.map(&:to_s)
-          allowed_writer_methods  = allowed_writer_methods.grep(WRITER_METHOD_REGEXP).to_set
-          allowed_writer_methods -= INVALID_WRITER_METHODS
-          allowed_writer_methods.freeze
-        end
+    # @api public
+    def attributes
+      warn "#{self}.attributes is deprecated. Use #{self}.attribute_set instead: #{caller.first}"
+      attribute_set
     end
 
   protected
@@ -104,8 +65,7 @@ module Virtus
     # @api private
     def virtus_setup_attributes_accessor_module
       @virtus_attributes_accessor_module = AttributesAccessor.new(inspect)
-      include virtus_attributes_accessor_module
-      self
+      include @virtus_attributes_accessor_module
     end
 
   private
@@ -128,13 +88,6 @@ module Virtus
       descendant.virtus_setup_attributes_accessor_module
     end
 
-    # Holds the anonymous module which hosts this class's Attribute accessors
-    #
-    # @return [Module]
-    #
-    # @api private
-    attr_reader :virtus_attributes_accessor_module
-
     # Hooks into const missing process to determine types of attributes
     #
     # @param [String] name
@@ -154,8 +107,13 @@ module Virtus
     #
     # @api private
     def virtus_add_attribute(attribute)
-      attributes << attribute
-      descendants.each { |descendant| descendant.attributes.reset }
+      super
+      descendants.each { |descendant| descendant.attribute_set.reset }
+    end
+
+    # @api private
+    def public_method_list
+      public_instance_methods
     end
 
   end # module ClassMethods

data/lib/virtus/extensions.rb

@@ -0,0 +1,93 @@
+module Virtus
+
+  # Extensions common for both classes and instances
+  module Extensions
+    WRITER_METHOD_REGEXP   = /=\z/.freeze
+    INVALID_WRITER_METHODS = %w[ == != === []= attributes= ].to_set.freeze
+
+    # A hook called when an object is extended with Virtus
+    #
+    # @param [Object] object
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def self.extended(object)
+      object.extend(InstanceMethods)
+      object.instance_eval do
+        @virtus_attributes_accessor_module = AttributesAccessor.new(object.class.inspect)
+        extend @virtus_attributes_accessor_module
+      end
+    end
+    private_class_method :extended
+
+    # Defines an attribute on an object's class
+    #
+    # @example
+    #    class Book
+    #      include Virtus
+    #
+    #      attribute :title,        String
+    #      attribute :author,       String
+    #      attribute :published_at, DateTime
+    #      attribute :page_count,   Integer
+    #    end
+    #
+    # @param [Symbol] name
+    #   the name of an attribute
+    #
+    # @param [Class] type
+    #   the type class of an attribute
+    #
+    # @param [#to_hash] options
+    #   the extra options hash
+    #
+    # @return [self]
+    #
+    # @see Attribute.build
+    #
+    # @api public
+    def attribute(*args)
+      attribute = Attribute.build(*args)
+      attribute.define_accessor_methods(@virtus_attributes_accessor_module)
+      virtus_add_attribute(attribute)
+      self
+    end
+
+    # The list of writer methods that can be mass-assigned to in #attributes=
+    #
+    # @return [Set]
+    #
+    # @api private
+    def allowed_writer_methods
+      @allowed_writer_methods ||=
+        begin
+          allowed_writer_methods  = public_method_list.map(&:to_s)
+          allowed_writer_methods  = allowed_writer_methods.grep(WRITER_METHOD_REGEXP).to_set
+          allowed_writer_methods -= INVALID_WRITER_METHODS
+          allowed_writer_methods.freeze
+      end
+    end
+
+  private
+
+    # Return an attribute set for that instance
+    #
+    # @return [AttributeSet]
+    #
+    # @api private
+    def attribute_set
+      @attribute_set ||= AttributeSet.new
+    end
+
+    # Add an attribute to the attribute set
+    #
+    # @return [AttributeSet]
+    #
+    # @api private
+    def virtus_add_attribute(attribute)
+      attribute_set << attribute
+    end
+
+  end # module Extensions
+end # module Virtus

data/lib/virtus/instance_methods.rb

@@ -140,7 +140,7 @@ module Virtus
     #
     # @api private
     def get_attributes
-      self.class.attributes.each_with_object({}) do |attribute, attributes|
+      attribute_set.each_with_object({}) do |attribute, attributes|
         name = attribute.name
         attributes[name] = get_attribute(name) if yield(attribute)
       end
@@ -155,7 +155,7 @@ module Virtus
     # @api private
     def set_attributes(attributes)
       ::Hash.try_convert(attributes).each do |name, value|
-        set_attribute(name, value) if self.class.allowed_writer_methods.include?("#{name}=")
+        set_attribute(name, value) if allowed_writer_methods.include?("#{name}=")
       end
     end
 
@@ -181,5 +181,10 @@ module Virtus
       __send__("#{name}=", value)
     end
 
+    # @api private
+    def public_method_list
+      public_methods
+    end
+
   end # module InstanceMethods
 end # module Virtus

data/lib/virtus/module_extensions.rb

@@ -0,0 +1,62 @@
+module Virtus
+
+  # Virtus module that can define attributes for later inclusion
+  #
+  module ModuleExtensions
+
+    def attribute(*args)
+      attribute_definitions << args
+    end
+
+  private
+
+    # Extend an object with Virtus methods and define attributes
+    #
+    # @param [Object] object
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def extended(object)
+      super
+      object.extend(Virtus)
+      define_attributes(object)
+    end
+
+    # Extend a class with Virtus methods and define attributes
+    #
+    # @param [Object] object
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def included(object)
+      super
+      object.send(:include, ClassInclusions)
+      define_attributes(object)
+    end
+
+    # Return attribute definitions
+    #
+    # @return [Array<Hash>]
+    #
+    # @api private
+    def attribute_definitions
+      @_attribute_definitions ||= []
+    end
+
+    # Define attributes on a class or instance
+    #
+    # @param [Object,Class] object
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def define_attributes(object)
+      attribute_definitions.each do |attribute_args|
+        object.attribute(*attribute_args)
+      end
+    end
+
+  end # class ModuleExtensions
+end # module Virtus

data/lib/virtus/value_object.rb

@@ -41,6 +41,7 @@ module Virtus
     private_class_method :included
 
     module InstanceMethods
+
       # the #get_attributes method accept a Proc object that will filter
       # out an attribute when the block returns false. the ValueObject
       # needs all the attributes, so we allow every attribute.
@@ -53,6 +54,23 @@ module Virtus
       def with(attribute_updates)
         self.class.new(get_attributes(&FILTER_NONE).merge(attribute_updates))
       end
+
+      # ValueObjects are immutable and can't be cloned
+      #
+      # They always represent the same value
+      #
+      # @example
+      #
+      #   value_object.clone === value_object # => true
+      #
+      # @return [self]
+      #
+      # @api public
+      def clone
+        self
+      end
+      alias dup clone
+
     end
 
     module ClassMethods
@@ -112,7 +130,7 @@ module Virtus
         @allowed_writer_methods ||=
           begin
             allowed_writer_methods = super
-            allowed_writer_methods += attributes.map{|attr| "#{attr.name}="}
+            allowed_writer_methods += attribute_set.map{|attr| "#{attr.name}="}
             allowed_writer_methods.to_set.freeze
           end
       end

data/lib/virtus/version.rb

@@ -1,3 +1,3 @@
 module Virtus
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/spec/integration/default_values_spec.rb

@@ -4,6 +4,13 @@ describe "default values" do
 
   before do
     module Examples
+
+      class Reference
+        include Virtus::ValueObject
+
+        attribute :ref, String
+      end
+
       class Page
         include Virtus
 
@@ -12,6 +19,7 @@ describe "default values" do
         attribute :view_count,   Integer, :default => 0
         attribute :published,    Boolean, :default => false, :accessor => :private
         attribute :editor_title, String,  :default => :default_editor_title
+        attribute :reference,    String,  :default => Reference.new
 
         def default_editor_title
           published? ? title : "UNPUBLISHED: #{title}"
@@ -41,4 +49,12 @@ describe "default values" do
     subject.editor_title.should == 'UNPUBLISHED: Top Secret'
   end
 
+  context 'with a ValueObject' do
+    it 'should not duplicate the ValueObject' do
+      page1 = Examples::Page.new
+      page2 = Examples::Page.new
+      page1.reference.should equal(page2.reference)
+    end
+  end
+
 end

data/spec/integration/extending_objects_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'I can extend objects' do
+  before do
+    module Examples
+      class User; end
+
+      class Admin; end
+    end
+  end
+
+  specify 'defining attributes on an object' do
+    attributes = { :name => 'John', :age => 29 }
+
+    admin = Examples::Admin.new
+    admin.extend(Virtus)
+
+    admin.attribute :name, String
+    admin.attribute :age,  Integer
+
+    admin.name = 'John'
+    admin.age  = 29
+
+    admin.name.should eql('John')
+    admin.age.should eql(29)
+
+    admin.attributes.should eql(attributes)
+
+    new_attributes   = { :name => 'Jane', :age => 28 }
+    admin.attributes = new_attributes
+
+    admin.name.should eql('Jane')
+    admin.age.should eql(28)
+  end
+end

data/spec/integration/struct_as_embedded_value_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe 'Using Struct as an embedded value attribute' do
+  before do
+    module Examples
+      Point = Struct.new(:x, :y)
+
+      class Rectangle
+        include Virtus
+
+        attribute :top_left,     Point
+        attribute :bottom_right, Point
+      end
+    end
+  end
+
+  subject do
+    Examples::Rectangle.new(:top_left => [ 3, 5 ], :bottom_right => [ 8, 7 ])
+  end
+
+  specify 'initialize a struct object with correct attributes' do
+    subject.top_left.x.should be(3)
+    subject.top_left.y.should be(5)
+
+    subject.bottom_right.x.should be(8)
+    subject.bottom_right.y.should be(7)
+  end
+end

data/spec/integration/using_modules_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe 'I can define attributes within a module' do
+  before do
+    module Examples
+      module Name
+        include Virtus
+
+        attribute :name, String
+      end
+
+      module Age
+        include Virtus
+
+        attribute :age,  Integer
+      end
+
+      class User
+        include Name
+      end
+
+      class Admin < User
+        include Age
+      end
+
+      class Moderator; end
+    end
+  end
+
+  specify 'including a module with attributes into a class' do
+    Examples::User.attribute_set[:name].should be_instance_of(Virtus::Attribute::String)
+
+    Examples::Admin.attribute_set[:name].should be_instance_of(Virtus::Attribute::String)
+    Examples::Admin.attribute_set[:age].should be_instance_of(Virtus::Attribute::Integer)
+
+    user = Examples::Admin.new(:name => 'Piotr', :age => 29)
+    user.name.should eql('Piotr')
+    user.age.should eql(29)
+  end
+
+  specify 'including a module with attributes into an instance' do
+    moderator = Examples::Moderator.new
+    moderator.extend(Examples::Name, Examples::Age)
+
+    moderator.attributes = { :name => 'John', :age => 21 }
+    moderator.name.should eql('John')
+    moderator.age.should eql(21)
+  end
+end

data/spec/integration/value_object_with_custom_constructor_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe "Defining a ValueObject with a custom constructor" do
+  before do
+    module Examples
+      class Point
+        include Virtus::ValueObject
+
+        attribute :x, Integer
+        attribute :y, Integer
+
+        def initialize(attributes)
+          if attributes.kind_of?(Array)
+            self.x = attributes.first
+            self.y = attributes.last
+          else
+            super
+          end
+        end
+      end
+
+      class Rectangle
+        include Virtus
+
+        attribute :top_left,     Point
+        attribute :bottom_right, Point
+      end
+    end
+  end
+
+  subject do
+    Examples::Rectangle.new(:top_left => [ 3, 4 ], :bottom_right => [ 5, 8 ])
+  end
+
+  specify "initialize a value object attribute with correct attributes" do
+    subject.top_left.x.should be(3)
+    subject.top_left.y.should be(4)
+
+    subject.bottom_right.x.should be(5)
+    subject.bottom_right.y.should be(8)
+  end
+end

data/spec/integration/virtus/value_object_spec.rb

@@ -13,11 +13,15 @@ describe Virtus::ValueObject do
       attribute :longitude, Float
     end
   end
+
   let(:attribute_values) { { :latitude => 10.0, :longitude => 20.0 } }
+
   let(:instance_with_equal_state) { class_under_test.new(attribute_values) }
+
   let(:instance_with_different_state) do
     class_under_test.new(:latitude => attribute_values[:latitude])
   end
+
   subject { class_under_test.new(attribute_values) }
 
   describe 'initialization' do
@@ -29,8 +33,8 @@ describe Virtus::ValueObject do
 
   describe 'writer visibility' do
     it 'attributes are configured for private writers' do
-      class_under_test.attributes[:latitude].public_reader?.should be(true)
-      class_under_test.attributes[:longitude].public_writer?.should be(false)
+      class_under_test.attribute_set[:latitude].public_reader?.should be(true)
+      class_under_test.attribute_set[:longitude].public_writer?.should be(false)
     end
 
     it 'writer methods are set to private' do

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

@@ -4,6 +4,8 @@ describe Virtus::Attribute, '.determine_type' do
   let(:object) { described_class }
 
   (described_class.descendants - [ Virtus::Attribute::Collection ]).each do |attribute_class|
+    next if attribute_class <= Virtus::Attribute::EmbeddedValue
+
     context "with class #{attribute_class.inspect}" do
       subject { object.determine_type(attribute_class) }
 
@@ -36,7 +38,7 @@ describe Virtus::Attribute, '.determine_type' do
 
     let(:primitive) { Class.new { include Virtus } }
 
-    it { should equal(Virtus::Attribute::EmbeddedValue) }
+    it { should equal(Virtus::Attribute::EmbeddedValue::FromOpenStruct) }
   end
 
   context 'when the primitive defaults to Object' do

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Virtus::Attribute::EmbeddedValue, '.determine_type' do
+  subject { described_class.determine_type(value) }
+
+  context "with Struct" do
+    let(:value) { Struct.new(:x) }
+
+    it { should be(Virtus::Attribute::EmbeddedValue::FromStruct) }
+  end
+
+  context "with OpenStruct" do
+    let(:value) { OpenStruct }
+
+    it { should be(Virtus::Attribute::EmbeddedValue::FromOpenStruct) }
+  end
+
+  context "with a Virtus descendant" do
+    let(:value) { Class.new { include Virtus; self } }
+
+    it { should be(Virtus::Attribute::EmbeddedValue::FromOpenStruct) }
+  end
+end

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

@@ -3,47 +3,18 @@ require 'spec_helper'
 describe Virtus::Attribute::EmbeddedValue, '#coerce' do
   subject { object.coerce(value) }
 
-  let(:attribute_name) { :attribute_name }
-  let(:model)          { OpenStruct      }
-  let(:instance)       { Object.new      }
+  let(:object)   { described_class.new(:name, :primitive => primitive) }
+  let(:instance) { Object.new                                          }
+  let(:value)    { primitive.new                                       }
 
-  context 'when the value is a hash' do
-    let(:value) { Hash[:foo => 'bar'] }
+  context 'when the value is a virtus object' do
+    let(:primitive) { Class.new { include Virtus } }
 
-    context 'when the options include the model' do
-      let(:object)         { described_class.new(attribute_name, :primitive => model) }
-      let(:model)          { mock('model')                                        }
-      let(:model_instance) { mock('model_instance') }
-
-      before do
-        model.should_receive(:new).with(value).and_return(model_instance)
-      end
-
-      it { should be(model_instance) }
-    end
-
-    context 'with the default OpenStruct model' do
-      let(:model_instance) { OpenStruct.new(value) }
-
-      context 'when the options are an empty Hash' do
-        let(:object) { described_class.new(attribute_name, {}) }
-
-        it { should == model_instance }
-      end
-
-      context 'when the options are not provided' do
-        let(:object) { described_class.new(attribute_name) }
-
-        it { should == model_instance }
-      end
-    end
+    it { should be(value) }
   end
 
-  context 'when the value is not a hash' do
-    let(:object) { described_class.new(attribute_name) }
-    let(:value)  { mock('value')                       }
-
-    before { model.should_not_receive(:new) }
+  context 'when the value is a virtus value object' do
+    let(:primitive) { Class.new { include Virtus::ValueObject } }
 
     it { should be(value) }
   end

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

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Virtus::Attribute::EmbeddedValue::FromOpenStruct, '#coerce' do
+  subject { object.coerce(value) }
+
+  let(:primitive) { OpenStruct }
+
+  let(:object) do
+    described_class.new(:name, :primitive => primitive)
+  end
+
+  context 'when the value is a primitive instance' do
+    let(:value) { primitive.new }
+
+    it { should be(value) }
+  end
+
+  context 'when the value is a hash' do
+    let(:value)    { Hash[:foo => 'bar'] }
+    let(:instance) { mock('instance') }
+
+    before do
+      primitive.should_receive(:new).with(value).and_return(instance)
+    end
+
+    it { should be(instance) }
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Virtus::Attribute::EmbeddedValue::FromStruct, '#coerce' do
+  subject { object.coerce(value) }
+
+  let(:primitive) { Struct.new(:x, :y) }
+
+  let(:object) do
+    described_class.new(:name, :primitive => primitive)
+  end
+
+  context 'when the value is a primitive instance' do
+    let(:value) { primitive.new }
+
+    it { should be(value) }
+  end
+
+  context 'when the value is an array' do
+    let(:value)    { [ 1 ,2 ] }
+    let(:instance) { mock('instance') }
+
+    before do
+      primitive.should_receive(:new).with(*value).and_return(instance)
+    end
+
+    it { should be(instance) }
+  end
+end

data/spec/unit/virtus/attribute/object/class_methods/descendants_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Virtus::Attribute::Object, '.descendants' do
   subject { described_class.descendants.map { |c| c.to_s }.sort }
 
+  before { pending 'Remove this spec in favor of Virtus::DescentantsTracker spec' }
+
   let(:known_descendants) do
     [ Virtus::Attribute::EmbeddedValue, Virtus::Attribute::Symbol,
       Virtus::Attribute::Time,          Virtus::Attribute::String,

data/spec/unit/virtus/class_methods/{attributes_spec.rb → attribute_set_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Virtus::ClassMethods, '#attributes' do
-  subject { object.attributes }
+describe Virtus::ClassMethods, '#attribute_set' do
+  subject { object.attribute_set }
 
   let(:object) { Class.new { extend Virtus::ClassMethods } }
 

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

@@ -9,7 +9,7 @@ describe Virtus::ClassMethods, '#attribute' do
   let(:type)       { Virtus::Attribute::String    }
 
   def assert_attribute_added(klass, name, attribute_class)
-    attributes = klass.attributes
+    attributes = klass.attribute_set
     attributes[name].should be_nil
     subject
     attribute = attributes[name]

data/spec/unit/virtus/{class_methods → extensions}/allowed_writer_methods_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Virtus::ClassMethods, '#allowed_writer_methods' do
+describe Virtus::Extensions, '#allowed_writer_methods' do
   subject { object.allowed_writer_methods }
 
   let(:object) do

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

@@ -6,7 +6,7 @@ describe Virtus::ValueObject, '.attribute' do
   let(:object)    { Class.new { include Virtus::ValueObject } }
   let(:name)      { :latitude                                 }
   let(:type)      { Float                                     }
-  let(:attribute) { object.attributes[name]                   }
+  let(:attribute) { object.attribute_set[name]                }
 
   it { should be(object) }
 

data/spec/unit/virtus/value_object/instance_methods/duplicates_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Virtus::ValueObject::InstanceMethods, 'duplication' do
+  let(:described_class) do
+    Class.new do
+      include Virtus::ValueObject
+
+      attribute :name, String
+    end
+  end
+
+  subject { described_class.new }
+
+  it '#clone returns the same instance' do
+    subject.should equal(subject.clone)
+  end
+
+  it '#dup returns the same instance' do
+    subject.should equal(subject.dup)
+  end
+
+end

data/virtus.gemspec

@@ -16,9 +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.3')
+  gem.add_runtime_dependency('backports', '~> 2.6.1')
 
   gem.add_development_dependency('rake',        '~> 0.9.2')
   gem.add_development_dependency('rspec',       '~> 1.3.2')
-  gem.add_development_dependency('guard-rspec', '~> 0.6.0')
+  gem.add_development_dependency('guard-rspec', '~> 1.0.0')
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Piotr Solnica
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-08 00:00:00 Z
+date: 2012-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: backports
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 21
         segments: 
         - 2
-        - 5
-        - 3
-        version: 2.5.3
+        - 6
+        - 1
+        version: 2.6.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -73,12 +73,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 6
         - 0
-        version: 0.6.0
+        version: 1.0.0
   type: :development
   version_requirements: *id004
 description: Attributes on Steroids for Plain Old Ruby Objects
@@ -124,6 +124,8 @@ files:
 - lib/virtus/attribute/default_value/from_clonable.rb
 - lib/virtus/attribute/default_value/from_symbol.rb
 - lib/virtus/attribute/embedded_value.rb
+- lib/virtus/attribute/embedded_value/from_open_struct.rb
+- lib/virtus/attribute/embedded_value/from_struct.rb
 - lib/virtus/attribute/float.rb
 - lib/virtus/attribute/hash.rb
 - lib/virtus/attribute/integer.rb
@@ -135,6 +137,7 @@ files:
 - lib/virtus/attribute/time.rb
 - lib/virtus/attribute_set.rb
 - lib/virtus/attributes_accessor.rb
+- lib/virtus/class_inclusions.rb
 - lib/virtus/class_methods.rb
 - lib/virtus/coercion.rb
 - lib/virtus/coercion/array.rb
@@ -152,7 +155,9 @@ files:
 - lib/virtus/coercion/time.rb
 - lib/virtus/coercion/time_coercions.rb
 - lib/virtus/coercion/true_class.rb
+- lib/virtus/extensions.rb
 - lib/virtus/instance_methods.rb
+- lib/virtus/module_extensions.rb
 - lib/virtus/support/descendants_tracker.rb
 - lib/virtus/support/equalizer.rb
 - lib/virtus/support/options.rb
@@ -164,8 +169,12 @@ files:
 - spec/integration/default_values_spec.rb
 - spec/integration/defining_attributes_spec.rb
 - spec/integration/embedded_value_spec.rb
+- spec/integration/extending_objects_spec.rb
 - spec/integration/mass_assignment_with_accessors_spec.rb
 - spec/integration/overriding_virtus_spec.rb
+- spec/integration/struct_as_embedded_value_spec.rb
+- spec/integration/using_modules_spec.rb
+- spec/integration/value_object_with_custom_constructor_spec.rb
 - spec/integration/virtus/instance_level_attributes_spec.rb
 - spec/integration/virtus/value_object_spec.rb
 - spec/rcov.opts
@@ -214,8 +223,11 @@ files:
 - spec/unit/virtus/attribute/define_accessor_methods_spec.rb
 - spec/unit/virtus/attribute/define_reader_method_spec.rb
 - spec/unit/virtus/attribute/define_writer_method_spec.rb
+- spec/unit/virtus/attribute/embedded_value/class_methods/determine_type_spec.rb
 - spec/unit/virtus/attribute/embedded_value/class_methods/merge_options_spec.rb
 - spec/unit/virtus/attribute/embedded_value/coerce_spec.rb
+- spec/unit/virtus/attribute/embedded_value/from_open_struct/coerce_spec.rb
+- spec/unit/virtus/attribute/embedded_value/from_struct/coerce_spec.rb
 - spec/unit/virtus/attribute/float/coerce_spec.rb
 - spec/unit/virtus/attribute/get_spec.rb
 - spec/unit/virtus/attribute/inspect_spec.rb
@@ -243,9 +255,8 @@ files:
 - spec/unit/virtus/attributes_accessor/define_reader_method_spec.rb
 - spec/unit/virtus/attributes_accessor/define_writer_method_spec.rb
 - spec/unit/virtus/attributes_accessor/inspect_spec.rb
-- spec/unit/virtus/class_methods/allowed_writer_methods_spec.rb
+- spec/unit/virtus/class_methods/attribute_set_spec.rb
 - spec/unit/virtus/class_methods/attribute_spec.rb
-- spec/unit/virtus/class_methods/attributes_spec.rb
 - spec/unit/virtus/class_methods/const_missing_spec.rb
 - spec/unit/virtus/class_methods/inherited_spec.rb
 - spec/unit/virtus/coercion/array/class_methods/to_set_spec.rb
@@ -308,6 +319,7 @@ files:
 - 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/extensions/allowed_writer_methods_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
@@ -323,6 +335,7 @@ files:
 - 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/initialize_spec.rb
+- spec/unit/virtus/value_object/instance_methods/duplicates_spec.rb
 - spec/unit/virtus/value_object/instance_methods/with_spec.rb
 - tasks/metrics/ci.rake
 - tasks/metrics/flay.rake