dryml 1.1.0.pre0 → 1.1.0.pre2

data/Rakefile

@@ -39,7 +39,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.authors      = ["Tom Locke"]
   gemspec.rubyforge_project = "hobo"
   gemspec.add_dependency("hobosupport", ["= #{Dryml::VERSION}"])
-  gemspec.add_dependency("actionpack", [">= 2.2.2"])
+  gemspec.add_dependency("actionpack", [">= 2.2.2", "< 3.0.0"])
 end
 Jeweler::GemcutterTasks.new
 Jeweler::RubyforgeTasks.new do |rubyforge|

data/lib/dryml/dryml_doc.rb

@@ -32,15 +32,21 @@ 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
+        attr_reader :name, :doc, :tag_defs, :source
         
         def comment
           first_node = doc[0][0]
-          doc.restore_erb_scriptlets(first_node.to_s.strip) if first_node.is_a?(REXML::Comment)
+          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
         end
         
         include CommentMethods
@@ -77,7 +83,7 @@ require 'rexml/xpath'
           doc.restore_erb_scriptlets(node.to_s).strip
         end
         
-        # The contents of the XML comment, if any, immediately above the tag definition
+        # The contents of the XML or ERB comment, if any, immediately above the tag definition
         def comment
           @comment ||= begin
             space = node.previous_sibling and
@@ -86,6 +92,9 @@ 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.rb

@@ -11,7 +11,13 @@ require 'hobosupport'
 require 'action_pack'
 require 'active_record' if ActionPack::VERSION::MAJOR==2 && ActionPack::VERSION::MINOR==2
 
-ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__)] if ActiveSupport.const_defined? :Dependencies
+if ActiveSupport.const_defined? :Dependencies
+  if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
+    ActiveSupport::Dependencies.autoload_paths |= [ File.dirname(__FILE__)]
+  else
+    ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__)]
+  end
+end
 
 # Hobo can be installed in /vendor/hobo, /vendor/plugins/hobo, vendor/plugins/hobo/hobo, etc.
 ::DRYML_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
@@ -19,7 +25,7 @@ ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__)] if ActiveSup
 # The Don't Repeat Yourself Markup Language
 module Dryml
 
-    VERSION = "1.1.0.pre0"
+    VERSION = "1.1.0.pre2"
 
     class DrymlSyntaxError < RuntimeError; end
       
@@ -284,8 +290,8 @@ module Dryml
       this = locals.delete(:this) || nil
 
       renderer_class = Dryml::Template.build_cache[template_path]._?.environment ||
-        Dryml.make_renderer_class(template_src, template_path, locals.keys)
-      renderer_class.new(template_path, view).render_page(this, locals)      
+        Dryml.make_renderer_class(template_src, template_path, locals.keys, [], included_taglibs)
+      renderer_class.new(template_path, view).render_page(this, locals)
     end
     
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dryml
 version: !ruby/object:Gem::Version 
-  hash: -1876988165
+  hash: -1876988167
   prerelease: true
   segments: 
   - 1
   - 1
   - 0
-  - pre0
-  version: 1.1.0.pre0
+  - pre2
+  version: 1.1.0.pre2
 platform: ruby
 authors: 
 - Tom Locke
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1876988165
+        hash: -1876988167
         segments: 
         - 1
         - 1
         - 0
-        - pre0
-        version: 1.1.0.pre0
+        - pre2
+        version: 1.1.0.pre2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,14 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 description: