purzelrakete-restful 0.2.3 → 0.2.4

data/lib/restful/apimodel/collection.rb

@@ -9,6 +9,12 @@ module Restful
         
         self.type = :collection
       end
+      
+      # invoke serialization
+      def serialize(type)
+        serializer = Restful::Serializers::Base.serializer(type)
+        serializer.serialize(self)
+      end
     end
   end
 end

data/lib/restful/serializers/hash_serializer.rb

@@ -8,38 +8,39 @@ module Restful
     class HashSerializer < Base
       
       serializer_name :hash
-
       
       def serialize(resource, options = {})
-        params = { "restful_url" => resource.full_url }
-        resource.values.each do |value|
-          params[hashify_key(value.name)] = serialize_value(value)
-        end
-        params
+        resource.is_a?(Restful::ApiModel::Collection) ?
+          serialize_array(resource.value) :
+          serialize_collection(resource)
       end
       
-      private
+      private      
       
         def hashify_key(original_key)
           original_key.to_s.tr("-", "_").to_sym
         end
         
+        def serialize_array(resources)
+          resources.map { |r| serialize(r) }
+        end
+
+        def serialize_collection(resource)
+          resource.values.inject({ "restful_url" => resource.full_url }) do |params, value|
+            params[hashify_key(value.name)] = serialize_value(value)
+            params
+          end
+        end
+        
         def serialize_value(value)
           case value.type
-            when :collection then serialize_collection(value.value)
+            when :collection then serialize_array(value.value)
             when :link       then Restful::Rails.tools.dereference(value.value)
             when :resource   then serialize(value)
             else                  formatted_value(value)
           end
         end
-        
-        def serialize_collection(resources)
-          returning [] do |array|
-            resources.each do |r|
-              array << serialize(r)
-            end
-          end
-        end
+
     end
   end
 end

data/lib/restful/serializers/xml_serializer.rb

@@ -13,33 +13,29 @@ module Restful
       serializer_name :xml
       
       def serialize(resource, options = {})
+          
         xml = options[:builder] || Builder::XmlMarkup.new(:indent => 2)
         xml.instruct! unless options[:instruct].is_a?(FalseClass)
         
-        xml.tag!(*root_element(resource)) do
-          add_link_to(resource, xml, :self => true)
-                    
-          resource.values.each do |value|
-            
-            if value.type == :collection # serialize the stuffs
-              resources = value.value
-              if first_resource = resources.first
-                xml.tag!(first_resource.name.pluralize, collections_decorations) do
-                  resources.each do |resource|
-                    serialize(resource,  { :instruct => false, :builder => xml })
-                  end              
-                end
+        if resource.is_a?(Restful::ApiModel::Collection)
+          add_collection(resource, xml, show_as_array = false)
+        else        
+          xml.tag!(*root_element(resource)) do
+            add_link_to(resource, xml, :self => true)
+
+            resource.values.each do |value|
+              if value.type == :collection # serialize the stuffs
+                add_collection(value, xml)
+              elsif value.type == :link
+                add_link_to(value, xml)
+              elsif value.type == :resource
+                serialize(value, {:instruct => false, :builder => xml})
+              else # plain ole
+                add_tag(xml, value)
               end
-              
-            elsif value.type == :link
-              add_link_to(value, xml)
-            elsif value.type == :resource
-              serialize(value, {:instruct => false, :builder => xml})
-            else # plain ole
-              add_tag(xml, value)
             end
-          end
-        end       
+          end       
+        end
       end
       
       # returns a resource, or collection of resources. 
@@ -49,6 +45,17 @@ module Restful
       
       protected
       
+        def add_collection(value, xml, show_as_array = true)
+          resources = value.value
+          if first_resource = resources.first
+            xml.tag!(first_resource.name.pluralize, (show_as_array ? collections_decorations : {})) do
+              resources.each do |resource|
+                serialize(resource,  { :instruct => false, :builder => xml })
+              end              
+            end
+          end
+        end
+      
         def add_link_to(resource, builder, options = {})
           is_self = !!options[:self]
           

data/restful.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "restful"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Bornkessel", "Rany Keddo"] 
   s.date = "2009-08-11"

data/test/fixtures/pets.xml.yaml

@@ -18,4 +18,14 @@ gracie:
       <person-restful-url type="link">http://example.com:3000/people/<%= @person.id %></person-restful-url>
       <species>123</species>
       <name>Gracie</name>
-    </pet>
+    </pet>
+    
+pets_array:
+  |
+    <?xml version="1.0" encoding="UTF-8"?>
+    <pets>
+      <pet>
+        <restful-url type="link">http://example.com:3000/pets/<%= @pet.id %></restful-url>
+        <name>mietze</name>
+      </pet>
+    </pets>

data/test/serializers/json_serializer_test.rb

@@ -58,6 +58,7 @@ context "json serializer" do
     end
   end
   
-
-    
+  specify "should serialize collections correctly" do
+    json_should_eql_fixture(@person.pets.to_restful_json, "pets", :pets_array)
+  end    
 end

data/test/serializers/xml_serializer_test.rb

@@ -44,4 +44,8 @@ context "params serializer" do
     @person.pets.create(:species => "cat", :age => 100, :name => "motze")
     xml_should_eql_fixture(@person.to_restful_xml(:pets_ages_hash), "people", :hashy_person)
   end
-end
+  
+  specify "should serialize collections correctly" do
+    xml_should_eql_fixture(@person.pets.to_restful_xml, "pets", :pets_array)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: purzelrakete-restful
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Daniel Bornkessel