purzelrakete-restful 0.2.2 → 0.2.3

data/lib/restful/converters/active_record.rb

@@ -5,7 +5,6 @@ module Restful
   module Converters
     class ActiveRecord
       def self.convert(model, config, options = {})
-
         published = []
         nested = config.nested?
 
@@ -15,15 +14,10 @@ module Restful
             :path => model.restful_path,
             :url => model.restful_url
         })
-                
+        
         # simple attributes
-        resource.values += Restful::Rails.tools.simple_attributes_on(model).map do |attribute|
-          key, value = attribute
-          
-          if config.published?(key.to_sym)
-            published << key.to_sym
-            Restful.attr(key.to_sym, value, compute_extended_type(model, key))
-          end
+        resource.values += Restful::Rails.tools.simple_attributes_on(model).map do |key, value|          
+          convert_to_simple_attribute(key, value, config, published, model)
         end.compact
 
         # has_many, has_one
@@ -91,6 +85,14 @@ module Restful
         
         resource
       end
+
+      def self.convert_to_simple_attribute(key, value, config,  published, model = nil)
+        if config.published?(key.to_sym)
+          published << key.to_sym
+          ext_type = (model ? compute_extended_type(model, key) : value.class.to_s.underscore.to_sym)
+          Restful.attr(key.to_sym, value, ext_type)
+        end
+      end
       
       private
    

data/lib/restful/rails/active_record/configuration.rb

@@ -8,7 +8,8 @@ module Restful
         def self.included(base)
           base.send :class_inheritable_accessor, :restful_config
           base.restful_config = Config.new
-          base.send :include, InstanceMethods
+          base.send :include, ResourceInstanceMethods
+          base.send :include, CommonInstanceMethods
           base.extend(ClassMethods)
         end
         
@@ -27,26 +28,50 @@ module Restful
             self.restful_config = Restful.cfg(*fieldnames)
           end
         end
-    
-        module InstanceMethods
-          
+        
+        module CommonInstanceMethods
           #
           #  converts this AR object to an apimodel object. per default, only the
           #  attributes in self.class.restful_config are shown. this can be overriden
           #  by passing in something like @pet.to_restful(:name, :species).
           #
-          def to_restful(config = self.class.restful_config)
-
+          def to_restful(config = nil)
+            config ||= self.class.restful_config if self.class.respond_to?(:restful_config)
+            config ||= []
+            
             if config && !config.is_a?(Config)
              config = Config.new(config)
             end
             
-            config.whitelisted = self.class.restful_config.whitelisted if config.whitelisted.empty?
-            config.restful_options.merge! self.class.restful_config.restful_options
+            if self.class.respond_to?(:restful_config)
+              config.whitelisted = self.class.restful_config.whitelisted if config.whitelisted.empty?
+              config.restful_options.merge! self.class.restful_config.restful_options
+            end
             
-            Restful::Converters::ActiveRecord.convert(self, config)
+            # array
+            if self.is_a?(Array)
+              elements = self.map do |el| 
+                raise TypeError.new("Not all array elements respond to #to_restful. ") unless el.respond_to?(:to_restful)
+                Restful::Converters::ActiveRecord.convert(el, el.class.restful_config)
+              end
+              
+              element_name = elements.first ? elements.first.name.pluralize : "nil-classes"
+              Restful.collection(element_name, elements, :array)
+            else
+              Restful::Converters::ActiveRecord.convert(self, config)
+            end
           end
           
+          # FIXME: read Restful::Serializers::Base.serializers. Load order problems?
+          [:xml, :json, :atom_like].each do |format|
+            define_method("to_restful_#{ format }") do |*args|
+              self.to_restful(*args).serialize(format)
+            end            
+          end
+        end
+    
+        module ResourceInstanceMethods
+                    
           # simple method through which a model should know it's own name. override this where necessary. 
           def restful_url(url_base = Restful::Rails.api_hostname)
             "#{ url_base }#{ restful_path }"
@@ -55,13 +80,6 @@ module Restful
           def restful_path
             "/#{ self.class.to_s.tableize }/#{ self.to_param }"
           end
-          
-          # FIXME: read out Restful::Serializers::Base.serializers. Load order problems?
-          [:xml, :json, :atom_like].each do |format|
-            define_method("to_restful_#{ format }") do |*args|
-              self.to_restful(*args).serialize(format)
-            end            
-          end
         end
         
         class Config # configures what attributes are exposed to the api. for a single resource.
@@ -117,4 +135,5 @@ module Restful
   end
 end
 
-ActiveRecord::Base.send :include, Restful::Rails::ActiveRecord::Configuration
+ActiveRecord::Base.send :include, Restful::Rails::ActiveRecord::Configuration
+Array.send :include, Restful::Rails::ActiveRecord::Configuration::CommonInstanceMethods

data/lib/restful/serializers/hash_serializer.rb

@@ -11,37 +11,35 @@ module Restful
 
       
       def serialize(resource, options = {})
-        params = {}
-        
+        params = { "restful_url" => resource.full_url }
         resource.values.each do |value|
-          if value.type == :collection # serialize the stuffs
-            resources = value.value
-            next if resources.empty?
-            name = resources.first.name.pluralize
-            
-            array = []
-            resources.each do |r|
-              array << serialize(r)
-            end
-            
-            params[hashify_key(value.name)] = array
-          elsif value.type == :link
-            params[hashify_key(value.name)] = Restful::Rails.tools.dereference(value.value)
-          elsif value.type == :resource
-            params[hashify_key(value.name)] = serialize(value)
-          else # plain ole
-            params[hashify_key(value.name)] = formatted_value(value)
-          end
+          params[hashify_key(value.name)] = serialize_value(value)
         end
-        
-        params["restful_url"] = resource.full_url
         params
       end
       
       private
+      
         def hashify_key(original_key)
           original_key.to_s.tr("-", "_").to_sym
         end
+        
+        def serialize_value(value)
+          case value.type
+            when :collection then serialize_collection(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/restful.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "restful"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
   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/people.json.yaml

@@ -65,5 +65,6 @@ bloggs_da_pet_hater:
       },
       "current_location": "Under a tree",
       "name": "Joe Bloggs",
+      "pets": [],
       "created_at": "<%= @person.created_at.xmlschema %>"
     }

data/test/test_helper.rb

@@ -99,7 +99,7 @@ end
 def puts_hash_diff(hash1, hash2, indent = 0)
   return if hash1 == hash2
   
-  (hash1.keys + hash2.keys).uniq.each do |key|
+  ((hash1 || {}).keys + (hash2 || {}).keys).uniq.each do |key|
     next if hash1[key] == hash2[key]
     print "  "*indent
     if hash1[key].is_a? Hash or hash2[key].is_a? Hash

metadata

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