hobo 0.7.2 → 0.7.3

data/hobo_files/plugin/taglibs/rapid_generics.dryml

@@ -0,0 +1,74 @@
+<def tag="creation-details">
+  <span class="creation-details">
+    <view field="&this.class.creator_attribute" class="creator" if="&this.class.creator_attribute" />
+    <view:created_at class="created-at" if="&this.respond_to?(:created_at)"/>
+  </span>
+</def>
+
+<def tag="primary-content">
+  <view class="primary-content" field="&this.class.primary_content_attribute" if="&this.class.primary_content_attribute" merge/>
+</def>
+
+<def tag="association-count">
+  <a class="association-count #{this_field.to_s.underscore}" href="##{this_field.to_s.underscore}" merge>
+    <count/>
+  </a>
+</def>
+
+<def tag="base-card">
+  <if test="&can_view?">
+    <div class="card #{linkable? ? 'linkable' : 'content'} #{type_name :dasherize => true}" merge-attrs>
+      <h3 param="title"><a if="&linkable?"/></h3>
+      <div class="content" param="content" if="&!linkable?">
+        <primary-content/>
+      </div>
+      <creation-details param/>
+      <do param="counter">
+        <set primary-collection="&primary_collection_name"/>
+        <if test="&primary_collection">
+          <span class="dependents"><count field="&primary_collection"/></span>
+        </if>
+      </do>
+      <delete-button label="X" unless="&linkable?(this, :edit)" param/>
+    </div>
+  </if>
+</def>
+
+<def tag="card">
+  <if test="&can_view?">
+    <%= poly = call_polymorphic_tag('card', attributes, parameters) %>
+    <base-card unless="&poly" merge/>
+  </if>
+</def>
+
+<def tag="search-card">
+  <%= poly = call_polymorphic_tag('search-card', attributes, parameters) %>
+  <card unless="&poly"/>
+</def>
+
+<def tag="collection">
+  <%= poly = call_polymorphic_tag('collection', attributes, parameters) %>
+  <ul class="collection" merge-attrs unless="&poly">
+    <li:><card param/></li:>
+  </ul>
+  <p class="empty-collection-message" if="&this.empty?" param="empty-message">
+    <% label = if (refl = this.try.proxy_reflection)
+                 refl.association_name.to_s.humanize.downcase
+               elsif (klass = this.try.member_class)
+                 klass.name.humanize.downcase.pluralize
+               else
+                 type_name(:plural => true).pluralize.humanize.downcase.to_s 
+               end %>
+    There are no <%= label.pluralize %>
+  </p>
+</def>
+
+<def tag="collection-preview" attrs="limit">
+  <% limit ||= 6 %>
+  <div class="collection-preview" merge-attrs>
+    <h2><do param="heading"><this-field.titleize/></do> <span param="show-all-link" if="&linkable?">(<a>show all</a>)</span></h2>
+    <collection with="&this.limit(limit)" merge-params>
+      <card: class="small"/>
+    </collection>
+  </div>
+</def>

data/hobo_files/plugin/taglibs/rapid_navigation.dryml

@@ -5,7 +5,7 @@
 <!--- General Navigation -->
   
 <def tag="navigation" attrs="current">
-  <ul merge-attrs>
+  <ul class="navigation" merge-attrs>
     <set-scoped current-navigation="&current">
       <do param="default"/>
     </set-scoped>
@@ -24,15 +24,16 @@
 <!--- Account Navigation (log in / out / signup) -->
 
 <def tag="account-nav">
-  <ul class="account-nav">
+  <ul with="&current_user" class="account-nav" param>
     <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' param="logged-in-as">Logged in as <view:login/></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>
     <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>
+      <set user="&Hobo::User.default_user_model"/>
+      <li class='nav-item' param="log-in"><a href="&login_url(user)">Log in</a></li>
+      <li if="&signup_url(user)" class="nav-item" param="sign-up"><a href="&signup_url(user)">Sign up</a></li>
     </else>
   </ul>
 </def>
@@ -41,52 +42,53 @@
 <!--- Pagination Navigation -->
 
 <def tag="page-nav" attrs="params">
-  <if test="&@pages && @pages.length > 1">
+  <if test="&this.try.page_count._? > 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>
+    <first-page-link    params="&params" param>|&lt;</first-page-link>
+    <previous-page-link params="&params" param>Previous</previous-page-link>
+    <next-page-link     params="&params" param>Next</next-page-link>
+    <last-page-link     params="&params" param>&gt|</last-page-link>
   </if>
 </def>
 
 
 <def tag="page-n-of-count">
-  Page <%= @pages.current_page.number %> of <%= @pages.length %>
+  Page <%= this.current_page %> of <%= this.page_count %>
 </def>
 
 
 <def tag="previous-page-link">
-  <a if="&@pages && @pages.current.previous"
-     href="&url_for(params.merge(:page => @pages.current.previous))">
+  <a if="&this.try.previous_page"
+     href="&url_for(params.merge(:page => this.previous_page))">
     <do param="default">&laquo; Previous page</do>
   </a>
 </def>
 
 
 <def tag="next-page-link">
-  <a if="&@pages && @pages.current.next"
-     href="&url_for(params.merge(:page => @pages.current.next))">
+  <a if="&this.try.next_page"
+     href="&url_for(params.merge(:page => this.next_page))">
     <do param="default">Next page &raqou;</do>
   </a>
 </def>
 
 
 <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))">
+  <a if="&this.try.current_page && this.current_page != 1"
+     href="&url_for(params.merge(:page => 1))">
     <do param="default">&laquo; First page</do>
   </a>
 </def>
 
 
 <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))">
+  <a if="&this.try.current_page && this.current_page != this.page_count"
+     href="&url_for(params.merge(:page => this.page_count))">
     <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">

data/hobo_files/plugin/taglibs/rapid_pages.dryml

@@ -26,11 +26,11 @@
     <body: param>
       <ajax-progress/>
       <header class="page-header" param>
-        <heading param="app-name"><a href="/#{base_url}"><app-name/></a></heading>
-        <live-search param if="&defined_route? :search"/>
+        <heading param="app-name"><a href="#{base_url}/"><app-name/></a></heading>
+        <live-search param if="&defined_route? :site_search"/>
         <nav param>
-          <account-nav if="&Hobo::UserController.user_models.first" param/>
-          <magic-nav class="main-nav" param="main-nav"/>
+          <account-nav if="&Hobo::User.default_user_model" param/>
+          <do param="main-nav"><magic-nav class="main-nav"/></do>
         </nav>
       </header>
       <section class="page-content" param="content">
@@ -53,7 +53,7 @@
       <section class="main-content" param="main-content">
         <param-content for="content"/>
       </section>
-      <aside class="aside-content" param/>
+      <aside class="aside-content" empty param/>
     </content:>
   </simple-layout>
 </def>
@@ -63,13 +63,14 @@
 
 
 <def tag="index-page">
-  <% model_name = @model.name.titleize %>
-  <page title="All #{model_name.pluralize}" merge>
-    <body: class="index-page #{@model.name.underscore}" param/>
+  <set model="&this.try.member_class || self.model"/>
+  <set model-name="&model.name.titleize"/>
+  <page title="All #{type_name :with => model, :pluralize => true}" merge>
+    <body: class="index-page #{type_id model}" param/>
     <content-header: param>
-      <heading param><%= model_name.pluralize %></heading>
-      <p class="note" param>There <do with="&@model"><count part="item-count" prefix="are"/></do></p>
-    </content-header>
+      <heading param><type-name with="&model"/></heading>
+      <p class="note" if param>There <count part="item-count" prefix="are"/></p>
+    </content-header:>
 
     <content-body: param>
       <nav param="top-pagination-nav"><page-nav/></nav>
@@ -80,16 +81,16 @@
     </content-body>
     
     <content-footer: param>
-      <a to="&@model" action="new" param="new-link" if="&linkable?(@model, :new)"/>
+      <a to="&model" action="new" param="new-link"/>
       <else>
-        <do with="&new_for_current_user @model">
-          <section class="create-new" if="&can_create?">
+        <if with="&model.user_new current_user">
+          <section class="create-new">
             <h2>New <type-name/></h2>
             <form><field-list/><submit label="Create #{type_name}"/></form>
           </section>
-        </do>
+        </if>
       </else>
-    </content-footer>
+    </content-footer:>
   </page>
 </def>
 
@@ -115,14 +116,10 @@
 </def>
 
 
-<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
-     dependent_collection = this.class.dependent_collections.first if this.class.dependent_collections.length == 1 
-  %>
+<def tag="show-page" attrs="primary-collection">
+  <set primary-collection-name="&(primary_collection || self.primary_collection_name).to_s"/>
   <page merge title="#{name :no_wrapper => true}">
-    <body: class="show-page #{type_name.underscore}" param/>
+    <body: class="show-page #{type_name :dasherize => true}" param/>
     <content-header: param>
       <if with="&this.dependent_on.reject{|x| x.is_a?(Hobo::User)}.first">
         <div class="container"><a/></div>
@@ -130,8 +127,12 @@
 
       <heading param><%= this %></heading>
       <creation-details param/>
-      <do param="dependent-collection-count"><a class="dependent-collection-count" href="##{dependent_collection.to_s.underscore}" part="dependent-collection-count" part-locals="dependent_collection" if="&dependent_collection"><count-dependents/></a></do>
-      <a action="edit" if="&can_edit?" class="edit">Edit <type-name/></a>
+      
+      <do field="&primary_collection_name" if="&primary_collection_name" param="primary-collection-count">
+        <association-count class="primary-collection-count" part="primary-collection-count"/>
+      </do>
+                         
+      <a action="edit" class="edit" if="&can_edit?" param="edit-link">Edit <type-name/></a>
     </content-header>
     
     <content-body: param>
@@ -140,58 +141,47 @@
       <field-list skip="&[this.class.name_attribute, this.class.primary_content_attribute, this.class.creator_attribute, this.class.dependent_on.first].compact "
                   skip-associations="has_many" param/>
 
-      <if test="&dependent_collection">
-        <section class="dependent-collection" field="&dependent_collection">
-          <a name="#{dependent_collection.to_s.underscore}"/>
-          <h2 param="dependent-collection-title"><%= dependent_collection.to_s.titleize %></h2>
-
-          <do param="collection">
-            <collection part="dependent-collection" part-locals="dependent_collection">
-              <empty-message:>No <%= dependent_collection.to_s %> have been added yet.</empty-message>
-            </collection>
-          </do>
-        
-          <do with="&new_for_current_user">
-            <section class="create-new" if="&!linkable?(:new) && can_create?">
-              <h2>Add <A-or-An word="&dependent_collection.to_s.singularize.titleize"/></h2>
-              <form update="dependent-collection, dependent-collection-count" message="Adding #{dependent_collection.to_s.singularize.titleize}..." reset-form>
-                <field-list skip="#{@this.class.reverse_reflection(@this.send(dependent_collection).proxy_reflection.name).name}"
-                            skip-associations="has_many" param="dependent-collection-field-list"/>
-                <submit label="Create #{dependent_collection.to_s.singularize.titleize}"/>
+      <section class="primary-collection" field="&primary_collection_name" if="&primary_collection_name">
+        <h2 param="primary-collection-title"><%= primary_collection_name.titleize %></h2>
+
+        <do param="primary-collection">
+          <collection part="primary-collection"/>
+        </do>
+
+        <if test="can_create?">
+          <nav class="new-link"><a action="new" if="&linkable?(:new) && can_create?"/></nav>
+          <else>
+            <section class="create-new" with="&new_for_current_user">
+              <h2>Add <A-or-An word="&primary_collection_name.singularize.titleize"/></h2>
+              <form update="primary-collection, primary-collection-count"
+                    message="Adding #{primary_collection_name.singularize.titleize}..." reset-form>
+                <field-list skip="#{@this.class.reverse_reflection(@this.send(primary_collection_name).proxy_reflection.name).name}"
+                            skip-associations="has_many" param="primary-collection-field-list"/>
+                <submit label="Create #{primary_collection_name.singularize.titleize}"/>
               </form>
             </section>
-          </do>
-        </section>
-      </if>
-      <else>
-        <section class="preview-collections">
-          <with-fields associations="has_many">
-            <section class="#{this_field.dasherize}">
-              <h2>Recent <this-field.titleize/></h2>
-              <collection with="&this.recent"/>
-              <a class="more">More... (<count/>)</a>
-            </section>
-          </with-fields>
-        </section>
-      </else>
-
-      <nav class="new-links" param="new-links">
-        <ul with="&has_many_assocs">
-          <li: replace><li if="&can_create? && linkable?(:new)"><a action="new"/></li></li>
-        </ul>
-      </nav>
+          </else>
+        </if>
+      </section>
 
-    </content-body>
+    </content-body:>
+    <aside: param>
+      <section class="preview-collections">
+        <with-fields fields="&non_through_collections - [primary_collection_name._?.to_sym]">
+          <collection-preview class="#{this_field.dasherize}"/>
+        </with-fields>
+      </section>
+    </aside:>
   </page>
 </def>
 
 
 <def tag="edit-page">
   <page merge>    
-    <body: class="edit-page #{this.class.name.underscore}" param/>
+    <body: class="edit-page #{type_name :dasherize => true}" param/>
     <content-header: param>
-      <heading><if test="&this.respond_to? :name"><name/></if><else><type-name/></else></heading>
-      <delete-button in-place="&false" label="Remove This #{this.class.name}" param/>
+      <heading param><if test="&this.respond_to? :name"><name/></if><else><type-name/></else></heading>
+      <delete-button label="Remove This #{type_name}" param/>
     </content-header>
 
     <content-body: param>
@@ -209,22 +199,23 @@
 
 
 <def tag="new-in-collection-page">
-  <set association-name="&@association.proxy_reflection.name.to_s.singularize.titleize"/>
+  <set association-name="&@association.origin_attribute.to_s"/>
   <page title="New #{type_name}" merge>
-    <body: class="new-in-collection-page #{type_name(:with => @owner)} #{type_name}" param/>
+    <body: class="new-in-collection-page #{association_name.underscore.dasherize} #{type_name :dasherize => true}" param/>
     <content-header: param>
-      <heading param>New <association-name/></heading>
-      <sub-heading param>For: <a with="&@owner" /></sub-heading>
+      <heading param>New <association-name.singularize.titleize/></heading>
+      <sub-heading param>For: <a with="&@association.origin"/></sub-heading>
     </content-header>
 
     <content-body: param>
       <error-messages/>
 
       <form param>
-        <field-list skip="#{@owner.class.reverse_reflection(@association.proxy_reflection.name).name}"
+        <field-list skip="#{@association.origin.class.reverse_reflection(association_name.to_sym).name}"
                     skip-associations="has_many" param/>
         <div class="actions" param="actions">
-          <submit label="Create #{association_name}" param/><do param="back-link"> or <a with="&@owner">Cancel</a></do>
+          <submit label="Create #{association_name.singularize.titleize}" param/>
+          <do param="back-link"> or <a with="&@association.origin">Cancel</a></do>
         </div>
       </form>
     </content-body>
@@ -233,14 +224,14 @@
 
 
 <def tag="show-collection-page">
-  <% title = "#{@reflection.name.to_s.titleize} for #{name(:with => @owner)}" %>
+  <% title = "#{this.origin_attribute.to_s.titleize} for #{name(:with => this.origin)}" %>
   <page title="&title" merge>
-    <body: class="show-collection-page #{type_name(:with => @owner)} #{type_name(:pluralize => true)}"
+    <body: class="show-collection-page #{type_name(:with => this.origin)} #{type_name(:pluralize => true) rescue debugger}"
           param/>
     <content-header: param>
-      <nav>Back to <a with="&@owner"/></nav>
+      <nav>Back to <a:origin/></nav>
       <heading><%= title %></heading>
-      <sub-heading><count with="&@pages.item_count" label="&@reflection.klass.name.titleize"/></sub-heading>
+      <sub-heading><count/></sub-heading>
     </content-header>
 
     <content-body: param>
@@ -250,114 +241,35 @@
       
       <nav param="bottom-pagination-nav"><page-nav param/></nav>
       
-      <nav if="&Hobo.simple_has_many_association?(@association)" param="new-link">
-        <a to="&@association" action="new"/>
+      <nav if="&Hobo.simple_has_many_association?(this)" param="new-link">
+        <a action="new"/>
       </nav>
     </content-body>
   </page>
 </def>
 
 
-<def tag="signup-page">
-  <page layout="simple" title="Sign up to #{app_name}" merge>
-    <body: class="signup-page" param/>
-
-    <live-search: replace/>
-    <nav: replace/>
-    
-    <content-header: param>
-      <heading param>Sign Up</heading>
-    </content-header>
-    
-    <content-body: param>
-      <error-messages/>
-      <form action="&request.request_uri" param>
-        <field-list fields="login, password, password_confirmation" param>
-          <password-confirmation-label:>Confirm Password</password-confirmation-label>
-        </field-list>
-
-        <div class="actions" param="actions">
-          <submit label='Sign Up'/>
-        </div>
-      </form>
-    </content-body>
-
-  </page>
-</def>
-
-
-<def tag="login-page" attrs="remember-me">
-  <page layout="simple" title="Log in to #{app_name}" merge>
-   
-    <body: class="login-page" param/>
- 
-    <live-search: replace/>
-    <nav: replace/>
-    
+<def tag="permission-denied-page" attrs="message">
+  <% message ||= "That operation is not allowed" %>
+  <page merge>
+    <body: class="permission-denied"/>
     <content-header: param>
-      <heading param>Log In</heading>
+      <heading param><message/></heading>
     </content-header>
-
-    <content-body: param>
-      <form action="&request.request_uri" class="login" param>
-        <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" class="string" 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" class="string" 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>
-        <set user="&Hobo::UserController.user_models.first"/>
-        <div class="actions" param="actions">
-          <submit label='Log in' param/><if test="&signup_url(user)" class='nav-item'> or <a href="&signup_url(user)">Sign up</a></if>
-        </div>
-      </form>
-    </content-body>
-  </page>
-</def>
-
-
-<def tag="account-disabled-page">
-
-  <page layout="simple" title="#{app_name} - account not available" merge>
-       
-    <body: class="account-disabled-page" param/>
-
-    <content-header: param><heading param>Account is not available</heading></content>
-
-    <content-body: param>
-      <p>Your account is not available at this time.</p>
-    </content-body>
   </page>
-
 </def>
- 
 
 
-<def tag="permission-denied-page">
+<def tag="not-found-page" attrs="message">
+  <% message ||= "The page you were looking for could not be found" %>
   <page merge>
+    <body: class="not-found"/>
     <content-header: param>
-      <heading param>That operation is not allowed</heading>
+      <heading param><message/></heading>
     </content-header>
   </page>
 </def>
 
-<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>
-</def>
 
 <def tag="doctype" attrs="version"><%=
   case version.upcase
@@ -379,6 +291,7 @@
   end
 %></def>
 
+
 <def tag="stylesheet" attrs="name, media">
   <repeat with="&comma_split(name)">
     <link href="#{base_url}/stylesheets/#{this}.css" media="#{ media || 'all' }"
@@ -386,6 +299,7 @@
   </repeat>
 </def>
 
+
 <def tag="javascript" attrs="name">
   <if test="&name.is_a?(Symbol)">
     <%= javascript_include_tag name %>
@@ -397,11 +311,13 @@
   </else>
 </def>
 
+
 <def tag="flash-message" attrs="type">
   <% type = type ? type.to_sym : :notice %>
   <div class="flash #{type}" if="&flash[type]" merge-attrs><%= flash[type] %></div>
 </def>
 
+
 <def tag="ajax-progress">
   <div id="ajax-progress">
     <div>
@@ -411,7 +327,5 @@
 </def>
 
 
-<def tag="app-name"><%= @hobo_app_name ||= File.basename(Dir.chdir(RAILS_ROOT) { Dir.getwd }).strip.titleize %></def>
-
 <def tag="default-page-title"><%= t = this.to_s; ; "#{t.blank? ? '' : t + ' - '}#{app_name}" %></def>