dryml 1.4.0.pre8 → 2.0.0.pre1

data/VERSION

@@ -1 +1 @@
-1.4.0.pre8
+2.0.0.pre1

data/dryml.gemspec

@@ -11,7 +11,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.1.0"])
+  s.add_runtime_dependency('actionpack', ["~> 3.2.0"])
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   s.add_development_dependency('rubydoctest', [">= 1.1.3"])
   s.add_development_dependency('cucumber', '~> 1.1.0')

data/lib/dryml/dryml_builder.rb

@@ -100,7 +100,7 @@ module Dryml
     end
 
     def erb_process(erb_src)
-      trim_mode = ActionView::TemplateHandlers::ERB.erb_trim_mode
+      trim_mode = ActionView::Template::Handlers::ERB.erb_trim_mode
       erb = Erubis.new(erb_src, :trim_mode => trim_mode)
       res = erb.src
       if res.respond_to? :force_encoding

data/lib/dryml/dryml_generator.rb

@@ -174,18 +174,6 @@ require 'fileutils'
       end
 
 
-      def linkable?(*args)
-        options = args.extract_options!
-        options[:subsite] = subsite
-        klass, action = if args.length == 1
-                          [model, args.first]
-                        else
-                          args
-                        end
-        Hobo::Routes.linkable?(klass, action, options)
-      end
-
-
       def sortable_collection?(collection, model=self.model)
         # There's no perfect way to detect for this, given that acts_as_list
         # does not provide any metadata to reflect on, but if the :order

data/lib/dryml/part_context.rb

@@ -56,7 +56,9 @@
       def marshal(session)
         context = [@part_name, @this_id, @locals]
         context << form_field_path if form_field_path
-        data = Base64.encode64(Marshal.dump(context)).strip
+        # http://stackoverflow.com/questions/2620975/strange-n-in-base64-encoded-string-in-ruby
+        # data = Base64.encode64(Marshal.dump(context)).strip
+        data = Base64.strict_encode64(Marshal.dump(context)).strip
         digest = generate_digest(data, session)
         "#{data}--#{digest}"
       end
@@ -65,7 +67,6 @@
       # Unmarshal part context to a hash and verify its integrity.
       def unmarshal(client_store, page_this, session)
         data, digest = CGI.unescape(client_store).strip.split('--')
-
         raise TamperedWithPartContext unless digest == generate_digest(data, session)
 
         context = Marshal.load(Base64.decode64(data))

data/lib/dryml/template.rb

@@ -14,6 +14,8 @@ module Dryml
 
     CODE_ATTRIBUTE_CHAR = "&"
 
+    NO_METADATA_TAGS = %w(doctype if else unless repeat do with name type-name)
+
     SPECIAL_ATTRIBUTES = %w(param merge merge-params merge-attrs
                             for-type
                             if unless repeat
@@ -397,9 +399,38 @@ module Dryml
 
       "#{start} " +
         # reproduce any line breaks in the start-tag so that line numbers are preserved
-        tag_newlines(el) + "%>" + children_to_erb(el) + "<% output_buffer; end"
+        tag_newlines(el) + "%>" +
+        wrap_tag_method_body_with_metadata(children_to_erb(el)) +
+        "<% output_buffer; end"
+    end
+
+    # this function is now basically just a hook for DrymlFireMarker
+    def wrap_source_with_metadata(content, kind, name, *args)
+      content
+    end
+
+    def wrap_tag_method_body_with_metadata(content)
+      name   = @def_element.attributes['tag']
+      for_   = @def_element.attributes['for']
+      name += " for #{for_}" if for_
+      wrap_source_with_metadata(content, "def", name, element_line_num(@def_element))
     end
 
+
+    def wrap_tag_call_with_metadata(el, content)
+      name = el.expanded_name
+      param = el.attributes['param']
+
+      if param == "&true"
+        name += " param"
+      elsif param
+        name += " param='#{param}'"
+      end
+
+      wrap_source_with_metadata(content, "call", name, element_line_num(el))
+    end
+
+
     def param_content_local_name(name)
       "_#{ruby_name name}__default_content"
     end
@@ -574,7 +605,8 @@ module Dryml
              end
 
       call = apply_control_attributes(call, el)
-      maybe_make_part_call(el, "<% concat(#{call}) %>")
+      call = maybe_make_part_call(el, "<% concat(#{call}) %>")
+      wrap_tag_call_with_metadata(el, call)
     end
 
 
@@ -588,6 +620,8 @@ module Dryml
     def parameter_tags_hash(el, containing_tag_name=nil)
       call_type = nil
 
+      metadata_name = containing_tag_name || el.expanded_name
+
       param_items = el.map do |node|
         case node
         when REXML::Text
@@ -612,7 +646,7 @@ module Dryml
           end
 
           if is_parameter_tag
-            parameter_tag_hash_item(e) + ", "
+            parameter_tag_hash_item(e, metadata_name) + ", "
           end
         end
       end.join
@@ -648,52 +682,52 @@ module Dryml
     end
 
 
-    def parameter_tag_hash_item(el)
+    def parameter_tag_hash_item(el, metadata_name)
       name = el.name.dup
       if name.sub!(/^before-/, "")
-        before_parameter_tag_hash_item(name, el)
+        before_parameter_tag_hash_item(name, el, metadata_name)
       elsif name.sub!(/^after-/, "")
-        after_parameter_tag_hash_item(name, el)
+        after_parameter_tag_hash_item(name, el, metadata_name)
       elsif name.sub!(/^prepend-/, "")
-        prepend_parameter_tag_hash_item(name, el)
+        prepend_parameter_tag_hash_item(name, el, metadata_name)
       elsif name.sub!(/^append-/, "")
-        append_parameter_tag_hash_item(name, el)
+        append_parameter_tag_hash_item(name, el, metadata_name)
       else
         hash_key = ruby_name name
         hash_key += "_replacement" if el.attribute("replace")
         if (param_name = get_param_name(el))
-          ":#{hash_key} => merge_tag_parameter(#{param_proc(el)}, all_parameters[:#{param_name}])"
+          ":#{hash_key} => merge_tag_parameter(#{param_proc(el, metadata_name)}, all_parameters[:#{param_name}])"
         else
-          ":#{hash_key} => #{param_proc(el)}"
+          ":#{hash_key} => #{param_proc(el, metadata_name)}"
         end
       end
     end
 
 
-    def before_parameter_tag_hash_item(name, el)
+    def before_parameter_tag_hash_item(name, el, metadata_name)
       param_name = get_param_name(el)
       dryml_exception("param declaration not allowed on 'before' parameters", el) if param_name
       content = children_to_erb(el) + "<% concat(#{param_restore_local_name(name)}.call({}, {})) %>"
-      ":#{ruby_name name}_replacement => #{replace_parameter_proc(el, content)}"
+      ":#{ruby_name name}_replacement => #{replace_parameter_proc(el, metadata_name, content)}"
     end
 
 
-    def after_parameter_tag_hash_item(name, el)
+    def after_parameter_tag_hash_item(name, el, metadata_name)
       param_name = get_param_name(el)
       dryml_exception("param declaration not allowed on 'after' parameters", el) if param_name
       content = "<% concat(#{param_restore_local_name(name)}.call({}, {})) %>" + children_to_erb(el)
-      ":#{ruby_name name}_replacement => #{replace_parameter_proc(el, content)}"
+      ":#{ruby_name name}_replacement => #{replace_parameter_proc(el, metadata_name, content)}"
     end
 
 
-    def append_parameter_tag_hash_item(name, el)
+    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)
+    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 } } } ] }"
@@ -702,6 +736,8 @@ module Dryml
 
     def default_param_proc(el, containing_param_name=nil)
       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)}}"
     end
 
@@ -711,14 +747,21 @@ module Dryml
     end
 
 
-    def param_proc(el)
+    def wrap_replace_parameter(el, name)
+      wrap_source_with_metadata(children_to_erb(el), "replace", name, element_line_num(el))
+    end
+
+
+    def param_proc(el, metadata_name_suffix)
+      metadata_name = "#{el.name} < #{metadata_name_suffix}"
+
       nl = tag_newlines(el)
 
       if (repl = el.attribute("replace"))
         dryml_exception("replace attribute must not have a value", el) if repl.has_rhs?
         dryml_exception("replace parameters must not have attributes", el) if el.attributes.length > 1
 
-        replace_parameter_proc(el, children_to_erb(el))
+        replace_parameter_proc(el, metadata_name, children_to_erb(el))
       else
         attributes = el.attributes.dup
         # Providing one of 'with' or 'field' but not the other should cancel out the other
@@ -734,13 +777,14 @@ module Dryml
           end
         end.compact
 
-        nested_parameters_hash = parameter_tags_hash(el)
+        nested_parameters_hash = parameter_tags_hash(el, metadata_name)
         "proc { [{#{attribute_items * ', '}}, #{nested_parameters_hash}] #{nl}}"
       end
     end
 
 
-    def replace_parameter_proc(el, content=nil)
+    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)}}"
     end

data/lib/dryml/template_environment.rb

@@ -160,7 +160,7 @@ module Dryml
         end
       end
 
-      id = if (typed_id = object.try.typed_id)
+      id = if (!object.is_a?(ActiveRecord::Relation) && typed_id = object.try.typed_id)
              typed_id
            elsif object == @this
              "this"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dryml
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre8
+  version: 2.0.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: hobo_support
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: rubydoctest
   requirement: !ruby/object:Gem::Requirement