dryml 1.3.0.RC2 → 1.3.0.RC3

data/VERSION

@@ -1 +1 @@
-1.3.0.RC2
+1.3.0.RC3

data/lib/dryml/dryml_builder.rb

@@ -58,10 +58,49 @@ 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 = ERB.new(erb_src, nil, trim_mode, "output_buffer")
-      res = erb.src.split(';')[1..-2].join(';')
+      erb = Erubis.new(erb_src, :trim_mode => trim_mode)
+      res = erb.src
       if res.respond_to? :force_encoding
         res.force_encoding(erb_src.encoding)
       end

data/lib/dryml/part_context.rb

@@ -121,7 +121,7 @@
       def restore_locals(locals)
         locals.map do |l|
           if l.is_a?(TypedId)
-            Hobo::Model.find_by_typed_id(this_id)
+            Hobo::Model.find_by_typed_id(l)
           else
             l
           end

data/lib/dryml/template.rb

@@ -251,7 +251,11 @@ module Dryml
         _tag_context(attributes) do
           attributes.delete :with
           attributes.delete :field
-          call_polymorphic_tag('#{name}', attributes, parameters) { #{name}__base(attributes.except, parameters) }
+          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
         end
       end
       )
@@ -722,14 +726,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
 
 
@@ -737,7 +741,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}<% } #{tag_newlines(el)}}"
+      "proc { |#{param_content_local_name(el.dryml_name)}| new_context { %>#{content}<% ; output_buffer } #{tag_newlines(el)}}"
     end
 
 
@@ -785,7 +789,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}<% } #{tag_newlines(el)}}"
+      "proc { |#{param_restore_local_name(param_name)}| new_context { %>#{content}<% ; output_buffer } #{tag_newlines(el)}}"
     end
 
 
@@ -813,7 +817,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) || n =~ /^without-/
+        next if n.in?(SPECIAL_ATTRIBUTES-['for-type']) || 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)}"

data/lib/dryml/template_environment.rb

@@ -188,6 +188,20 @@ 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('-', '_')
@@ -246,7 +260,8 @@ module Dryml
               @_form_field_path, @_form_field_paths_by_object ]
       @_this_type = nil
       res = nil
-      @view.with_output_buffer { res = yield }
+      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
       @_this, @_this_parent, @_this_field, @_this_type, @_form_field_path, @_form_field_paths_by_object = ctx
       res.to_s
     end

data/lib/dryml.rb

@@ -9,6 +9,7 @@ require 'action_pack'
 require 'openssl'
 
 ActiveSupport::Dependencies.autoload_paths |= [File.dirname(__FILE__)]
+ActiveSupport::Dependencies.autoload_once_paths |= [File.dirname(__FILE__)]
 
 # The Don't Repeat Yourself Markup Language
 module Dryml
@@ -65,9 +66,10 @@ module Dryml
   end
 
   def call_render(view, local_assigns, identifier)
-    renderer = page_renderer(view, identifier, local_assigns.keys)
     this = view.controller.send(:dryml_context) || local_assigns[:this]
     view.instance_variable_set("@this", this)
+    # do this last, as TemplateEnvironment copies instance variables in initalize
+    renderer = page_renderer(view, identifier, local_assigns.keys)
     if identifier =~ /#{ID_SEPARATOR}/
       tag_name = identifier.split(ID_SEPARATOR).last
       renderer.render_tag(tag_name, {:with => this} )

data/taglibs/core.dryml

@@ -71,10 +71,10 @@ For example, you might want to wrap an `<img>` tag in an `<a>` tag but only unde
 
 ### Usage
 
-    <if test="&current_user.administrtator?">Logged in as administrator</if>
+    <if test="&current_user.administrator?">Logged in as administrator</if>
     <else>Logged in as normal user</else>
-
-**IMPORTANT NOTE**: `<if>` tests for non-blank vs. blank (as defined by ActiveSuport), not true vs. false.
+    
+**IMPORTANT NOTE**: `<if>` tests for non-blank vs. blank (as defined by ActiveSupport), not true vs. false. 
 
 If you do not give the `test` attribute, uses the current context instead. This allows a nice trick like this:
 

metadata

@@ -2,7 +2,7 @@
 name: dryml
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.3.0.RC2
+  version: 1.3.0.RC3
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -04:00
+date: 2011-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.RC2
+        version: 1.3.0.RC3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: The Don't Repeat Yourself Markup Language