hobo 0.6.4 → 0.7.0

data/hobo_files/plugin/tags/rapid_navigation.dryml

@@ -5,34 +5,34 @@
 <!--- General Navigation -->
   
 <def tag="navigation" attrs="current">
-  <ul merge_attrs>
-    <set_scoped current_navigation="&current">
-      <tagbody/>
-    </set_scoped>
+  <ul merge-attrs>
+    <set-scoped current-navigation="&current">
+      <do param="default"/>
+    </set-scoped>
   </ul>
 </def>
 
-<def tag="nav_item">
-  <set body="&tagbody.call"/>
+<def tag="nav-item">
+  <set body="&parameters.default"/>
   <li class="#{'current' if (c = scope.current_navigation) && c.downcase == body.downcase.gsub(/<.*?>/, '').strip}"
-      merge_attrs="&attributes - attrs_for(:a)">
-    <a merge_attrs="&attributes & attrs_for(:a)"><%= body %></a>
+      merge-attrs="&attributes - attrs_for(:a)">
+    <a merge-attrs="&attributes & attrs_for(:a)"><%= body %></a>
   </li>
 </def>
 
 
 <!--- Account Navigation (log in / out / signup) -->
 
-<def tag="account_nav">
-  <ul class="account_nav">
+<def tag="account-nav">
+  <ul class="account-nav">
     <if test="&logged_in?">
-      <li class='nav_item'>Logged in as <view:login with="&current_user"/></li>
-      <li class='nav_item'><a href="&logout_url">Log out</a></li>
+      <li class='nav-item'>Logged in as <view:login with="&current_user"/></li>
+      <li class='nav-item'><a href="&logout_url">Log out</a></li>
     </if>
     <else>
       <set user="&Hobo::UserController.user_models.first"/>
-      <li class='nav_item'><a href="&login_url(user)">Log in</a></li>
-      <li if="&signup_url(user)" class='nav_item'><a href="&signup_url(user)">Sign up</a></li>
+      <li class='nav-item'><a href="&login_url(user)">Log in</a></li>
+      <li if="&signup_url(user)" class='nav-item'><a href="&signup_url(user)">Sign up</a></li>
     </else>
   </ul>
 </def>
@@ -40,59 +40,59 @@
 
 <!--- Pagination Navigation -->
 
-<def tag="page_nav" attrs="params">
+<def tag="page-nav" attrs="params">
   <if test="&@pages && @pages.length > 1">
-    <page_n_of_count/> - 
-    <first_page_link params="&params">|&lt;</first_page_link>
-    <previous_page_link params="&params">Previous</previous_page_link>
-    <next_page_link params="&params">Next</next_page_link>
-    <last_page_link params="&params">&gt|</last_page_link>
+    <page-n-of-count/> - 
+    <first-page-link params="&params">|&lt;</first-page-link>
+    <previous-page-link params="&params">Previous</previous-page-link>
+    <next-page-link params="&params">Next</next-page-link>
+    <last-page-link params="&params">&gt|</last-page-link>
   </if>
 </def>
 
 
-<def tag="page_n_of_count">
+<def tag="page-n-of-count">
   Page <%= @pages.current_page.number %> of <%= @pages.length %>
 </def>
 
 
-<def tag="previous_page_link">
+<def tag="previous-page-link">
   <a if="&@pages && @pages.current.previous"
      href="&url_for(params.merge(:page => @pages.current.previous))">
-    <tagbody>&laquo; Previous page</tagbody>
+    <do param="default">&laquo; Previous page</do>
   </a>
 </def>
 
 
-<def tag="next_page_link">
+<def tag="next-page-link">
   <a if="&@pages && @pages.current.next"
      href="&url_for(params.merge(:page => @pages.current.next))">
-    <tagbody>Next page &raqou;</tagbody>
+    <do param="default">Next page &raqou;</do>
   </a>
 </def>
 
 
-<def tag="first_page_link">
+<def tag="first-page-link">
   <a if="&@pages && @pages.first_page && @pages.current != @pages.first_page"
      href="&url_for(params.merge(:page => @pages.first_page))">
-    <tagbody>&laquo; First page</tagbody>
+    <do param="default">&laquo; First page</do>
   </a>
 </def>
 
 
-<def tag="last_page_link">
+<def tag="last-page-link">
   <a if="&@pages && @pages.last_page && @pages.current != @pages.last_page"
      href="&url_for(params.merge(:page => @pages.last_page))">
-    <tagbody>Last page &raquo;</tagbody>
+    <do param="default">Last page &raquo;</do>
   </a>
 </def>
 
 <!-- magic nav, just to get you started -->
 <!-- write your own navigation using the <navigation> tag -->
-<def tag="magic_nav">
-  <navigation merge_attrs>
-    <nav_item href="#{base_url}/">Home</nav_item>
-    <nav_item repeat="&Hobo.models[0..2]"><name/></nav_item>
-    <nav_item href="&search_url" if="&defined_route? :search">Search</nav_item>
+<def tag="magic-nav">
+  <navigation merge-attrs>
+    <nav-item href="#{base_url}/">Home</nav-item>
+    <nav-item repeat="&Hobo.models.select{|m| [0..2]}"><name/></nav-item>
+    <nav-item href="&search_url" if="&defined_route? :search">Search</nav-item>
   </navigation>
 </def>

data/hobo_files/plugin/tags/rapid_pages.dryml

@@ -1,11 +1,11 @@
-<def tag="BasePage" attrs="title, doctype">
+<def tag="base-page" attrs="title, doctype">
   <% title ||= request.request_uri %>
   <doctype version="&doctype || 'HTML 4.01 STRICT'"/>
   <html>
     <head param>
       <title param><%= title %></title>
       <do param="stylesheets">
-        <stylesheet name="hobo_base"/>
+        <stylesheet name="reset"/>
         <stylesheet name="application"/>
       </do>
       <do param="scripts">
@@ -18,273 +18,273 @@
 </def>
 
 
-<def tag="Page">
-  <BasePage merge>
-    <stylesheets param>
-      <stylesheet name="hobo_base"/>
-      <stylesheet name="hobo_rapid"/>
+<def tag="page">
+  <base-page merge>
+    <stylesheets: param>
+      <stylesheet name="reset"/>
+      <stylesheet name="hobo-rapid"/>
       <stylesheet name="application"/>
     </stylesheets>
 
-    <scripts param>
-      <javascript name="prototype, effects, dragdrop, controls, lowpro, hobo_rapid, application"/>
-      <hobo_rapid_javascripts param/>
+    <scripts: param>
+      <javascript name="prototype, effects, dragdrop, controls, lowpro, hobo-rapid, application"/>
+      <hobo-rapid-javascripts param/>
     </scripts>
 
-    <body param>
-      <div class="page_wrapper" param="wrapper">
-        <ajax_progress/>
-        <header class="page_header" param>
+    <body: param>
+      <div class="page-wrapper" param="wrapper">
+        <ajax-progress/>
+        <header class="page-header" param>
           <nav param>
-            <magic_nav class="main_nav" param="main_nav"/>
-            <account_nav if="&Hobo::UserController.user_models.first" param/>
+            <magic-nav class="main-nav" param="main-nav"/>
+            <account-nav if="&Hobo::UserController.user_models.first" param/>
           </nav>
         </header>
-        <section class="page_content" param="content">
-          <header class="content_header" param="content_header"/>
-          <flash_message param/>
-          <section class="content_body" param="content_body"/>
-          <footer class="content_footer" param="content_footer"/>
+        <section class="page-content" param="content">
+          <header class="content-header" param="content-header"/>
+          <flash-message param/>
+          <section class="content-body" param="content-body"/>
+          <footer class="content-footer" param="content-footer"/>
         </section>
-        <footer class="page_footer" param/>
+        <footer class="page-footer" param/>
       </div>
     </body>
-  </BasePage>
+  </base-page>
 </def>
 
-<def tag="PageWithoutAside" alias_of="Page"/>
-<def tag="PageWithAside">
-  <PageWithoutAside merge>
-    <content>
-      <section class="main_content" param="main_content">
-        <default_tagbody for="content"/>
+<def tag="page-without-aside" alias-of="page"/>
+<def tag="page-with-aside">
+  <page-without-aside merge>
+    <content:>
+      <section class="main-content" param="main-content">
+        <default-tagbody for="content"/>
       </section>
-      <aside class="aside_content" param/>
+      <aside class="aside-content" param/>
     </content>
-  </PageWithoutAside>
+  </page-without-aside>
 </def>
       
 
-<def tag="PageForIndex"><Page merge/></def>
-<def tag="PageForNew"><Page merge/></def>
-<def tag="PageForShow"><Page merge/></def>
-<def tag="PageForEdit"><Page merge/></def>
-<def tag="PageForNewInCollection"><Page merge/></def>
-<def tag="PageForShowCollection"><Page merge/></def>
+<def tag="page-for-index"><page merge/></def>
+<def tag="page-for-new"><page merge/></def>
+<def tag="page-for-show"><page merge/></def>
+<def tag="page-for-edit"><page merge/></def>
+<def tag="page-for-new-in-collection"><page merge/></def>
+<def tag="page-for-show-collection"><page merge/></def>
 
 
-<def tag="IndexPage">
+<def tag="index-page">
   <% model_name = @model.name.titleize %>
-  <PageForIndex title="All #{model_name.pluralize}" merge>
-    <body class="index_page #{@model.name.underscore.pluralize}" param/>
-    <content_header param>
+  <page-for-index title="All #{model_name.pluralize}" merge>
+    <body: class="index-page #{@model.name.underscore.pluralize}" param/>
+    <content-header: param>
       <heading param><%= model_name.pluralize %></heading>
-      <p class="note" param>There <count part="item_count" prefix="are" with="&@model"/></p>
-    </content_header>
+      <p class="note" param>There <do with="&@model"><count part="item-count" prefix="are"/></do></p>
+    </content-header>
 
-    <content_body param>
-      <nav param="top_pagination_nav"><page_nav/></nav>
+    <content-body: param>
+      <nav param="top-pagination-nav"><page-nav/></nav>
       
-      <Table param>
-        <tr><td><a/></td><td><delete_button update="item_count"/></td></tr>
-      </Table>
+      <table param>
+        <tr:><td><a/></td><td><delete-button update="item-count"/></td></tr>
+      </table>
       
-      <nav param="bottom_pagination_nav"><page_nav/></nav>
-    </content_body>
+      <nav param="bottom-pagination-nav"><page-nav/></nav>
+    </content-body>
     
-    <content_footer param>
-      <a to="&@model" action="new" param="new_link"/>
-    </content_footer>
-  </PageForIndex>
+    <content-footer: param>
+      <a to="&@model" action="new" param="new-link"/>
+    </content-footer>
+  </page-for-index>
 </def>
 
 
-<def tag="NewPage">
-  <PageForNew title="New #{type_name}" merge>
-    <body class="new_page #{type_name.underscore}" param/>
-    <content_header param>
-      <heading param>New <type_name title/></heading>
-    </content_header>
+<def tag="new-page">
+  <page-for-new title="New #{type_name}" merge>
+    <body: class="new-page #{type_name.underscore}" param/>
+    <content-header: param>
+      <heading param>New <type-name title/></heading>
+    </content-header>
 
-    <content_body param>
-      <ErrorMessages param/>
+    <content-body: param>
+      <error-messages param/>
 
       <form param>
-        <FieldList skip_associations="has_many" param/>
+        <field-list skip-associations="has_many" param/>
         <submit label="Create" param/>
       </form>
-    </content_body>
-  </PageForNew>
+    </content-body>
+  </page-for-new>
 </def>
 
 
-<def tag="ShowPage">
+<def tag="show-page">
   <% has_many_assocs = this.class.reflections.values.map do |refl|
        this.send(refl.name) if Hobo.simple_has_many_association?(refl)
      end.compact
   %>
-  <PageForShow merge title="#{name :no_wrapper => true}">
-    <body class="show_page #{type_name.underscore}" param/>
-    <content_header param>
-      <heading param><type_name/><if test="&this.respond_to? :name">: <editor:name/></if></heading>
-      <delete_button in_place="&false" param/>
-    </content_header>
+  <page-for-show merge title="#{name :no_wrapper => true}">
+    <body: class="show-page #{type_name.underscore}" param/>
+    <content-header: param>
+      <heading param><type-name/><if test="&this.respond_to? :name">: <editor:name/></if></heading>
+      <delete-button in-place="&false" param/>
+    </content-header>
     
-    <content_body param>
-      <FieldList skip="name" tag="editor" param/>
+    <content-body: param>
+      <field-list skip="name" tag="editor" param/>
 
-      <nav param="new_links">
-        <UL with="&has_many_assocs">
-          <li><a action="new"/></li>
-        </UL>
+      <nav param="new-links">
+        <ul with="&has_many_assocs">
+          <li:><a action="new"/></li>
+        </ul>
       </nav>
-    </content_body>
-  </PageForShow>
+    </content-body>
+  </page-for-show>
 </def>
 
 
-<def tag="EditPage">
-  <PageForEdit merge>    
-    <body class="edit_page #{this.class.name.underscore}" param/>
-    <content_header param>
-      <heading><type_name/><if test="&this.respond_to? :name">: <name/></if></heading>
-      <delete_button in_place="&false" param/>
-    </content_header>
+<def tag="edit-page">
+  <page-for-edit merge>    
+    <body: class="edit-page #{this.class.name.underscore}" param/>
+    <content-header: param>
+      <heading><type-name/><if test="&this.respond_to? :name">: <name/></if></heading>
+      <delete-button in-place="&false" param/>
+    </content-header>
 
-    <content_body param>
-      <ErrorMessages param/>
+    <content-body: param>
+      <error-messages param/>
       <form param>
-        <FieldList skip_associations="has_many" param/>
+        <field-list skip-associations="has_many" param/>
         <submit label="Save"/>
       </form>
           
-    </content_body>
-  </PageForEdit>
+    </content-body>
+  </page-for-edit>
 </def>
 
 
-<def tag="NewInCollectionPage">
-  <PageForNewInCollection title="New #{type_name}" merge>
-    <body class="new_in_collection_page #{type_name(:with => @owner)} #{type_name}" param/>
-    <content_header param>
-      <heading param>New <type_name/></heading>
-      <sub_heading param>For: <a with="&@owner" /></sub_heading>
-    </content_header>
+<def tag="new-in-collection-page">
+  <page-for-new-in-collection title="New #{type_name}" merge>
+    <body: class="new-in-collection-page #{type_name(:with => @owner)} #{type_name}" param/>
+    <content-header: param>
+      <heading param>New <type-name/></heading>
+      <sub-heading param>For: <a with="&@owner" /></sub-heading>
+    </content-header>
 
-    <content_body param>
-      <ErrorMessages/>
+    <content-body: param>
+      <error-messages/>
 
       <form param>
-        <FieldList skip_associations="has_many" param/>
+        <field-list skip-associations="has_many" param/>
         <submit label='Add to #{name(:with => @owner, :no_wrapper => true)}' param/>
       </form>
-    </content_body>
-  </PageForNewInCollection>
+    </content-body>
+  </page-for-new-in-collection>
 </def>
 
 
-<def tag="ShowCollectionPage">
+<def tag="show-collection-page">
   <% title = "#{@reflection.name.to_s.titleize} for #{name(:with => @owner)}" %>
-  <PageForShowCollection title="&title" merge>
-    <body class="show_collection_page #{type_name(:with => @owner)} #{type_name(:pluralize => true)}"
+  <page-for-show-collection title="&title" merge>
+    <body: class="show-collection-page #{type_name(:with => @owner)} #{type_name(:pluralize => true)}"
           param/>
-    <content_header param>
+    <content-header: param>
       <nav>Back to <a with="&@owner"/></nav>
       <heading><%= title %></heading>
-      <sub_heading><count with="&@pages.item_count" label="&@reflection.klass.name.titleize"/></sub_heading>
-    </content_header>
+      <sub-heading><count with="&@pages.item_count" label="&@reflection.klass.name.titleize"/></sub-heading>
+    </content-header>
 
-    <content_body param>
-      <nav param="top_pagination_nav"><page_nav/></nav>
+    <content-body: param>
+      <nav param="top-pagination-nav"><page-nav/></nav>
 
-      <Table param="Table">
-        <tr>
-          <if test="can_view?">
-            <td><a/></td><td><delete_button/></td>
+      <table param="Table">
+        <tr:>
+          <if test="&can_view?">
+            <td><a/></td><td><delete-button/></td>
           </if>
         </tr>
-      </Table>
+      </table>
       
-      <nav param="bottom_pagination_nav"><page_nav param/></nav>
+      <nav param="bottom-pagination-nav"><page-nav param/></nav>
       
-      <nav if="&Hobo.simple_has_many_association?(@association)" param="new_link">
+      <nav if="&Hobo.simple_has_many_association?(@association)" param="new-link">
         <a to="&@association" action="new"/>
       </nav>
-    </content_body>
-  </PageForShowCollection>
+    </content-body>
+  </page-for-show-collection>
 </def>
 
 
-<def tag="LoginPage" attrs="remember_me">
-  <Page title="Log In" merge>
-    <body class="login_page" param/>
-    <nav replace/>
-    <content_header param>
+<def tag="login-page" attrs="remember-me">
+  <page title="Log In" merge>
+    <body: class="login-page" param/>
+    <nav: replace/>
+    <content-header: param>
       <heading param>Log In</heading>
-    </content_header>
+    </content-header>
 
-    <content_body param>
+    <content-body: param>
       <form action="&request.request_uri" param>
-        <field_list>
-          <field_list_item>
-            <item_label param="login_label"><%= model.login_attr.to_s.titleize %></item_label>
-            <item_value><input type="text" name="login" id="login" param="login_input" /></item_value>
-          </field_list_item>
-
-          <field_list_item>
-            <item_label param="password_label">Password</item_label>
-            <item_value><input type="password" name="password" id="password" param="password_input"/></item_value>
-          </field_list_item>
-
-          <field_list_item if="&remember_me">
-            <item_label class="field_label" param="remember_me_label">Remember me:</item_label>
-            <item_value><input type="checkbox" name="remember_me" id="remember_me" param="remember_me_input"/></item_value>
-          </field_list_item>
-        </field_list>
+        <labelled-item-list>
+          <labelled-item>
+            <item-label param="login-label"><%= model.login_attr.to_s.titleize %></item-label>
+            <item-value><input type="text" name="login" id="login" param="login-input" /></item-value>
+          </labelled-item>
+
+          <labelled-item>
+            <item-label param="password-label">Password</item-label>
+            <item-value><input type="password" name="password" id="password" param="password-input"/></item-value>
+          </labelled-item>
+
+          <labelled-item if="&remember_me">
+            <item-label class="field-label" param="remember-me-label">Remember me:</item-label>
+            <item-value><input type="checkbox" name="remember_me" id="remember-me" param="remember-me-input"/></item-value>
+          </labelled-item>
+        </labelled-item-list>
         <submit label='Log in' param/>
       </form>
-    </content_body>
-  </Page>
+    </content-body>
+  </page>
 </def>
 
 
-<def tag="SignupPage">
-  <Page title="Sign Up" merge>
-    <body class="signup_page" param/>
-    <nav replace/>
-    <content_header param>
+<def tag="signup-page">
+  <page title="Sign Up" merge>
+    <body: class="signup-page" param/>
+    <nav: replace/>
+    <content-header: param>
       <heading param>Sign Up</heading>
-    </content_header>
+    </content-header>
     
-    <content_body param>
-      <ErrorMessages/>
+    <content-body: param>
+      <error-messages/>
       <form action="&request.request_uri" param>
-        <FieldList fields="login, password, password_confirmation" param>
-          <password_confirmation_label>Confirm Password</password_confirmation_label>
-        </FieldList>
+        <field-list fields="login, password, password_confirmation" param>
+          <password-confirmation-label:>Confirm Password</password-confirmation-label>
+        </field-list>
 
         <submit label='Sign Up'/>
       </form>
-    </content_body>
+    </content-body>
 
-  </Page>
+  </page>
 </def>
 
 
-<def tag="PermissionDeniedPage">
-  <Page merge>
-    <content_header param>
+<def tag="permission-denied-page">
+  <page merge>
+    <content-header: param>
       <heading param>That operation is not allowed</heading>
-    </content_header>
-  </Page>
+    </content-header>
+  </page>
 </def>
 
-<def tag="NotFoundPage">
-  <Page merge>
-    <content_header param>
+<def tag="not-found-page">
+  <page merge>
+    <content-header: param>
       <heading param>The page you were looking for could not be found</heading>
-    </content_header>
-  </Page>
+    </content-header>
+  </page>
 </def>
 
 <def tag="doctype" attrs="version"><%=
@@ -325,15 +325,15 @@
   </else>
 </def>
 
-<def tag="flash_message" attrs="type">
+<def tag="flash-message" attrs="type">
   <% type = type ? type.to_sym : :notice %>
-  <div class="flash #{type}" if="&flash[type]" merge_attrs><%= flash[type] %></div>
+  <div class="flash #{type}" if="&flash[type]" merge-attrs><%= flash[type] %></div>
 </def>
 
-<def tag="ajax_progress">
-  <div id="ajax_progress">
+<def tag="ajax-progress">
+  <div id="ajax-progress">
     <div>
-      <span id="ajax_progress_text"></span>
+      <span id="ajax-progress-text"></span>
     </div>
   </div>
 </def>