Merge pull request #1 from AbleTech/feature/content_type_changes

Feature/content type changes

Author: nigelramsay

lib/easy/api/controller_methods.rb

@@ -4,9 +4,25 @@ module InstanceMethods
     # Renders the Easy::Api::Result object in either json or html format (can be extended to include other formats)
     def render_format
       respond_to do |format|
-        format.html { render :status => @result.status_code }
-        format.xml  { render :xml => @result.to_xml(:root => 'response', :skip_types => true), :status => @result.status_code }
-        format.json { render :json => @result, :status => (params[:callback].present? ? 200 : @result.status_code), :callback => params[:callback] }
+        format.html do
+          render :status => @result.status_code
+        end
+
+        format.xml do
+          render :xml => @result.to_xml(:root => 'response', :skip_types => true), :status => @result.status_code
+        end
+
+        format.json do
+          if params[:callback].present?
+            status = 200
+            content_type = 'application/javascript'
+          else
+            status = @result.status_code
+            content_type = 'application/json'
+          end
+
+          render :json => @result, :status => status, :callback => params[:callback], :content_type => content_type
+        end
       end
     end
 

lib/easy/api/version.rb

@@ -1,5 +1,5 @@
 module Easy
   module Api
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end