arrest 0.0.53 → 0.0.54

data/lib/arrest.rb

@@ -7,6 +7,7 @@ require "arrest/attributes/belongs_to"
 require "arrest/attributes/has_attributes"
 require "arrest/attributes/attribute"
 require "arrest/attributes/nested_attribute"
+require "arrest/attributes/nested_collection"
 require "arrest/attributes/belongs_to_attribute"
 require "arrest/attributes/has_many_attribute"
 require "arrest/attributes/has_many_sub_resource_attribute"

data/lib/arrest/attributes/attribute.rb

@@ -10,6 +10,11 @@ module Arrest
 
     def from_hash(parent, value)
       return if value == nil
+
+      if @clazz.respond_to?(:convert)
+        return @clazz.convert(value)
+      end
+
       converter = CONVERTER[@clazz]
       if converter == nil
         puts "No converter for: #{@clazz.name}"
@@ -18,8 +23,14 @@ module Arrest
       converter.convert value
     end
 
+
     def to_hash value
       return nil unless value != nil
+
+      if @clazz.respond_to?(:mk_json)
+        return @clazz.mk_json(value)
+      end
+
       converter = CONVERTER[@clazz]
       if converter == nil
         puts "No converter for: #{@clazz.name}"

data/lib/arrest/attributes/converter.rb

@@ -4,27 +4,6 @@ end
 
 module Arrest
 
-  class NestedCollection < Attribute
-    def initialize name, read_only, clazz
-      super name, read_only, clazz
-    end
-
-    def from_hash(parent, value)
-      return nil unless value != nil
-      raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
-      value.map do |v|
-        @clazz.new(parent, v)
-      end
-    end
-
-    def to_hash value
-      return nil unless value != nil
-      raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
-      value.map(&:to_hash)
-    end
-
-  end
-
   CONVERTER = {}
 
   def add_converter key, converter
@@ -53,7 +32,7 @@ module Arrest
       end
     end
   end
-  
+
   class IdentConv < Converter
     def self.convert value
       value
@@ -76,7 +55,6 @@ module Arrest
     target Array
   end
 
-
   class TimeConv < Converter
     target Time
 

data/lib/arrest/attributes/has_attributes.rb

@@ -148,8 +148,11 @@ module Arrest
           end
         else
           send :define_method, "#{attribute.name}=" do |v|
-            Arrest::debug "setter #{self.class.name} #{attribute.name} = #{v}"
-            self.attribute_values[attribute.name] = v
+            converted_v = convert(attribute, v)
+            Arrest::debug "setter #{self.class.name} #{attribute.name} = #{converted_v}"
+            self.attribute_values[attribute.name] = converted_v
+            #Arrest::debug "setter #{self.class.name} #{attribute.name} = #{v}"
+            #self.attribute_values[attribute.name] = v
           end
         end
 
@@ -174,7 +177,7 @@ module Arrest
 
       def nested_array name, clazz, options = {}
         read_only = !!options[:read_only]
-        add_attribute NestedCollection.new(name, read_only, clazz)
+        add_attribute Arrest::NestedCollection.new(name, read_only, clazz)
       end
     end
 
@@ -182,5 +185,22 @@ module Arrest
       @stubbed
     end
 
+    private
+      # attribute setter checks for proper conversion of v into attribute type
+      def convert(attribute, v)
+        clazz = attribute.clazz
+        # either as it is already the correct (||nested_array) type
+        if v == nil || v.is_a?(clazz) || (attribute.is_a?(Arrest::NestedCollection) && v.is_a?(Array))
+          converted_v = v
+        elsif clazz.respond_to?(:convert) # or its clazz implements a convert method
+          converted_v = clazz.convert(v)
+        elsif CONVERTER[clazz]            # or a converter has been registered in arrest
+          converted_v = CONVERTER[clazz].convert(v)
+        else                              # otherwise raise
+          raise ArgumentError, "Setting of attribute with type >#{clazz}< with value type >#{v.class}< failed."
+        end
+        converted_v
+      end
+
   end
-end
+end

data/lib/arrest/attributes/nested_collection.rb

@@ -0,0 +1,22 @@
+module Arrest
+
+  class NestedCollection < Attribute
+    def initialize name, read_only, clazz
+      super name, read_only, clazz
+    end
+
+    def from_hash(parent, value)
+      return nil unless value != nil
+      raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
+      value.map do |v|
+        @clazz.new(parent, v)
+      end
+    end
+
+    def to_hash value
+      return nil unless value != nil
+      raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
+      value.map(&:to_hash)
+    end
+  end
+end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.53"
+  VERSION = "0.0.54"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.54
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000Z
+date: 2012-05-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &12566020 !ruby/object:Gem::Requirement
+  requirement: &16399200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12566020
+  version_requirements: *16399200
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &12564860 !ruby/object:Gem::Requirement
+  requirement: &16398660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *12564860
+  version_requirements: *16398660
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &12525060 !ruby/object:Gem::Requirement
+  requirement: &16398100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *12525060
+  version_requirements: *16398100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12524260 !ruby/object:Gem::Requirement
+  requirement: &16397580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *12524260
+  version_requirements: *16397580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12523360 !ruby/object:Gem::Requirement
+  requirement: &16397140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12523360
+  version_requirements: *16397140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12521560 !ruby/object:Gem::Requirement
+  requirement: &16396640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12521560
+  version_requirements: *16396640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12519220 !ruby/object:Gem::Requirement
+  requirement: &16393140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *12519220
+  version_requirements: *16393140
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &12495320 !ruby/object:Gem::Requirement
+  requirement: &16392620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12495320
+  version_requirements: *16392620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &12494260 !ruby/object:Gem::Requirement
+  requirement: &16391800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12494260
+  version_requirements: *16391800
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12492320 !ruby/object:Gem::Requirement
+  requirement: &16390520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12492320
+  version_requirements: *16390520
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -144,6 +144,7 @@ files:
 - lib/arrest/attributes/has_many_attribute.rb
 - lib/arrest/attributes/has_many_sub_resource_attribute.rb
 - lib/arrest/attributes/nested_attribute.rb
+- lib/arrest/attributes/nested_collection.rb
 - lib/arrest/attributes/polymorphic_attribute.rb
 - lib/arrest/class_utils.rb
 - lib/arrest/exceptions.rb