active_scaffold_vho 3.2.4 → 3.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQ4NTMwYWQ0MzYzNjZhMmVlNjA5MzAxYmE3MWI3YmFkNDg4NzFhYQ==
+    ZDc3NWI5YWQ0NmNlZTY0YzNiZjBhZmMxZGRlYzdjYjI3OWY2NTYyNw==
   data.tar.gz: !binary |-
-    NDQyNTA0MWQyZjQ4NWIwNWUzYzk0MDFlNjM3NTgxOTUyNGFiNzg3NA==
+    MmYzMzdhMzJmMmNiNTk0NGY4MTAyNzcwZGE2Nzg3YjBhMzhjZDM2Mw==
 SHA512:
   metadata.gz: !binary |-
-    NDNkNzIwOTVkNTQzYWZmZGEzNmZkYjRlYjEzY2FlYmU4OGUyODhmYjI1MWM5
-    ZjlhZWEzMmE3ZjVlNDUwMWZhYTliNzFiM2I4YzZlZTEzYTM2N2FhMjk1ZjVl
-    YjE0M2U0MjJlOGEyZWFhNjIxM2IxNDk2NjY0ZTA5YWUyYThlODU=
+    Y2EyYTljMzA2YmE1OWFlMmExNGZjMDZlNThhYzQzM2I5MDBmN2Q0ZTkwNWJj
+    MDFlZjhhYWQyN2VkMjdiNWM5NjhiNzlkOTE2ZjI2ZDI2YjBiOGU5NGRlNmE1
+    ZTFmY2Y1M2RiNDAyZjA2OWQ2ZWE4NmQ0OThiOTZjZTY5N2E3M2I=
   data.tar.gz: !binary |-
-    ZWJkNjM2MDYwMTM5ZTUzZDQ5MzBlZDU3Zjk4Nzg1OGVkYmJmNjE2YTZlOTNk
-    NmYxNjVhYWVjY2ZjYjcwMTlmMWUyNjdkNjhlZTYxNTRkMWU3YmZmYjUzOTlm
-    ZTM4MzY4Zjk2MGMxMTQ2YzJlMmNkZjBlODc2MmI5YTk1NDFmZTE=
+    ZDg0ZTNkMzhlYzdlY2U0NTYwMGQ2NjhlY2NiY2Q2MGE4MTI0YzI5YTU3OWJh
+    NjFmMWQ2ZjMzNTJlZmY2ZWVhNDkyZjNkZjY1ZThmYjU4YTBiMmU1NmNmMmQz
+    MWYzNmViYjc5YTJkNDlmZGI0M2QzYmVhZmM1ZWY5OTRmOTdlNGQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.3)
+    active_scaffold_vho (3.2.4)
       kaminari
       rails (>= 3.1.0)
 

data/lib/active_scaffold/actions/core.rb

@@ -88,7 +88,19 @@ module ActiveScaffold::Actions
 
     # API response object that will be converted to XML/YAML/JSON using to_xxx
     def response_object
-      @response_object = successful? ? (@record || @records) : @record.errors
+      @response_object = if successful?
+                           (@record || @records)
+                         else
+                           unless flash[:error].nil?
+                             @record.errors.add(:base, flash[:error])
+                             flash.discard(:error)
+                           end
+                           {:errors => @record.errors}
+                         end
+    end
+
+    def error_object_attributes
+      [:errors]
     end
 
     # Success is the existence of certain variables and the absence of errors (when applicable).
@@ -153,6 +165,10 @@ module ActiveScaffold::Actions
       model.respond_to?(:build) ? model.build(build_options || {}) : model.new
     end
 
+    def virtual_columns(columns)
+      columns.reject {|col| active_scaffold_config.model.columns_hash[col] || active_scaffold_config.model.reflect_on_association(col)}
+    end
+
     private
     def respond_to_action(action)
       respond_to do |type|

data/lib/active_scaffold/actions/create.rb

@@ -67,15 +67,18 @@ module ActiveScaffold::Actions
     end
 
     def create_respond_to_xml
