hobo 1.1.0 → 1.3.0.RC

data/{taglibs → lib/hobo/rapid/taglibs}/rapid_generics.dryml

@@ -18,16 +18,18 @@
 <!-- Renders a message such as "No products to display". If the collection (`this`) is empty, `style="display:none"` is added. This means the message is still present and can be revealed with JavaScript if all items in the collection are removed with ajax remove buttons.
   -->
 <def tag="empty-collection-message">
-  <div class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
-    <ht key="#{this.member_class.name.tableize}.collection.empty_message">
-      No <collection-name lowercase/> to display
-    </ht>
-  </div>
+  <unless test="&this.member_class.nil?">
+    <div class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
+      <ht key="#{this.member_class.name.underscore}.collection.empty_message">
+        No <collection-name/> to display
+      </ht>
+    </div>
+  </unless>
 </def>
 
 
 <!-- Repeats the body of the tag inside a `<ul>` list with one item for each object in the collection (`this`). If no body is given, renders a `<card>` inside the `<li>`.
-  
+
 The `<li>` tags are automatically given a 'model ID' CSS class, which means the ajax `<remove-button>` will automatically be able to remove items from the collection. Also adds 'even' and 'odd' CSS classes.
  -->
 <def tag="collection">
@@ -39,7 +41,8 @@ The `<li>` tags are automatically given a 'model ID' CSS class, which means the
   <empty-collection-message param="empty-message"/>
 </def>
 
-<!-- Renders a comma separated list of any fields passed in the `fields` attribute that are true (in the Ruby sense). For example, if a forum post had a boolean field `sticky`, this tag can be used to automatically label sticky posts "Sticky". Similarly, you could automatically add an "Administrator" label to the user's home page (this is seen in the default Hobo app).  -->
-<def tag="record-flags" attrs="fields"><%=
-  comma_split(fields).select { |f| this.send(f) }.map { |f| f.titleize }.join(', ')
+<!-- Renders a `separator` separated list of any fields passed in the `fields` attribute that are true (in the Ruby sense). For example, if a forum post had a boolean field `sticky`, this tag can be used to automatically label sticky posts "Sticky". Similarly, you could automatically add an "Administrator" label to the user's home page (this is seen in the default Hobo app).  -->
+<def tag="record-flags" attrs="fields, separator"><%=
+  separator ||= ', '
+  comma_split(fields).select { |f| this.send(f) }.map { |f| this.class.human_attribute_name(f) }.join(separator)
 %></def>

data/lib/hobo/rapid/taglibs/rapid_i18n.dryml

@@ -0,0 +1,107 @@
+<!-- Rapid i18n provides tags related with the Rails-I18n project -->
+
+<!-- Wrapper around ActiveModel::Name#human
+
+#### Attributes
+
+ - model - (optional) should be a model class or a record object (default to this)
+ - count - (optional) used to pick the inflected string for the model. It should be an integer.
+ -->
+
+<def tag="model-name-human" attrs="model, count"><%=
+  model ||= this
+  model = model.class unless model.kind_of? Class
+  # prepare symbolized attributes for merging
+  attrs = {}
+  all_attributes.each_pair{|k,v| attrs[k.to_sym] = v}
+  model.model_name.human( attrs )
+%>
+</def>
+
+
+<!-- Wrapper around ActiveRecord::Base.human_attribute_name.
+
+#### Attributes
+
+ - attribute - the attribute to lookup
+ - model - (optional) should be a model class or a record object (default to this)
+ - count - (optional) should be an integer
+
+ -->
+
+<def tag="human-attribute-name" attrs="attribute, model"><%=
+  model ||= this
+  model = model.class unless model.kind_of? Class
+  # prepare symbolized attributes for merging
+  attrs = {}
+  all_attributes.each_pair{|k,v| attrs[k.to_sym] = v}
+  model.human_attribute_name( attribute.to_sym, attrs )
+%>
+</def>
+
+<!-- Used to localize and pluralize collection names.
+A collection name is a special case of an attribute name, (indeed you should store the collection names as attribute names in the locale files), so this tag internally uses human_attribute_name to return them.
+
+With the `your` attribute and in the special case the context is a Hobo::Model::UserMixin instance it automatically embeds the `your` tag funtionality. (note: :name is added by default as an interpolable variable)
+
+### Attributes
+
+ - collection - the attribute/collection key to lookup in the `activerecord.attributes` namespace. (e.g. 'roles')
+ - count - used to pick the inflected string for the collection. It should be an integer.
+ - your - wraps the collection name in a `Your` tag
+
+### Example
+
+
+  it:
+    activerecord:
+      attributes:
+        post:
+          comments:
+            one: "Commento"
+            other: "Commenti"
+        user:
+          roles:
+            one: "Ruolo"
+            other: "Ruoli"
+    tags:
+      your:
+        roles:
+          current_user:
+            one: "Il tuo Ruolo"
+            other: "I tuoi Ruoli"
+          other_user:
+            one: "Ruolo di {{name}}"
+            other: Ruoli di {{name}}"
+
+  # context is a Post instance ('your' is ignored)
+  <human-collection-name collection="comments" count="&user.comments.count" your/>
+  I18n.locale = :en => "Comment" or "Comments"
+  I18n.locale = :it => "Commento" or "Commenti"
+
+  # context is an User instance
+  <human-collection-name collection="roles' count="&user.roles.count" your/>
+  I18n.locale = :en => "Your Role" or "Jim's Role" or "Your Roles" or "Jim's Roles"
+  I18n.locale = :it => "Il tuo Ruolo" or "Il Ruolo di Jim" or "I tuoi Ruoli" or "I Ruoli di Jim"
+  (output is the same as <Your key="roles" count=>"&user.roles.count"/> )
+
+  <human-collection-name collection="roles" count="&user.roles.count"/>
+  I18n.locale = :en => "Role" or "Roles"
+  I18n.locale = :it => "Ruolo" or "Ruoli"
+-->
+<def tag="human-collection-name" attrs="collection, count, your"><%
+  raise Hobo::Error, "The 'collection' attribute must be defined" if collection.blank?
+  belong_class = this.kind_of?(Class) ? this : this.class
+  raise Hobo::Error, "The context is not an ActiveRecord::Base instance or class. (this = #{this.typed_id rescue this.inspect})" unless belong_class < ActiveRecord::Base
+  # prepare symbolized attributes for merging
+  attrs = {}
+  all_attributes.each_pair{|k,v| attrs[k.to_sym] = v} -%>
+<% if your && belong_class < Hobo::Model::UserBase && this.kind_of?(Hobo::Model::UserBase) && I18n.locale == :en -%>
+    <your key="&collection" merge-attrs="&{:name=>this.name}.merge(attrs)" capitalize>
+      <%= belong_class.human_attribute_name(collection.to_sym, attrs) %>
+    </your>
+<% else -%>
+    <%= belong_class.human_attribute_name( collection.to_sym, attrs ) %>
+<% end %>
+</def>
+

data/{taglibs → lib/hobo/rapid/taglibs}/rapid_lifecycles.dryml

@@ -1,14 +1,14 @@
 <!-- Contains view-layer support for Hobo's lifecycles. Note that lifecycle forms are generated automatically in `app/views/taglibs/auto/rapid/forms.dryml` - this library contains only lifecycle push-buttons. -->
 
 <!-- A push-button to invoke a lifecycle transition either as a page-reload or as an ajax call.
-  
+
 ### Attributes
 
  - `transition` - the name of the transition to invoke. Required
  - `update` - one or more DOM IDs of ajax parts to update after the transition
  - `label` - the label on the button. Defaults to the name of the transition
 
-All of the [standard ajax attributes](/api_taglibs/rapid_forms) are also supported. 
+All of the [standard ajax attributes](/api_taglibs/rapid_forms) are also supported.
 
 ### Warning
 
@@ -21,11 +21,11 @@ Transitions with parameters are implemented using a form.  HTML does not allow f
     end
     transition_name = transition.name
     has_params = !transition.options[:params].blank?
-    ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
+    ajax_attributes, html_attributes = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS)
 
     html_attributes[:method] ||= has_params ? :get : :put
     add_classes!(html_attributes, "transition-button #{transition_name}-button")
-    label = ht("#{this.class.name.tableize}.actions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
+    label = ht("#{this.class.to_s.underscore}.actions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
     url = object_url(this, transition_name, :method => html_attributes[:method])
 
     if (update || !ajax_attributes.empty?) && !has_params
@@ -48,9 +48,9 @@ For example, you could use this on a `Friendship` card: the person invited to ha
 This tag behaves similarly to repeat: an else tag may be used to handle the case of no buttons:
 
     <transition-buttons/><else>Sorry, no buttons to press.</else>
-  -->  
+  -->
 <def tag="transition-buttons">
-  <% ajax_attrs, html_attrs = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS) %>
+  <% ajax_attrs, html_attrs = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS) %>
   <div merge-attrs="&html_attrs" class="transitions">
     <% transitions = this.lifecycle.publishable_transitions_for(current_user) %>
     <if test="&transitions">
@@ -59,4 +59,4 @@ This tag behaves similarly to repeat: an else tag may be used to handle the case
       <% end %>
     </if>
   </div>
-</def>
+</def>

data/{taglibs → lib/hobo/rapid/taglibs}/rapid_navigation.dryml

@@ -1,13 +1,13 @@
 <!-- Support for navigation links, account navigation (log in, out etc.) and pagination navigation. -->
 
 <!-- General purpose navigation bar. Renders a `<ul class="navigation">`. This tag is intended to be used in conunction with `<nav-item>`. The main feature of this pair of tags (over, say, just using a plain `<ul>` list), is that it's easy to have a 'current' CSS class added to the appropriate nav item (so you can highlight the page/section the user is)
-  
+
 The main navigation in the default hobo app is implemented with `<navigation>` but this tag is also appropriate for any sub-navigation.
-  
+
 ### Attributes
 
- - `current` - the textual content of the nav item that should have the 'current' CSS class added (see example) 
- 
+ - `current` - the textual content of the nav item that should have the 'current' CSS class added (see example)
+
 ### Example
 
 The normal usage is to define your own navigation tag that calls `<navigation>`.
@@ -25,7 +25,7 @@ Then in your pages you can call the tag like this
  - On the 'red' page: `<sub-nav current="red"/>`
  - On the 'green' page:  `<sub-nav current="green"/>`
  - and so on.
- 
+
    -->
 <def tag="navigation" attrs="current">
   <ul class="navigation" merge-attrs>
@@ -57,7 +57,7 @@ Example 2: navigation based on a collection of items.  Each item will be transfo
 
 -->
 <def tag="nav-item" attrs="name">
-  <% body = parameters.default 
+  <% body = parameters.default
      body = h(this.to_s) if body.blank?
      name ||= body.gsub(/<.*?>/, '').strip
      -%>
@@ -69,7 +69,7 @@ Example 2: navigation based on a collection of items.  Each item will be transfo
 
 
 <!-- Account Navigation (log in / out / signup)
-  
+
 When logged in, this renders:
 
  - "Logged in as ..."
@@ -80,22 +80,22 @@ When not logged in, renders:
 
  - Log in link
  - Sign up link
- 
+
 This is a simple tag - just look at the source if you need to know more detail.
 
   -->
 <def tag="account-nav">
   <do with="&current_user">
     <ul class="navigation account-nav" param>
-      <li if="&RAILS_ENV == 'development'" param="dev-user-changer"><dev-user-changer/></li>
+      <li if="&Rails.env.development?" param="dev-user-changer"><dev-user-changer/></li>
       <if test="&logged_in?">
-        <li class='nav-item' param="logged-in-as"><a to="&current_user"><ht key="hobo.actions.logged_in_as" name="#{name}">Logged in as <name/></ht></a></li>
-        <li class='nav-item' param="account"><a action="account"><ht key="hobo.actions.account">Account</ht></a></li>
-        <li class='nav-item' param="log-out"><a href="&logout_url"><ht key="hobo.actions.logout">Log out</ht></a></li>
+        <li class='nav-item' param="logged-in-as"><a to="&current_user"><t key="hobo.actions.logged_in_as" name="&name">Logged in as <name/></t></a></li>
+        <li class='nav-item' param="account"><a action="account"><t key="hobo.actions.account">Account</t></a></li>
+        <li class='nav-item' param="log-out"><a href="&logout_url"><t key="hobo.actions.logout">Log out</t></a></li>
       </if>
       <else>
-        <li class='nav-item' param="log-in"><a href="&login_url"><ht key="hobo.actions.login">Log in</ht></a></li>
-        <li if="&signup_url" class="nav-item" param="sign-up"><a href="&signup_url"><ht key="hobo.actions.signup">Sign up</ht></a></li>
+        <li class='nav-item' param="log-in"><a href="&login_url"><t key="hobo.actions.login">Log in</t></a></li>
+        <li if="&signup_url" class="nav-item" param="sign-up"><a href="&signup_url"><t key="hobo.actions.signup">Sign up</t></a></li>
       </else>
     </ul>
   </do>
@@ -104,5 +104,5 @@ This is a simple tag - just look at the source if you need to know more detail.
 
 <!--- A simple wrapper around the `will_paginate` helper. All options to `will_paginate` are available as attributes -->
 <def tag="page-nav">
-  <%= will_paginate this, attributes.symbolize_keys.reverse_merge(:inner_window => 2, :previous_label => translate("hobo.actions.previous", :default=>"&laquo; Prev"), :next_label =>translate("hobo.actions.next", :default=>"Next &raquo;")) %>
+  <%= will_paginate this, attributes.symbolize_keys.reverse_merge(:inner_window => 2, :previous_label => translate("hobo.actions.previous", :default=>"« Prev"), :next_label =>translate("hobo.actions.next", :default=>"Next »")) %>
 </def>

data/{taglibs → lib/hobo/rapid/taglibs}/rapid_pages.dryml

@@ -1,15 +1,15 @@
 <!-- Rapid-Pages provides tags for working with entire pages. It includes the main `<page>` tag which is the starting point for all pages in Rapid, various supporting tags for things such as stylesheet and javascript includes. Also defines the standard error pages for permission-denied and not-found.
 -->
-  
+
 <!-- The basic page structure for all the pages in a Hobo Rapid application. Providing the doctype, page title, standard stylesheet javascript includes, the ajax progress spinner, default header with app-name, account navigation, main navigation, and live search, empty section for the page content, flash message (if any) and an empty page footer.
-  
+
 The easiest way to see what this tag does is to look at the source.
-  
+
 ### Attributes
 
  - `title` - the page title, will have ": `<app-name>`" appended
  - `full-title` - the full page title. Set this if you do not want the app name suffix.
-  
+
 -->
 <def tag="page" attrs="title, full-title">
   <% full_title ||= "#{title} : #{app_name}" %>
@@ -17,14 +17,14 @@ The easiest way to see what this tag does is to look at the source.
     <head param>
       <title param><%= strip_tags full_title %></title>
       <do param="stylesheets">
-        <!-- note that this is probably overridden in your app/views/taglibs/themes/xxx/xxx.dryml --> 
+        <!-- note that this is probably overridden in your app/views/taglibs/themes/xxx/xxx.dryml -->
         <stylesheet name="reset, hobo-rapid"/>
         <theme-stylesheet />
         <stylesheet name="application" param="app-stylesheet"/>
       </do>
 
       <do param="scripts">
-        <javascript param name="prototype, effects, dragdrop, controls, lowpro, hobo-rapid"/>
+        <javascript param name="prototype, effects, dragdrop, controls, rails, lowpro, hobo-rapid"/>
         <if-ie version="lt IE 7" param="fix-ie6">
           <javascript name="IE7"/>
           <javascript name="ie7-recalc"/>
@@ -32,13 +32,14 @@ The easiest way to see what this tag does is to look at the source.
         <do param="custom-scripts"/>
         <javascript param="application-javascript" name="application"/>
       </do>
+      <%= csrf_meta_tag %>
     </head>
 
     <body param>
       <set-scoped flash-rendered="&false">
         <ajax-progress param/>
         <header class="page-header" param>
-          <account-nav if="&login_url(Hobo::User.default_user_model)" param/>
+          <account-nav if="&login_url(Hobo::Model::UserBase.default_user_model)" param/>
           <h1 param="app-name"><a href="#{base_url}/"><app-name/></a></h1>
           <live-search param if="&defined_route? :site_search"/>
           <main-nav current="&title" param/>
@@ -54,10 +55,10 @@ The easiest way to see what this tag does is to look at the source.
 
 <!-- Renderes dynamically generated JavaScript required by `hobo-rapid.js`, including the information required to perform automatic part updates -->
 <def tag="page-scripts">
-  <script type="text/javascript" param="default">
+  <do param="default">
     <hobo-rapid-javascripts/>
-    <part-contexts-storage/>
-  </script>
+    <part-contexts-javascripts/>
+  </do>
 </def>
 
 
@@ -71,11 +72,11 @@ The easiest way to see what this tag does is to look at the source.
 <def tag="edit-page"  polymorphic/>
 
 <!-- The page rendered by default in the case of a permission-denied error
-  
+
 ### Attributes
 
  - `message` - The main message to display. Defaults to "That operation is not allowed"
- 
+
   -->
 <def tag="permission-denied-page" attrs="message">
   <% message ||= "That operation is not allowed" %>
@@ -97,14 +98,14 @@ The easiest way to see what this tag does is to look at the source.
 
 
 <!-- The page rendered by default in the case of a not-found error
-  
+
 ### Attributes
 
- - `message` - The main message to display. Defaults to "The page you were looking for could not be found"
- 
+ - `message` - The main message to display. Defaults to "The page you requested cannot be found."
+
   -->
 <def tag="not-found-page" attrs="message">
-  <% message ||= "The page you were looking for could not be found" %>
+  <% message ||= t("hobo.messages.not_found", :default=>["The page you requested cannot be found."]) %>
   <page merge>
     <body: class="not-found"/>
     <content: param>
@@ -117,53 +118,53 @@ The easiest way to see what this tag does is to look at the source.
 
 
 <!-- Renders one of five HTML DOCTYPE declarations, according to the `version` attribute.
-  
+
 ### Attributes
  - 'version' - the doctype version, must be one of:
- 
+
    - HTML 4.01 STRICT
    - HTML 4.01 TRANSITIONAL
    - XHTML 1.0 STRICT
    - XHTML 1.0 TRANSITIONAL
    - XHTML 1.1
-  
+
 See the source for the actual output
 
  -->
-<def tag="doctype" attrs="version"><%=
+<def tag="doctype" attrs="version"><%=raw(
   case version.upcase
     when "HTML 4.01 STRICT"
-      '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" ' + 
+      '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" ' +
         '"http://www.w3.org/TR/html4/strict.dtd">'
     when "HTML 4.01 TRANSITIONAL"
-      '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ' + 
+      '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ' +
         '"http://www.w3.org/TR/html4/loose.dtd">'
     when "XHTML 1.0 STRICT"
-      '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ' + 
+      '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ' +
         '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
     when "XHTML 1.0 TRANSITIONAL"
-      '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ' + 
+      '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ' +
         '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
     when "XHTML 1.1"
-      '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' + 
+      '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' +
         '"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
-  end
+  end)
 %></def>
 
 
 <!-- Renders an `<html>` tag along with the DOCTYPE specified in the `doctype` attribute.
-  
+
 ### Attributes
- 
+
  - `doctype` - the version of the DOCTYPE required. See the `version` attribute to `<doctype>`
  -->
 <def tag="html" attrs="doctype">
   <% doctype ||= 'XHTML 1.0 TRANSITIONAL' -%>
   <doctype version="&doctype"/>
   <% attributes.reverse_merge!(:xmlns => "http://www.w3.org/1999/xhtml") if doctype.upcase =~ /^XHTML/ -%>
-  <%= "<html#{tag_options(attributes)}>" %>
+  <%=raw "<html#{tag_options(attributes, true)}>" %>
     <set-scoped xmldoctype="&doctype.upcase =~ /^XHTML/"><do param="default"/></set-scoped>
-  <%= "</html>" %>
+  <%=raw "</html>" %>
 </def>
 
 <!-- empty tags should be written as <br> in HTML and <br /> in XHTML -->
@@ -192,15 +193,15 @@ See the source for the actual output
 
 
 <!-- Renders a conditional comment in order to have some content ignored by all browsers other than Internet Explorer
-  
-### Example 
+
+### Example
 
 
     <if-ie version="lt IE 7"> ... </if-ie>
-    
+
  -->
 <def tag="if-ie" attrs="version">
-  <%= "<!--[if #{version || 'IE'}]>" %><do param="default"/><%= "<![endif]-->" %>
+  <%=raw "<!--[if #{version || 'IE'}]>" %><do param="default"/><%=raw "<![endif]-->" %>
 </def>
 
 <!-- Simple wrapper for the `stylesheet_link_tag` helper. The `name` attribute can be a comma-separated list of stylesheet names.
@@ -229,7 +230,7 @@ See the source for the actual output
 ### Attributes
 
  - `type` - which flash message to display. Defaults to `:notice`
-  
+
 ### CSS Classes
 
 The flash is output in a `<div class="flash notice">`, where `notice` is the `type` specified.
@@ -245,7 +246,7 @@ The flash is output in a `<div class="flash notice">`, where `notice` is the `ty
 <def tag="flash-messages" attrs="names"><%=
   scope.flash_rendered = true if scope.respond_to? :flash_rendered
   names = names.nil? ? flash.keys : comma_split(names)
-  names.map { |name| flash_message :type => name }.join
+  names.map { |name| flash_message :type => name }.safe_join
 %></def>
 
 <!-- Renders `<div id="ajax-progress"><div><span id="ajax-progress-text"></span></div></div>`. The theme will style this as an ajax progress 'spinner' -->