attrio 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f38f08eb9c96c9bc68668f4b28bacece08cd119b
-  data.tar.gz: 982476ccb901dc19c20c37f8f1509d5614ebda47
+  metadata.gz: c37cd18841fadc28823ecaa640d6305070784769
+  data.tar.gz: fbff0c3dac7fba2297dc760ba7483110cd15343c
 SHA512:
-  metadata.gz: ccb357e02fcadfde2302b69f4c773379c75a980631cda62d043d2e4d1ffa12afd43417e09bea001c6826bffdd44a1f41193776f0130546850351e6b88e47eb88
-  data.tar.gz: 8649db1c408b5db579bd4cc8775d642dbe71056e0ea7095b00587f8fa3089fe8b59bf0527305317b1ba0b18814f182ce391ff6fce756ec3eda2470c434c45c32
+  metadata.gz: abd5ad3981872e97d9d9c82702949583663265c4a20aef0c3844aa0793adaefb847a8e864e5884464c1a9ee960e56fb9d86eafba735f3dd0000d83fd117bed52
+  data.tar.gz: 5cc8f267baabd969c5d4d54a8eb0ee37260b542777f8a8a28987d63de7ddc3ab256f4ef9967d64e6bd7834d16a27b6bed23f25027d9ef1ddde7d1fe785099248

data/README.md

@@ -29,7 +29,7 @@ Include Attrio into your class and then use `#define_attributes` block to declar
 ```ruby
 class User
   include Attrio
-	
+
   define_attributes do
   	attr :name, String
     attr :age, Integer
@@ -46,10 +46,10 @@ By default Attrio defines `#attributes` accessor which contains `Hash` with attr
  * reader method visibility
  * instance variable name
  * additional options
- 
+
 ```ruby
 user = User.new
-user.attributes 
+user.attributes
 # => {
 #	:name => #<Attrio::Attribute:0x007fc44e8ca680 @object=#<User:0x007fc44e8b2b48>, @name="name", @type=String, @options={}, @writer_method_name="name=", @writer_visibility=:public, @instance_variable_name="@name", @reader_method_name="name", @reader_visibility=:public>,
 #	:age => #<Attrio::Attribute:0x007fc44e8d4c98 @object=#<User:0x007fc44e8b2b48>, @name="age", @type=Attrio::Types::Integer, @options={}, @writer_method_name="age=", @writer_visibility=:public, @instance_variable_name="@age", @reader_method_name="age", @reader_visibility=:public>,
@@ -71,17 +71,17 @@ Accessor name can be easily overridden by passing `:as` option to `define_attrib
 ```ruby
 class User
   include Attrio
-	
+
   define_attributes :as => 'api_attributes' do
   	attr :name, String
     attr :age, Integer
     attr :birthday, DateTime
   end
-  
+
   define_attributes :as => 'settings' do
     attr :receives_notifications, Boolean, :default => true
   end
-  
+
 end
 ```
 
@@ -113,7 +113,7 @@ class Page
     # default from a method name as symbol
     attr :editor_title, String,  :default => :default_editor_title
   end
-  
+
   def initialize(attributes = {})
     self.attributes = attributes
   end
@@ -129,7 +129,7 @@ class Page
       title
     else
       title.present? ? "UNPUBLISHED: #{title}" : "UNPUBLISHED"
-    end    
+    end
   end
 end
 ```
@@ -142,7 +142,7 @@ p = Page.new
 p.attributes[:editor_title].default?
 => true
 p.editor_title = 'PUBLISHED'
-=> "PUBLISHED" 
+=> "PUBLISHED"
 p.attributes[:editor_title].default?
 => false
 ```
@@ -163,7 +163,7 @@ module MassAssignment
   end
 end
 
-class City  
+class City
   include Attrio
   include MassAssignment
 
@@ -204,12 +204,12 @@ user.address.city.name
 
 ### Methods visibility
 
-Don't want your accessors to be public? Visibility can be overridden easily. 
+Don't want your accessors to be public? Visibility can be overridden easily.
 
 ```ruby
 class User
   include Attrio
-	
+
   define_attributes do
   	attr :name, String, :writer => :protected
     attr :secret_rating, Integer, :reader => :private
@@ -224,8 +224,8 @@ Any Ruby class can be passed as type to Attrio. If this class responds to `typec
 ```ruby
 class Klass
   include Attrio
-	
-  define_attributes do  	
+
+  define_attributes do
   	attr :custom_attribute, CustomClass
   end
 end
@@ -240,10 +240,10 @@ By default boolean typecasts 'yes', '1', 1, 'true' as `TrueClass` and all other
 ```ruby
 class Klass
   include Attrio
-	
+
   define_attributes do
   	attr :boolean_attribute, Boolean
-  	
+
   	attr :custom_boolean_attribute, Boolean, :yes => ['ja', '1', 1]
   	# attr :custom_boolean_attribute, Boolean, :yes_values => ['ja', '1', 1]
   	# attr :custom_boolean_attribute, Boolean, :no => ['nein', '0', 0]
