dryml 1.1.0 → 1.3.0.RC

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>
 
 
@@ -15,13 +17,21 @@ Using regular DRYML conditional logic it is rather akward to conditionally wrap
 ### Usage
 
 For example, you might want to wrap an `<img>` tag in an `<a>` tag but only under certain conditions. Say the current context has an `href` attribute that may or may not be nil. We want to wrap the img in `<a>` if `href` is not nil:
-  
+
     <wrap when="&this.href.present?" tag="a" href="&this.href"><img src="&this.img_filename"/></wrap>
-{: .dryml}  
+{: .dryml}
 -->
 <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>
 
 
@@ -31,7 +41,7 @@ For example, you might want to wrap an `<img>` tag in an `<a>` tag but only unde
 
     <partial name="my-partial" locals="&{:x => 10, :y => 20}"/>
 -->
-<def tag="partial" attrs="name, locals"><%= 
+<def tag="partial" attrs="name, locals"><%=
    locals ||= {}
    render(:partial => name, :locals => locals.merge(:this => this))
 %></def>
@@ -41,13 +51,13 @@ For example, you might want to wrap an `<img>` tag in an `<a>` tag but only unde
 
 ### Attributes
 
- - join: The value of this attribute, if given, will be inserted between each of the items (e.g. `join=", "` is very common).  
+ - join: The value of this attribute, if given, will be inserted between each of the items (e.g. `join=", "` is very common).
 -->
-<def tag="repeat" attrs="join"><if><%= 
+<def tag="repeat" attrs="join"><if><%=
   raise ArgumentError, "Cannot <repeat> on #{this.inspect}" unless this.respond_to? :each
   context_map do
     parameters.default
-  end.join(join)
+  end.safe_join(join)
 %></if></def>
 
 
@@ -61,19 +71,19 @@ For example, you might want to wrap an `<img>` tag in an `<a>` tag but only unde
 
 ### Usage
 
-    <if test="&current_user.administrator?">Logged in as administrator</if>
+    <if test="&current_user.administrtator?">Logged in as administrator</if>
     <else>Logged in as normal user</else>
-    
-**IMPORTANT NOTE**: `<if>` tests for non-blank vs. blank (as defined by ActiveSupport), not true vs. false. 
+
+**IMPORTANT NOTE**: `<if>` tests for non-blank vs. blank (as defined by ActiveSuport), not true vs. false.
 
 If you do not give the `test` attribute, uses the current context instead. This allows a nice trick like this:
 
     <if:comments>...</if>
-    
+
 This has the double effect of changing the context to the `this.comments`, and only evaluating the body if there are comments (because an empty
-collection is considered blank)  
+collection is considered blank)
 -->
-<def tag="if" attrs="test"><%= 
+<def tag="if" attrs="test"><%=
   test = all_attributes.fetch(:test, this)
   res = (cond = !test.blank?) ? parameters.default : ""
   Dryml.last_if = cond
@@ -88,8 +98,8 @@ collection is considered blank)
 
 
 <!-- Same behaviour as `<if>`, except the test is negated. -->
-<def tag="unless" attrs="test"><%= 
-  test = all_attributes.fetch(:test, this)     
+<def tag="unless" attrs="test"><%=
+  test = all_attributes.fetch(:test, this)
   res = (cond = test.blank?) ? parameters.default : ""
   Dryml.last_if = cond
   res
@@ -100,37 +110,37 @@ collection is considered blank)
 <def tag="fake-field-context" attrs="fake-field, context"><%=
   res = ""
   new_field_context(fake_field, context) { res << parameters.default }
-  res
+  raw res
 %></def>
 
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="html"><%= "<html#{tag_options(attributes)}>" -%><do param="default"/><%= "</html>" -%></def>
+<def tag="html"><%=raw "<html#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</html>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="table"><%= "<table#{tag_options(attributes)}>" -%><do param="default"/><%= "</table>" -%></def>
+<def tag="table"><%=raw "<table#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</table>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="a"><%= "<a#{tag_options(attributes)}>" -%><do param="default"/><%= "</a>" -%></def>
+<def tag="a"><%=raw "<a#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</a>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="section"><%= "<section#{tag_options(attributes)}>" -%><do param="default"/><%= "</section>" -%></def>
+<def tag="section"><%=raw "<section#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</section>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="header"><%= "<header#{tag_options(attributes)}>" -%><do param="default"/><%= "</header>" -%></def>
+<def tag="header"><%=raw "<header#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</header>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="footer"><%= "<footer#{tag_options(attributes)}>" -%><do param="default"/><%= "</footer>" -%></def>
+<def tag="footer"><%=raw "<footer#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</footer>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="form"><%= "<form#{tag_options(attributes)}>" -%><do param="default"/><%= "</form>" -%></def>
+<def tag="form"><%=raw "<form#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</form>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="submit"><%= "<submit#{tag_options(attributes)}>" -%><do param="default"/><%= "</submit>" -%></def>
+<def tag="submit"><%=raw "<submit#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</submit>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="input"><%= "<input#{tag_options(attributes)}>" -%><do param="default"/><%= "</input>" -%></def>
+<def tag="input"><%=raw "<input#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</input>" -%></def>
 
 <!-- nodoc.  Define core HTML tags defined in Rapid so that DRYML can be used without Rapid. -->
-<def tag="link"><%= "<link#{tag_options(attributes)}>" -%><do param="default"/><%= "</link>" -%></def>
+<def tag="link"><%=raw "<link#{tag_options(attributes, true)}>" -%><do param="default"/><%= "</link>" -%></def>
 

data/test/dryml.rdoctest

@@ -3,12 +3,11 @@
         >> require 'active_support'
         >> require 'action_view'
         >> require 'action_controller'
-        >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobosupport/lib')
+        >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobo_support/lib')
         >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../dryml/lib')
-        >> require 'hobosupport'
+        >> require 'hobo_support'
         >> require 'dryml'
-        >> require 'dryml/template_handler'
-        >> Dryml.enable
+        >> require 'dryml/railtie/template_handler'
 
 {.hidden}
 
@@ -35,11 +34,11 @@
 
 This triggers bug #452, so disabled.  FIXME.
 
-        #>> 
+        #>>
          Dryml.render(%q{<def tag="myp">
                              <p param="default"/>
                            </def>
-                           <extend tag="myp">                             
+                           <extend tag="myp">
                              <old-myp merge>
                                <default: replace>Hello <default: restore/></default:>
                              </old-myp>

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dryml
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+  prerelease: 6
+  version: 1.3.0.RC
 platform: ruby
 authors: 
 - Tom Locke
@@ -15,69 +10,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 -05:00
+date: 2011-05-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hobosupport
+  name: actionpack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: hobo_support
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
-    - - <
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: 1.3.0.RC
   type: :runtime
   version_requirements: *id002
-description: 
+- !ruby/object:Gem::Dependency 
+  name: rubydoctest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+description: The Don't Repeat Yourself Markup Language
 email: tom@tomlocke.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
 - CHANGES.txt
 - LICENSE.txt
 - README
 - Rakefile
 - TODO.txt
+- VERSION
 - dryml.gemspec
 - lib/dryml.rb
 - lib/dryml/dryml_builder.rb
 - lib/dryml/dryml_doc.rb
 - lib/dryml/dryml_generator.rb
-- lib/dryml/dryml_support_controller.rb
+- lib/dryml/extensions/action_controller/dryml_methods.rb
 - lib/dryml/helper.rb
 - lib/dryml/parser.rb
 - lib/dryml/parser/attribute.rb
@@ -89,17 +78,19 @@ files:
 - lib/dryml/parser/text.rb
 - lib/dryml/parser/tree_parser.rb
 - lib/dryml/part_context.rb
+- lib/dryml/railtie.rb
+- lib/dryml/railtie/page_tag_resolver.rb
+- lib/dryml/railtie/template_handler.rb
 - lib/dryml/scoped_variables.rb
 - lib/dryml/static_tags
 - lib/dryml/tag_parameters.rb
 - lib/dryml/taglib.rb
 - lib/dryml/template.rb
 - lib/dryml/template_environment.rb
-- lib/dryml/template_handler.rb
 - taglibs/core.dryml
 - test/dryml.rdoctest
 has_rdoc: true
-homepage: http://hobocentral.net/
+homepage: http://hobocentral.net
 licenses: []
 
 post_install_message: 
@@ -112,25 +103,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: The web app builder for Rails
+summary: The Don't Repeat Yourself Markup Language
 test_files: []
 

data/lib/dryml/dryml_support_controller.rb

@@ -1,13 +0,0 @@
-class Dryml::DrymlSupportController < ActionController::Base
-
-  def edit_source
-    dryml_editor = ENV['DRYML_EDITOR']
-    if dryml_editor
-      file = File.join(RAILS_ROOT, params[:file])
-      command = dryml_editor.sub(":file", file).sub(":line", params[:line])
-      system(command)
-    end
-    render :nothing => true
-  end
-
-end

data/lib/dryml/template_handler.rb

@@ -1,187 +0,0 @@
-module Dryml
-
-  class TemplateHandler < ActionView::TemplateHandler
-    
-    def compile(*args)
-      # Ignore - we handle compilation ourselves
-    end
-    
-    # Pre Rails 2.2
-    def render(template)
-      renderer = Dryml.page_renderer_for_template(@view, template.locals.keys, template)
-      this = @view.instance_variable_set("@this", @view.controller.send(:dryml_context) || template.locals[:this])
-      s = renderer.render_page(this, template.locals)
-      # Important to strip whitespace, or the browser hangs around for ages (FF2)
-      s.strip
-    end
-    
-    def render_for_rails22(template, view, local_assigns)
-      renderer = Dryml.page_renderer_for_template(view, local_assigns.keys, template)
-      this = view.controller.send(:dryml_context) || local_assigns[:this]
-      @view._?.instance_variable_set("@this", this)
-      s = renderer.render_page(this, local_assigns)
-
-      # Important to strip whitespace, or the browser hangs around for ages (FF2)
-      s.strip
-    end
-
-  end
-
-end
-
-module ActionController
-
-  class Base
-
-    def dryml_context
-      @this
-    end
-
-    def dryml_fallback_tag(tag_name)
-      @dryml_fallback_tag = tag_name
-    end
-
-
-    def call_dryml_tag(tag, options={})
-      @template.send(:_evaluate_assigns_and_ivars)
-
-      # TODO: Figure out what this bit is all about :-)
-      if options[:with]
-        @this = options[:with] unless options[:field]
-      else
-        options[:with] = dryml_context
-      end
-
-      Dryml.render_tag(@template, tag, options)
-    end
-
-
-    # TODO: This is namespace polution, should be called render_dryml_tag
-    def render_tag(tag, attributes={}, options={})
-      text = call_dryml_tag(tag, attributes)
-      text && render({:text => text, :layout => false }.merge(options))
-    end
-    
-    # DRYML fallback tags -- monkey patch this method to attempt to render a tag if there's no template
-    def render_for_file_with_dryml(template, status = nil, layout = nil, locals = {})
-      # in rails 2.2, "template" is actually "template_path"
-      
-      # if we're passed a MissingTemplateWrapper, see if there's a
-      # dryml tag that will render the page
-      if template.respond_to? :original_template_path
-        # this is the Rails 2.3 path
-        tag_name = @dryml_fallback_tag || "#{File.basename(template.original_template_path).dasherize}-page"
-        
-        text = call_dryml_tag(tag_name)
-        if text
-          return render_for_text(text, status)
-        else
-          template.raise_wrapped_exception
-        end
-      else
-        begin
-          result = render_for_file_without_dryml(template, status, layout, locals)
-        rescue ActionView::MissingTemplate => ex
-          # this is the Rails 2.2 path
-          tag_name = @dryml_fallback_tag || "#{File.basename(template).dasherize}-page"
-          
-          text = call_dryml_tag(tag_name)
-          if text
-            return render_for_text(text, status)
-          else
-            raise ex
-          end
-        end
-      end
-    end
-    alias_method_chain :render_for_file, :dryml
-      
-  end
-end
-
-class ActionView::Template
-  
-  def render_with_dryml(view, local_assigns = {})
-    if handler == Dryml::TemplateHandler
-      render_dryml(view, local_assigns)
-    else
-      render_without_dryml(view, local_assigns)
-    end
-  end
-  alias_method_chain :render, :dryml
-  
-  # We've had to copy a bunch of logic from Renderable#render, because we need to prevent Rails
-  # from trying to compile our template. DRYML templates are each compiled as a class, not just a method,
-  # so the support for compiling templates that Rails provides is innadequate.
-  def render_dryml(view, local_assigns = {})
-    if view.instance_variable_defined?(:@_render_stack)
-      # Rails 2.2
-      stack = view.instance_variable_get(:@_render_stack)
-      stack.push(self)
- 
-      # This is only used for TestResponse to set rendered_template
-      unless is_a?(ActionView::InlineTemplate) || view.instance_variable_get(:@_first_render)
-        view.instance_variable_set(:@_first_render, self)
-      end
-
-      view.send(:_evaluate_assigns_and_ivars)
-      view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
- 
-      result = Dryml::TemplateHandler.new.render_for_rails22(self, view, local_assigns)
- 
-      stack.pop
-      result
-    else
-      # Rails 2.3      
-      compile(local_assigns)
-
-      view.with_template self do
-        view.send(:_evaluate_assigns_and_ivars)
-        view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
-        
-        Dryml::TemplateHandler.new.render_for_rails22(self, view, local_assigns)      
-      end
-    end
-  end
-  
-end
-
-# this is only used in Rails 2.3
-class MissingTemplateWrapper
-  attr_reader :original_template_path
-  
-  def initialize(exception, path)
-    @exception = exception
-    @original_template_path = path
-  end
-
-  def method_missing(*args)
-    raise @exception
-  end
-
-  def render
-    raise @exception
-  end
-end
-  
-    
-module ActionView
-  class PathSet < Array
-    # this is only used by Rails 2.3
-    def find_template_with_dryml(original_template_path, format = nil, html_fallback = true)
-      begin
-        find_template_without_dryml(original_template_path, format, html_fallback)
-      rescue ActionView::MissingTemplate => ex
-        # instead of throwing the exception right away, hand back a
-        # time bomb instead.  It'll blow if mishandled...
-        return MissingTemplateWrapper.new(ex, original_template_path)
-      end
-    end
-
-    if method_defined? "find_template"
-      # only rails 2.3 has this function
-      alias_method_chain :find_template, :dryml
-    end
-  end
-end
-