rlayout 0.3.4 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+Changes in version 0.4.1 (2008-11-28)
+-------------------------------------
+fix bugs about inheritable hash attributes related to model
+
+Changes in version 0.4.0 (2008-11-25)
+-------------------------------------
+new feature support to auto-fetch or create model
+
 Changes in version 0.3.4 (2008-07-10)
 -------------------------------------
 support rails 2.1

data/README

@@ -1,4 +1,4 @@
-Rails Layout Extension, release 0.3.4 (Jul. 2008)
+Rails Layout Extension, release 0.4.1 (Nov. 2008)
 
 Feature
 =======

data/Rakefile

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

data/lib/rlayout/common.rb

@@ -0,0 +1,13 @@
+=begin Rlayout
+author: Leon Li(scorpio_leon@hotmail.com)
+=end
+class Object
+  def class_simple_name
+    if self.is_a?(Class)
+      fullname = self.to_s
+    else
+      fullname = self.class.to_s
+    end
+    fullname.scan(/(.*::)*([^\(]*)/)[0][1]
+  end
+end

data/lib/rlayout/layout.rb

@@ -10,18 +10,19 @@ module Rlayout
         end
       end
     end
-    def render_with_a_layout_ext(options = nil, &block) #:nodoc:
+    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, &block)
+      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? 
         page_config = page_config.strip
         page_config.split("\n").each do |pair| 
           key, value = pair.split(": ")
+          value = '' if value.nil?
           if key == 'layout'
             new_layout = value
           else
@@ -36,7 +37,7 @@ module Rlayout
         template_with_options = true
       end
       
-      if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options))
+      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
@@ -54,4 +55,4 @@ module Rlayout
       end
     end
   end
-end
+end

data/lib/rlayout/model.rb

@@ -0,0 +1,255 @@
+=begin Rlayout
+author: Leon Li(scorpio_leon@hotmail.com)
+=end
+#TODO support multi-model
+require 'rlayout/common'
+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 find_model_by_id
+      self.class.get_model_class.find(params[:id]) 
+    end
+    
+    def need_model?
+      @action_name_sym = params[:action].to_sym
+      self.class.need_model[@action_name_sym] ||= begin
+        model_require = self.class.get_model_require
+        if model_require.nil?
+          false
+        else
+          if model_require.include?(:none)
+            false
+          else
+            model_require_options = self.class.get_model_require_options
+            #TODO use regex
+            if model_require_options && model_require_options[:except] && model_require_options[:except].include?(@action_name_sym)
+              false
+            else
+              model_require && (model_require.include?(@action_name_sym) || model_require.include?(:all))
+            end
+          end
+        end
+      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
+        end
+        #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}")
+      end
+      
+    end
+    
+    def model?
+      @model_exists = (@model && @model.id) if @model_exists.nil? 
+    end
+    
+    def execute_create
+      if respond_to?(:create_action)
+        create_action
+      else
+        @model.save!
+      end
+    end
+    
+    def execute_update
+      if respond_to?(:update_action)
+        update_action
+      else
+        @model.save!
+      end
+    end
+    
+    def execute_destroy
+      if respond_to?(:destroy_action)
+        destroy_action
+      else
+        @model.destroy
+      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
+      
+      def model_require(*model_require)
+        options = model_require.extract_options! || {}
+        klass = options.delete(:class)
+        model_class(klass) unless klass.nil?
+        options.each {|k, v| options[k] = [v] unless v.is_a?(Array)}
+        @model_require = model_require
+        @model_require_options = options
+      end
+      
+      def get_model_require
+        @model_require                 
+      end
+      def get_model_require_options
+        @model_require_options
+      end
+      
+      def need_model
+        @need_model ||= {}
+      end
+      
+      def need_model=(need)
+        @need_model = need
+      end
+      
+      # 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
+
+      def get_full_model_name
+        @model_full_name ||= self.class_full_name.underscore[0..-12].singularize
+      end
+      
+      def get_model_class
+        @model_class ||= eval("#{get_full_model_name.camelize}")
+      end
+      
+      def model_class(model_class)
+        @model_class = model_class
+        @model_name = model_class.class_simple_name.underscore
+        @model_full_name = model_class.class_full_name.underscore
+      end
+      
+      #inheritable
+      def get_default_results
+        read_inheritable_attribute("default_results") || {}
+      end
+      
+      #inheritable
+      def set_default_result(hash)
+        write_inheritable_hash("default_results", hash)
+      end
+      
+      #inheritable
+      def default_create_result(hash)
+        set_default_result(:create => hash)
+      end
+      def default_update_result(hash)
+        set_default_result(:update => hash)
+      end
+      def default_destroy_result(hash)
+        set_default_result(:destroy => hash)
+      end 
+      
+      def set_action_result(hash)
+        @action_results ||= {}
+        @action_results.merge!(hash)
+      end
+      
+      def create_result(hash)
+        set_action_result(:create => hash)
+      end
+      def update_result(hash)
+        set_action_result(:update => hash)
+      end
+      def destroy_result(hash)
+        set_action_result(:destroy => hash)
+      end
+      
+      def get_action_result(action)
+        if @action_results
+          get_default_results.merge(@action_results)[action]
+        else
+          get_default_results[action]
+        end
+      end
+      
+      def parse_result(result, binding)
+        result.each do |k, v|
+          result[k] = eval(v[4..-1], binding) if v.is_a?(String) && v[0, 4] == 'exp:'
+        end
+        result
+      end
+      
+    end
+  end
+end

