rlayout 0.4.1 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,16 @@
+Changes in version 0.5.1 (2009-3-9)
+support rails 2.3
+
+Changes in version 0.5.0 (2009-2-18)
+support rails 2.2.2
+use !request.get? to replace request.post?
+hide persist method
+fix arguments number error of destroy call back
+use constant for layout parameter name in request
+add process for protected attributes
+abstract fetch_model for inheritance
+
+
 Changes in version 0.4.1 (2008-11-28)
 -------------------------------------
 fix bugs about inheritable hash attributes related to model

data/README

@@ -1,4 +1,4 @@
-Rails Layout Extension, release 0.4.1 (Nov. 2008)
+Rails Layout Extension, release 0.5.1 (Mar. 2009)
 
 Feature
 =======

data/Rakefile

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

data/lib/rlayout/layout.rb

@@ -1,26 +1,39 @@
 =begin Rlayout
 author: Leon Li(scorpio_leon@hotmail.com)
 =end
+
 module Rlayout
   module Layout
+    LAYOUT_PARAMETER = :layout if !defined?(LAYOUT_PARAMETER)
     def self.included(base)
-      if base.method_defined?(:render_with_no_layout)
+      base.class_eval do
+        #for rails 2.1
+        if method_defined?(:render_with_no_layout)
+          base.class_eval do
+            alias_method :render, :render_with_a_layout_ext
+          end
+        end
+
+        #for rails 2.2
         base.class_eval do
-          alias_method :render, :render_with_a_layout_ext
+          alias_method :_render_with_layout, :_render_with_layout_with_rlayout
         end
       end
+
     end
+
+    #for rails 2.1
     def render_with_a_layout_ext(options = nil, extra_options = {}, &block) #:nodoc:
       template_with_options = options.is_a?(Hash)
-      
+
       #get layout from view
       options_new = options.dup.merge :layout => false if template_with_options
       content_for_layout = render_with_no_layout(options_new, extra_options, &block)
       new_layout = nil
       page_config = @template.instance_variable_get("@content_for_config")
-      unless page_config.nil? 
+      unless page_config.nil?
         page_config = page_config.strip
-        page_config.split("\n").each do |pair| 
+        page_config.split("\n").each do |pair|
           key, value = pair.split(": ")
           value = '' if value.nil?
           if key == 'layout'
@@ -30,16 +43,16 @@ module Rlayout
           end
         end
       end
-      new_layout = params[:layout] if new_layout.nil? || new_layout.empty?
+      new_layout = params[LAYOUT_PARAMETER] if new_layout.nil? || new_layout.empty?
       unless new_layout.nil? || new_layout.empty?
-      options ||= {}
-        options[:layout] = new_layout == 'none' || new_layout == 'false' ? false : new_layout
+        options ||= {}
+        options[:layout] = new_layout == 'false' ? false : new_layout
         template_with_options = true
       end
-      
+
       if (layout = pick_layout(template_with_options, options)) && apply_layout?(template_with_options, options)
         #assert_existence_of_template_file(layout)
-        
+
         options = options.merge :layout => false if template_with_options
         logger.info("Rendering template within #{layout}") if logger
         #content_for_layout = render_with_no_layout(options, &block)
@@ -54,5 +67,60 @@ module Rlayout
         content_for_layout
       end
     end
+
+    #for rails 2.2
+    def  _render_with_layout_with_rlayout(options, local_assigns, &block) #:nodoc:
+      partial_layout = options.delete(:layout)
+
+      if block_given?
+        begin
+          @_proc_for_layout = block
+          concat(render(options.merge(:partial => partial_layout)))
+        ensure
+          @_proc_for_layout = nil
+        end
+      else
+        begin
+
+          original_content_for_layout = @content_for_layout if defined?(@content_for_layout)
+          @content_for_layout = render(options)
+
+          #part 1 start to add for extract layout from page
+          pagel_layout = params[LAYOUT_PARAMETER] unless params[LAYOUT_PARAMETER].nil?
+          unless @content_for_config.nil?
+            @content_for_config.strip!
+            @content_for_config.split("\n").each do |pair|
+              key, value = pair.split(": ")
+              value = '' if value.nil?
+              if key == 'layout'
+                pagel_layout = value if pagel_layout.nil? || pagel_layout.empty?
+              else
+                instance_variable_set("@content_for_#{key}", value)
+              end
+            end
+          end
+          
+          unless pagel_layout == 'false'
+            partial_layout = active_layout(pagel_layout) if pagel_layout.present?
+            #part 1 end to add for extract layout from page
+            if (options[:inline] || options[:file] || options[:text])
+              @cached_content_for_layout = @content_for_layout
+              render(:file => partial_layout, :locals => local_assigns)
+            else
+              render(options.merge(:partial => partial_layout))
+            end
+            #part 2 start to add for extract layout from page
+          else
+            @content_for_layout
+          end
+          #part 2 end to add for extract layout from page
+        ensure
+          @content_for_layout = original_content_for_layout
+        end
+      end
+    end
   end
