purzelrakete-restful 0.2.8 → 0.2.9

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

@@ -73,7 +73,11 @@ module Restful
                         
             elsif self.is_a?(Hash)
               elements = self.map do |k,v|
-                value = v.respond_to?(:to_restful) ? Restful::Converters::ActiveRecord.convert(v, v.class.restful_config) : v
+                if v.respond_to?(:to_restful) and v.class.respond_to?(:restful_config)
+                  value = Restful::Converters::ActiveRecord.convert(v, v.class.restful_config)
+                else
+                  value =  v.respond_to?(:to_restful) ? v.to_restful : v
+                end
                 Restful::ApiModel::Attribute.new(k, value, :map)
               end
               

data/restful.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "restful"
-  s.version = "0.2.8"
+  s.version = "0.2.9"
   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

@@ -72,9 +72,23 @@ bloggs_da_pet_hater:
 hash_with_person:
   |
     { 
-      "total_hits": 10, 
+      "total_hits": 1, 
       "a_person": {
         "restful_url": "http://example.com:3000/people/<%= @person.to_param %>",
         "name": "Joe Bloggs"
       }
+    }
+    
+hash_with_people:
+  |
+    { 
+      "total_hits": 2, 
+      "people": [{
+        "restful_url": "http://example.com:3000/people/<%= @person.to_param %>",
+        "name": "Joe Bloggs"
+      },
+      {
+        "restful_url": "http://example.com:3000/people/<%= @person.to_param %>",
+        "name": "Joe Bloggs"
+      }]
     }

data/test/rails/restful_publish_test.rb

@@ -26,7 +26,7 @@ context "restful publish" do
     @pet = @person.pets.create(:name => "Mietze")
 
     @pet.to_restful(:include => :owner).values.map(&:name).should.include :owner
-    Pet.restful_config.whitelisted.should.not.include? :owner
+    Pet.restful_config.whitelisted.include?(:owner).should.equal false
   end
 end
 

data/test/serializers/json_serializer_test.rb

@@ -72,6 +72,11 @@ context "json serializer" do
   
   specify "should be able to serialize a map" do
     Person.restful_publish(:name)
-    json_should_eql_fixture({ "total_hits" => 10, "a_person" => @person }.to_restful_json, "people", :hash_with_person)
+    json_should_eql_fixture({ "total_hits" => 1, "a_person" => @person }.to_restful_json, "people", :hash_with_person)
+  end
+  
+  specify "should be able to serialize a map with arrays as values" do
+    Person.restful_publish(:name)
+    json_should_eql_fixture({ "total_hits" => 2, "people" => [ @person, @person ] }.to_restful_json, "people", :hash_with_people)
   end
 end

metadata

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