hobo 0.7.4 → 0.7.5

data/hobo_files/plugin/taglib-docs/rapid_plus.markdown

@@ -0,0 +1,65 @@
+# Rapid Plus
+
+ * [<table-plus>](#table-plus)
+ * [<change-password-form>](#change-password-form)
+
+
+---
+
+<a name="table-plus">&nbsp;</a>
+##  &lt;table-plus&gt;
+
+
+
+### Attributes (merged with [&lt;div&gt;](#div))
+
+ * sort-field
+ * sort-direction
+ * sort-columns
+
+
+### Parameters (merged with [&lt;table&gt;](#table))
+
+<ul><li>&lt;header:&gt; (&lt;div&gt;)
+<ul><li>&lt;search-form:&gt; (&lt;form&gt;)
+<ul><li>&lt;search-submit:&gt; (&lt;submit&gt;)
+</li>
+</ul></li>
+</ul></li>
+<li>(dynamic parameter) (&lt;th&gt;)
+<ul><li>(dynamic parameter) (&lt;a&gt;)
+</li>
+<li>&lt;up-arrow:&gt; (&lt;do&gt;)
+</li>
+<li>&lt;down-arrow:&gt; (&lt;do&gt;)
+</li>
+</ul></li>
+<li>&lt;empty-message:&gt; (&lt;do&gt;)
+</li>
+<li>&lt;page-nav:&gt;
+</li>
+</ul>
+
+
+---
+
+<a name="change-password-form">&nbsp;</a>
+##  &lt;change-password-form&gt;
+
+
+
+### Attributes 
+
+None
+
+### Parameters 
+
+<ul><li>&lt;form:&gt;
+<ul><li>&lt;field-list:&gt;
+</li>
+<li>&lt;actions:&gt; (&lt;div&gt;)
+<ul><li>&lt;submit:&gt;
+</li>
+</ul></li>
+</ul></li>
+</ul>

data/hobo_files/plugin/taglib-docs/rapid_support.markdown

@@ -0,0 +1,50 @@
+# Rapid Support
+
+ * [<with-fields>](#with-fields)
+ * [<with-field-names>](#with-field-names)
+
+
+---
+
+<a name="with-fields">&nbsp;</a>
+##  &lt;with-fields&gt;
+
+
+
+### Attributes 
+
+ * fields
+ * associations
+ * skip
+ * skip-associations
+ * include-timestamps
+ * force-all
+
+
+### Parameters 
+
+<ul><li>&lt;default:&gt; (&lt;do&gt;)
+</li>
+<li>&lt;default:&gt; (&lt;do&gt;)
+</li>
+</ul>
+
+
+---
+
+<a name="with-field-names">&nbsp;</a>
+##  &lt;with-field-names&gt;
+
+
+
+### Attributes 
+
+ * fields
+ * skip
+ * skip-associations
+ * include-timestamps
+
+
+### Parameters 
+
+None

data/hobo_files/plugin/taglib-docs/rapid_user_pages.markdown

@@ -0,0 +1,129 @@
+# Rapid User Pages
+
+ * [<signup-page>](#signup-page)
+ * [<login-page>](#login-page)
+ * [<account-disabled-page>](#account-disabled-page)
+ * [<account-page>](#account-page)
+
+
+---
+
+<a name="signup-page">&nbsp;</a>
+##  &lt;signup-page&gt;
+
+
+
+### Attributes (merged with [&lt;page&gt;](#page))
+
+None
+
+### Parameters (merged with [&lt;page&gt;](#page))
+
+<ul><li>&lt;body:&gt;
+</li>
+<li>&lt;content-header:&gt;
+<ul><li>&lt;heading:&gt;
+</li>
+</ul></li>
+<li>&lt;content-body:&gt;
+<ul><li>&lt;form:&gt;
+<ul><li>&lt;field-list:&gt;
+</li>
+<li>&lt;actions:&gt; (&lt;div&gt;)
+</li>
+</ul></li>
+</ul></li>
+</ul>
+
+
+---
+
+<a name="login-page">&nbsp;</a>
+##  &lt;login-page&gt;
+
+
+
+### Attributes (merged with [&lt;page&gt;](#page))
+
+ * remember-me
+
+
+### Parameters (merged with [&lt;page&gt;](#page))
+
+<ul><li>&lt;body:&gt;
+</li>
+<li>&lt;content-header:&gt;
+<ul><li>&lt;heading:&gt;
+</li>
+</ul></li>
+<li>&lt;content-body:&gt;
+<ul><li>&lt;form:&gt;
+<ul><li>&lt;labelled-item-list:&gt;
+<ul><li>&lt;login-label:&gt; (&lt;item-label&gt;)
+</li>
+<li>&lt;login-input:&gt; (&lt;input&gt;)
+</li>
+<li>&lt;password-label:&gt; (&lt;item-label&gt;)
+</li>
+<li>&lt;password-input:&gt; (&lt;input&gt;)
+</li>
+<li>&lt;remember-me-label:&gt; (&lt;item-label&gt;)
+</li>
+<li>&lt;remember-me-input:&gt; (&lt;input&gt;)
+</li>
+</ul></li>
+<li>&lt;actions:&gt; (&lt;div&gt;)
+<ul><li>&lt;submit:&gt;
+</li>
+</ul></li>
+</ul></li>
+</ul></li>
+</ul>
+
+
+---
+
+<a name="account-disabled-page">&nbsp;</a>
+##  &lt;account-disabled-page&gt;
+
+
+
+### Attributes (merged with [&lt;page&gt;](#page))
+
+None
+
+### Parameters (merged with [&lt;page&gt;](#page))
+
+<ul><li>&lt;body:&gt;
+</li>
+<li>&lt;content-header:&gt;
+<ul><li>&lt;heading:&gt;
+</li>
+</ul></li>
+<li>&lt;content-body:&gt;
+</li>
+</ul>
+
+
+---
+
+<a name="account-page">&nbsp;</a>
+##  &lt;account-page&gt;
+
+
+
+### Attributes (merged with [&lt;page&gt;](#page))
+
+None
+
+### Parameters (merged with [&lt;page&gt;](#page))
+
+<ul><li>&lt;body:&gt;
+</li>
+<li>&lt;content-header:&gt;
+</li>
+<li>&lt;content-body:&gt;
+<ul><li>&lt;error-messages:&gt;
+</li>
+</ul></li>
+</ul>

data/hobo_files/plugin/taglibs/rapid.dryml

@@ -296,7 +296,7 @@
 
 <def tag="view" for="Numeric" attrs="format"><%= format ? format % this : this.to_s %></def>
 
-<def tag="view" for="string"><%= h(this).gsub("\n", "<br/>") %></def>
+<def tag="view" for="string"><%= this.try.to_html || h(this).gsub("\n", "<br/>") %></def>
 
 <def tag="view" for="boolean"><%= this ? 'Yes' : 'No' %></def>
 
@@ -335,7 +335,7 @@
 
 
 <def tag="theme-stylesheet" attrs="name">
-  <% name ||= 'application' -%>
+  <% name ||= Hobo.current_theme -%>
   <link href="#{base_url}/hobothemes/#{Hobo.current_theme}/stylesheets/#{name}.css"
         media="screen" rel="Stylesheet" type="text/css" />
 </def>

data/hobo_files/plugin/taglibs/rapid_forms.dryml

@@ -145,14 +145,6 @@
   <%= text_area_tag(name, this, add_classes(attributes, :tiny_mce)) %>
 </def>
 
-<def tag="input" for="markdown" attrs="name">
-  <%= text_area_tag(name, this, attributes) %>
-</def>
-
-<def tag="input" for="textile" attrs="name">
-  <%= text_area_tag(name, this, attributes) %>
-</def>
-
 <def tag="input" for="date" attrs="order">
   <% order = order.nil? ? [:year, :month, :day] : comma_split(order).*.to_sym -%>
   <%= select_date(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
@@ -193,7 +185,7 @@
 <def tag="remote-method-button" attrs="method, update, label"><%= 
   ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
 
-  url = object_url(this, method)
+  url = object_url(this, method, :method => :post)
   add_classes!(html_attributes, "button remote-method-button #{method}-button")
   if update || result_update || !ajax_attrs.empty?
     label ||= method.titleize
@@ -298,18 +290,11 @@
 </def>
 
 
-<def tag="belongs-to-autocompleting-input">
-<% refl = this_type
-   completer_model ||= refl.klass
-   completer_attr ||= refl.klass.id_name_column
-   id ||= dom_id + "_completer"
-   where_attributes = attributes.select_hash {|k,v| k.to_s.starts_with? "where_"}
-   url = object_url(completer_model, :completions, { :for => completer_attr }.update(where_attributes))
-  %>
-
-  <input type="text" id="#{id}" class="autocomplete-bhv" autocomplete-url="#{url}"
-         name="#{param_name_for_this}" merge-attrs/>
-  <div id="#{id}-completions" class="completions-popup" style="display:none"></div>
+<def tag="name-one" attrs="complete-target, completer">
+  <input type="text" name="#{param_name_for_this}" 
+         class="autocompleter #{type_and_field} complete-on:#{dom_id complete_target}:#{completer}"
+         merge-attrs/>
+  <div class="completions-popup" style="display:none"></div>
 </def>
 
 
@@ -371,7 +356,7 @@
 
 
 <def tag="after-submit" attrs="uri, stay-here, go-back">
-  <% uri = request.request_uri if stay_here %>
+  <% uri = "stay-here" if stay_here %>
   <% uri = session[:previous_uri] if go_back %>
   <input type="hidden" value="&params[:after_submit] || uri" name="after_submit" if="&uri"/>
 </def>

data/hobo_files/plugin/taglibs/rapid_generics.dryml

@@ -1,6 +1,6 @@
 <def tag="creation-details">
   <div class="creation-details">
-    <view field="&this.class.creator_attribute" class="creator" if="&this.class.creator_attribute" param="by"/>
+    <if:get_creator><view class="creator" param="by"/></if:>
     <view:created_at class="created-at" if="&this.respond_to?(:created_at)" param="at"/>
   </div>
 </def>
@@ -97,19 +97,21 @@
 </def>
 
 
-<def tag="collection-preview" attrs="limit">
+<def tag="collection-preview" attrs="limit, if-any">
   <% limit ||= 6 %>
   <do with="&this.is_a?(Class) ? this.limit(limit).all : this.limit(limit)">
-    <set collection-name="&(this.try.origin_attribute || this.member_class.name.pluralize).to_s"/>
-    <div class="collection-preview" merge-attrs>
-      <h2>
-        <do param="heading"><collection-name.titleize/></do> 
-        <span param="show-all-link" if="&this.any? && linkable?">(<a>show all</a>)</span>
-      </h2>
-      <collection merge-params>
-        <card: class="small"/>
-      </collection>
-    </div>
+    <unless test="&if_any && this.empty?">
+      <set collection-name="&(this.try.origin_attribute || this.member_class.name.pluralize).to_s"/>
+      <div class="collection-preview" merge-attrs>
+        <h2>
+          <do param="heading"><collection-name.titleize/></do> 
+          <span param="show-all-link" if="&linkable? && this.count > limit">(<a>show all</a>)</span>
+        </h2>
+        <collection merge-params>
+          <card: class="small"/>
+        </collection>
+      </div>
+    </unless>
   </do>
 </def>
 

data/hobo_files/plugin/taglibs/rapid_navigation.dryml

@@ -3,7 +3,8 @@
   -->
 
 <!--- General Navigation -->
-  
+
+<!-- General purpose navigation bar. Renders a `<ul class="navigation">` -->
 <def tag="navigation" attrs="current">
   <ul class="navigation" merge-attrs>
     <set-scoped current-navigation="&current">
@@ -29,7 +30,7 @@
 <def tag="account-nav">
   <ul with="&current_user" class="account-nav" param>
     <if test="&logged_in?">
-      <li class='nav-item' param="logged-in-as"><a to="&current_user">Logged in as <view:login/></a></li>
+      <li class='nav-item' param="logged-in-as"><a to="&current_user">Logged in as <name/></a></li>
       <li class='nav-item' param="account"><a action="account">Account</a></li>
       <li class='nav-item' param="log-out"><a href="&logout_url">Log out</a></li>
     </if>
@@ -86,8 +87,8 @@
 </def>
 
 
-<!-- magic nav, just to get you started -->
-<!-- write your own navigation using the <navigation> tag -->
+<!-- magic nav, just to get you started. Don't try to customise this
+but rather write your own navigation using the `<navigation>` tag -->
 <def tag="magic-nav">
   <navigation merge-attrs>
     <nav-item href="#{base_url}/">Home</nav-item>

data/hobo_files/plugin/taglibs/rapid_pages.dryml

@@ -12,6 +12,7 @@
 
       <do param="scripts">
         <javascript param name="prototype, effects, dragdrop, controls, lowpro, hobo-rapid, application"/>
+        <do param="fix-ie6"><%= "<!--[if lt IE 7]>" %><javascript name="IE7"/><%= "<![endif]-->" %></do>
         <hobo-rapid-javascripts param/>
       </do>
     </head>
@@ -70,7 +71,10 @@
     <body: class="index-page #{type_id model}" param/>
     <content-header: param>
       <heading param><type-name with="&model" plural/></heading>
-      <p class="note" if param>There <count prefix="are"/></p>
+      <p class="note" param="count">
+        <if>There <count prefix="are"/></if>
+        <else>There aren't any <type-name lowercase plural/> yet.</else>
+      </p>
     </content-header:>
 
     <content-body: param>

data/hobo_files/plugin/tasks/fix_dryml.rake

@@ -100,7 +100,7 @@ def fix_file(filename)
   # happy
   @src = "<root>" + src + "</root>"
   begin
-    doc = REXML::Document.new(Hobo::Dryml::RexSource.new(@src), :dryml_mode => true)
+    doc = Hobo::Dryml::Parser::Document.new(Hobo::Dryml::Parser::Source.new(@src))
   rescue REXML::ParseException => e
     raise Exception, "File: #{@template_path}\n#{e}"
   end

data/hobo_files/plugin/tasks/generate_tag_reference.rb

@@ -0,0 +1,162 @@
+require 'fileutils'
+require 'hobosupport'
+Dependencies.load_paths << File.dirname(__FILE__) + "/../lib"
+
+require 'rexml/xpath'
+XPath = REXML::XPath
+
+require 'maruku'
+
+
+def tag_title(tag, link=false)
+  if tag.is_a? String
+    name = tag
+    anchor = tag
+  else
+    for_attr = tag.attributes['for'] and for_decl = %( for=`"#{for_attr}"`)
+    name = tag.attributes['tag']
+    anchor = tag_anchor(tag)
+  end
+  
+  title = "&lt;#{name}#{for_decl}&gt;"
+  
+  if link
+    "[#{title}](##{anchor})"
+  else
+    title
+  end
+end
+
+
+def link_to_tag(tag)
+  tag_title(tag, true)
+end
+
+
+def tag_anchor(element)
+  for_attr = element.attributes['for']
+  name = element.attributes['tag']
+  
+  if for_attr
+    "#{name}--for-#{for_attr}"
+  else
+    name
+  end
+end
+
+
+def comment_for_tag(element)
+  space = element.previous_sibling and 
+    space.to_s.blank? && space.to_s.count("\n") == 1 and
+    comment = space.previous_sibling
+  
+  comment.to_s.strip if comment.is_a?(REXML::Comment)
+end
+
+
+def doc_for_tag(tagdef)
+  comment = comment_for_tag(tagdef)
+  
+  params_merged_with = XPath.first(tagdef, ".//*[@merge|@merge-params]")._?.name
+  params_merged_with &&= "(merged with #{link_to_tag params_merged_with})"
+
+  attrs_merged_with = XPath.first(tagdef, ".//*[@merge|@merge-attrs]")._?.name
+  attrs_merged_with &&= "(merged with #{link_to_tag attrs_merged_with})"
+
+  attrs = tagdef.attributes['attrs'] || []
+  attrs = attrs.split(/,\s*/).where_not.blank?.map { |a| " * #{a}\n" }.join
+  
+  parameters = params_to_list(get_parameters(tagdef))
+<<-END
+---
+
+<a name="#{tag_anchor tagdef}">&nbsp;</a>
+##  #{tag_title tagdef}
+
+#{comment}
+
+### Attributes #{attrs_merged_with}
+
+#{attrs.blank? ? 'None' : attrs}
+
+### Parameters #{params_merged_with}
+
+#{parameters.blank? ? 'None' : parameters}
+END
+end
+
+
+def get_parameters(elem)
+  result = []
+  elem.elements.each do |e|
+    if e.attributes['param']
+      result << [e, get_parameters(e)]
+    else
+      result.concat(get_parameters(e))
+    end
+  end
+  result
+end
+
+
+def params_to_list(params, indent=" ")
+  items = params.map do |elem, sub_params|
+    p_attr = elem.attributes['param']
+    entry = if p_attr == "&true"
+              "&lt;#{elem.name}:&gt;"
+            elsif p_attr =~ /#\{/
+                "(dynamic parameter) (&lt;#{elem.name}&gt;)"
+            else
+              "&lt;#{p_attr}:&gt; (&lt;#{elem.name}&gt;)"
+            end
+    sub_list = params_to_list(sub_params, indent + ' ') unless sub_params.empty?
+    "<li>#{entry}\n#{sub_list}</li>\n"
+  end.join
+  
+  items.any? ? "<ul>#{items}</ul>" : ""
+end
+
+
+def contents(root)
+  tags = XPath.match(root, '/*/def')
+  tags.map { |tag| " * #{link_to_tag tag}\n" }.join
+end
+
+
+def doc_for_taglib(title, root)
+  tags = XPath.match(root, '/*/def').map { |e| doc_for_tag(e) }.join("\n\n")  
+  
+  "# #{title}\n\n" + contents(root) + "\n\n" + tags
+end
+
+namespace :hobo do
+
+  desc "Generate markdown formatted reference docs automatically from DRYML taglibs"
+  task :generate_tag_reference do
+    
+    src = ENV['src']
+    
+    output_dir = ENV['output'] || "taglib-docs"
+    raise RuntimeError, "#{output_dir} is not a directory" if File.exists?(output_dir) && !File.directory?(output_dir)
+    
+    FileUtils.mkdir output_dir unless File.exists? output_dir
+    
+    dryml_files = File.directory?(src) ? Dir["#{src}/*"] : [src]
+    
+    dryml_files.each do |f|
+      basename = File.basename(f).sub(/\.dryml$/, '')
+      title = basename.titleize
+
+      doc = Hobo::Dryml::Parser::Document.new(File.read(f), f)
+    
+      markdown = doc_for_taglib(title, doc)
+      #html = Maruku.new(markdown).to_html
+      
+      output_file = "#{output_dir}/#{basename}.markdown"
+      puts output_file
+      File.open(output_file, 'w') { |f| f.write(markdown) }
+    end
+  end
+  
+end
+