-end
+end
+=begin Rlayout
+author: Leon Li(scorpio_leon@hotmail.com)
+=end

data/lib/rlayout/model.rb

@@ -7,9 +7,72 @@ module Rlayout
   module Model
     def self.included(base)
       base.extend(ClassMethods)
-      base.write_inheritable_attribute(:hidden_actions, base.hidden_actions - ['create', 'update', 'destroy'])
     end
-    
+
+    def create
+      before_create if respond_to?(:before_create)
+      result = self.class.get_action_result(:create)
+      begin
+        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
+      end
+      before_create_result if respond_to?(:before_create_result)
+      case result_type.to_s
+      when 'redirect'
+        redirect_to(self.class.parse_result(result, binding))
+      when 'render'
+        render(self.class.parse_result(result, binding))
+      end
+    end
+
+    def update
+      result = self.class.get_action_result(:update)
+      before_update if respond_to?(:before_update)
+      begin
+        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
+      end
+      before_update_result if respond_to?(:before_update_result)
+      case result_type.to_s
+      when 'redirect'
+        redirect_to(self.class.parse_result(result, binding))
+      when 'render'
+        render(self.class.parse_result(result, binding))
+      end
+    end
+
+    def destroy
+      result = self.class.get_action_result(:destroy)
+      before_destroy if respond_to?(:before_destroy)
+      begin
+        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
+      end
+      before_destroy_result if respond_to?(:before_destroy_result)
+      case result_type.to_s
+      when 'redirect'
+        redirect_to(self.class.parse_result(result, binding))
+      when 'render'
+        render(self.class.parse_result(result, binding))
+      end
+    end
+
+    protected
     def find_model_by_id
       self.class.get_model_class.find(params[:id]) 
     end
@@ -35,24 +98,22 @@ module Rlayout
         end
       end
     end
+
+    def fetch_model
+      if params[:id].present?
+        @model = find_model_by_id
+      else
+        @model = self.class.get_model_class.new
+      end
+    end
     
     def set_model
       if need_model?
         @model = nil
-        unless params[:id].nil?
-          @model = find_model_by_id
-          if @model && request.post?
-            params_key = self.class.get_full_model_name.gsub(/\//, "_").to_sym
-            @model.attributes=params[params_key] unless @model.nil? || params[params_key].nil?
-          end
-        else
-          if request.post?
-            params_key = self.class.get_full_model_name.gsub(/\//, "_").to_sym
-            #notice, don't use @model.attributes= after new due to mock require
-            @model = self.class.get_model_class.new(params[params_key])
-          else
-            @model = self.class.get_model_class.new
-          end
+        fetch_model
+        if @model && !request.get?
+          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}
         instance_variable_set("@#{self.class.get_model_name}", @model)
@@ -90,68 +151,7 @@ module Rlayout
       end
     end
     
-    def create
-      before_create if respond_to?(:before_create)
-      result = self.class.get_action_result(:create)
-      begin
-        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
-      end
-      before_create_result if respond_to?(:before_create_result)
-      case result_type.to_s
-      when 'redirect'
-        redirect_to(self.class.parse_result(result, binding))
-      when 'render'
-        render(self.class.parse_result(result, binding))
-      end
-    end
     
-    def update
-      result = self.class.get_action_result(:update)
-      before_update if respond_to?(:before_update)
-      begin
-        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
-      end
-      before_update_result if respond_to?(:before_update_result)
-      case result_type.to_s
-      when 'redirect'
-        redirect_to(self.class.parse_result(result, binding))
-      when 'render'
-        render(self.class.parse_result(result, binding))
-      end
-    end
-    
-    def destroy
-      result = self.class.get_action_result(:destroy)
-      before_destroy if respond_to?(:before_destroy)
-      begin
-        execute_destroy
-        destroy_success_callback(e) if respond_to?(:destroy_success_callback)
-        result = result[:success].dup
-        result_type = result.delete(:type)
-      rescue => e
-        destroy_error_callback if respond_to?(:destroy_error_callback)
-        result = result[:error].dup
-      end
-      before_destroy_result if respond_to?(:before_destroy_result)
-      case result_type.to_s
-      when 'redirect'
-        redirect_to(self.class.parse_result(result, binding))
-      when 'render'
-        render(self.class.parse_result(result, binding))
-      end
-    end
     
     module ClassMethods
       

data/lib/rlayout_layout.rb

@@ -3,7 +3,14 @@ author: Leon Li(scorpio_leon@hotmail.com)
 =end
 require 'rlayout/layout'
 
-ActionController::Base.class_eval do
-  #for page layout
-  include Rlayout::Layout
-end
+if RAILS_GEM_VERSION >= '2.2'
+  ActionView::Base.class_eval do
+    #for rails 2.2
+    include Rlayout::Layout
+  end
+else
+  ActionController::Base.class_eval do
+    #for rails 2.1
+    include Rlayout::Layout
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rlayout
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Leon Li
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-28 00:00:00 +08:00
+date: 2009-03-09 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: Rails Layout Extension
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: improve rails layout such as simplifying content_for usage and let erb file can determine layout