purzelrakete-restful 0.2.4 → 0.2.5

data/lib/restful/apimodel/collection.rb

@@ -4,6 +4,8 @@
 module Restful
   module ApiModel
     class Collection < Attribute
+      attr_accessor :total_entries
+      
       def initialize(name, resources, extended_type)
         super
         

data/lib/restful/converters/active_record.rb

@@ -9,17 +9,17 @@ module Restful
         nested = config.nested?
 
         resource = Restful.resource(
-          model.class.to_s.tableize.demodulize.singularize, { 
-            :base => Restful::Rails.api_hostname, 
+          model.class.to_s.tableize.demodulize.singularize, {
+            :base => Restful::Rails.api_hostname,
             :path => model.restful_path,
             :url => model.restful_url
         })
         
         # simple attributes
-        resource.values += Restful::Rails.tools.simple_attributes_on(model).map do |key, value|          
+        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
         resource.values += model.class.reflections.keys.map do |key|
           if config.published?(key.to_sym)

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

@@ -50,13 +50,18 @@ module Restful
             
             # array
             if self.is_a?(Array)
-              elements = self.map do |el| 
+              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)
+              
+              collection = returning Restful.collection(element_name, elements, :array) do |collection|
+                collection.total_entries = self.total_entries if self.respond_to?(:total_entries)
+              end          
+
+              collection    
             else
               Restful::Converters::ActiveRecord.convert(self, config)
             end
@@ -136,4 +141,5 @@ module Restful
 end
 
 ActiveRecord::Base.send :include, Restful::Rails::ActiveRecord::Configuration
-Array.send :include, Restful::Rails::ActiveRecord::Configuration::CommonInstanceMethods
+Array.send :include, Restful::Rails::ActiveRecord::Configuration::CommonInstanceMethods
+Hash.send :include, Restful::Rails::ActiveRecord::Configuration::CommonInstanceMethods

data/lib/restful/rails.rb

@@ -17,6 +17,6 @@ module Restful
     def self.tools
       Restful::Rails::ActiveRecord::MetadataTools::Utils
     end
-    
+
   end
 end

data/lib/restful/serializers/hash_serializer.rb

@@ -11,30 +11,32 @@ module Restful
       
       def serialize(resource, options = {})
         resource.is_a?(Restful::ApiModel::Collection) ?
-          serialize_array(resource.value) :
-          serialize_collection(resource)
+          serialize_collection(resource) :
+          serialize_tuples(resource.values, resource.full_url)
       end
-      
+
       private      
-      
-        def hashify_key(original_key)
-          original_key.to_s.tr("-", "_").to_sym
-        end
         
-        def serialize_array(resources)
-          resources.map { |r| serialize(r) }
+        def serialize_collection(collection)
+          values = collection.value.map { |r| serialize(r) }
+        
+          if entries = collection.total_entries
+            values = { :total_entries => entries, collection.name => values }
+          end
+        
+          values
         end
-
-        def serialize_collection(resource)
-          resource.values.inject({ "restful_url" => resource.full_url }) do |params, value|
-            params[hashify_key(value.name)] = serialize_value(value)
+        
+        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
         end
         
         def serialize_value(value)
           case value.type
-            when :collection then serialize_array(value.value)
+            when :collection then serialize_collection(value)
             when :link       then Restful::Rails.tools.dereference(value.value)
             when :resource   then serialize(value)
             else                  formatted_value(value)

data/restful.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "restful"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
   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/converters/active_record_converter_test.rb

@@ -118,4 +118,5 @@ context "active record converter" do
 
     xml_should_eql_fixture(@person.to_restful_xml(:wallet), "people", :joe_with_zwiebelleder)
   end
+  
 end

data/test/fixtures/models/pet.rb

@@ -1,5 +1,5 @@
 class Pet < ActiveRecord::Base
-  belongs_to :owner, :class_name => "Person", :foreign_key => "person_id"
+  belongs_to :owner, :class_name => "Person", :foreign_key => "person_id"  
 
   apiable
 end

data/test/rails/configuration_test.rb

@@ -41,5 +41,4 @@ context "Configuration" do
     config = Restful.cfg(:one, :restful_options => {:nested => true})
     config.nested?.should.== true
   end
-  
 end

data/test/serializers/json_serializer_test.rb

@@ -21,6 +21,7 @@ context "json serializer" do
   
   specify "should be able to serialize objects with empty collections" do
     @person.pets = []
+    
     assert_nothing_raised do
       json_should_eql_fixture(@person.to_restful_json, "people", :bloggs_da_pet_hater)
     end
@@ -61,4 +62,11 @@ context "json serializer" do
   specify "should serialize collections correctly" do
     json_should_eql_fixture(@person.pets.to_restful_json, "pets", :pets_array)
   end    
+  
+  specify "should be able to serialize collections with total entries info" do
+    pets = PaginatedCollection.new(@person.pets)
+    pets.total_entries = 1001
+
+    json_should_eql_fixture(pets.to_restful_json, "pets", :pets_array_with_total_entries)
+  end
 end

data/test/test_helper.rb

@@ -64,6 +64,7 @@ require plugin_root.join 'init'
 require 'fixtures/models/pet'
 require 'fixtures/models/wallet'
 require 'fixtures/models/person'
+require 'fixtures/models/paginated_collection'
 
 Restful::Rails.api_hostname = "http://example.com:3000"
 

metadata

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