resource_full 0.7.6 → 0.7.7

data/lib/resource_full/render/json.rb

@@ -12,7 +12,12 @@ module ResourceFull
       end
       def show_json
         self.model_object = send("find_#{model_name}")
-        render :json => model_object.to_json(show_json_options)
+        
+        json_representation = with_root_included_in_json do
+          model_object.to_json(show_json_options)
+        end
+        
+        render :json => json_representation
       rescue ActiveRecord::RecordNotFound => e
         render :json => e.to_json, :status => :not_found
       rescue => e
@@ -24,7 +29,12 @@ module ResourceFull
       end
       def index_json
         self.model_objects = send("find_all_#{model_name.pluralize}")
-        render :json => model_objects.to_json(index_json_options)
+        
+        json_representation = with_root_included_in_json do
+          model_objects.to_json(index_json_options)
+        end
+        
+        render :json => json_representation
       end
 
       def count_json
@@ -36,7 +46,11 @@ module ResourceFull
         {}
       end
       def new_json
-        render :json => send("new_#{model_name}").to_json(new_json_options)
+        json_representation = with_root_included_in_json do
+          send("new_#{model_name}").to_json(new_json_options)
+        end
+        
+        render :json => json_representation
       end
 
       def create_json_options
@@ -94,14 +108,25 @@ module ResourceFull
         end
       rescue ActiveRecord::RecordNotFound => e
         render :json => e.to_json, :status => :not_found
+      rescue ActiveRecord::RecordInvalid => e
+        render :json => e.to_json, :status => :unprocessable_entity
       rescue => e
         handle_generic_error_in_json(e)
       end
 
       private
-      def handle_generic_error_in_json(exception)
-        render :json => exception, :status => :unprocessable_entity
-      end
+      
+        def handle_generic_error_in_json(exception)
+          render :json => exception, :status => :internal_server_error
+        end
+      
+        def with_root_included_in_json
+          old_value = ActiveRecord::Base.include_root_in_json
+          ActiveRecord::Base.include_root_in_json = true
+          yield
+        ensure
+          ActiveRecord::Base.include_root_in_json = old_value
+        end
     end
   end
 end

data/lib/resource_full/render/xml.rb

@@ -93,13 +93,15 @@ module ResourceFull
         end
       rescue ActiveRecord::RecordNotFound => e
         render :xml => e.to_xml, :status => :not_found
+      rescue ActiveRecord::RecordInvalid => e
+        render :xml => e.to_xml, :status => :unprocessable_entity
       rescue => e
         handle_generic_error_in_xml(e)
       end
 
       private
       def handle_generic_error_in_xml(exception)
-        render :xml => exception, :status => :unprocessable_entity
+        render :xml => exception, :status => :internal_server_error
       end
     end
   end

data/lib/resource_full/version.rb

@@ -2,7 +2,7 @@ module ResourceFull #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 7
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/resource_full/render/json_spec.rb

@@ -9,6 +9,7 @@ describe "ResourceFull::Render::JSON", :type => :controller do
     rescue_action_in_public!
     ResourceFullMockUser.delete_all
     ResourceFullMockUsersController.resource_identifier = :id
+    ActiveRecord::Base.include_root_in_json = true
   end
 
   describe "index" do
@@ -21,6 +22,15 @@ describe "ResourceFull::Render::JSON", :type => :controller do
       hash.size.should == 2
       response.code.should == '200'
     end
+    
+    it "renders the model object with the json root included even if ActiveRecord isn't configured that way" do
+      2.times { ResourceFullMockUser.create! }
+      ActiveRecord::Base.include_root_in_json = false
+
+      get :index, :format => 'json'
+      hash = Hash.from_json(response.body)
+      hash.first.should have_key("resource_full_mock_user")
+    end
 
     it "rescues all unhandled exceptions with an JSON response" do
       ResourceFullMockUser.expects(:find).raises SomeNonsenseException, "sparrow farts"
@@ -87,6 +97,17 @@ describe "ResourceFull::Render::JSON", :type => :controller do
       hash = Hash.from_json(response.body)
       hash["error"]["text"].should == "Couldn't find ResourceFullMockUser with id=1"
     end
+    
+    it "renders the model object with the json root included even if ActiveRecord isn't configured that way" do
+      ActiveRecord::Base.include_root_in_json = false
+      user = ResourceFullMockUser.create!
+
+      get :show, :id => user.id, :format => 'json'
+      response.code.should == '200'
+      hash = Hash.from_json(response.body)
+      hash.should have_key("resource_full_mock_user")
+      ActiveRecord::Base.include_root_in_json.should be_false
+    end
 
     it "renders appropriate errors if a generic exception occurs" do
       mock_user = ResourceFullMockUser.create!
@@ -112,6 +133,12 @@ describe "ResourceFull::Render::JSON", :type => :controller do
 
       response.body.should == ResourceFullMockUser.new.to_json
     end
+    
+    it "renders the model object with the json root included even if ActiveRecord isn't configured that way" do
+      ActiveRecord::Base.include_root_in_json = false
+      get :new, :format => 'json'
+      Hash.from_json(response.body).should have_key("resource_full_mock_user")
+    end
   end
 
   describe "create" do
@@ -222,7 +249,7 @@ describe "ResourceFull::Render::JSON", :type => :controller do
       hash["error"]["text"].should == "Couldn't find ResourceFullMockUser with id=1"
     end
 
-    it "renders appropriate errors if a generic exception is raised" do
+    it "renders appropriate errors if RecordInvalid is raised" do
       mock_user = ResourceFullMockUser.create!
       ResourceFullMockUser.send :define_method, :destroy do
         errors.add_to_base("Cannot delete")
@@ -240,6 +267,17 @@ describe "ResourceFull::Render::JSON", :type => :controller do
       end
     end
 
+    it "renders appropriate errors if a generic error is raised" do
+      mock_user = ResourceFullMockUser.create!
+      ResourceFullMockUser.any_instance.expects(:destroy).raises SomeNonsenseException, "sparrow farts"
+      
+      delete :destroy, :id => mock_user.id.to_s, :format => 'json'
+
+      response.code.should == '500'
+      hash = Hash.from_json(response.body)
+      hash["error"]["text"].should == "sparrow farts"
+    end
+
     it "renders error if the model could not be destroyed"
   end
 

data/spec/resource_full/render/xml_spec.rb

@@ -355,7 +355,7 @@ describe "ResourceFull::Render::XML" , :type => :controller do
         response.should have_tag("errors") { with_tag("error", "Couldn't find ResourceFullMockUser with id=1")}
       end
 
-      it "renders appropriate errors if a generic exception is raised" do
+      it "renders appropriate errors if RecordInvalid exception is raised" do
         mock_user = ResourceFullMockUser.create!
         ResourceFullMockUser.send :define_method, :destroy do
           errors.add_to_base("Cannot delete")
@@ -371,6 +371,15 @@ describe "ResourceFull::Render::XML" , :type => :controller do
           ResourceFullMockUser.send :remove_method, :destroy
         end
       end
+      
+      it "renders appropriate errors if a generic exception is raised" do
+        mock_user = ResourceFullMockUser.create!
+        ResourceFullMockUser.any_instance.expects(:destroy).raises SomeNonsenseException, "sparrow farts"
+        delete :destroy, :id => mock_user.id.to_s, :format => 'xml'
+
+        response.code.should == '500'
+        response.should have_tag("errors") { with_tag("error", "sparrow farts") }
+      end
 
       it "renders error if the model could not be destroyed"
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Brian Guthrie
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +05:30
+date: 2010-04-19 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: action_controller
+  name: actionpack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: active_record
+  name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: