dryml 1.1.0 → 1.3.0.RC

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

@@ -0,0 +1,23 @@
+ActionController::Base.class_eval do
+
+  before_filter do
+    append_view_path Dryml::Railtie::PageTagResolver.new(self)
+  end
+
+  attr_accessor :dryml_fallback_tag
+
+  def dryml_context
+    @this
+  end
+
+  def call_dryml_tag(tag, options={})
+    # TODO: Figure out what this bit is all about :-)
+    if options[:with]
+      @this = options[:with] unless options[:field]
+    else
+      options[:with] = dryml_context
+    end
+    Dryml.render_tag(view_context, tag, options)
+  end
+
+end

data/lib/dryml/helper.rb

@@ -31,7 +31,7 @@ module Dryml::Helper
       end
       res
     end
-    
+
     def first_item?
       if scope.repeat_collection.respond_to? :each_pair
         this == scope.repeat_collection.first.try.last
@@ -39,8 +39,8 @@ module Dryml::Helper
         this == scope.repeat_collection.first
       end
     end
-    
-    
+
+
     def last_item?
       if scope.repeat_collection.respond_to? :each_pair
         this == scope.repeat_collection.last.try.last
@@ -49,7 +49,7 @@ module Dryml::Helper
       end
     end
 
-        def param_name_for(path)
+    def param_name_for(path)
       field_path = field_path.to_s.split(".") if field_path.is_one_of?(String, Symbol)
       attrs = path.rest.map{|part| "[#{part.to_s.sub /\?$/, ''}]"}.join
       "#{path.first}#{attrs}"

data/lib/dryml/parser/tree_parser.rb

@@ -54,7 +54,7 @@ module Dryml::Parser
             c = REXML::CData.new( event[1] )
             @build_context.add( c )
           when :processing_instruction
-            @build_context.add( Instruction.new( event[1], event[2] ) )
+            @build_context.add( REXML::Instruction.new( event[1], event[2] ) )
           end
         end
       rescue REXML::Validation::ValidationException

data/lib/dryml/part_context.rb

@@ -21,8 +21,8 @@
           "hoboParts['#{dom_id}'] = (#{code});\n"
         end.join
       end
-      
-      
+
+
       def self.pre_marshal(x)
         if x.is_a?(ActiveRecord::Base) && x.respond_to?(:typed_id)
           TypedId.new(x.typed_id)
@@ -40,19 +40,19 @@
           c.form_field_path = environment.form_field_path
         end
       end
-      
-      
+
+
       def self.for_refresh(encoded_context, page_this, session)
         new do |c|
           c.unmarshal(encoded_context, page_this, session)
         end
       end
-      
-      
+
+
       def initialize
         yield self
       end
-      
+
       attr_accessor :part_name, :locals, :this, :this_field, :this_id, :form_field_path
 
 
@@ -72,26 +72,26 @@
         raise TamperedWithPartContext unless digest == generate_digest(data, session)
 
         context = Marshal.load(Base64.decode64(data))
-        
+
         part_name, this_id, locals, form_field_path = context
 
         if RAILS_DEFAULT_LOGGER
           RAILS_DEFAULT_LOGGER.info "Call part: #{part_name}. this-id = #{this_id}, locals = #{locals.inspect}"
           RAILS_DEFAULT_LOGGER.info "         : form_field_path = #{form_field_path.inspect}" if form_field_path
         end
-        
+
         self.part_name             = part_name
         self.this_id               = this_id
         self.locals                = restore_locals(locals)
         self.form_field_path       = form_field_path
-        
-        parse_this_id(page_this)        
+
+        parse_this_id(page_this)
       end
 
 
       # Generate the HMAC keyed message digest. Uses SHA1 by default.
       def generate_digest(data, session)
