hobo 1.1.0 → 1.3.0.RC

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

@@ -1,7 +1,7 @@
 <!-- Tags that define higher level interactive 'widgets' -->
 
 <!-- An enhanced version of Rapid's `<table>` that has support for column sorting, searching and pagination.
-  
+
 This tag calls `<table merge-params>`, so the parameters for `<table>` are also available.
 
 An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchable_sortable_table) of this tag is available in the [Agility Tutorial](/tutorials/agility)
@@ -15,21 +15,12 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
       <div class="search">
         <form param="search-form" method="get" action="">
           <hidden-fields for-query-string skip="page, search"/>
-          <span><ht key="hobo.table_plus.search">Search</ht></span>
+          <span><t key="hobo.table_plus.search">Search</t></span>
           <input class="search" type="search" name="search" value="&params[:search]"/>
-          <submit label="Go" class="search-button" param="search-submit"/>
+          <submit label="&t('hobo.table_plus.submit_label', :default=>'Go')" class="search-button" param="search-submit"/>
         </form>
       </div>
     </div>
-    <%
-      page_path = if (request.post? || request.put?) && params[:page_path]
-                    params[:page_path]
-                  else
-                    view_name.sub(Dryml::EMPTY_PAGE, params[:action] || '')
-                  end
-      controller, action = page_path.split('/')
-    %>
-
 
     <table merge-attrs="&attributes & (attrs_for(:table) + attrs_for(:with_fields))" empty merge-params>
       <field-heading-row:>
@@ -37,12 +28,12 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
           <% col = sort_columns[scope.field_path] || scope.field_path
              sort = sort_field == col && sort_direction == 'asc' ?
                       "-#{col}" : col
-             sort_url = url_for(params.merge(:sort => sort, :controller => controller, :action => action) - [:page])
-             col_heading_name = this.member_class.try.view_hints.try.field_name(scope.field_name) || scope.field_name.titleize %>
-                          
-          <th param="#{scope.field-name}-heading">
-            <a href="&sort_url" class="column-sort" 
-               param="#{scope.field-name}-heading-link"><%= col_heading_name %></a>
+             sort_url = url_for_page_path(params.merge(:sort => sort) - [:page])
+             col_heading_name = this.member_class.try.human_attribute_name(scope.field_name, :default=> scope.field_name.titleize) %>
+
+          <th param="#{scope.field_name}-heading">
+            <a href="&sort_url" class="column-sort"
+               param="#{scope.field_name}-heading-link"><%= col_heading_name %></a>
             <if test="&col == sort_field">
               <do param="up-arrow" if="&sort_direction == 'desc'">&uarr;</do>
               <do param="down-arrow" if="&sort_direction == 'asc'">&darr;</do>
@@ -51,19 +42,18 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
         </with-field-names>
         <th if="&all_parameters[:controls]" class="controls"></th>
       </field-heading-row>
-    </table>    
-    <do param="empty-message" if="empty?"><ht key="hobo.table_plus.empty" model="#{name.downcase}">No <collection-name lowercase/> to display</ht></do>
+    </table>
+    <empty-collection-message param="empty-message"/>
 
-   
-    <page-nav param params="&{:action=>action, :controller=>controller}" if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
+    <page-nav param params="&recognize_page_path.slice(:controller,:action)" if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
   </div>
 </def>
 
 
-<!-- An enhanced version of Rapid's `<collection>` tag that supports drag-and-drop re-ordering. 
-  
+<!-- An enhanced version of Rapid's `<collection>` tag that supports drag-and-drop re-ordering.
+
 Each item in the collection has a `<div class="ordering-handle" param="handle">` added, which can be used to drag the item up and down.
-  
+
 ### Attributes
 
  - `sortable-options` - a hash of options to pass to the `sortable_elemnt` helper. Default are:
@@ -73,8 +63,8 @@ Each item in the collection has a `<div class="ordering-handle" param="handle">`
           :scroll => :window,
           :handle => 'ordering-handle',
           :complete => [visual_effect(:highlight, attributes[:id])] }
-          
-### Controller support 
+
+### Controller support
 
 This tag assumes the controller has a `reorder` action and the model has a `position_column` method. This action is added automatically by Hobo's model-controller if the model declares `acts_as_list`. See also [Drag and Drop Reordering](/manual/controllers#drag_and_drop_reordering) in the [Controllers and Routing](/manual/controllers) chapter of the manual.
  -->
@@ -105,21 +95,34 @@ This tag assumes the controller has a `reorder` action and the model has a `posi
 </def>
 
 
+<!-- Deprecated: use collection-preview instead. -->
+<def tag="preview-with-more"><collection-preview merge/></def>
+
+
 <!-- Captures the common pattern of a list of "the first few" cards, along with a link to the rest. -->
-<def tag="preview-with-more" attrs="name">
-  <% name ||= collection_name.pluralize -%>
-  <section class="#{name.gsub(' ', '-').dasherize} preview-with-more" param="default">
-    <h3 param="heading"><%= name.titleize %></h3>
-    <a param="more"><ht key="hobo.live_search.more">More</ht> <type-name plural lowercase/>...</a>
+<def tag="collection-preview" attrs="name">
+  <% model_class = this.member_class
+     name ||= model_class.name.downcase.pluralize -%>
+  <section class="#{name.dasherize} collection-preview" param="default">
+    <h3 param="heading">
+      <ht key="#{model_class.to_s.underscore}.collection.heading" count="&this.size">
+        <do param="heading-content"><%= name.pluralize.titleize %></do>
+      </ht>
+    </h3>
+    <a with="&model_class" action="new" if="&can_create?(model_class.new)" param="new-link">
+      <ht key="#{model_class.to_s.underscore}.actions.new">New <%= model_class.model_name.human %></ht>
+    </a>
     <collection param/>
-    <a action="new" if="&can_create?(this.new)" param="new-link">New <%= this.member_class.view_hints.model_name %></a>
+    <unless test="&this.empty? || this.size == model_class.count">
+      <a param="show-all"><ht key="#{model_class.to_s.underscore}.actions.show_all" count="100">Show all <%= name.pluralize.titleize %>...</ht></a>
+    </unless>
   </section>
 </def>
 
 
 <!-- Renders a gravatar (see [gravatar.com](http://gravatar.com)) image in side a link to `this`. Requires `this` to have an `email_address` field. Normally called with a user record in context.
 
-### Attributes 
+### Attributes
 
  - `size` - Size in pixels of the image. Defaults to 80.
  - `rating` - The rating allowed. Defaults to 'g'. See [gravatar.com](http://gravatar.com) for information on ratings.
@@ -134,11 +137,11 @@ This tag assumes the controller has a `reorder` action and the model has a `posi
 <!-- Provides an ajax-powered *find-as-you-type* live search field which is hooked up to Hobo's site-side search feature. At the moment this tag is not very flexible. It is not easy to use if for anything other than Hobo's site-wide search. -->
 <def tag="live-search">
   <div class="search">
-    <label for="search-field"><ht key="hobo.live_search.label">Search</ht></label><input type="search" class="live-search"/>
+    <label for="search-field"><t key="hobo.live_search.label">Search</t></label><input type="search" class="live-search"/>
     <spinner id="search-spinner"/>
   </div>
   <section class="hidden" id="search-results-panel">
-    <h2><ht key="hobo.live_search.results_label">Search Results</ht></h2><div param="close-button"><ht key="hobo.live_search.close_button">close</ht></div>
+    <h2><t key="hobo.live_search.results_label">Search Results</t></h2><div param="close-button"><t key="hobo.live_search.close_button">close</t></div>
     <section id="search-results">&nbsp;</section>
   </section>
 </def>
@@ -159,22 +162,83 @@ And the controller action:
       finder = params[:state] ? Order.send(params[:state]) : Order
       hobo_index finder
     end
-  
+
 See [Filtering stories by status](/tutorials/agility#filtering_stories_by_status) in the [Agility Tutorial](/tutorials/agility) for an example.
 
 ### Attributes
 
  - `param-name` - the name of the HTTP parameter to use for the filter
- - `options` - an array of options for the menu. 
+ - `options` - an array of options or an array of arrays (useful for localized apps) for the menu.
+   It can be omitted if you provide the options as an array or array of arrays in the locale file.
  - `no-filter` - The text of the first option which indicates no filter is in effect. Defaults to 'All'
+ - `first-value` - the value to be used with the first option. Typically not used,
+ meaning the option has a blank value.
+ - model - the model name (optional: needed if you use the "activerecord.attributes" namespace.
+
+### I18n
+
+It lookups the options attributes in "activerecord.attributes.#{model}.filter_menu.#{param\_name}.options"
+with fallback to "filter_menu.#{param_name}.options".
+The passed options are used as a default in case the lookup fails.
+Besides the "activerecord.attributes.#{model}.filter_menu.#{param_name}.no_filter" or
+"tags.filter_menu.default.no_filter" key is used as default of the attribute "no-filter"
+(or "All" if no default is found)
+
+### I18n Example
+
+
+  es:
+    activerecord:
+      attributes:
+        <model_name>:
+          filter_menu:
+            period:
+              no_filter: Todos Períodos
+              options:
+              - [ "Hoy", "today" ]
+              - [ "Ayer", "yesterday" ]
+
+or
+
+  es:
+    tags:
+      filter_menu:
+        period:
+          no_filter: Todos Períodos
+          options:
+          - [ "Hoy", "today" ]
+          - [ "Ayer", "yesterday" ]
+
+   TIME_PERIODS = %w[today yesterday]
+
+   <t-filter-menu param-name="period" options="&TIME_PERIODS" no-filter="All Periods"/>
+
+   with I18n.locale == :es
+   <select name="period">
+     <option value="">Todos Períodos</option>
+     <option value="today">Hoy</option>
+     <option value="yesterday">Ayer</option>
+   </select>
+
+   with I18n.locale == :en (i.e no locale file)
+   <select name="period">
+     <option value="">All Periods</option>
+     <option value="today">today</option>
+     <option value="yesterday">yesterday</option>
+   </select>
+
   -->
-<def tag="filter-menu" attrs="param-name, options, no-filter, id">
-  <% no_filter ||= "All" %>
-  <form action="&request.request_uri" method="get" class="filter-menu" merge-attrs="id">
+<def tag="filter-menu" attrs="model, param-name, options, no-filter, id, first-value">
+  <% options = t("activerecord.attributes.#{model}.filter_menu.#{param_name}.options", :default=>[:"tags.filter_menu.#{param_name}.options", options])
+     raise ArgumentError, %(You must provide an "options" attribute, or set "activerecord.attributes.#{model}.filter_menu.#{param_name}.options" or "tags.filter_menu.#{param_name}.options" to an Array or to an Array of Arrays
+     in your locale file(s)) unless options.is_a?(Array)
+     no_filter = t("activerecord.attributes.#{model}.filter_menu.#{param_name}.no_filter", :default=>[:"tags.filter_menu.#{param_name}.no_filter", :"tags.filter_menu.default.no_filter", no_filter, "All"]) %>
+  <form action="&request.fullpath" method="get" class="filter-menu" merge-attrs="id">
     <div>
-      <% selected = options.detect {|o| o.is_a?(Array) ? o[1].to_s==params[param_name.gsub('-', '_')] : o.to_s==params[param_name.gsub('-', '_')] } %>
+      <% opt = options.first.kind_of?(Array) ? options.*.last : options
+         selected = opt.detect {|o| o.to_s==params[param_name.gsub('-', '_')] }  %>
       <select-menu name="&param_name" options="&options" selected="&selected"
-                   first-option="&no_filter" merge-params/>
+                   first-option="&no_filter" first-value="&first_value" key="&param_name" merge-params/>
     </div>
   </form>
 </def>

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

@@ -5,26 +5,21 @@
   <%= Rails.version -%>
 </def>
 
-<!-- returns "vendor" or "gem" -->
-<def tag="rails-location">
-  <%= Rails.vendor_rails? ? "vendor" : "gem" -%>
-</def>
-
-<!-- `RAILS_ROOT` -->
+<!-- `Rails.root` -->
 <def tag="rails-root">
-  <%= RAILS_ROOT -%>
+  <%= Rails.root -%>
 </def>
 
 <!-- `RAILS_ENV` -->
 <def tag="rails-env">
-  <%= RAILS_ENV -%>
+  <%= Rails.env -%>
 </def>
 
 <!-- Which change management system is in use:  "git" "subversion" "other" -->
 <def tag="cms-method">
-  <%= if File.exist?("#{RAILS_ROOT}/.git")
+  <%= if File.exist?("#{Rails.root}/.git")
         "git"
-      elsif File.exist?("#{RAILS_ROOT}/.svn")
+      elsif File.exist?("#{Rails.root}/.svn")
         "subversion"
       else
         "other"
@@ -38,19 +33,19 @@
 
 <!-- the git version currently in use -->
 <def tag="git-version" attrs="dir">
-  <% dir=RAILS_ROOT if dir.blank? -%>
-  <%= Dir.chdir(dir) {`git rev-list "HEAD^..HEAD" --abbrev-commit --abbrev=7`} -%>
+  <% dir=Rails.root if dir.blank? -%>
+  <%= Dir.chdir(dir) {`git rev-parse --verify HEAD --short=7`} -%>
 </def>
 
-<!-- returns 'clean' if there are no modified files, 'modified' otherwise. -->
+<!-- returns 'clean' if there are no modified or added files, 'dirty' otherwise. -->
 <def tag="git-clean" attrs="dir">
-  <% dir=RAILS_ROOT if dir.blank? -%>
-  <%= Dir.chdir(dir) {`git ls-files -m`}.blank? ? "clean" : "modified"  -%>
+  <% dir=Rails.root if dir.blank? -%>
+  <%= Dir.chdir(dir) {`git status -s`}.blank? ? "clean" : "dirty"  -%>
 </def>
 
 <!-- the time & date of the last commit -->
 <def tag="git-last-commit-time">
-  <%= `git log "HEAD^..HEAD" --pretty=format:%cD` -%>
+  <%= `git log -1 --format=%cD` -%>
 </def>
 
 <!-- calls `git-clean` or `svn-clean` as appropriate.  `svn-clean` not yet written. -->
@@ -84,13 +79,7 @@
 
 <!-- repeats on Rails.configuration.gems, including dependent gems -->
 <def tag="with-gems">
-  <% gems = ActiveSupport::OrderedHash.new -%>
-  <% Rails.configuration.gems.each do |gem|
-       gems[name] ||= gem
-       gem.dependencies.each do |dep|
-         gems[dep] ||= dep
-       end
-     end -%>
+  <% gems = Bundler::LockfileParser.new(File.read('Gemfile.lock')).specs -%>
   <repeat with="&gems">
     <do param="default"/>
   </repeat>
@@ -101,37 +90,19 @@
   <%= this.name -%>
 </def>
 
-<def tag="gem-version-requirement">
-  <unless test="this.nil?"><%=
-    this.requirements.map{|l| l.first+l.second.to_s}.join(",")
--%></unless>
-</def>
-
-<!-- inside `<with-gems>`, returns the version required -->
-<def tag="gem-version-required">
-  <gem-version-requirement:version-requirements />
-</def>  
-
 <!-- inside `<with-gems>`, returns the version -->
 <def tag="gem-version">
-  <%= this.specification.version.to_s -%>
-</def>
-
-<!-- inside `<with-gems>`, returns 'frozen', 'installed' or 'missing' -->
-<def tag="gem-frozen">
-  <%= this.frozen? ? "frozen" : (this.installed? ? "installed" : "missing") -%>
+  <%= this.version.to_s -%>
 </def>
 
 <!-- inside `<with-gems>`, returns the gem dependencies -->
 <def tag="gem-dependencies">
-  <repeat with="&this.dependencies">
-    <%= this.name -%><gem-version-requirement with="&this.requirement || this.version_requirements" />
-  </repeat>
+    <%= this.dependencies(&it.to_s).safe_join('<br>'.html_safe) -%>
 </def>
 
 <!-- repeats on the plugins used by the application -->
 <def tag="with-plugins">
-  <% plugins = Rails.configuration.plugin_loader.new(Hobo.rails_initializer).plugins %>
+  <% plugins = Rails.application.railties.plugins %>
   <repeat with="&plugins">
     <do param="default" />
   </repeat>
@@ -139,31 +110,31 @@
 
 <!-- within `<with-plugins>`, returns the plugin name -->
 <def tag="plugin-name">
-  <%= this.name -%>
+  <%= this.name.to_s -%>
 </def>
 
 <!-- within `<with-plugins>`, returns the plugin location (directory) -->
 <def tag="plugin-location">
-  <%= this.directory -%>
+  <%= this.root.to_s -%>
 </def>
 
 <def tag="plugin-git-clean">
-  <git-clean dir="&this.directory"/>
+  <git-clean dir="&this.root.to_s"/>
 </def>
 
 <def tag="plugin-git-version">
-  <git-version dir="&this.directory"/>
+  <git-version dir="&this.root.to_s"/>
 </def>
 
 <!-- within `<with-plugins>`, try and determine the method that was used to install the plugin.   Returns "braid", "symlink", "git-submodule" or "other" -->
 <def tag="plugin-method">
-  <%= 
-      braids = File.open("#{RAILS_ROOT}/.braids") {|f| YAML::load(f) } rescue {}
-      if !braids[this.directory.gsub(RAILS_ROOT+"/", "")].nil?
+  <%=
+      braids = File.open("#{Rails.root}/.braids") {|f| YAML::load(f) } rescue {}
+      if !braids[this.root.to_s.gsub(Rails.root.to_s+"/", "")].nil?
         "braid"
-      elsif File.lstat(this.directory).symlink?
+      elsif File.lstat(this.root.to_s).symlink?
         "symlink"
-      elsif File.exist?(this.directory+"/.git")
+      elsif File.exist?(this.root.to_s+"/.git")
         "git-submodule"
       else
         "other"
@@ -186,13 +157,13 @@
 </def>
 
 <def tag="plugin-braid-clean">
-  <%= diff=`braid diff #{this.directory.gsub(RAILS_ROOT+"/", "")}`
+  <%= diff=`braid diff #{this.directory.gsub(Rails.root+"/", "")}`
       diff.strip.empty? ? "clean" : "modified" -%>
 </def>
 
 <def tag="plugin-braid-version">
-  <%=  braids = File.open("#{RAILS_ROOT}/.braids") {|f| YAML::load(f) } rescue {}
-       b=braids[this.directory.gsub(RAILS_ROOT+"/", "")]
+  <%=  braids = File.open("#{Rails.root}/.braids") {|f| YAML::load(f) } rescue {}
+       b=braids[this.directory.gsub(Rails.root+"/", "")]
        b['revision'][0...7] if b -%>
 </def>
 
@@ -305,7 +276,7 @@
       end -%>
 </def>
 
-<!-- given an association, return the name --> 
+<!-- given an association, return the name -->
 <def tag="model-association-class-name">
   <%= (this.class_name.try.respond_to? 'underscore') ? this.class_name.underscore.singularize.camelize : this.try.class_name -%>
 </def>

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

@@ -2,7 +2,7 @@
 
 
 <!-- Call with the context set to a record. Repeats the content of the tag with `this` and `this_field` set to the value and name of each of the record's fields in turn. E.g. this is useful for generating a form containing each of the fields. Tags like `<field-list>` and `<table>` forward their attributes to this tag and also have the features described here. For example, the `fields` attribute to `<field-list>` supports the same options as described here.
-  
+
 This tag is in need of a review - it's a bit funky.
 
 ### Attributes
@@ -17,14 +17,14 @@ This tag is in need of a review - it's a bit funky.
  - `skip-associations` - set to `has-many` to omit all `has_many` associations.
  - `include-timestamps` - whether or not to include the standard ActiveRecord timestamp fields such as `created_at` and `updated_at`. Defaults to false.
  - `force-all` - by default fields are skipped if the current user does not have view permission. Set `force-all` to true to skip this permission check and include all the fields.
-  
+
   -->
 <def tag="with-fields" attrs="fields, associations, skip, skip-associations, include-timestamps, force-all"><%
   fields.nil? || associations.nil? or raise ArgumentError, "with-fields -- specify either fields or associations but not both"
-   
+
   field_names = if associations == "has_many"
                   this.class.reflections.values.select { |refl| refl.macro == :has_many }.map { |refl| refl.name.to_s }
-                                                                                                                
+
                 elsif fields.nil? || fields == "*" || fields.is_a?(Class)
                   klass = fields.is_a?(Class) ? fields : this.class
                   columns = standard_fields(klass, include_timestamps)
@@ -43,7 +43,7 @@ This tag is in need of a review - it's a bit funky.
                 end
   field_names -= comma_split(skip) if skip
   field_names = field_names.select {|f| can_view?(this, f)} unless force_all
-  field_names.each do |field| 
+  field_names.each do |field|
     %><set-scoped field-name="&field"><%
     if field == "this"
       %><do param="default"/><%
@@ -55,7 +55,7 @@ This tag is in need of a review - it's a bit funky.
 %></def>
 
 <!-- Call with the context set to a model class. Repeats the content of the tag with `this` set name of each of the model's fields in turn. E.g. this tag is used when generating the heading row in a `<table fields='...'/>`.
-  
+
 This tag is in need of a review - it's a bit funky.
 
 ### Attributes
@@ -68,7 +68,7 @@ This tag is in need of a review - it's a bit funky.
  - `skip` - comma separated list of field names to omit.
  - `skip-associations` - set to `has-many` to omit all `has_many` associations.
  - `include-timestamps` - whether or not to include the standard ActiveRecord timestamp fields such as `created_at` and `updated_at`. Defaults to false.
-  
+
   -->
 <def tag="with-field-names" attrs="fields, skip, skip-associations, include-timestamps"><%=
   field_names = if fields.nil? || fields == "*" || fields.is_a?(Class)
@@ -92,10 +92,10 @@ This tag is in need of a review - it's a bit funky.
   field_names -= comma_split(skip) if skip
   scope.new_scope :field_name => nil, :field_path => nil do
     field_names.map do |n|
-      scope.field_name = n == "this" ? this.member_class.try.name : n.to_s.gsub("." , "_") 
+      scope.field_name = n == "this" ? this.member_class.try.name : n.to_s.gsub("." , "_")
       scope.field_path = n
       parameters.default
-    end.join
+    end.safe_join
   end
 %>
 </def>