purzelrakete-restful 0.2.15 → 0.2.16

data/CHANGES.markdown

@@ -26,3 +26,7 @@
   - 0.2.15
 
     * :includes like active record to_xml to_json
+
+21. Aug 2009
+
+* refactored HashSerializer to be much clearer

data/lib/restful/apimodel/map.rb

@@ -8,7 +8,7 @@ module Restful
 
       def initialize(name)
         self.name = name
-        self.type = :hash
+        self.type = :map
         self.values = []
       end
 

data/lib/restful/serializers/base.rb

@@ -6,18 +6,18 @@ module Restful
     class Base
       cattr_accessor :serializers
       
-      def serialize(resource, options = {}) # implement me. 
+      def serialize(resource, options = {})
         raise NotImplementedError.new
       end
       
-      def deserialize(resource, options = {}) # implement me. 
+      def deserialize(resource, options = {})
         raise NotImplementedError.new        
       end
       
       #
       #  Grabs a serializer, given...
       #
-      #    .serialize(:xml, Resource.new(:animal => "cow"))
+      #    #serialize :xml, Resource.new(:animal => "cow")
       #
       def self.serializer(type)
         serializers[type].new
@@ -28,20 +28,21 @@ module Restful
         self.serializers[key] = self
       end
       
-      def formatted_value(value)
-        return value unless value.respond_to?(:value)
+      def serialize_attribute(attribute)
+        return formatted_ruby_type(attribute) unless attribute.respond_to?(:value)
+        return nil if attribute.value.blank? && attribute.extended_type != :false_class
         
-        return nil if value.value.blank? && value.extended_type != :false_class
-        case value.extended_type
-        when :datetime
-          value.value.xmlschema
-        when :time
-          value.value.xmlschema
-        when :date
-          value.value.to_s(:db)
-        else
-          value.value
-        end        
+        formatted_ruby_type(attribute.value)
+      end
+      
+      def formatted_ruby_type(obj)
+        case obj
+          when DateTime then obj.xmlschema
+          when Time     then obj.xmlschema
+          when Date     then obj.to_s(:db)
+          else
+            obj
+          end
       end
       
       protected

data/lib/restful/serializers/hash_serializer.rb

@@ -1,7 +1,7 @@
 require 'restful/serializers/base'
 
 #
-#  AR params hash.
+#  Vanilla Hash.
 #
 module Restful
   module Serializers
@@ -9,49 +9,37 @@ module Restful
       
       serializer_name :hash
       
-      def serialize(resource, options = {})
-        case resource
-        when Restful::ApiModel::Collection then serialize_collection(resource)
-        when Restful::ApiModel::Resource   then serialize_tuples(resource.values, resource.full_url)
-        when Restful::ApiModel::Map        then serialize_map(resource)
-        else
-          serialize_tuples(resource.values, resource.full_url)
-        end
+      def serialize(obj, options = {})
+        case obj.type
+          when :link              then obj.value
+          when :simple_attribute  then serialize(obj.value)
+          when :collection        then serialize_collection(obj)
+          when :map               then serialize_array_of_apimodels(obj.values)
+          when :resource          then serialize_array_of_apimodels(obj.values, { "restful_url" => obj.full_url })
+          else
+            formatted_ruby_type(obj)
+          end
       end
-
+      
       private      
         
         def serialize_collection(collection)
-          values = collection.value.map { |r| serialize(r) }
-        
           if entries = collection.total_entries
-            values = { :total_entries => entries, collection.name => values }
+            { :total_entries => entries, collection.name => serialize_unpaginated_collection(collection) }
+          else
+            serialize_unpaginated_collection(collection)
           end
-        
-          values
         end
         
-        def serialize_map(map)
-          map.values.inject({}) do |memo, attribute|
-            memo[attribute.name] = serialize_value(attribute.value)
-            memo
-          end
-        end
-        
-        def serialize_tuples(tuples, url)
-          tuples.inject({ "restful_url" => url }) do |params, value|
-            params[value.name.to_s.tr("-", "_").to_sym] = serialize_value(value)
-            params
-          end
+        def serialize_unpaginated_collection(collection)
+          collection.value.map { |r| serialize(r) }
         end
         
-        def serialize_value(value)
-          case value.type
-            when :collection then serialize_collection(value)
-            when :link       then value.value
-            when :resource   then serialize(value)
-            else                  formatted_value(value)
-          end
+        def serialize_array_of_apimodels(apimodels, defaults = {})
+          apimodels.inject(defaults) do |memo, apimodel|
+            memo[apimodel.name.to_s.underscore.to_sym] = serialize(apimodel)
+            memo
+          end          
         end
     end
   end

data/lib/restful/serializers/json_serializer.rb

@@ -11,9 +11,7 @@ module Restful
       serializer_name :json
       
       def serialize(resource, options = {})
-        hasher = Restful::Serializers::HashSerializer.new
-        hash = hasher.serialize(resource, options)
-        Yajl::Encoder.encode(hash)
+        Yajl::Encoder.encode HashSerializer.new.serialize(resource, options)
       end
     end
   end

data/lib/restful/serializers/xml_serializer.rb

@@ -71,7 +71,7 @@ module Restful
           if value.extended_type == :hash
             build_hash(builder, value)
           else
-            builder.tag!(value.name.to_s.dasherize, formatted_value(value), decorations(value))
+            builder.tag!(value.name.to_s.dasherize, serialize_attribute(value), decorations(value))
           end
         end
         

data/restful.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "restful"
-  s.version = "0.2.15"
+  s.version = "0.2.16"
   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/serializers/xml_serializer_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
-context "params serializer" do
+context "xml serializer" do
   setup do 
     Person.restful_publish(:name, :current_location, :pets, :wallet, :created_at)
     Pet.restful_publish(:name)

metadata

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