rlayout 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+Changes in version 0.5.2 (2009-4-20)
+improve error handling
+
 Changes in version 0.5.1 (2009-3-9)
 support rails 2.3
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake/gempackagetask'
 PKG_NAME = "rlayout"
-PKG_VERSION = "0.5.1"
+PKG_VERSION = "0.5.2"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/rlayout/model.rb

@@ -1,7 +1,7 @@
 =begin Rlayout
-author: Leon Li(scorpio_leon@hotmail.com)
+# author: Leon Li(scorpio_leon@hotmail.com)
 =end
-#TODO support multi-model
+# #TODO support multi-model
 require 'rlayout/common'
 module Rlayout
   module Model
@@ -16,12 +16,20 @@ module Rlayout
         execute_create
         create_success_callback if respond_to?(:create_success_callback)
         result = result[:success].dup
-        result_type = result.delete(:type)
       rescue => e
-        create_error_callback(e) if respond_to?(:create_error_callback)
-        result = result[:error].dup
+        if respond_to?(:create_error_callback)
+          create_error_callback(e)
+        else
+          add_error e
+        end
+        if result[:error].present?
+          result = result[:error].dup
+        else
+          raise e
+        end
       end
       before_create_result if respond_to?(:before_create_result)
+      result_type = result.delete(:type)
       case result_type.to_s
       when 'redirect'
         redirect_to(self.class.parse_result(result, binding))
@@ -37,12 +45,20 @@ module Rlayout
         execute_update
         update_success_callback if respond_to?(:update_success_callback)
         result = result[:success].dup
-        result_type = result.delete(:type)
       rescue => e
-        update_error_callback(e) if respond_to?(:update_error_callback)
-        result = result[:error].dup
+        if respond_to?(:update_error_callback)
+          update_error_callback(e)
+        else
+          add_error e
+        end
+        if result[:error].present?
+          result = result[:error].dup
+        else
+          raise e
+        end
       end
       before_update_result if respond_to?(:before_update_result)
+      result_type = result.delete(:type)
       case result_type.to_s
       when 'redirect'
         redirect_to(self.class.parse_result(result, binding))
@@ -58,12 +74,20 @@ module Rlayout
         execute_destroy
         destroy_success_callback if respond_to?(:destroy_success_callback)
         result = result[:success].dup
-        result_type = result.delete(:type)
       rescue => e
-        destroy_error_callback(e) if respond_to?(:destroy_error_callback)
-        result = result[:error].dup
+        if respond_to?(:destroy_error_callback)
+          destroy_error_callback(e)
+        else
+          add_error e
+        end
+        if result[:error].present?
+          result = result[:error].dup
+        else
+          raise e
+        end
       end
       before_destroy_result if respond_to?(:before_destroy_result)
+      result_type = result.delete(:type)
       case result_type.to_s
       when 'redirect'
         redirect_to(self.class.parse_result(result, binding))
@@ -73,8 +97,15 @@ module Rlayout
     end
 
     protected
+
+    def add_error(error=nil)
+      flash[:error] ||= []
+      flash[:error] = [flash[:error]] unless flash[:error].is_a?(Array)
+      flash[:error] << (error || $!.to_s)
+    end
+
     def find_model_by_id
-      self.class.get_model_class.find(params[:id]) 
+      self.class.get_model_class.find(params[:id])
     end
     
     def need_model?
@@ -88,7 +119,7 @@ module Rlayout
             false
           else
             model_require_options = self.class.get_model_require_options
-            #TODO use regex
+            # #TODO use regex
             if model_require_options && model_require_options[:except] && model_require_options[:except].include?(@action_name_sym)
               false
             else
@@ -115,7 +146,7 @@ module Rlayout
           params_key = self.class.get_full_model_name.gsub(/\//, "_").to_sym
           @model.attributes=params[params_key] unless @model.nil? || params[params_key].nil?
         end
-        #bind @model to @#{self.class.get_model_name}
+        # #bind @model to @#{self.class.get_model_name}
         instance_variable_set("@#{self.class.get_model_name}", @model)
       else
         @model = instance_variable_get("@#{self.class.get_model_name}")
@@ -124,7 +155,7 @@ module Rlayout
     end
     
     def model?
-      @model_exists = (@model && @model.id) if @model_exists.nil? 
+      @model_exists = (@model && @model.id) if @model_exists.nil?
     end
     
     def execute_create
@@ -165,7 +196,7 @@ module Rlayout
       end
       
       def get_model_require
-        @model_require                 
+        @model_require
       end
       def get_model_require_options
         @model_require_options
@@ -179,8 +210,7 @@ module Rlayout
         @need_model = need
       end
       
-      # get the model_name
-      # override this if the model's name is special
+      # get the model_name override this if the model's name is special
       def get_model_name
         @model_name ||= self.class_simple_name.underscore[0..-12].singularize
       end
@@ -199,17 +229,17 @@ module Rlayout
         @model_full_name = model_class.class_full_name.underscore
       end
       
-      #inheritable
+      # #inheritable
       def get_default_results
         read_inheritable_attribute("default_results") || {}
       end
       
-      #inheritable
+      # #inheritable
       def set_default_result(hash)
         write_inheritable_hash("default_results", hash)
       end
       
-      #inheritable
+      # #inheritable
       def default_create_result(hash)
         set_default_result(:create => hash)
       end
@@ -218,7 +248,7 @@ module Rlayout
       end
       def default_destroy_result(hash)
         set_default_result(:destroy => hash)
-      end 
+      end
       
       def set_action_result(hash)
         @action_results ||= {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rlayout
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Leon Li
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 +08:00
+date: 2009-05-12 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
-description: improve rails layout such as simplifying content_for usage and let erb file can determine layout
+description: "    improve rails layout such as simplifying content_for usage and let erb file can determine layout\n"
 email: scorpio_leon@hotmail.com
 executables: []
 
@@ -26,7 +26,6 @@ files:
 - Rakefile
 - CHANGELOG
 - README
-- lib/rlayout
 - lib/rlayout/model.rb
 - lib/rlayout/template.rb
 - lib/rlayout/layout.rb
@@ -36,19 +35,16 @@ files:
 - lib/rlayout.rb
 - lib/rlayout_controller.rb
 - lib/rlayout_layout.rb
-- example/templates
-- example/templates/simple
 - example/templates/simple/common.html.erb
-- example/templates/xhtml
 - example/templates/xhtml/controlfooter.html.erb
 - example/templates/xhtml/common.html.erb
 - example/templates/xhtml/controlheader.html.erb
-- example/templates/simple_mce
 - example/templates/simple_mce/text_area.html.erb
-- example/templates/xhtml_mce
 - example/templates/xhtml_mce/text_area.html.erb
 has_rdoc: false
 homepage: http://rlayout.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -69,9 +65,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: Rails Layout Extension
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: improve rails layout such as simplifying content_for usage and let erb file can determine layout
 test_files: []