dryml 1.3.0.pre11 → 1.3.0.pre12

data/VERSION

@@ -1 +1 @@
-1.3.0.pre11
+1.3.0.pre12

data/lib/dryml/extensions/action_controller/dryml_methods.rb

@@ -4,6 +4,8 @@ ActionController::Base.class_eval do
     append_view_path Dryml::Railtie::PageTagResolver.new(self)
   end
 
+  attr_accessor :dryml_fallback_tag
+
   # dryml does not use layouts
   def action_has_layout?
     false
@@ -13,10 +15,6 @@ ActionController::Base.class_eval do
     @this
   end
 
-  def dryml_fallback_tag(tag_name)
-    @dryml_fallback_tag = tag_name
-  end
-
   def call_dryml_tag(tag, options={})
     # TODO: Figure out what this bit is all about :-)
     if options[:with]

data/lib/dryml/railtie/page_tag_resolver.rb

@@ -8,10 +8,10 @@ module Dryml
       end
 
       def find_templates(name, prefix, partial, details)
-        tag_name = @dryml_fallback_tag || name.dasherize + '-page'
+        tag_name = @controller.dryml_fallback_tag || name.dasherize + '-page'
         text = @controller.call_dryml_tag(tag_name)
         return [] unless text
-        [ActionView::Template.new(text, "dryml-tag:#{tag_name}", Dryml::Railtie::PageTagHandler, details)]
+        [ActionView::Template.new(text, "dryml-page-tag:#{tag_name}", Dryml::Railtie::PageTagHandler, details)]
       end
 
     end

data/lib/dryml.rb

@@ -73,46 +73,49 @@ module Dryml
 
     def empty_page_renderer(view)
       controller_name = view.controller.class.name.underscore.sub(/_controller$/, "")
-      page_renderer(view, [], "#{controller_name}/#{EMPTY_PAGE}")
+      page_renderer(view, "#{controller_name}/#{EMPTY_PAGE}" )
     end
 
     def call_render(view, local_assigns, identifier)
-      page = view.request.fullpath
-      renderer = page_renderer(view, local_assigns.keys, page, identifier)
+      page_path = view.request.fullpath
+      renderer = page_renderer(view, page_path, local_assigns.keys, identifier)
       this = view.controller.send(:dryml_context) || local_assigns[:this]
       view.instance_variable_set("@this", this)
       renderer.render_page(this, local_assigns).strip
     end
 
 
-    def page_renderer(view, local_names=[], page=nil, filename=nil)
-      if Rails.env.development?
-        clear_cache
-        Taglib.clear_cache
-      end
+    def page_renderer(view, page_path, local_names=[], identifier=nil)
 
       prepare_view!(view)
-      included_taglibs = ([APPLICATION_TAGLIB] + application_taglibs() + [subsite_taglib(page)] + controller_taglibs(view.controller.class)).compact
-
-      if page.ends_with?(EMPTY_PAGE)
+      included_taglibs = ([APPLICATION_TAGLIB] + application_taglibs() + [subsite_taglib(page_path)] + controller_taglibs(view.controller.class)).compact
+
+      if identifier.blank? && ! page_path.ends_with?(EMPTY_PAGE)
+        opt = ActionController::Routing::Routes.recognize_path(page_path)
+        identifier = view.view_paths.find( opt[:action],
+                                           opt[:controller],
+                                           false,
+                                           view.lookup_context.instance_variable_get('@details')).identifier
+      end
+      if page_path.ends_with?(EMPTY_PAGE) || identifier.starts_with?('dryml-page-tag:')
         controller_class = view.controller.class
         @tag_page_renderer_classes[controller_class.name] ||=
-          make_renderer_class("", page, local_names, DEFAULT_IMPORTS, included_taglibs)
-        @tag_page_renderer_classes[controller_class.name].new(page, view)
+          make_renderer_class("", page_path, local_names, DEFAULT_IMPORTS, included_taglibs)
+        @tag_page_renderer_classes[controller_class.name].new(page_path, view)
       else
-        mtime = File.mtime(filename)
-        renderer_class = @renderer_classes[page]
+        mtime = File.mtime(identifier)
+        renderer_class = @renderer_classes[page_path]
 
         # do we need to recompile?
         if (!renderer_class ||                                          # nothing cached?
             (local_names - renderer_class.compiled_local_names).any? || # any new local names?
             renderer_class.load_time < mtime)                           # cache out of date?
-          renderer_class = make_renderer_class(File.read(filename), filename, local_names,
+          renderer_class = make_renderer_class(File.read(identifier), identifier, local_names,
                                                DEFAULT_IMPORTS, included_taglibs)
           renderer_class.load_time = mtime
-          @renderer_classes[page] = renderer_class
+          @renderer_classes[page_path] = renderer_class
         end
-        renderer_class.new(page, view)
+        renderer_class.new(page_path, view)
       end
     end
 
@@ -172,7 +175,7 @@ module Dryml
       # Not sure why this isn't done for me...
       # There's probably a button to press round here somewhere
       for var in %w(@flash @cookies @action_name @_session @_request @request_origin
-                    @template @request @ignore_missing_templates @_headers @variables_added
+                    @request @ignore_missing_templates @_headers @variables_added
                     @_flash @response @template_class
                     @_cookies @before_filter_chain_aborted @url
                     @_response @template_root @headers @_params @params @session)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dryml
 version: !ruby/object:Gem::Version 
-  hash: -1637175962
+  hash: -1637175961
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre11
-  version: 1.3.0.pre11
+  - pre12
+  version: 1.3.0.pre12
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -04:00
+date: 2010-10-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,13 +43,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175962
+        hash: -1637175961
         segments: 
         - 1
         - 3
         - 0
-        - pre11
-        version: 1.3.0.pre11
+        - pre12
+        version: 1.3.0.pre12
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency