dryml 1.3.0.RC4 → 1.3.0.pre10

data/Rakefile

@@ -2,17 +2,22 @@ require 'rake'
 require 'rake/rdoctask'
 require 'rake/testtask'
 
+$:.unshift File.expand_path('../lib', __FILE__)
+$:.unshift File.expand_path('../../hobo_support/lib', __FILE__)
+require 'dryml' # to get VERSION
+
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
 RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 
+desc "Default Task"
+task :default => [ :test ]
+
 # --- Testing --- #
 
-namespace "test" do
-  desc "Run the doctests"
-  task :doctest do |t|
-    files=Dir['test/**/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
-    exit(1) if !system("#{RUBYDOCTEST} #{files}")
-  end
+desc "Run all tests"
+task :test do |t|
+  files=Dir['test/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
+  exit(1) if !system("#{RUBYDOCTEST} #{files}")
 end
 
 # --- RDOC --- #

data/VERSION

@@ -1 +1 @@
-1.3.0.RC4
+1.3.0.pre10

data/dryml.gemspec

@@ -1,6 +1,5 @@
 name = File.basename( __FILE__, '.gemspec' )
 version = File.read(File.expand_path('../VERSION', __FILE__)).strip
-require 'date'
 
 Gem::Specification.new do |s|
 
@@ -11,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary = "The Don't Repeat Yourself Markup Language"
   s.description = "The Don't Repeat Yourself Markup Language"
 
-  s.add_runtime_dependency('actionpack', ["~> 3.0.0"])
+  s.add_runtime_dependency('actionpack', [">= 3.0.0"])
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   s.add_development_dependency('rubydoctest', [">= 0"])
 
@@ -25,5 +24,4 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
 
-  s.extensions = 'ext/mkrf_conf.rb'
 end

data/lib/dryml/dryml_builder.rb

@@ -1,5 +1,3 @@
-require 'erubis'
-
 module Dryml
 
   class DRYMLBuilder
@@ -60,49 +58,10 @@ module Dryml
     end
 
 
-    class Erubis < ::Erubis::Eruby
-      def add_preamble(src)
-
-      end
-
-      def add_text(src, text)
-        return if text.empty?
-        src << "self.output_buffer.safe_concat('" << escape_text(text) << "');"
-      end
-
-      BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
-
-      def add_expr_literal(src, code)
-        if code =~ BLOCK_EXPR
-          src << 'self.output_buffer.append= ' << code << ";\nself.output_buffer;"
-        else
-          src << 'self.output_buffer.append= (' << code << ");\nself.output_buffer;"
-        end
-      end
-
-      def add_stmt(src, code)
-        # skip fallback code - it utterly destroys DRYML-generated ERB
-        super
-      end
-
-      def add_expr_escaped(src, code)
-        if code =~ BLOCK_EXPR
-          src << "self.output_buffer.safe_append= " << code << ";\nself.output_buffer;"
-        else
-          src << "self.output_buffer.safe_concat((" << code << ").to_s);"
-        end
-      end
-
-      def add_postamble(src)
-        # NOTE: we can't just add a 'self.output_buffer' here because this parser
-        # is used to compile taglibs which don't HAVE one
-      end
-    end
-
     def erb_process(erb_src)
       trim_mode = ActionView::TemplateHandlers::ERB.erb_trim_mode
-      erb = Erubis.new(erb_src, :trim_mode => trim_mode)
-      res = erb.src
+      erb = ERB.new(erb_src, nil, trim_mode, "output_buffer")
+      res = erb.src.split(';')[1..-2].join(';')
       if res.respond_to? :force_encoding
         res.force_encoding(erb_src.encoding)
       end

data/lib/dryml/dryml_doc.rb

@@ -32,21 +32,15 @@ require 'rexml/xpath'
 
         def initialize(home, filename, name=nil)
           @name = name || filename.sub(/.dryml$/, '')[home.length+1..-1]
-          @source = File.read(filename)
           @doc = Dryml::Parser::Document.new(File.read(filename), filename)
           parse_tag_defs
         end
 
-        attr_reader :name, :doc, :tag_defs, :source
+        attr_reader :name, :doc, :tag_defs
 
         def comment
           first_node = doc[0][0]
-          if first_node.is_a?(REXML::Comment)
-            doc.restore_erb_scriptlets(first_node.to_s.strip)
-          elsif first_node.to_s.strip.starts_with?("[![DRYML-ERB")
-            text = doc.restore_erb_scriptlets(first_node.to_s.strip)
-            text.match(/<%#(.*?)%>/m)[1] rescue nil
-          end
+          doc.restore_erb_scriptlets(first_node.to_s.strip) if first_node.is_a?(REXML::Comment)
         end
 
         include CommentMethods
@@ -83,7 +77,7 @@ require 'rexml/xpath'
           doc.restore_erb_scriptlets(node.to_s).strip
         end
 
-        # The contents of the XML or ERB comment, if any, immediately above the tag definition
+        # The contents of the XML comment, if any, immediately above the tag definition
         def comment
           @comment ||= begin
             space = node.previous_sibling and
@@ -92,9 +86,6 @@ require 'rexml/xpath'
 
             if comment_node.is_a?(REXML::Comment)
               doc.restore_erb_scriptlets(comment_node.to_s.strip)
-            elsif space.to_s.strip.starts_with?("[![DRYML-ERB")
-              text = doc.restore_erb_scriptlets(space.to_s.strip)
-              text.match(/.*<%#(.*?)%>$/m)[1] rescue nil
             end
           end
         end

data/lib/dryml/dryml_generator.rb

@@ -195,7 +195,6 @@ require 'fileutils'
           refl = model.reflections[collection]
           klass = refl.klass
           klass < ActiveRecord::Acts::List::InstanceMethods &&
-            klass.table_exists? &&
             klass.new.position_column == refl.options[:order].to_s
         end
       end

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

@@ -4,12 +4,19 @@ 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
+  end
 
   def dryml_context
     @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/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/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,20 +72,20 @@
         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
 
 
@@ -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_handler.rb

@@ -0,0 +1,13 @@
+module Dryml
+  class Railtie
+    class PageTagHandler < ActionView::Template::Handler
+
+      self.default_format = Mime::HTML
+
+      def self.call(template)
+        "ActionView::Template::Text.new(%q(#{template.source}), Mime::HTML).render"
+      end
+
+    end
+  end
+end

data/lib/dryml/railtie/page_tag_resolver.rb

@@ -8,16 +8,12 @@ module Dryml
       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
+        tag_name = @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)]
       end
 
-   end
+    end
   end
 end

data/lib/dryml/railtie.rb

@@ -15,12 +15,5 @@ module Dryml
       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,40 +24,27 @@
 
         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]
-          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
+          plugin = options[:plugin]
+          rails_root = Object.const_defined?(:Rails) ? Rails.root : "."
+          base = if plugin == "dryml"
+                   "#{Dryml.root}/taglibs"
+                 elsif plugin == "hobo"
+                   "#{Hobo.root}/lib/hobo/rapid/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
         end
 
       end

data/lib/dryml/template.rb

@@ -51,7 +51,7 @@ module Dryml
     def compile(local_names=[], auto_taglibs=[])
       now = Time.now
 
-      unless @template_path.blank?
+      unless @template_path.ends_with?(EMPTY_PAGE)
         p = Pathname.new template_path
         p = Pathname.new(Rails.root) + p unless p.absolute? || !Object.const_defined?(:Rails)
         mtime = p.mtime rescue Time.now
@@ -133,7 +133,6 @@ module Dryml
        when scriplet_rex
          t
        when /\S+/
-         t.gsub!(/(\(|\))/){"\\#{$1}"}
          "<% safe_concat %(#{t}) %>"
        else
          t
@@ -190,7 +189,7 @@ module Dryml
       require_toplevel(el)
       require_attribute(el, "as", /^#{DRYML_NAME}$/, true)
       options = {}
-      %w(src module plugin gem as).each do |attr|
+      %w(src module plugin as).each do |attr|
         options[attr.to_sym] = el.attributes[attr] if el.attributes[attr]
       end
       @builder.add_build_instruction(:include, options)
@@ -251,11 +250,7 @@ module Dryml
         _tag_context(attributes) do
           attributes.delete :with
           attributes.delete :field
-          if for_klass = parse_for_type(attributes)
-            call_polymorphic_tag('#{name}', for_klass, attributes, parameters) { #{name}__base(attributes.except, parameters) }
-          else
-            call_polymorphic_tag('#{name}', attributes, parameters) { #{name}__base(attributes.except, parameters) }
-          end
+          call_polymorphic_tag('#{name}', attributes, parameters) { #{name}__base(attributes.except, parameters) }
         end
       end
       )
@@ -276,9 +271,7 @@ module Dryml
                       # It's a symbolic type name - look up the Ruby type name
                       klass = HoboFields.to_class(for_type) or
                         dryml_exception("No such type in polymorphic tag definition: '#{for_type}'", el)
-                      # ActiveSupport::TimeWithZone.name would return 'Time'
-                      # so we add an exception to pick the right datetime type
-                      klass == ActiveSupport::TimeWithZone ? 'datetime' : klass.name
+                      klass.name
                     else
                       for_type
                     end.underscore.gsub('/', '__')
@@ -402,17 +395,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]
-        "<% safe_concat(%(<!--[DRYML|#{metadata * '|'}[-->)) %>" +
-        content +
-        "<% safe_concat(%(<!--]DRYML]-->)) %>"
+        "<!--[DRYML|#{metadata * '|'}[-->" + content + "<!--]DRYML]-->"
       end
     end
 
+
     def wrap_tag_method_body_with_metadata(content)
       name   = @def_element.attributes['tag']
       for_   = @def_element.attributes['for']
@@ -554,7 +547,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)
@@ -726,14 +719,14 @@ module Dryml
     def append_parameter_tag_hash_item(name, el, metadata_name)
       ":#{ruby_name name} => proc { [{}, { :default => proc { |#{param_content_local_name(name)}| new_context { %>" +
         param_content_element(name) + children_to_erb(el) +
-        "<% ; output_buffer } } } ] }"
+        "<% } } } ] }"
     end
 
 
     def prepend_parameter_tag_hash_item(name, el, metadata_name)
       ":#{ruby_name name} => proc { [{}, { :default => proc { |#{param_content_local_name(name)}| new_context { %>" +
         children_to_erb(el) + param_content_element(name) +
-        "<% ; output_buffer } } } ] }"
+        "<% } } } ] }"
     end
 
 
@@ -741,7 +734,7 @@ module Dryml
       content = children_to_erb(el)
       content = wrap_source_with_metadata(content, "param", containing_param_name,
                                           element_line_num(el)) if containing_param_name
-      "proc { |#{param_content_local_name(el.dryml_name)}| new_context { %>#{content}<% ; output_buffer } #{tag_newlines(el)}}"
+      "proc { |#{param_content_local_name(el.dryml_name)}| new_context { %>#{content}<% } #{tag_newlines(el)}}"
     end
 
 
@@ -755,8 +748,8 @@ module Dryml
     end
 
 
-    def param_proc(el, metadata_name_suffix)
-      metadata_name = "#{el.name} < #{metadata_name_suffix}"
+    def param_proc(el, metadata_name_prefix)
+      metadata_name = "#{metadata_name_prefix}><#{el.name}"
 
       nl = tag_newlines(el)
 
@@ -789,7 +782,7 @@ module Dryml
     def replace_parameter_proc(el, metadata_name, content=nil)
       content ||= wrap_replace_parameter(el, metadata_name)
       param_name = el.dryml_name.sub(/^(before|after|append|prepend)-/, "")
-      "proc { |#{param_restore_local_name(param_name)}| new_context { %>#{content}<% ; output_buffer } #{tag_newlines(el)}}"
+      "proc { |#{param_restore_local_name(param_name)}| new_context { %>#{content}<% } #{tag_newlines(el)}}"
     end
 
 
@@ -817,7 +810,7 @@ module Dryml
       items = attributes.map do |n,v|
         dryml_exception("invalid attribute name '#{n}' (remember to use '-' rather than '_')", el) unless n =~ DRYML_NAME_RX
 
-        next if n.in?(SPECIAL_ATTRIBUTES-['for-type']) || n =~ /^without-/
+        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)}"
@@ -1030,6 +1023,8 @@ 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
     end

data/lib/dryml/template_environment.rb

@@ -26,9 +26,10 @@ module Dryml
     include ActionView::Helpers
     include Helper  ## FIXME remove
 
-    def initialize(view=nil)
-      unless view.nil?
+    def initialize(view_name=nil, view=nil)
+      unless view_name.nil? && view.nil?
         @view = view
+        @_view_name = view_name
         @_erb_binding = binding
         @_part_contexts = {}
         @_scoped_variables = ScopedVariables.new
@@ -48,7 +49,7 @@ module Dryml
       end
     end
 
-    for attr in [:erb_binding, :part_contexts,
+    for attr in [:erb_binding, :part_contexts, :view_name,
                  :this, :this_parent, :this_field, :this_key,
                  :form_this, :form_field_path, :form_field_names]
       class_eval "def #{attr}; @_#{attr}; end"
@@ -188,20 +189,6 @@ module Dryml
       end
     end
 
-    def parse_for_type(attributes)
-      t = attributes[:for_type]
-      if t.nil?
-        nil
-      elsif t.is_a?(Class)
-        t
-      elsif t =~ /^[A-Z]/
-        t.constantize
-      elsif t =~ /^[a-z]/ && defined?(HoboFields.to_class)
-        HoboFields.to_class(t)
-      else
-        nil
-      end
-    end
 
     def call_polymorphic_tag(name, *args)
       name = name.to_s.gsub('-', '_')
@@ -219,13 +206,11 @@ module Dryml
 
     def find_polymorphic_tag(name, call_type=nil)
       call_type ||= (this.respond_to?(:member_class) && this.member_class) || this_type
+
       begin
         found = nil
         while true
-          # ActiveSupport::TimeWithZone.name would return 'Time'
-          # so we add an exception to pick the right datetime type
-          type_name = ( call_type == ActiveSupport::TimeWithZone ? 'datetime' : call_type.name.to_s).underscore.gsub('/', '__')
-          if respond_to?(poly_name = "#{name}__for_#{type_name}")
+          if respond_to?(poly_name = "#{name}__for_#{call_type.name.to_s.underscore.gsub('/', '__')}")
             found = poly_name
             break
           else
@@ -260,8 +245,7 @@ module Dryml
               @_form_field_path, @_form_field_paths_by_object ]
       @_this_type = nil
       res = nil
-      outer_res = @view.with_output_buffer { res = yield }
-      Rails.logger.error("new_context: #{caller.first}") if !outer_res.blank? && outer_res.to_s != res.to_s
+      @view.with_output_buffer { res = yield }
       @_this, @_this_parent, @_this_field, @_this_type, @_form_field_path, @_form_field_paths_by_object = ctx
       res.to_s
     end
@@ -347,14 +331,13 @@ module Dryml
 
 
     def with_form_context(form_this=this, form_field_path=[form_this.class.name.underscore])
-      ctx = [@_form_this, @_form_field_path, @_form_field_paths_by_object]
       @_form_this = form_this
       @_form_field_path = form_field_path
       @_form_field_paths_by_object = { form_this => form_field_path }
       res = scope.new_scope :in_form => true, :form_field_names => [] do
         yield
       end
-      @_form_this, @_form_field_path, @_form_field_paths_by_object = ctx
+      @_form_this = @_form_field_path = @_form_field_paths_by_object = nil
       res
     end
 
@@ -542,6 +525,14 @@ module Dryml
     end
 
 
+
+
+    def part_contexts_javascripts
+      storage = part_contexts_storage
+      storage.blank? ? "" : "<script type=\"text/javascript\">\n#{storage}</script>\n"
+    end
+
+
     def part_contexts_storage
       PartContext.client_side_storage(@_part_contexts, session)
     end