data/lib/rlayout/template.rb

@@ -35,7 +35,7 @@ class Rlayout::TemplateUtil
       type = 'common' if type.nil?
       template_key = key+'_'+type
       @tag_templates ||= {}
-      if @tag_templates[template_key].nil? || ENV['RAILS_ENV'] != 'production'
+      if @tag_templates[template_key].nil? || RAILS_ENV != 'production'
         template_file = File.join(RAILS_ROOT, 'templates', key, "#{type}.html.erb")
         template_file = File.join(RAILS_ROOT, 'templates', key, "common.html.erb") unless File.exists?(template_file)
         @tag_templates[template_key] = File.read(template_file)

data/lib/rlayout.rb

@@ -1,6 +1,7 @@
 =begin Rlayout
 author: Leon Li(scorpio_leon@hotmail.com)
 =end
+require 'rlayout_model'
 require 'rlayout_layout'
 require 'rlayout_controller'
 require 'rlayout_template'

data/lib/rlayout_controller.rb

@@ -3,7 +3,6 @@ author: Leon Li(scorpio_leon@hotmail.com)
 =end
 require 'action_view'
 
-
 ActionView::Base.class_eval do
   
   #for using controller method in view

data/lib/rlayout_model.rb

@@ -0,0 +1,9 @@
+=begin Rlayout
+author: Leon Li(scorpio_leon@hotmail.com)
+=end
+require 'rlayout/model'
+
+ActionController::Base.class_eval do
+  #for page layout
+  include Rlayout::Model
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rlayout
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors: 
 - Leon Li
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-11 00:00:00 +08:00
+date: 2008-11-28 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -22,26 +22,29 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- CHANGELOG
 - MIT-LICENSE
 - Rakefile
+- CHANGELOG
 - README
 - lib/rlayout
-- lib/rlayout/layout.rb
+- lib/rlayout/model.rb
 - lib/rlayout/template.rb
+- lib/rlayout/layout.rb
+- lib/rlayout/common.rb
+- lib/rlayout_model.rb
+- lib/rlayout_template.rb
 - lib/rlayout.rb
 - lib/rlayout_controller.rb
 - lib/rlayout_layout.rb
-- lib/rlayout_template.rb
 - example/templates
 - example/templates/simple
 - example/templates/simple/common.html.erb
-- example/templates/simple_mce
-- example/templates/simple_mce/text_area.html.erb
 - example/templates/xhtml
-- example/templates/xhtml/common.html.erb
 - 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
@@ -66,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: Rails Layout Extension
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: improve rails layout such as simplifying content_for usage and let erb file can determine layout