-        secret = self.class.secret || ActionController::Base.session_options[:secret] || ActionController::Base.cached_session_options.first[:secret]
+        secret = self.class.secret || Rails.application.config.secret_token
         key = secret.respond_to?(:call) ? secret.call(session) : secret
         OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(self.class.digest), key, data)
       end
@@ -121,7 +121,7 @@
       def restore_locals(locals)
         locals.map do |l|
           if l.is_a?(TypedId)
-            Hobo::Model.find_by_typed_id(l)
+            Hobo::Model.find_by_typed_id(this_id)
           else
             l
           end

data/lib/dryml/railtie/page_tag_resolver.rb

@@ -0,0 +1,23 @@
+module Dryml
+  class Railtie
+    class PageTagResolver < ActionView::Resolver
+
+      def initialize(controller)
+        @controller = controller
+        super()
+      end
+
+      def find_templates(name, prefix, partial, details)
+        tag_name = @controller.dryml_fallback_tag || name.dasherize + '-page'
+        method_name = tag_name.to_s.gsub('-', '_')
+        if Dryml.empty_page_renderer(@controller.view_context).respond_to?(method_name)
+          [ActionView::Template.new('', Dryml.page_tag_identifier(@controller.controller_path, tag_name),
+                                    Dryml::Railtie::TemplateHandler, details)]
+        else
+          []
+        end
+      end
+
+   end
+  end
+end

data/lib/dryml/railtie/template_handler.rb

@@ -0,0 +1,15 @@
+module Dryml
+  class Railtie
+    class TemplateHandler < ActionView::Template::Handler
+
+      self.default_format = Mime::HTML
+
+      def self.call(template)
+        "Dryml.call_render(self, local_assigns, '#{template.identifier}')"
+      end
+
+    end
+  end
+end
+
+

data/lib/dryml/railtie.rb

@@ -0,0 +1,26 @@
+module Dryml
+  class Railtie < Rails::Railtie
+
+    ActiveSupport.on_load(:before_initialize) do |app|
+      require 'dryml'
+      require 'dryml/template'
+      require 'dryml/dryml_generator'
+    end
+
+    ActiveSupport.on_load(:action_controller) do
+      require 'dryml/extensions/action_controller/dryml_methods'
+    end
+
+    ActiveSupport.on_load(:action_view) do
+      ActionView::Template.register_template_handler("dryml", Dryml::Railtie::TemplateHandler)
+    end
+
+    initializer 'dryml' do |app|
+      app.config.to_prepare do
+        Dryml.clear_cache
+        Dryml::Taglib.clear_cache
+      end
+    end
+
+  end
+end

data/lib/dryml/tag_parameters.rb

@@ -22,7 +22,7 @@
 
       undef_method :default
 
-      # Question: does this do anything? -Tom 
+      # Question: does this do anything? -Tom
       def [](param_name)
         fetch(param_name, nil)
       end

data/lib/dryml/taglib.rb

@@ -24,29 +24,40 @@
 
         private
 
+        # Requirements for  hobo-plugin for loading a taglib when the plugin is loaded as a gem:
+        # - the plugin must define the <gem_name>.camelize.constantize.root() method
+        # - the root() method must return a Pathname object (like Hobo.root, Dryml.root, Rails.root, etc.)
+        # - the taglibs must be available in the 'taglibs' dir in the gem root
+        # You can include the taglib with <include gem='gem_name'/> if the taglib name has the same gem name.
+        # If the plugin defines different taglibs you must also specify the src attribute of the taglib that you want
+        # to include: <include gem='gem_name' src='taglib_name'/>'
+
         def taglib_filename(options)
-          plugin = options[:plugin]
-          rails_root = Object.const_defined?(:RAILS_ROOT) ? RAILS_ROOT : "."
-          base = if plugin == "dryml"
-                   "#{DRYML_ROOT}/taglibs"
-                 elsif plugin == "hobo"
-                   "#{HOBO_ROOT}/taglibs"
-                 elsif plugin
-                   "#{rails_root}/vendor/plugins/#{plugin}/taglibs"
-                 elsif options[:src] =~ /\//
-                   "#{rails_root}/app/views"
-                 elsif options[:template_dir] =~ /^#{HOBO_ROOT}/
-                   options[:template_dir]
-                 elsif options[:absolute_template_path]
-                    options[:absolute_template_path]
-                 else
-                   "#{rails_root}/#{options[:template_dir].gsub(/^\//, '')}" # remove leading / if there is one
-                 end
-
-          src = options[:src] || plugin
-          filename = "#{base}/#{src}.dryml"
-          raise DrymlException, "No such taglib: #{base} #{options.inspect} #{filename}" unless File.exists?(filename)
-          filename
+          plugin       = options[:plugin]
+          gem          = options[:gem]
+          app_root     = Object.const_defined?(:Rails) ? Rails.root : Pathname.new(File.expand_path('.'))
+          taglibs_path = case
+                         when plugin == 'dryml'
+                           Dryml.root.join 'taglibs'
+                         when plugin == 'hobo', gem == 'hobo'
+                           Hobo.root.join 'lib/hobo/rapid/taglibs'
+                         when !plugin.blank?
+                           app_root.join 'vendor/plugins', plugin, 'taglibs'
+                         when !gem.blank?
+                           gem.tr('-','_').camelize.constantize.root.join 'taglibs'
+                         when options[:src] =~ /\//
+                           app_root.join 'app/views'
+                         when options[:template_dir] =~ /^#{Hobo.root}/
+                           Pathname.new(options[:template_dir])
+                         when options[:absolute_template_path]
+                           Pathname.new(options[:absolute_template_path])
+                         else
+                           app_root.join options[:template_dir].gsub(/^\//, '') # remove leading / if there is one
+                         end
+          src          = options[:src] || gem || plugin
+          taglib_file  = taglibs_path.join "#{src}.dryml"
+          raise DrymlException, "No such taglib: #{src} #{options.inspect} #{taglib_file}" unless taglib_file.exist?
+          taglib_file.to_s
         end
 
       end

data/lib/dryml/template.rb

@@ -38,7 +38,7 @@ module Dryml
       @src = src
       @environment = environment # a class or a module
       @template_path = template_path
-      @template_path = @template_path.sub(%r(^#{Regexp.escape(RAILS_ROOT)}/), "") if Object.const_defined? :RAILS_ROOT
+      @template_path = @template_path.sub(%r(^#{Regexp.escape(Rails.root.to_s)}/), "") if Object.const_defined? :Rails
 
       @builder = Template.build_cache[@template_path] || DRYMLBuilder.new(self)
       @builder.set_environment(environment)
@@ -51,11 +51,11 @@ module Dryml
     def compile(local_names=[], auto_taglibs=[])
       now = Time.now
 
-      unless @template_path.ends_with?(EMPTY_PAGE)
+      unless @template_path.blank?
         p = Pathname.new template_path
-        p = Pathname.new(RAILS_ROOT) + p unless p.absolute? || !Object.const_defined?(:RAILS_ROOT)
+        p = Pathname.new(Rails.root) + p unless p.absolute? || !Object.const_defined?(:Rails)
         mtime = p.mtime rescue Time.now
-      
+
         if !@builder.ready?(mtime)
           @builder.start
           parsed = true
@@ -70,7 +70,7 @@ module Dryml
           Template.build_cache[@template_path] = @builder
         end
       end
-      
+
       # compile the build instructions
       @builder.build(local_names, auto_taglibs, mtime)
 
@@ -112,13 +112,13 @@ module Dryml
 
       # v important this comes before REXML::Text, as REXML::CData < REXML::Text
       when REXML::CData
-        REXML::CData::START + node.to_s + REXML::CData::STOP
+        "<% safe_concat %(#{REXML::CData::START + node.to_s + REXML::CData::STOP}) %>"
 
       when REXML::Comment
-        REXML::Comment::START + node.to_s + REXML::Comment::STOP
+        "<% safe_concat %(#{REXML::Comment::START + node.to_s + REXML::Comment::STOP}) %>"
 
       when REXML::Text
-        strip_suppressed_whiteaspace(node.to_s)
+        text_with_scriplets_to_erb(node.to_s)
 
       when REXML::Element
         element_to_erb(node)
@@ -126,8 +126,19 @@ module Dryml
     end
 
 
-    def strip_suppressed_whiteaspace(s)
-      s # s.gsub(/ -(\s*\n\s*)/, '<% \1 %>')
+    def text_with_scriplets_to_erb(s)
+     scriplet_rex = /(\[!\[DRYML-ERB\d+\s*\]!\])/m
+     s.split(scriplet_rex).map do |t|
+       case t
+       when scriplet_rex
+         t
+       when /\S+/
+         t.gsub!(/(\(|\))/){"\\#{$1}"}
+         "<% safe_concat %(#{t}) %>"
+       else
+         t
+       end
+     end.join
     end
 
 
@@ -179,7 +190,7 @@ module Dryml
       require_toplevel(el)
       require_attribute(el, "as", /^#{DRYML_NAME}$/, true)
       options = {}
-      %w(src module plugin as).each do |attr|
+      %w(src module plugin gem as).each do |attr|
         options[attr.to_sym] = el.attributes[attr] if el.attributes[attr]
       end
       @builder.add_build_instruction(:include, options)
@@ -234,7 +245,7 @@ module Dryml
 
 
     def define_polymorphic_dispatcher(el, name)
-      # FIXME: The new erb context ends up being set-up twice 
+      # FIXME: The new erb context ends up being set-up twice
       src = %(
       def #{name}(attributes={}, parameters={})
         _tag_context(attributes) do
@@ -246,29 +257,31 @@ module Dryml
       )
       @builder.add_build_instruction(:eval, :src => src, :line_num => element_line_num(el))
     end
-    
-    
+
+
     def extend_element(el)
       def_element(el, true)
     end
-    
-    
+
+
     def type_specific_suffix
       el = @def_element
       for_type = el.attributes['for']
       if for_type
         type_name = if defined?(HoboFields) && for_type =~ /^[a-z]/
                       # It's a symbolic type name - look up the Ruby type name
-                      klass = HoboFields.to_class(for_type) or 
+                      klass = HoboFields.to_class(for_type) or
                         dryml_exception("No such type in polymorphic tag definition: '#{for_type}'", el)
-                      klass.name
+                      # ActiveSupport::TimeWithZone.name would return 'Time'
+                      # so we add an exception to pick the right datetime type
+                      klass == ActiveSupport::TimeWithZone ? 'datetime' : klass.name
                     else
                       for_type
                     end.underscore.gsub('/', '__')
         "__for_#{type_name}"
       end
     end
-        
+
 
     def def_element(el, extend_tag=false)
       require_toplevel(el)
@@ -285,12 +298,12 @@ module Dryml
         name        += suffix
         unsafe_name += suffix
       end
-      
+
       if el.attributes['polymorphic']
         %w(for alias-of).each do |attr|
           dryml_exception("def cannot have both 'polymorphic' and '#{attr}' attributes") if el.attributes[attr]
         end
-        
+
         define_polymorphic_dispatcher(el, ruby_name(name))
         name        += "__base"
         unsafe_name += "__base"
@@ -351,13 +364,13 @@ module Dryml
     def tag_method(name, el, extend_tag=false)
       name = ruby_name name
       param_names = param_names_in_definition(el)
-      
+
       if extend_tag
         @extend_key = 'a' + Digest::SHA1.hexdigest(el.to_s)[0..10]
         alias_statement = "; alias_method_chain_on_include :#{name}, :#{@extend_key}"
         name = "#{name}_with_#{@extend_key}"
       end
-            
+
       src = "<% def #{name}(all_attributes={}, all_parameters={}); " +
         "parameters = Dryml::TagParameters.new(all_parameters, #{param_names.inspect.underscore}); " +
         "all_parameters = Dryml::TagParameters.new(all_parameters); " +
@@ -385,17 +398,17 @@ module Dryml
         "<% output_buffer; end"
     end
 
-
     def wrap_source_with_metadata(content, kind, name, *args)
       if (!include_source_metadata) || name.in?(NO_METADATA_TAGS)
         content
       else
         metadata = [kind, name] + args + [@template_path]
-        "<!--[DRYML|#{metadata * '|'}[-->" + content + "<!--]DRYML]-->"
+        "<% safe_concat(%(<!--[DRYML|#{metadata * '|'}[-->)) %>" +
+        content +
+        "<% safe_concat(%(<!--]DRYML]-->)) %>"
       end
     end
 
-
     def wrap_tag_method_body_with_metadata(content)
       name   = @def_element.attributes['tag']
       for_   = @def_element.attributes['for']
@@ -431,7 +444,7 @@ module Dryml
                el.attributes['for'] || @containing_tag_name
              end
       local_name = param_content_local_name(name)
-      "<%= #{local_name} && #{local_name}.call %>"
+      "<%= #{local_name}.call if #{local_name} %>"
     end
 
 
@@ -459,7 +472,7 @@ module Dryml
 
       newlines = "\n" * part_src.count("\n")
       args = [attribute_to_ruby(dom_id), ":#{part_name}", part_locals].compact
-      "<%= call_part(#{args * ', '}) #{newlines} %>"
+      "<%=raw call_part(#{args * ', '}) #{newlines} %>"
     end
 
 
@@ -477,8 +490,8 @@ module Dryml
     def part_delegate_tag_name(el)
       "#{@def_name}_#{el.attributes['part']}__part_delegate"
     end
-    
-    
+
+
     def current_def_name
       @def_element && @def_element.attributes['tag']
     end
@@ -496,8 +509,8 @@ module Dryml
         nil
       end
     end
-    
-    
+
+
     def inside_def_for_type?
       @def_element && @def_element.attributes['for']
     end
@@ -505,7 +518,7 @@ module Dryml
 
     def call_name(el)
       dryml_exception("invalid tag name (remember to use '-' rather than '_')", el) unless el.dryml_name =~ /^#{DRYML_NAME}(\.#{DRYML_NAME})*$/
-      
+
       name = Dryml.unreserve(ruby_name(el.dryml_name))
       if call_to_self_from_type_specific_def?(el)
         "#{name}__base"
@@ -517,8 +530,8 @@ module Dryml
         name
       end
     end
-    
-    
+
+
     def old_tag_call?(el)
       @def_element && el.dryml_name == "old-#{current_def_name}"
     end
@@ -527,7 +540,7 @@ module Dryml
     def call_to_self_from_type_specific_def?(el)
       inside_def_for_type? && el.dryml_name == current_def_name &&!el.attributes['for-type']
     end
-    
+
 
     def polymorphic_call_type(el)
       t = el.attributes['for-type']
@@ -537,7 +550,7 @@ module Dryml
         'this_type'
       elsif t =~ /^[A-Z]/
         t
-      elsif t =~ /^[a-z]/ && defined? HoboFields.to_class
+      elsif t =~ /^[a-z]/ && defined?(HoboFields.to_class)
         klass = HoboFields.to_class(t)
         klass.name
       elsif is_code_attribute?(t)
@@ -607,7 +620,7 @@ module Dryml
       call_type = nil
 
       metadata_name = containing_tag_name || el.expanded_name
-      
+
       param_items = el.map do |node|
         case node
         when REXML::Text
@@ -642,7 +655,7 @@ module Dryml
           param_items = " :default => #{default_param_proc(el, containing_tag_name)}, "
         end
       end
-      
+
       param_items.concat without_parameters(el)
 
       merge_params = el.attributes['merge-params'] || merge_attribute(el)
@@ -660,8 +673,8 @@ module Dryml
         "{#{param_items}}"
       end
     end
-    
-    
+
+
     def without_parameters(el)
       without_names = el.attributes.keys.map { |name| name =~ /^without-(.*)/ and $1 }.compact
       without_names.map { |name| ":#{ruby_name name}_replacement => proc {|__discard__| '' }, " }.join
@@ -738,8 +751,8 @@ module Dryml
     end
 
 
-    def param_proc(el, metadata_name_prefix)
-      metadata_name = "#{metadata_name_prefix}><#{el.name}"
+    def param_proc(el, metadata_name_suffix)
+      metadata_name = "#{el.name} < #{metadata_name_suffix}"
 
       nl = tag_newlines(el)
 
@@ -780,7 +793,10 @@ module Dryml
       part_name = el.attributes['part']
       if part_name
         part_id = el.attributes['id'] || part_name
-        "<div class='part-wrapper' id='<%= #{attribute_to_ruby part_id} %>'>#{part_element(el, call)}</div>"
+
+        "<% safe_concat(\"<div class='part-wrapper' id='#{attribute_to_ruby(part_id)[1..-2]}'>\") %>" +
+          part_element(el, call) +
+          "<% safe_concat(%(</div>)) %>"
       else
         call
       end
@@ -799,7 +815,7 @@ module Dryml
 
         next if n.in?(SPECIAL_ATTRIBUTES) || n =~ /^without-/
         next if el.attributes['part'] && n == 'id' # The id is rendered on the <div class="part-wrapper"> instead
-        
+
         ":#{ruby_name n} => #{attribute_to_ruby(v)}"
       end.compact
 
@@ -817,8 +833,8 @@ module Dryml
         hash
       end
     end
-    
-    
+
+
     def compile_merge_attrs(el)
       merge_attrs = el.attributes['merge-attrs']
       if merge_attrs == "&true"
@@ -830,7 +846,7 @@ module Dryml
         "(all_attributes & #{merge_attr_names.inspect})"
       end
     end
-    
+
 
     def static_tag_to_method_call(el)
       part = el.attributes["part"]
@@ -877,15 +893,11 @@ module Dryml
       else
         start_tag_src = el.start_tag_source.gsub(REXML::CData::START, "").gsub(REXML::CData::STOP, "")
 
-        # Allow #{...} as an alternate to <%= ... %>
-        start_tag_src.gsub!(/=\s*('.*?'|".*?")/) do |s|
-          s.gsub(/#\{(.*?)\}/, '<%= \1 %>')
-        end
-
+        sts = "<% safe_concat(%(#{start_tag_src}))%>"
         if el.has_end_tag?
-          start_tag_src + children_to_erb(el) + "</#{el.name}>"
+          sts + children_to_erb(el) + "<% safe_concat(%(</#{el.name}>)) %>"
         else
-          start_tag_src
+          sts
         end
       end
     end
@@ -947,7 +959,11 @@ module Dryml
                 "(#{attr[1..-1]})"
               else
                 if attr !~ /"/
-                  '"' + attr + '"'
+                  if attr =~ /\#\{/
+                    '"' + attr + '"'
+                  else
+                    '"' + attr + '"'
+                  end
                 elsif attr !~ /'/
                   "'#{attr}'"
                 else
@@ -1010,9 +1026,7 @@ module Dryml
     end
 
     def include_source_metadata
-      # disabled for now -- we're still getting broken rendering with this feature on
-      return false
-      @include_source_metadata = RAILS_ENV == "development" && !ENV['DRYML_EDITOR'].blank? if @include_source_metadata.nil?
+      @include_source_metadata = Rails.env.development? && !ENV['DRYML_EDITOR'].blank? if @include_source_metadata.nil?
       @include_source_metadata
     end