edifice 0.6.9 → 0.7.0

data/lib/edifice/controller.rb

@@ -0,0 +1,56 @@
+module Edifice
+  
+  module Controller
+    def self.included(controller)
+      controller.helper_method(:view_path, :view_path_normalized, 
+        :view_name, :view_name_normalized, :layout_name)
+      
+      unless (controller == ActionMailer::Base)
+        controller.after_filter(:write_edifice_headers)
+      end
+      
+      controller.class_eval do
+        def self.responder
+          Edifice::Responder
+        end
+      end
+    end
+    
+    # this will get called once per template. So we make sure it only writes for the first
+    def set_edifice_names(view_name, view_path, layout)
+      unless @edifice_names_set
+        @view_name = view_name
+        @view_path = view_path
+        @layout = layout
+        
+        @edifice_names_set = true
+      end
+    end
+    
+    def write_edifice_headers
+      response.headers['x-edifice-view_path'] = view_path_normalized
+      response.headers['x-edifice-view_name'] = view_name_normalized
+      response.headers['x-edifice-layout'] = layout_name
+    end
+    
+    def view_path
+      (@view_path || 'no_controller').gsub('/', '_')
+    end
+    
+    def view_path_normalized
+      view_path.camelcase(:lower)
+    end
+
+    def view_name
+      @view_name || 'no_view'
+    end
+    
+    def view_name_normalized
+      view_name.camelcase(:lower)
+    end
+    
+    def layout_name
+      @layout || 'no_layout'
+    end
+  end
+end

data/lib/edifice/renderer.rb

@@ -0,0 +1,20 @@
+module Edifice
+  module Renderer
+    def self.included(renderer)
+      renderer.class_eval do
+        def _template_renderer #:nodoc:
+          @_template_renderer ||= Edifice::TemplateRenderer.new(@lookup_context)
+        end
+      end
+    end
+  end
+
+  class TemplateRenderer < ActionView::TemplateRenderer
+    def render_template(template, layout_name = nil, locals = {})
+      @view.controller.set_edifice_names(template.virtual_path.name, 
+        template.virtual_path.prefix, (layout_name.nil? ? '' : layout_name.split('/').last))
+      
+      super(template, layout_name, locals)
+    end
+  end
+end

data/lib/edifice/version.rb

@@ -1,3 +1,3 @@
 module Edifice
-  VERSION = "0.6.9"
+  VERSION = "0.7.0"
 end

data/lib/edifice.rb

@@ -1,4 +1,6 @@
 require 'edifice/helper'
+require 'edifice/controller'
+require 'edifice/renderer'
 require 'edifice/form_model'
 require 'edifice/responder'
 
@@ -12,60 +14,9 @@ module Edifice
     FileUtils.rm_r File.join(install_dir, 'edifice')
     FileUtils.cp_r edifice_js_dir, install_dir
   end
-  
-  module Controller
-    def self.included(controller)
-      controller.helper_method(:view_path, :view_path_normalized, 
-        :view_name, :view_name_normalized, :layout_name)
-      
-      unless (controller == ActionMailer::Base)
-        controller.after_filter(:write_edifice_headers)
-        controller.alias_method_chain(:_render_template, :edifice)
-      end
-      
-      controller.class_eval do
-        def self.responder
-          Edifice::Responder
-        end
-      end
-    end
-    
-    def _render_template_with_edifice(options)
-      @view_path = options[:prefix]
-      @view_name = options[:template]
-      @layout = options[:layout] ? File.split(options[:layout]).last : nil
-      
-      _render_template_without_edifice(options)
-    end
-    
-    def write_edifice_headers
-      response.headers['x-edifice-view_path'] = view_path_normalized
-      response.headers['x-edifice-view_name'] = view_name_normalized
-      response.headers['x-edifice-layout'] = layout_name
-    end
-    
-    def view_path
-      (@view_path || 'no_controller').gsub('/', '_')
-    end
-    
-    def view_path_normalized
-      view_path.camelcase(:lower)
-    end
-
-    def view_name
-      @view_name || 'no_view'
-    end
-    
-    def view_name_normalized
-      view_name.camelcase(:lower)
-    end
-    
-    def layout_name
-      @layout || 'no_layout'
-    end
-  end
 end
 
 ActionController::Base.send :include, Edifice::Controller
 # ActionMailer::Base.send :include, Edifice::Controller
-ActionView::Base.send :include, Edifice::Helper
+ActionView::Base.send :include, Edifice::Helper
+ActionView::Renderer.send :include, Edifice::Renderer

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 9
-  version: 0.6.9
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Tom Coleman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 +10:00
+date: 2011-09-20 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -42,9 +42,11 @@ files:
 - edifice.gemspec
 - init.rb
 - lib/edifice.rb
+- lib/edifice/controller.rb
 - lib/edifice/form_model.rb
 - lib/edifice/helper.rb
 - lib/edifice/railtie.rb
+- lib/edifice/renderer.rb
 - lib/edifice/responder.rb
 - lib/edifice/version.rb
 - lib/public/javascripts/edifice/edifice_form.js