@@ -259,12 +259,12 @@ These three class have similar behaviour and options. By passing `:format` optio
 ```ruby
 class Klass
   include Attrio
-	
+
   define_attributes do
   	attr :date_attribute, Date
   	attr :time_attribute, Time
   	attr :date_time_attribute, DateTime
-  	
+
 	attr :custom_date_time_attribute, DateTime, :format => '%m/%d/%y-%H:%M:%S-%z'
   end
 end
@@ -277,7 +277,7 @@ Attribute will be typecasted using `to_f` method.
 ```ruby
 class Klass
   include Attrio
-	
+
   define_attributes do
   	attr :float_attribute, Float
   end
@@ -293,7 +293,7 @@ Optional `:base` parameter can be passed, during the typecast attribute will be
 ```ruby
 class Klass
   include Attrio
-	
+
   define_attributes do
   	attr :integer_attribute, Integer
   	attr :custom_integer_attribute, Integer, :base => 2
@@ -305,12 +305,12 @@ end
 
 Attribute will be typecasted using `to_sym` method.
 
-If Optional `:underscore` parameter is passed, then attribute value will be downcased and underscored before calling `to_sym`. 
+If Optional `:underscore` parameter is passed, then attribute value will be downcased and underscored before calling `to_sym`.
 
 ```ruby
 class Klass
   include Attrio
-	
+
   define_attributes do
   	attr :symbol_attribute, Symbol
   	attr :custom_symbol_attribute, Symbol, :underscore => true
@@ -341,7 +341,7 @@ Attrio adds its own `#inspect` method when included to the class. This overridde
 ```ruby
 class Klass
   include Attrio
-	
+
   define_attributes :inspect => false do
   	attr :attribute, String
   end
@@ -369,6 +369,7 @@ Contributors:
 
 * [Igor Alexandrov](http://igor-alexandrov.github.com/)
 * [Julia Egorova](https://github.com/vankiru)
+* [Dmitry Radionov](https://github.com/Gikls)
 
 ## License
 

data/lib/attrio/builders/writer_builder.rb

@@ -25,7 +25,7 @@ module Attrio
         klass.send :define_method, options[:method_name] do |value|
           if !value.nil?
             value = if type.respond_to?(:typecast) && type.respond_to?(:typecasted?)
-              type.typecasted?(value) ? value : type.typecast(*[value, options])
+              type.typecasted?(value, options) ? value : type.typecast(*[value, options])
             else
               type == Hash && value.is_a?(Hash) ? value : type.new(value)
             end

data/lib/attrio/types/array.rb

@@ -5,8 +5,7 @@ module Attrio
     class Array < Base
       def self.typecast(value, options = {})
         begin
-          array = value.respond_to?(:split) ? value.split(options[:split]) : Attrio::Helpers.to_a(value)
-
+          array = (!value.is_a?(Array) && value.respond_to?(:split)) ? value.split(options[:split]) : Attrio::Helpers.to_a(value).flatten!
           if options[:element].present?
             type = Attrio::AttributesParser.cast_type(self.element_type(options[:element]))
             options = self.element_options(options[:element])
@@ -26,8 +25,13 @@ module Attrio
         end
       end
 
-      def self.typecasted?(value)
-        value.is_a? ::Array
+      def self.typecasted?(value, options = {})
+        if options[:element].present?
+          type = Attrio::AttributesParser.cast_type(self.element_type(options[:element]))
+          value.is_a?(::Array) && !value.any?{ |e| !e.is_a?(type) }
+        else
+          value.is_a?(::Array)
+        end
       end
 
     protected

data/lib/attrio/types/base.rb

@@ -9,7 +9,7 @@ module Attrio
         raise NotImplementedError
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         false
       end
 

data/lib/attrio/types/boolean.rb

@@ -14,7 +14,7 @@ module Attrio
         end
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         value.is_a?(TrueClass) || value.is_a?(FalseClass)
       end
 

data/lib/attrio/types/date.rb

@@ -11,7 +11,7 @@ module Attrio
         end
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         value.is_a? ::Date
       end
     end

data/lib/attrio/types/date_time.rb

@@ -11,7 +11,7 @@ module Attrio
         end
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         value.is_a? ::DateTime
       end
     end

data/lib/attrio/types/float.rb

@@ -11,7 +11,7 @@ module Attrio
         end
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         value.is_a? ::Float
       end
     end

data/lib/attrio/types/integer.rb

@@ -14,7 +14,7 @@ module Attrio
         end
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         value.is_a? ::Integer
       end
     end

data/lib/attrio/types/set.rb

@@ -26,7 +26,7 @@ module Attrio
         end
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         value.is_a? ::Set
       end
     end

data/lib/attrio/types/symbol.rb

@@ -12,7 +12,7 @@ module Attrio
         end
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         value.is_a? ::Symbol
       end
     end

data/lib/attrio/types/time.rb

@@ -11,7 +11,7 @@ module Attrio
         end      
       end
 
-      def self.typecasted?(value)
+      def self.typecasted?(value, options = {})
         value.is_a? ::Time
       end
     end

data/lib/attrio/version.rb

@@ -4,7 +4,7 @@ module Attrio
   module Version
     MAJOR = 0
     MINOR = 7
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attrio
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Igor Alexandrov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec