hobo 1.3.0.pre29 → 1.3.0.pre31

data/VERSION

@@ -1 +1 @@
-1.3.0.pre29
+1.3.0.pre31

data/app/controllers/dev_controller.rb

@@ -5,7 +5,7 @@ class DevController < ActionController::Base
   before_filter :developer_modes_only
 
   def set_current_user
-    model = params[:model] || Hobo::Model::User.default_user_model
+    model = params[:model] || Hobo::Model::UserBase.default_user_model
     self.current_user = if params[:login]
                           model.where(model.login_attribute => params[:login]).first
                         else

data/lib/generators/hobo/i18n/templates/hobo.de.yml

@@ -140,7 +140,7 @@ de:
       current_password_is_not_correct: "ist nicht korrekt"
       you_are_site_admin: "Sie sind jetzt der Administrator"
       you_signed_up: "Sie haben sich angemeldet"
-      no: "Kein %{model}-Objekt gefunden."
+      none: "Kein %{model}-Objekt gefunden."
       confirm: "Sind Sie sich sicher?"
 
     # default hobo collection translation

data/lib/generators/hobo/i18n/templates/hobo.en.yml

@@ -63,7 +63,7 @@ en:
     forgot_password_sent:
       title: "Forgotten password - E-mail sent"
       heading: "Forgotten password - E-mail sent"
-      text: "An e-mail with instructions on how you generate a new password has been sent to %{email_address}. If you don't receive this e-mail please check your spamfilter."
+      text: "An e-mail with instructions on how to generate a new password has been sent to %{email_address}. If you don't receive this e-mail please check your spam folder."
 
     account_disabled_page:
       title: "Account disabled"
@@ -131,15 +131,15 @@ en:
       current_password_is_not_correct: "is not correct"
       you_are_site_admin: "You are now the site administrator"
       you_signed_up: "You have signed up"
-      no: "No %{model} available."
+      none: "No %{model} available."
       confirm: "Are you sure?"
 
     # default hobo collection translation
     collection:
       count: &collection_count
         zero: &no_model "No %{model}"
-        one: "There is only one %{model} at the moment"
-        other: "There are already %{count} %{model}"
+        one: "There is one %{model}."
+        other: "There are %{count} %{model}."
       # you can use the following to completely override the collection heading
       # be aware that you will loose the automatic Your <collection> / Jom's <collection>
       # default output for User models

data/lib/generators/hobo/i18n/templates/hobo.es.yml

@@ -138,7 +138,7 @@ es:
       current_password_is_not_correct: "no está correcta"
       you_are_site_admin: "Ahora usted es el administrador del sitio."
       you_signed_up: "Usted se inscribió."
-      no: "No hay %{model} disponibles."
+      none: "No hay %{model} disponibles."
       confirm: "¿Está seguro?"
 
     # default hobo collection translation

data/lib/generators/hobo/i18n/templates/hobo.it.yml

@@ -137,7 +137,7 @@ it:
       current_password_is_not_correct: "non è esatta"
       you_are_site_admin: "Adesso sei amministratore del sito."
       you_signed_up: "Ti sei iscritto."
-      no: "Nessun record %{model} disponibile."
+      none: "Nessun record %{model} disponibile."
       confirm: "Sei sicuro?"
 
     # default hobo collection translation

data/lib/generators/hobo/i18n/templates/hobo.pt-PT.yml

@@ -121,7 +121,7 @@
         success: "Obrigado por efectuar o registo!"
         must_activate: "Deve ativar o seu registo antes de se identificar. Por favor, verifique na sua caixa de correio electrônico."
       login:
-        success: "Está indetificado no sistema."
+        success: "Está identificado no sistema."
         error: "Não especificou um utilizador válido ({{login}}) e respectiva palavra-chave!"
       logout: "Saiu do sistema."
       reset_password: "A sua palavra-chave foi apagada."
@@ -132,7 +132,7 @@
       current_password_is_not_correct: "não está correta."
       you_are_site_admin: "Agora é o administrador do site"
       you_signed_up: "Acabou de se registar"
-      no: "Nenhum #{model} disponível."
+      none: "Nenhum #{model} disponível."
       confirm: "Tem a certeza?"
 
     # default hobo collection translation

data/lib/generators/hobo/i18n/templates/hobo.ru.yml

@@ -136,7 +136,7 @@ ru:
       current_password_is_not_correct: "неправильно"
       you_are_site_admin: "Вы получили права администратора сайта."
       you_signed_up: "Вы зарегестрировались."
-      no: "Нет доступных %{model}ей."
+      none: "Нет доступных %{model}ей."
       confirm: "Вы уверены?"
 
     # default hobo collection translation

data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/views/clean-sidemenu.dryml

@@ -9,7 +9,7 @@
 
     <header: class="sidemenu" param>
       <live-search param if="&defined_route? :site_search"/>
-      <account-nav if="&login_url(Hobo::Model::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>
     </header:>
 

data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb

@@ -113,7 +113,7 @@ NOTE: You might want to sign up as the administrator before adding this!
       end
       inject_into_file 'app/controllers/application_controller.rb', <<EOI, :after => "protect_from_forgery\n" if private_site
   include Hobo::Controller::AuthenticationSupport
-  before_filter :except => [:login, :forgot_password, :accept_invitation, :do_accept_invitation] do
+  before_filter :except => [:login, :forgot_password, :accept_invitation, :do_accept_invitation, :reset_password] do
      login_required unless #{@user_resource_name.camelize}.count == 0
   end
 EOI

data/lib/generators/hobo/user_controller/templates/controller.rb.erb

@@ -17,8 +17,10 @@ class <%= class_name %>Controller < ApplicationController
 
   def do_accept_invitation
     do_transition_action :accept_invitation do
-      self.current_user = this
-      flash[:notice] = t("hobo.messages.you_signed_up", :default=>"You have signed up")
+      if this.valid?
+        self.current_user = this
+        flash[:notice] = t("hobo.messages.you_signed_up", :default=>"You have signed up")
+      end
     end
   end
 <% end -%>

data/lib/hobo.rb

@@ -25,7 +25,7 @@ module Hobo
 
   class << self
 
-    attr_accessor :current_theme
+    attr_accessor :current_theme, :engines
 
     def raw_js(s)
       RawJs.new(s)
@@ -64,13 +64,18 @@ module Hobo
 
     def subsites
       # Any directory inside app/controllers defines a subsite
-      @subsites ||= Dir["#{Rails.root}/app/controllers/*"].map do |f|
-                      File.basename(f) if File.directory?(f)
-                    end.compact
+      app_dirs = ["#{Rails.root}/app"] + Hobo.engines.map { |e| "#{e}/app" }
+      @subsites ||= app_dirs.map do |app|
+                      Dir["#{app}/controllers/*"].map do |f|
+                        File.basename(f) if File.directory?(f)
+                      end.compact
+                    end.flatten
     end
 
   end
 
+  self.engines = []
+
 end
 
 require 'hobo/engine'

data/lib/hobo/controller.rb

@@ -98,6 +98,12 @@ module Hobo
     end
 
 
+    # dryml does not use layouts
+    def action_has_layout?
+      false
+    end
+
+
     def dryml_context
       @this
     end

data/lib/hobo/controller/authentication_support.rb

@@ -38,7 +38,7 @@ module Hobo
       #   skip_before_filter :login_required
       #
       def login_required(user_model=nil)
-        auth_model = user_model || Hobo::Model::User.default_user_model
+        auth_model = user_model || Hobo::Model::UserBase.default_user_model
         if current_user.guest?
           username, passwd = get_auth_data
           self.current_user = auth_model.authenticate(username, passwd) || nil if username && passwd && auth_model

data/lib/hobo/controller/model.rb

@@ -50,15 +50,21 @@ module Hobo
 
 
     def self.all_controllers(subsite=nil, force=false)
+      controller_dirs = ["#{Rails.root}/app/controllers"] + Hobo.engines.map { |e| "#{e}/app/controllers" }
+
       # Load every controller in app/controllers/<subsite>...
       @controllers_loaded ||= {}
       if force || !@controllers_loaded[subsite]
-        dir = "#{Rails.root}/app/controllers#{'/' + subsite if subsite}"
-        Dir.entries(dir).each do |f|
-          if f =~ /^[a-zA-Z_][a-zA-Z0-9_]*_controller\.rb$/
-            name = f.remove(/.rb$/).camelize
-            name = "#{subsite.camelize}::#{name}" if subsite
-            name.constantize
+        controller_dirs.each do |controller_dir|
+          dir = "#{controller_dir}#{'/' + subsite if subsite}"
+          if File.directory?(dir)
+            Dir.entries(dir).each do |f|
+              if f =~ /^[a-zA-Z_][a-zA-Z0-9_]*_controller\.rb$/
+                name = f.remove(/.rb$/).camelize
+                name = "#{subsite.camelize}::#{name}" if subsite
+                name.constantize
+              end
+            end
           end
         end
         @controllers_loaded[subsite] = true
@@ -73,7 +79,6 @@ module Hobo
     end
 
 
-
     module ClassMethods
 
       attr_writer :model

data/lib/hobo/extensions/active_record/hobo_methods.rb

@@ -5,7 +5,7 @@ ActiveRecord::Base.class_eval do
   end
   def self.hobo_user_model
     include Hobo::Model
-    include Hobo::Model::User
+    include Hobo::Model::UserBase
   end
   alias_method :has_hobo_method?, :respond_to_without_attributes?
 end

data/lib/hobo/extensions/i18n.rb

@@ -3,6 +3,7 @@ I18n.module_eval do
 
     def translate_with_show_keys(key, options = {})
       translation = translate_without_show_keys(key, options)
+      return translation unless translation.is_a?(String)
       keys = normalize_keys(locale, key, options[:scope]).join('.')
       "[#{keys}]" + translation
     end

data/lib/hobo/helper.rb

@@ -343,19 +343,19 @@ module Hobo
 
 
     # Login url for a given user record or user class
-    def forgot_password_url(user_class=Hobo::Model::User.default_user_model)
+    def forgot_password_url(user_class=Hobo::Model::UserBase.default_user_model)
       send("#{user_class.name.underscore}_forgot_password_url") rescue nil
     end
 
 
     # Login url for a given user record or user class
-    def login_url(user_class=Hobo::Model::User.default_user_model)
+    def login_url(user_class=Hobo::Model::UserBase.default_user_model)
       send("#{user_class.name.underscore}_login_url") rescue nil
     end
 
 
     # Sign-up url for a given user record or user class
-    def signup_url(user_class=Hobo::Model::User.default_user_model)
+    def signup_url(user_class=Hobo::Model::UserBase.default_user_model)
       send("#{user_class.name.underscore}_signup_url") rescue nil
     end
 
@@ -395,6 +395,7 @@ module Hobo
       options = args.extract_options!
       target = args.empty? || args.first.is_a?(Symbol) ? this : args.shift
       action = args.first
+      return false if action.nil? && target.try.new_record?
 
       if target.respond_to?(:member_class) && (origin = target.try.origin)
         klass = origin.class

data/lib/hobo/model.rb

@@ -142,7 +142,7 @@ module Hobo
         self.creator_attribute         = name.to_sym if options.delete(:creator)
         validate = options.delete(:validate) {true}
 
-        #FIXME - this should be in Hobo::Model::User
+        #FIXME - this should be in Hobo::Model::UserBase
         send(:login_attribute=, name.to_sym, validate) if options.delete(:login) && respond_to?(:login_attribute=)
       end
 
@@ -357,7 +357,7 @@ module Hobo
 
 
     def to_url_path
-      "#{self.class.to_url_path}/#{to_param}" unless new_record?
+      "#{self.class.to_url_path}/#{to_param}"
     end
 
 

data/lib/hobo/model/permissions.rb

@@ -19,8 +19,6 @@ module Hobo
           attr_accessor :acting_user, :origin, :origin_attribute
 
           bool_attr_accessor :exempt_from_edit_checks
-
-          define_callbacks :after_user_new
         end
       end
 
@@ -48,7 +46,7 @@ module Hobo
             r.set_creator user
             yield r if block_given?
             r.user_view(user)
-            r.with_acting_user(user) { r.send :run_callbacks, :after_user_new }
+            r.with_acting_user(user) { r.try.after_user_new }
           end
         end
 

data/lib/hobo/model/scopes/apply_scopes.rb

@@ -4,7 +4,7 @@ module Hobo
       module ApplyScopes
 
         def apply_scopes(scopes)
-          result = self
+          result = scoped
           scopes.each_pair do |scope, arg|
             if arg.is_a?(Array)
               result = result.send(scope, *arg) unless arg.first.blank?

data/lib/hobo/model/{user.rb → user_base.rb}

@@ -2,7 +2,7 @@ require 'digest/sha1'
 
 module Hobo
   module Model
-    module User
+    module UserBase
 
       @user_models = []
 

data/lib/hobo/rapid/generators/rapid/pages.dryml.erb

@@ -33,7 +33,7 @@ model_key = model.to_s.underscore
         </h2>
 
         <p param="count" if>
-          <ht key="<%= model_key %>.collection.count" count="&this.size">
+          <ht key="<%= model_key %>.collection.count" count="&collection_count">
             <count summary/>
           </ht>
         </p>
@@ -110,7 +110,7 @@ edit_link      = linkable?(:edit)
 main_content   = model.primary_content_attribute
 show_fields    = standard_fields(:belongs_to).*.to_s - [model.name_attribute, main_content, creator, back_link, *boolean_fields].*.to_s
 
-is_user_model = model < Hobo::Model::User
+is_user_model = model < Hobo::Model::UserBase
 
 collection     = model.view_hints.primary_children
 if collection
@@ -273,7 +273,7 @@ owner_model     = model.reflections[owner].klass
 linkable_owner  = linkable?(owner_model, :show)
 owner_tag       = linkable_owner ? "a" : "name"
 
-owner_is_user = owner_model < Hobo::Model::User
+owner_is_user = owner_model < Hobo::Model::UserBase
 
 owner = model.reflections[owner].macro == :has_many ? owner.to_s.singularize : owner.to_s
 -%>
@@ -306,7 +306,7 @@ new_link = :new.in?(actions)
         </h3>
 <% end -%>
         <p param="count" if>
-          <ht key="<%= model_key %>.collection.count" count="&this.size">
+          <ht key="<%= model_key %>.collection.count" count="&collection_count">
             <count summary/>
           </ht>
         </p>

data/lib/hobo/rapid/helper.rb

@@ -102,7 +102,10 @@ module Hobo
         s.gsub(' ', ' ')
       end
 
-
+      # returns the number of items in the collection.  See LH #889
+      def collection_count
+        this.try.to_int || this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
+      end
 
 
       def in_place_editor(attributes, this=nil)

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

@@ -368,7 +368,7 @@ Or a new page if the context is a class:
 
       content = name if content.blank?
 
-      href = object_url(target, action, (params || {}).merge(:subsite => subsite))
+      href = object_url(target, action, (params || {}).merge(:subsite => subsite)) unless (action.nil? && target.try.new_record?)
       if href.nil?
         # This target is registered with Hobo::Routes as not linkable
         content
@@ -472,13 +472,13 @@ Assuming the context is a blog post...
 <def tag="links-for-collection"><%= this.empty? ? "(none)" : context_map { a }.safe_join(", ") %></def>
 
 <!-- Renders `this` in localized :default format. `format` can be a symbol representing a locale key or a standard format string (see strftime) -->
-<def tag="view" for="Date" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
+<def tag="view" for="date" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
 
 <!-- Renders `this` in localized :default format. `format` can be a symbol representing a Time::DATE_FORMATS or a standard format string (see strftime) -->
-  <def tag="view" for="Time" attrs="format"><%= this && (format||= :time) && (format.is_a?(Symbol) ? this.to_s(format) : this.strftime(format) ) %></def>
+  <def tag="view" for="time" attrs="format"><%= this && (format||= :time) && (format.is_a?(Symbol) ? this.to_s(format) : this.strftime(format) ) %></def>
 
 <!-- Renders `this` in localized :default format. `format` can be a symbol representing a locale key or a standard format string (see strftime) -->
-<def tag="view" for="ActiveSupport::TimeWithZone" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
+<def tag="view" for="datetime" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
 
 <!-- Renders localized `number_with_delimiter this`, or `format % this` if the `format` attribute is given -->
 <def tag="view" for="Numeric" attrs="format"><%= format ? format % this : number_with_delimiter(this) %></def>
@@ -564,7 +564,7 @@ You can pass a summary attribute, which will generate a complete localized sente
   raise Exception.new("asked for count of a string") if this.is_a?(String)
   Rails.logger.warn('The "prefix" attribute is deprecated: please, use a locale string') unless prefix.blank?
 
-  c = this.try.to_int || this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
+  c = collection_count
 
   # generated label will be pluralized
   label ||= case
@@ -772,7 +772,7 @@ Notes
 
 <!-- Development mode only - a menu to change the `current_user` -->
 <def tag="dev-user-changer">
-  <set user="&Hobo::Model::User.default_user_model"/>
+  <set user="&Hobo::Model::UserBase.default_user_model"/>
   <select-menu if="&user && Rails.env.development?"
                first-option="#{t('hobo.dev_user_changer.guest', {:default=>'Guest'})}" options="&user.all(:limit => 30).*.login"
                onchange="location.href = '#{dev_support_path :action=>:set_current_user}?login=' + encodeURIComponent(this.options[this.selectedIndex].value)"

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

