acts_as_api 0.1.7 → 0.1.10

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.10 2010-07-23
+
+* More Bugfixes. When you want to render an Array of records (e.g. from MyRecord.all)
+make sure you pass the :root options to render_as_api - in case it will return an empty array
+
 === 0.1.7 2010-07-05
 
 * Fixed bug with multi-word models.

data/lib/acts_as_api.rb

@@ -16,7 +16,7 @@ require "acts_as_api/array"
 # acts_as_api uses the default serializers of your rails app and doesn't
 # force you into more dependencies.
 module ActsAsApi
-  VERSION = '0.1.7'
+  VERSION = '0.1.10'
 
   # The accepted response formats
   # Default is +[:xml, :json]+
@@ -27,6 +27,15 @@ module ActsAsApi
   # with the name of the model.
   ADD_ROOT_NODE_FOR = [:json]
 
+  # Holds formats that should be dasherized
+  DASHERIZE_FOR = [:xml]
+
+  # The default name of a root node of a response
+  # if no root paramter is passed in render_for_api
+  # and the gem is not able to determine a root name
+  # automatically
+  DEFAULT_ROOT = :record
+
 end
 
 # Attach ourselves to active record

data/lib/acts_as_api/rendering.rb

@@ -28,33 +28,41 @@ module ActsAsApi
       output_params = render_options
 
 
-      # set the name of the root node - pluralize for arrays
-      if api_model.is_a?(Array)
-        api_root_name = api_model.respond_to?(:model_name) ? api_model.model_name.singular.pluralize :  api_model.first.class.model_name.singular.pluralize
+      api_root_name = nil
+
+      if !output_params[:root].nil?
+
+        api_root_name = output_params[:root].to_s
+
+      elsif api_model.respond_to?(:model_name)
+        api_root_name = api_model.model_name
+      elsif api_model.is_a?(Array) && !api_model.empty? && api_model.first.class.respond_to?(:model_name)
+        api_root_name = api_model.first.class.model_name
+      elsif api_model.class.respond_to?(:model_name)
+        api_root_name = api_model.class.model_name
       else
-        api_root_name = api_model.class.model_name.singular
+        api_root_name = ActsAsApi::DEFAULT_ROOT.to_s
       end
 
-      api_root_name.dasherize if api_format.to_s == :xml.to_s
+      api_root_name = api_root_name.underscore.tr('/', '_')
 
-      # Does not work
-      #api_root_name.camelize if api_format.to_s == :json.to_s
+      if api_model.is_a?(Array)
+        api_root_name = api_root_name.pluralize
+      end
 
-      output_params[:root] ||= api_root_name
+      api_root_name = api_root_name.dasherize if ActsAsApi::DASHERIZE_FOR.include? api_format.to_sym
 
-      
+      output_params[:root] = api_root_name
 
       #output_params[:root] = output_params[:root].camelize if render_options.has_key?(:camelize) && render_options[:camelize]
       #output_params[:root] = output_params[:root].dasherize if !render_options.has_key?(:dasherize) || render_options[:dasherize]
 
-
       api_response = api_model.as_api_response
 
       if ActsAsApi::ADD_ROOT_NODE_FOR.include? api_format
         api_response = { api_root_name.to_sym =>  api_response}
       end
 
-
       # create the Hash as response
       output_params[api_format] = api_response
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - "Christian B\xC3\xA4uerlein"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +02:00
+date: 2010-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency