dryml 1.3.0.pre31 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.3.0.pre31
+1.3.0

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.0.0"])
+  s.add_runtime_dependency('actionpack', ["~> 3.0.0"])
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   s.add_development_dependency('rubydoctest', [">= 0"])
 
@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
 
+  s.extensions = 'ext/mkrf_conf.rb'
 end

data/ext/mkrf_conf.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+
+# the whole reason this file exists:   to return an error if openssl
+# isn't installed.
+require 'openssl'
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
+f.write("task :default\n")
+f.close

data/lib/dryml/dryml_builder.rb

@@ -1,3 +1,5 @@
+require 'erubis'
+
 module Dryml
 
   class DRYMLBuilder
@@ -58,10 +60,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/dryml_generator.rb

@@ -195,6 +195,7 @@ 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/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/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) ? Rails.root : "."
-          base = if plugin == "dryml"
-                   "#{Dryml.root}/taglibs"
-                 elsif plugin == "hobo"
-                   "#{Hobo.root}/lib/hobo/rapid/taglibs"
-                 elsif not plugin.blank?
-                   "#{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

@@ -190,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)
@@ -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
       )
@@ -398,17 +402,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']
@@ -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
 
 
@@ -751,8 +755,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)
 
@@ -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)}"
@@ -1026,8 +1030,6 @@ 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

@@ -144,7 +144,7 @@ module Dryml
 
       id = if (typed_id = object.try.typed_id)
              typed_id
-           elsif object == this
+           elsif object == @this
              "this"
            end
       attribute ? "#{id}:#{attribute}" : id
@@ -162,7 +162,7 @@ module Dryml
 
 
     def refresh_part(encoded_context, session, dom_id)
-      context = Dryml::PartContext.for_refresh(encoded_context, this, session)
+      context = Dryml::PartContext.for_refresh(encoded_context, @this, session)
 
       with_part_context(context) do
         send("#{context.part_name}_part", *context.locals)
@@ -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
@@ -332,13 +347,14 @@ 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 = nil
+      @_form_this, @_form_field_path, @_form_field_paths_by_object = ctx
       res
     end
 
@@ -526,14 +542,6 @@ 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

data/lib/dryml.rb

@@ -6,8 +6,10 @@
 
 require 'hobo_support'
 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
@@ -64,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} )
@@ -111,10 +114,10 @@ module Dryml
   end
 
   def get_field_path(object, path)
+    return nil if object.nil?
     path = path.is_a?(String) ? path.split('.') : Array(path)
     parent = nil
     path.each do |field|
-      return nil if object.nil?
       parent = object
       object = get_field(parent, field)
     end
@@ -181,7 +184,7 @@ private
   def taglibs_for(controller_path)
     ( taglibs_in_dir('application').unshift(APPLICATION_TAGLIB) +
       subsite_taglibs(controller_path) +
-      (controller_path.camelize+"Controller").constantize.try.included_taglibs||[]
+      ((controller_path.camelize+"Controller").constantize.try.included_taglibs||[])
     ).compact
   end
 

data/taglibs/core.dryml

@@ -4,7 +4,9 @@
   It's the DRYML equivalent of Ruby's `send` method.
 -->
 <def tag="call-tag" attrs="tag">
-  <%= send(tag.gsub('-', '_'), attributes, parameters) %>
+  <%= Dryml.static_tags.include?(tag) ?
+      content_tag(tag, parameters.default, attributes) :
+      send(tag.gsub('-', '_'), attributes, parameters) %>
 </def>
 
 
@@ -21,7 +23,15 @@ For example, you might want to wrap an `<img>` tag in an `<a>` tag but only unde
 -->
 <def tag="wrap" attrs="tag, when, parameter">
   <% parameter ||= :default %>
-  <%= when_ ? send(tag, attributes, { parameter.to_sym => parameters[:default] }) : parameters.default %>
+  <%= if when_
+        if Dryml.static_tags.include?(tag)
+          content_tag(tag, parameters.default, attributes)
+        else
+          send(tag.gsub('-', '_'), attributes, { parameter.to_sym => parameters[:default] })
+        end
+      else
+        parameters.default
+      end %>
 </def>
 
 
@@ -61,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

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dryml
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.3.0.pre31
+  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -04:00
+date: 2011-11-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.pre31
+        version: 1.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -50,8 +50,8 @@ description: The Don't Repeat Yourself Markup Language
 email: tom@tomlocke.com
 executables: []
 
-extensions: []
-
+extensions: 
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 
 files: 
@@ -62,6 +62,7 @@ files:
 - TODO.txt
 - VERSION
 - dryml.gemspec
+- ext/mkrf_conf.rb
 - lib/dryml.rb
 - lib/dryml/dryml_builder.rb
 - lib/dryml/dryml_doc.rb
@@ -113,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