@@ -573,7 +573,7 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
 
   -->
 <def tag="delete-button" attrs="label, update, in-place, image, confirm, fade, subsite"><%=
-  in_place = false if in_place.nil? && this == @this && request.method == :get
+  in_place = false if in_place.nil? && this == @this && request.method.downcase == "get"
   url = object_url(this, :method => :delete, :subsite => subsite)
   if (Dryml.last_if = url && can_delete?)
     attributes = attributes.merge(if image
@@ -659,7 +659,7 @@ For situations where there are too many target records to practically include in
   -->
 <def tag="select-one" attrs="include-none, blank-message, options, sort, limit, text-method"><%
   raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit?
-  blank_message ||= ht("#{this_type.name.underscore}.message.no", :default=>"(No #{this_type.model_name.human})")
+  blank_message ||= ht("#{this_type.name.underscore}.messages.none", :default=>"No #{this_type.model_name.human} available.")
   limit ||= 100
 
   options ||= begin
@@ -785,7 +785,7 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
 <!-- Renders a localized list of error messages following a form submission. Expects the errors to be in `this.errors`. Renders nothing if there are no errors.
   -->
 <def tag="error-messages">
-  <section class="error-messages" merge-attrs if="&this.errors.length > 0">
+  <section class="error-messages" merge-attrs if="&this.errors.size > 0">
     <h2 param="heading">
       <t key="activerecord.errors.template.header" model="&this.class.model_name.human" count="&this.errors.size">
         <%= model = this.class.model_name.human

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

@@ -42,7 +42,7 @@
 <!-- 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::User instance it automatically embeds the `your` tag funtionality. (note: :name is added by default as an interpolable variable)
+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
 
@@ -96,7 +96,7 @@ With the `your` attribute and in the special case the context is a Hobo::Model::
   # prepare symbolized attributes for merging
   attrs = {}
   all_attributes.each_pair{|k,v| attrs[k.to_sym] = v} -%>
-<% if your && belong_class < Hobo::Model::User && this.kind_of?(Hobo::Model::User) && I18n.locale == :en -%>
+<% 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>

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

@@ -24,7 +24,7 @@ The easiest way to see what this tag does is to look at the source.
       </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::Model::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/>

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

@@ -171,16 +171,35 @@ See [Filtering stories by status](/tutorials/agility#filtering_stories_by_status
  - `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 filter_menu.#{param_name}.options.
+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 "tags.filter_menu.default.no_filter" key is used as default of the attribute "no-filter"
+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:
@@ -209,16 +228,16 @@ Besides the "tags.filter_menu.default.no_filter" key is used as default of the a
    </select>
 
   -->
-<def tag="filter-menu" attrs="param-name, options, no-filter, id">
-  <% opt = t("tags.filter_menu.#{param_name}.options", :default=>'')
+<def tag="filter-menu" attrs="model, param-name, options, no-filter, id, first-value">
+  <% opt = t("activerecord.attributes.#{model}.filter_menu.#{param_name}.options", :default=>[:"tags.filter_menu.#{param_name}.options"])
      options = opt unless opt.blank?
-     no_filter = t("tags.filter_menu.#{param_name}.no_filter", :default=>[:"tags.filter_menu.default.no_filter", no_filter, "All"]) %>
+     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>
       <% 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" key="&param_name" merge-params/>
+                   first-option="&no_filter" first-value="&first_value" key="&param_name" merge-params/>
     </div>
   </form>
 </def>

metadata

@@ -2,7 +2,7 @@
 name: hobo
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.3.0.pre29
+  version: 1.3.0.pre31
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 -04:00
+date: 2011-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.pre29
+        version: 1.3.0.pre31
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.pre29
+        version: 1.3.0.pre31
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.pre29
+        version: 1.3.0.pre31
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -260,7 +260,7 @@ files:
 - lib/hobo/model/scopes.rb
 - lib/hobo/model/scopes/apply_scopes.rb
 - lib/hobo/model/scopes/automatic_scopes.rb
-- lib/hobo/model/user.rb
+- lib/hobo/model/user_base.rb
 - lib/hobo/model/view_hints.rb
 - lib/hobo/rapid/generators/rapid/cards.dryml.erb
 - lib/hobo/rapid/generators/rapid/forms.dryml.erb