virtus 0.0.5 → 0.0.6

data/lib/virtus/attribute/array.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage:
+    # Array
     #
+    # @example
     #   class Post
     #     include Virtus
     #
@@ -10,9 +11,11 @@ module Virtus
     #   end
     #
     #   post = Post.new(:tags => %w(red green blue))
+    #
     class Array < Object
-      primitive ::Array
-      complex   true
+      primitive       ::Array
+      coercion_method :to_array
+
     end # class Array
   end # class Attribute
 end # module Virtus

data/lib/virtus/attribute/boolean.rb

@@ -4,8 +4,7 @@ module Virtus
     # Bolean attribute allows true or false values to be set
     # Additionally it adds boolean reader method, like "admin?"
     #
-    # Example usage:
-    #
+    # @example
     #   class Post
     #     include Virtus
     #
@@ -16,7 +15,8 @@ module Virtus
     #   post.published?  # => false
     #
     class Boolean < Object
-      primitive TrueClass
+      primitive       TrueClass
+      coercion_method :to_boolean
 
       # Returns if the given value is either true or false
       #
@@ -33,40 +33,21 @@ module Virtus
         value.equal?(true) || value.equal?(false)
       end
 
-      # Coerce value into true or false
-      #
-      # @see Virtus::Typecast::Boolean.call
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      def typecast_to_primitive(value)
-        Typecast::Boolean.call(value)
-      end
-
       # Creates standard and boolean attribute reader methods
       #
-      # @param [Class] model
+      # @param [Module] mod
       #
       # @return [self]
       #
       # @api private
-      def add_reader_method(model)
+      def define_reader_method(mod)
         super
 
-        name        = self.name
-        method_name = "#{name}?"
-
-        model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          module AttributeMethods   # module AttributeMethods
-            def #{method_name}      #   def active?
-              #{name}               #     @active
-            end                     #   end
-          end                       # end
-          include AttributeMethods  # include AttributeMethods
-        RUBY
+        reader_method_name = "#{name}?"
+        attribute          = self
 
-        model.send(reader_visibility, method_name)
+        mod.send(:define_method,    reader_method_name) { attribute.get(self) }
+        mod.send(reader_visibility, reader_method_name)
 
         self
       end

data/lib/virtus/attribute/date.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage:
+    # Date
     #
+    # @example
     #   class Post
     #     include Virtus
     #
@@ -15,22 +16,18 @@ module Virtus
     #   Post.new(:published_on => '2011/06/09')
     #
     #   # typecasting from a hash
-    #   Post.new(:published_on => { :year => 2011, :month => 6, :day => 9 })
+    #   Post.new(:published_on => {
+    #     :year  => 2011,
+    #     :month => 6,
+    #     :day   => 9,
+    #   })
     #
     #   # typecasting from an object which implements #to_date
     #   Post.new(:published_on => DateTime.now)
     #
     class Date < Object
-      primitive ::Date
-
-      # @see Virtus::Typecast::Time.to_date
-      #
-      # @return [Date]
-      #
-      # @api private
-      def typecast_to_primitive(value)
-        Typecast::Time.to_date(value)
-      end
+      primitive       ::Date
+      coercion_method :to_date
 
     end # class Date
   end # class Attribute

data/lib/virtus/attribute/date_time.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage:
+    # DateTime
     #
+    # @example
     #   class Post
     #     include Virtus
     #
@@ -16,22 +17,19 @@ module Virtus
     #
     #   # typecasting from a hash
     #   Post.new(:published_on => {
-    #     :year => 2011, :month => 6, :day => 9, :hour => 10, :minutes => 48 })
+    #     :year  => 2011,
+    #     :month => 6,
+    #     :day   => 9,
+    #     :hour  => 10,
+    #     :min   => 48,
+    #   })
     #
     #   # typecasting from an object which implements #to_datetime
     #   Post.new(:published_on => Time.now)
     #
     class DateTime < Object
-      primitive ::DateTime
-
-      # @see Virtus::Typecast::Time.to_datetime
-      #
-      # @return [DateTime]
-      #
-      # @api private
-      def typecast_to_primitive(value)
-        Typecast::Time.to_datetime(value)
-      end
+      primitive       ::DateTime
+      coercion_method :to_datetime
 
     end # class DateTim
   end # class Attribute

data/lib/virtus/attribute/decimal.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage:
+    # Decimal
     #
+    # @example
     #   class ExchangeRate
     #     include Virtus
     #
@@ -12,16 +13,8 @@ module Virtus
     #   ExchangeRate.new(:dollar => '2.6948')
     #
     class Decimal < Numeric
-      primitive ::BigDecimal
-
-      # @see Virtus::Typecast::Numeric.to_d
-      #
-      # @return [BigDecimal]
-      #
-      # @api private
-      def typecast_to_primitive(value)
-        Typecast::Numeric.to_d(value)
-      end
+      primitive       ::BigDecimal
+      coercion_method :to_decimal
 
     end # class Decimal
   end # class Attribute

data/lib/virtus/attribute/float.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage:
+    # Float
     #
+    # @example
     #   class ExchangeRate
     #     include Virtus
     #
@@ -21,16 +22,8 @@ module Virtus
     #   ExchangeRate.new(:dollar => BigDecimal.new('2.69')
     #
     class Float < Numeric