-      render :xml => response_object.to_xml(:only => create_columns_names), :content_type => Mime::XML, :status => response_status, :location => response_location
+      column_names = successful? ? create_columns_names : error_object_attributes
+      render :xml => response_object.to_xml(:only => column_names, :methods => virtual_columns(column_names)), :content_type => Mime::XML, :status => response_status, :location => response_location
     end
 
     def create_respond_to_json
-      render :text => response_object.to_json(:only => create_columns_names), :content_type => Mime::JSON, :status => response_status, :location => response_location
+      column_names = successful? ? create_columns_names : error_object_attributes
+      render :text => response_object.to_json(:only => column_names, :methods => virtual_columns(column_names)), :content_type => Mime::JSON, :status => response_status, :location => response_location
     end
 
     def create_respond_to_yaml
-      render :text => Hash.from_xml(response_object.to_xml(:only => create_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status, :location => response_location
+      column_names = successful? ? create_columns_names : error_object_attributes
+      render :text => Hash.from_xml(response_object.to_xml(:only => column_names, :methods => virtual_columns(column_names))).to_yaml, :content_type => Mime::YAML, :status => response_status, :location => response_location
     end
 
     # A simple method to find and prepare an example new record for the form

data/lib/active_scaffold/actions/delete.rb

@@ -31,15 +31,18 @@ module ActiveScaffold::Actions
     end
 
     def destroy_respond_to_xml
-      render :xml => successful? ? "" : response_object.to_xml(:only => active_scaffold_config.list.columns.names), :content_type => Mime::XML, :status => response_status
+      column_names = successful? ? [active_scaffold_config.model.primary_key] : error_object_attributes
+      render :xml => successful? ? "" : response_object.to_xml(:only => column_names), :content_type => Mime::XML, :status => response_status
     end
 
     def destroy_respond_to_json
-      render :text => successful? ? "" : response_object.to_json(:only => active_scaffold_config.list.columns.names), :content_type => Mime::JSON, :status => response_status
+      column_names = successful? ? [active_scaffold_config.model.primary_key] : error_object_attributes
+      render :text => successful? ? "" : response_object.to_json(:only => column_names), :content_type => Mime::JSON, :status => response_status
     end
 
     def destroy_respond_to_yaml
-      render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.list.columns.names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+      column_names = successful? ? [active_scaffold_config.model.primary_key] : error_object_attributes
+      render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => column_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
 
     def destroy_find_record

data/lib/active_scaffold/actions/list.rb

@@ -40,13 +40,16 @@ module ActiveScaffold::Actions
       end
     end
     def list_respond_to_xml
-      render :xml => response_object.to_xml(:only => list_columns_names), :content_type => Mime::XML, :status => response_status
+      column_names = successful? ? list_columns_names : error_object_attributes
+      render :xml => response_object.to_xml(:only => column_names, :methods => virtual_columns(column_names)), :content_type => Mime::XML, :status => response_status
     end
     def list_respond_to_json
-      render :text => response_object.to_json(:only => list_columns_names), :content_type => Mime::JSON, :status => response_status
+      column_names = successful? ? list_columns_names : error_object_attributes
+      render :text => response_object.to_json(:only => column_names, :methods => virtual_columns(column_names)), :content_type => Mime::JSON, :status => response_status
     end
     def list_respond_to_yaml
-      render :text => Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+      column_names = successful? ? list_columns_names : error_object_attributes
+      render :text => Hash.from_xml(response_object.to_xml(:only => column_names, :methods => virtual_columns(column_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
     
     def row_respond_to_html
@@ -115,16 +118,25 @@ module ActiveScaffold::Actions
         @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id] && params[:id].to_i > 0
         respond_to_action(:action_confirmation)
       else
-        if params[:id] && params[:id] && params[:id].to_i > 0
-          @record = find_if_allowed(params[:id], (request.post? || request.put?) ? :update : :delete)
-          unless @record.nil?
-            yield @record
+        begin
+          if params[:id] && params[:id] && params[:id].to_i > 0
+            @record = find_if_allowed(params[:id], (request.post? || request.put?) ? :update : :delete)
+            unless @record.nil?
+              yield @record
+            else
+              self.successful = false
+              flash[:error] = as_(:no_authorization_for_action, :action => action_name)
+            end
           else
-            self.successful = false
-            flash[:error] = as_(:no_authorization_for_action, :action => action_name)
+            yield
           end
-        else
-          yield
+        rescue ActiveRecord::RecordInvalid
+        rescue ActiveRecord::StaleObjectError
+          @record.errors.add(:base, as_(:version_inconsistency)) unless @record.nil?
+          self.successful=false
+        rescue ActiveRecord::RecordNotSaved
+          @record.errors.add(:base, as_(:record_not_saved)) if !@record.nil? && @record.errors.empty?
+          self.successful = false
         end
         respond_to_action(render_action)
       end
@@ -146,15 +158,18 @@ module ActiveScaffold::Actions
     end
 
     def action_update_respond_to_xml
-      render :xml => successful? ? "" : response_object.to_xml(:only => list_columns_names), :content_type => Mime::XML, :status => response_status
+      column_names = successful? ? list_columns_names : error_object_attributes
+      render :xml => response_object.to_xml(:only => column_names, :methods => virtual_columns(column_names)), :content_type => Mime::XML, :status => response_status
     end
 
     def action_update_respond_to_json
-      render :text => successful? ? "" : response_object.to_json(:only => list_columns_names), :content_type => Mime::JSON, :status => response_status
+      column_names = successful? ? list_columns_names : error_object_attributes
+      render :text => response_object.to_json(:only => column_names, :methods => virtual_columns(column_names)), :content_type => Mime::JSON, :status => response_status
     end
 
     def action_update_respond_to_yaml
-      render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+      column_names = successful? ? list_columns_names : error_object_attributes
+      render :text => Hash.from_xml(response_object.to_xml(:only => column_names, :methods => virtual_columns(column_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
 
     def save_current_page_num

data/lib/active_scaffold/actions/show.rb

@@ -21,15 +21,18 @@ module ActiveScaffold::Actions
     protected
     
     def show_respond_to_json
-      render :text => response_object.to_json(:only => show_columns_names), :content_type => Mime::JSON, :status => response_status
+      column_names = successful? ? show_columns_names : error_object_attributes
+      render :text => response_object.to_json(:only => show_columns_names, :methods => virtual_columns(column_names)), :content_type => Mime::JSON, :status => response_status
     end
 
     def show_respond_to_yaml
-      render :text => Hash.from_xml(response_object.to_xml(:only => show_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+      column_names = successful? ? show_columns_names : error_object_attributes
+      render :text => Hash.from_xml(response_object.to_xml(:only => show_columns_names, :methods => virtual_columns(column_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
 
     def show_respond_to_xml
-      render :xml => response_object.to_xml(:only => show_columns_names), :content_type => Mime::XML, :status => response_status
+      column_names = successful? ? show_columns_names : error_object_attributes
+      render :xml => response_object.to_xml(:only => show_columns_names, :methods => virtual_columns(column_names)), :content_type => Mime::XML, :status => response_status
     end
 
     def show_respond_to_js

data/lib/active_scaffold/actions/update.rb

@@ -55,13 +55,16 @@ module ActiveScaffold::Actions
       render :action => 'on_update'
     end
     def update_respond_to_xml
-      render :xml => response_object.to_xml(:only => update_columns_names), :content_type => Mime::XML, :status => response_status
+      column_names = successful? ? update_columns_names : error_object_attributes
+      render :xml => response_object.to_xml(:only => column_names, :methods => virtual_columns(column_names)), :content_type => Mime::XML, :status => response_status
     end
     def update_respond_to_json
-      render :text => response_object.to_json(:only => update_columns_names), :content_type => Mime::JSON, :status => response_status
+      column_names = successful? ? update_columns_names : error_object_attributes
+      render :text => response_object.to_json(:only => column_names, :methods => virtual_columns(column_names)), :content_type => Mime::JSON, :status => response_status
     end
     def update_respond_to_yaml
-      render :text => Hash.from_xml(response_object.to_xml(:only => update_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+      column_names = successful? ? update_columns_names : error_object_attributes
+      render :text => Hash.from_xml(response_object.to_xml(:only => column_names, :methods => virtual_columns(column_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
     # A simple method to find and prepare a record for editing
     # May be overridden to customize the record (set default values, etc.)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 4
+    PATCH = 5
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda