aduki 0.0.10 → 0.0.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6ca8a03939e3f4904afebba8a335ca2f7e3fdcc5
+  data.tar.gz: 70223137072e357aa6963fa97b3536fe14ffa93d
+SHA512:
+  metadata.gz: 7bde6768466c7cecde67f17caa5dfa0cd3c4b6956342e75affc73a4447335e6bbc4bf48dd72229456db8926bec4d900c49e297ad9a904088f082303ed8ebf1d5
+  data.tar.gz: 93dab1a3ebcb754f76edc823caea987cdabee8f1d70f24567ca2d2d3c72f91b70ec9a64cf415805fc341d94094d12360761dc83633a5f7f69119a0da1c92063c

data/lib/aduki.rb

@@ -29,6 +29,11 @@ module Aduki
     collector
   end
 
+  def self.maybe_parse_date str
+    return nil if (str == nil) || (str == '')
+    Date.parse(str)
+  end
+
   def self.to_value klass, setter, value
     return value.map { |v| to_value klass, setter, v} if value.is_a? Array
 
@@ -36,9 +41,15 @@ module Aduki
     if type.is_a? Hash
       to_typed_hash type.values.first, value
     elsif type == Date
-      Date.parse value
+      case value
+      when Date; value
+      when String; maybe_parse_date(value)
+      end
     elsif type == Time
-      Time.parse value
+      case value
+      when Time; value
+      when String; Time.parse(value)
+      end
     elsif type && (type <= Integer)
       value.to_i
     elsif type && (type <= Float)
@@ -73,22 +84,40 @@ module Aduki
     setters
   end
 
+  def self.apply_array_attribute klass, object, getter, value
+    setter_method = "#{getter}=".to_sym
+    return unless object.respond_to? setter_method
+
+    array = object.send getter
+    if array == nil
+      array = []
+      object.send(setter_method, array)
+    end
+    array << to_value(klass, getter, value)
+  end
+
+  def self.apply_single_attribute klass, object, setter, value
+    setter_method = "#{setter}=".to_sym
+    return unless object.respond_to? setter_method
+
+    object.send setter_method, to_value(klass, setter, value)
+  end
+
+  def self.apply_attribute klass, object, setter, value
+    if setter.match(/\[\d+\]/)
+      getter = setter.gsub(/\[\d+\]/, '').to_sym
+      apply_array_attribute klass, object, getter, value
+    else
+      apply_single_attribute klass, object, setter, value
+    end
+  end
+
   def self.apply_attributes object, attrs
-    setters = split_attributes attrs
+    setters = split_attributes(attrs || { })
     klass = object.class
 
     setters.sort.each do |setter, value|
-      if setter.match(/\[\d+\]/)
-        setter = setter.gsub(/\[\d+\]/, '')
-        array = object.send setter.to_sym
-        if array == nil
-          array = []
-          object.send("#{setter}=", array)
-        end
-        array << to_value(klass, setter, value)
-      else
-        object.send "#{setter}=", to_value(klass, setter, value)
-      end
+      apply_attribute klass, object, setter, value
     end
   end
 

data/lib/aduki/version.rb

@@ -1,3 +1,3 @@
 module Aduki
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: aduki
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.0.11
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rspec_numbering_formatter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: recursive attribute setting for ruby objects
@@ -50,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,27 +66,26 @@ files:
 homepage: https://github.com/conanite/aduki
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: set object attributes recursively from an attributes hash
 test_files:
 - spec/array_attribute_spec.rb