-      primitive ::Float
-
-      # @see Virtus::Typecast::Numeric.to_f
-      #
-      # @return [Float]
-      #
-      # @api private
-      def typecast_to_primitive(value)
-        Typecast::Numeric.to_f(value)
-      end
+      primitive       ::Float
+      coercion_method :to_float
 
     end # class Float
   end # class Attribute

data/lib/virtus/attribute/hash.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage:
+    # Hash
     #
+    # @example
     #   class Post
     #     include Virtus
     #
@@ -12,8 +13,9 @@ module Virtus
     #   Post.new(:meta => { :tags => %w(foo bar) })
     #
     class Hash < Object
-      primitive ::Hash
-      complex   true
+      primitive       ::Hash
+      coercion_method :to_hash
+
     end # class Hash
   end # class Attribute
 end # module Virtus

data/lib/virtus/attribute/integer.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage:
+    # Integer
     #
+    # @example
     #   class Post
     #     include Virtus
     #
@@ -18,16 +19,8 @@ module Virtus
     #   Post.new(:read_count => 100.0)
     #
     class Integer < Numeric
-      primitive ::Integer
-
-      # @see Virtus::Typecast::Numeric.to_i
-      #
-      # @return [Integer]
-      #
-      # @api private
-      def typecast_to_primitive(value)
-        Typecast::Numeric.to_i(value)
-      end
+      primitive       ::Integer
+      coercion_method :to_integer
 
     end # class Integer
   end # class Attribute

data/lib/virtus/attribute/numeric.rb

@@ -5,6 +5,7 @@ module Virtus
     class Numeric < Object
       primitive      ::Numeric
       accept_options :min, :max
+
     end # class Numeric
   end # class Attribute
 end # module Virtus

data/lib/virtus/attribute/object.rb

@@ -4,6 +4,7 @@ module Virtus
     # Base class for every attribute
     class Object < Attribute
       primitive ::Object
+
     end # class Object
   end # class Attribute
 end # module Virtus

data/lib/virtus/attribute/string.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage
+    # String
     #
+    # @example
     #   class User
     #     include Virtus
     #
@@ -15,16 +16,8 @@ module Virtus
     #   User.new(:name => :John)
     #
     class String < Object
-      primitive ::String
-
-      # @see Virtus::Typecast::String.call
-      #
-      # @return [String]
-      #
-      # @api private
-      def typecast_to_primitive(value)
-        Virtus::Typecast::String.call(value)
-      end
+      primitive       ::String
+      coercion_method :to_string
 
     end # class String
   end # class Attribute

data/lib/virtus/attribute/time.rb

@@ -1,8 +1,9 @@
 module Virtus
   class Attribute
 
-    # Example usage:
+    # Time
     #
+    # @example
     #   class Post
     #     include Virtus
     #
@@ -16,27 +17,19 @@ module Virtus
     #
     #   # typecasting from a hash
     #   Post.new(:published_at => {
-    #     :year    => 2011,
-    #     :month   => 6,
-    #     :day     => 9,
-    #     :hour    => 11,
-    #     :minutes => 8
+    #     :year  => 2011,
+    #     :month => 6,
+    #     :day   => 9,
+    #     :hour  => 11,
+    #     :min   => 8,
     #   })
     #
     #   # typecasting from an object which implements #to_time
     #   Post.new(:published_at => DateTime.now)
     #
     class Time < Object
-      primitive ::Time
-
-      # @see Virtus::Typecast::Time.to_time
-      #
-      # @return [Time]
-      #
-      # @api private
-      def typecast_to_primitive(value)
-        Typecast::Time.to_time(value)
-      end
+      primitive       ::Time
+      coercion_method :to_time
 
     end # class Time
   end # class Attribute

data/lib/virtus/class_methods.rb

@@ -3,6 +3,21 @@ module Virtus
   # Class methods that are added when you include Virtus
   module ClassMethods
 
+    # Hook called when module is extended
+    #
+    # @param [Class] descendant
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def self.extended(descendant)
+      super
+      descendant.extend(DescendantsTracker)
+      descendant.const_set(:AttributeMethods, Module.new)
+    end
+
+    private_class_method :extended
+
     # Defines an attribute on an object's class
     #
     # @example
@@ -29,13 +44,8 @@ module Virtus
     # @api public
     def attribute(name, type, options = {})
       attribute = Attribute.determine_type(type).new(name, options)
-
-      attribute.add_reader_method(self)
-      attribute.add_writer_method(self)
-
-      attributes << attribute
-      descendants.each { |descendant| descendant.attributes.reset }
-
+      define_attribute_methods(attribute)
+      add_attribute(attribute)
       self
     end
 
@@ -81,5 +91,30 @@ module Virtus
       Attribute.determine_type(name) || super
     end
 
+    # Define the attribute reader and writer methods in the class
+    #
+    # @param [Attribute]
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def define_attribute_methods(attribute)
+      attribute.define_reader_method(self)
+      attribute.define_writer_method(self)
+      include self::AttributeMethods
+    end
+
+    # Add the attribute to the class' and descendants' attributes
+    #
+    # @param [Attribute]
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def add_attribute(attribute)
+      attributes << attribute
+      descendants.each { |descendant| descendant.attributes.reset }
+    end
+
   end # module ClassMethods
 end # module Virtus