hobo 1.3.0.RC4 → 1.3.0.pre10

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

@@ -31,11 +31,11 @@ module Hobo
         def create_scope(check_only=false)
           matched_scope = true
 
-          case
+
           # --- Association Queries --- #
 
           # with_players(player1, player2)
-          when name =~ /^with_(.*)/ && (refl = reflection($1))
+          if name =~ /^with_(.*)/ && (refl = reflection($1))
             return true if check_only
 
             def_scope do |*records|
@@ -49,7 +49,7 @@ module Hobo
             end
 
           # with_player(a_player)
-          when name =~ /^with_(.*)/ && (refl = reflection($1.pluralize))
+          elsif name =~ /^with_(.*)/ && (refl = reflection($1.pluralize))
             return true if check_only
 
             exists_sql = exists_sql_condition(refl)
@@ -59,7 +59,7 @@ module Hobo
             end
 
           # any_of_players(player1, player2)
-          when name =~ /^any_of_(.*)/ && (refl = reflection($1))
+          elsif name =~ /^any_of_(.*)/ && (refl = reflection($1))
             return true if check_only
 
             def_scope do |*records|
@@ -73,7 +73,7 @@ module Hobo
             end
 
           # without_players(player1, player2)
-          when name =~ /^without_(.*)/ && (refl = reflection($1))
+          elsif name =~ /^without_(.*)/ && (refl = reflection($1))
             return true if check_only
 
             def_scope do |*records|
@@ -87,7 +87,7 @@ module Hobo
             end
 
           # without_player(a_player)
-          when name =~ /^without_(.*)/ && (refl = reflection($1.pluralize))
+          elsif name =~ /^without_(.*)/ && (refl = reflection($1.pluralize))
             return true if check_only
 
             exists_sql = exists_sql_condition(refl)
@@ -97,7 +97,7 @@ module Hobo
             end
 
           # team_is(a_team)
-          when name =~ /^(.*)_is$/ && (refl = reflection($1)) && refl.macro.in?([:has_one, :belongs_to])
+          elsif name =~ /^(.*)_is$/ && (refl = reflection($1)) && refl.macro.in?([:has_one, :belongs_to])
             return true if check_only
 
             if refl.options[:polymorphic]
@@ -113,7 +113,7 @@ module Hobo
             end
 
           # team_is_not(a_team)
-          when name =~ /^(.*)_is_not$/ && (refl = reflection($1)) && refl.macro.in?([:has_one, :belongs_to])
+          elsif name =~ /^(.*)_is_not$/ && (refl = reflection($1)) && refl.macro.in?([:has_one, :belongs_to])
             return true if check_only
 
             if refl.options[:polymorphic]
@@ -132,7 +132,7 @@ module Hobo
           # --- Column Queries --- #
 
           # name_is(str)
-          when name =~ /^(.*)_is$/ && (col = column($1))
+          elsif name =~ /^(.*)_is$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -140,7 +140,7 @@ module Hobo
             end
 
           # name_is_not(str)
-          when name =~ /^(.*)_is_not$/ && (col = column($1))
+          elsif name =~ /^(.*)_is_not$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -148,7 +148,7 @@ module Hobo
             end
 
           # name_contains(str)
-          when name =~ /^(.*)_contains$/ && (col = column($1))
+          elsif name =~ /^(.*)_contains$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -156,7 +156,7 @@ module Hobo
             end
 
           # name_does_not_contain
-          when name =~ /^(.*)_does_not_contain$/ && (col = column($1))
+          elsif name =~ /^(.*)_does_not_contain$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -164,7 +164,7 @@ module Hobo
             end
 
           # name_starts(str)
-          when name =~ /^(.*)_starts$/ && (col = column($1))
+          elsif name =~ /^(.*)_starts$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -172,7 +172,7 @@ module Hobo
             end
 
           # name_does_not_start
-          when name =~ /^(.*)_does_not_start$/ && (col = column($1))
+          elsif name =~ /^(.*)_does_not_start$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -180,7 +180,7 @@ module Hobo
             end
 
           # name_ends(str)
-          when name =~ /^(.*)_ends$/ && (col = column($1))
+          elsif name =~ /^(.*)_ends$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -188,7 +188,7 @@ module Hobo
             end
 
           # name_does_not_end(str)
-          when name =~ /^(.*)_does_not_end$/ && (col = column($1))
+          elsif name =~ /^(.*)_does_not_end$/ && (col = column($1))
             return true if check_only
 
             def_scope do |str|
@@ -196,7 +196,7 @@ module Hobo
             end
 
           # published (a boolean column)
-          when (col = column(name)) && (col.type == :boolean)
+          elsif (col = column(name)) && (col.type == :boolean)
             return true if check_only
 
             def_scope do
@@ -204,7 +204,7 @@ module Hobo
             end
 
           # not_published
-          when name =~ /^not_(.*)$/ && (col = column($1)) && (col.type == :boolean)
+          elsif name =~ /^not_(.*)$/ && (col = column($1)) && (col.type == :boolean)
             return true if check_only
 
             def_scope do
@@ -212,7 +212,7 @@ module Hobo
             end
 
           # published_before(time)
-          when name =~ /^(.*)_before$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
+          elsif name =~ /^(.*)_before$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
             return true if check_only
 
             def_scope do |time|
@@ -220,7 +220,7 @@ module Hobo
             end
 
           # published_after(time)
-          when name =~ /^(.*)_after$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
+          elsif name =~ /^(.*)_after$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
             return true if check_only
 
             def_scope do |time|
@@ -228,7 +228,7 @@ module Hobo
             end
 
           # published_between(time1, time2)
-          when name =~ /^(.*)_between$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
+          elsif name =~ /^(.*)_between$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
             return true if check_only
 
             def_scope do |time1, time2|
@@ -236,12 +236,12 @@ module Hobo
             end
 
            # active (a lifecycle state)
-          when @klass.has_lifecycle? && name.to_sym.in?(@klass::Lifecycle.state_names)
+          elsif @klass.has_lifecycle? && name.to_sym.in?(@klass::Lifecycle.state_names)
             return true if check_only
 
             if @klass::Lifecycle.state_names.length == 1
               # nothing to check for - create a dummy scope
-              def_scope { @klass.scoped }
+              def_scope { @klass.where '' }
               true
             else
               def_scope do
@@ -250,92 +250,94 @@ module Hobo
             end
 
           # self is / is not
-          when name == "is"
+          elsif name == "is"
             return true if check_only
 
             def_scope do |record|
               @klass.where "#{@klass.table_name}.#{@klass.primary_key} = ?", record
             end
 
-          when name == "is_not"
+          elsif name == "is_not"
             return true if check_only
 
             def_scope do |record|
               @klass.where "#{@klass.table_name}.#{@klass.primary_key} <> ?", record
             end
 
+          else
 
-          when name == "by_most_recent"
-            return true if check_only
+            case name
 
-            def_scope do
-              @klass.order "#{@klass.table_name}.created_at DESC"
-            end
+            when "by_most_recent"
+              return true if check_only
 
-          when name == "recent"
-            return true if check_only
+              def_scope do
+                @klass.order "#{@klass.table_name}.created_at DESC"
+              end
 
-            if "created_at".in?(@klass.columns.*.name)
-              def_scope do |*args|
-                count = args.first || 6
-                @klass.order("#{@klass.table_name}.created_at DESC").limit(count)
+            when "recent"
+              return true if check_only
+
+              if "created_at".in?(@klass.columns.*.name)
+                def_scope do |*args|
+                  count = args.first || 6
+                  @klass.order("#{@klass.table_name}.created_at DESC").limit(count)
+                end
+              else
+                def_scope do |*args|
+                  count = args.first || 6
+                  limit(count)
+                end
               end
-            else
+
+            when "order_by"
+              return true if check_only
+
+              klass = @klass
               def_scope do |*args|
-                count = args.first || 6
-                limit(count)
+                field, asc = args
+                type = klass.attr_type(field)
+                if type.nil? #a virtual attribute from an SQL alias, e.g., 'total' from 'COUNT(*) AS total'
+                  colspec = "#{field}" # don't prepend the table name
+                elsif type.respond_to?(:name_attribute) && (name = type.name_attribute)
+                  include = field
+                  colspec = "#{type.table_name}.#{name}"
+                else
+                  colspec = "#{klass.table_name}.#{field}"
+                end
+                @klass.includes(include).order("#{colspec} #{asc._?.upcase}")
               end
-            end
 
-          when name == "order_by"
-            return true if check_only
 
-            klass = @klass
-            def_scope do |*args|
-              field, asc = args
-              type = klass.attr_type(field)
-              if type.nil? #a virtual attribute from an SQL alias, e.g., 'total' from 'COUNT(*) AS total'
-                colspec = "#{field}" # don't prepend the table name
-              elsif type.respond_to?(:name_attribute) && (name = type.name_attribute)
-                include = field
-                colspec = "#{type.table_name}.#{name}"
-              else
-                colspec = "#{klass.table_name}.#{field}"
-              end
-              @klass.includes(include).order("#{colspec} #{asc._?.upcase}")
-            end
+            when "include"
+              return true if check_only
 
-          when name == "include"
-            # DEPRECATED: it clashes with Module.include when called on an ActiveRecord::Relation
-            # after a scope chain, if you didn't call it on the class itself first
-            Rails.logger.warn "Automatic scope :include has been deprecated: use :includes instead."
-            return true if check_only
+              def_scope do |inclusions|
+                @klass.includes(inclusions)
+              end
 
-            def_scope do |inclusions|
-              @klass.includes(inclusions)
-            end
+            when "search"
+              return true if check_only
 
-          when name == "search"
-            return true if check_only
+              def_scope do |query, *fields|
+                match_keyword = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
 
-            def_scope do |query, *fields|
-              match_keyword = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
+                words = query.split
+                args = []
+                word_queries = words.map do |word|
+                  field_query = '(' + fields.map { |field| "(#{@klass.table_name}.#{field} #{match_keyword} ?)" }.join(" OR ") + ')'
+                  args += ["%#{word}%"] * fields.length
+                  field_query
+                end
 
-              words = query.split
-              args = []
-              word_queries = words.map do |word|
-                field_query = '(' + fields.map { |field| "(#{@klass.table_name}.#{field} #{match_keyword} ?)" }.join(" OR ") + ')'
-                args += ["%#{word}%"] * fields.length
-                field_query
+                @klass.where *([word_queries.join(" AND ")] + args)
               end
 
-              @klass.where *([word_queries.join(" AND ")] + args)
+            else
+              matched_scope = false
             end
 
-          else
-            matched_scope = false
           end
-
           matched_scope
         end
 

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

@@ -2,7 +2,7 @@ require 'digest/sha1'
 
 module Hobo
   module Model
-    module UserBase
+    module User
 
       @user_models = []
 
@@ -32,7 +32,7 @@ module Hobo
           end
 
           validates_confirmation_of :password,              :if => :new_password_required?
-          validate :validate_password
+          password_validations
           validate :validate_current_password_when_changing_password
 
           # Virtual attributes for setting and changing the password
@@ -56,6 +56,10 @@ module Hobo
       # Additional classmethods for authentication
       module ClassMethods
 
+        # Validation of the plaintext password
+        def password_validations
+          validates_length_of :password, :within => 4..40, :if => :new_password_required?
+        end
 
         def login_attribute=(attr, validate=true)
           @login_attribute = attr = attr.to_sym
@@ -168,15 +172,9 @@ module Hobo
         (new_record? && password) || lifecycle_changing_password? || changing_password?
       end
 
-      # Validation of the plaintext password. Override this function to change your validation.
-      def validate_password
-        errors.add(:password, I18n.t("hobo.messages.validate_password", :default => "must be at least 6 characters long and must not consist solely of lowercase letters")) \
-          if new_password_required? && (password.nil? || password.length<6 || /^[[:lower:]]*$/.match(password))
-      end
 
       def validate_current_password_when_changing_password
-        errors.add :current_password, I18n.t("hobo.messages.current_password_is_not_correct", :default => "is not correct") \
-          if changing_password? && !authenticated?(current_password)
+        changing_password? && !authenticated?(current_password) and errors.add :current_password, I18n.t("hobo.messages.current_password_is_not_correct", :default => "is not correct")
       end
 
     end

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

@@ -19,7 +19,7 @@ has_body    = (!show_link && description_attribute) || creator_link || creator_a
 
 show_title = !show_link && (name_attribute || !has_body)
 
-model_key = model.to_s.underscore
+model_key = model.name.pluralize.underscore
 -%>
 <def tag="card" for="<%= model.name %>">
   <card class="<%= model_class %>" param="default" merge>
@@ -53,7 +53,7 @@ model_key = model.to_s.underscore
       <view:<%= creator_attribute %> param="creator"/>
 <% end -%>
 <% if primary_collection -%>
-      <ht key="<%= model.reflect_on_association(primary_collection).klass.to_s.underscore %>.collection.count" count="&this.<%= primary_collection %>.size">
+      <ht key="<%= primary_collection.to_s.pluralize.underscore %>.collection.count" count="&this.<%= primary_collection %>.size">
          <count:<%= primary_collection%> param/>
       </ht>
 <% end -%>

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

@@ -1,11 +1,10 @@
 <% each_controller do -%>
 <%
-next unless @controller < Hobo::Controller::Model
 form_fields = standard_fields :belongs_to, :has_many
 
 cancel_to_show_page  = linkable?(:show)
 cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
-model_key = model.to_s.underscore
+model_key = model.name.tableize
 -%>
 <def tag="form" for="<%= model.name %>">
   <form merge param="default">
@@ -30,7 +29,7 @@ model_key = model.to_s.underscore
 </def>
 <% end -%>
 
-<% transitions.uniq{|s| s.name}.each do |transition| -%>
+<% transitions.each do |transition| -%>
 <def tag="<%= transition.name.to_s.dasherize %>-form" polymorphic/>
 <def tag="<%= transition.name.to_s.dasherize %>-form" for="<%= model.name %>">
   <form lifecycle="<%= transition.name %>" merge param="default">
@@ -38,10 +37,10 @@ model_key = model.to_s.underscore
     <input type="hidden" name="key" value="&this.lifecycle.provided_key" if="&this.lifecycle.provided_key"/>
     <field-list fields="<%= transition.parameters * ', ' %>" param/>
     <div param="actions">
-      <submit label="#{t 'activerecord.attributes.<%= model_key %>.lifecycle.transitions.<%= transition.name.to_s %>', :default=>['<%= transition.name.to_s.titleize %>']}" param/><or-cancel param="cancel"/>
+      <submit label="#{ht '<%= model_key %>.actions.<%= transition.name.to_s %>', :default=>['<%= transition.name.to_s.titleize %>']}" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>
 <% end -%>
 
-<% end # of each_model do -%>
+<% end # of each_model do -%>

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

@@ -3,8 +3,8 @@
 <def tag="main-nav">
   <navigation class="main-nav" merge-attrs param="default">
     <nav-item href="#{base_url}/">Home</nav-item>
-<% models.select { |m| linkable?(m, :index) }.each do |m| -%>
-    <nav-item with="&<%= m.name %>"><ht key="<%= m.to_s.underscore %>.nav_item" count="100"><model-name-human count="100"/></ht></nav-item>
+<% models.select { |m| linkable?(m, :index) }[0..4].each do |m| -%>
+    <nav-item with="&<%= m.name %>"><ht key="<%= m.name.tableize %>.nav_item"><model-name-human/></ht></nav-item>
 <% end -%>
   </navigation>
 </def>
@@ -12,16 +12,16 @@
 
 
 <% each_controller do -%>
-<% next unless @controller < Hobo::Controller::Model %>
+
 <!-- ====== <%= model.name %> Pages ====== -->
 <%
 new_link = linkable?(:new)
 new_form = !new_link && linkable?(model, :create, :method => :post)
-model_key = model.to_s.underscore
+model_key = model.name.tableize
 -%>
 
 <def tag="index-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.index.title', :default=>[model.model_name.human(:count=>100)] }">
+  <page merge title="#{ht '<%= model_key %>.index.title', :default=>[model.model_name.human(:count=>model.count)] }">
     <body: class="index-page <%= model_class %>" param/>
 
     <content: param>
@@ -33,7 +33,7 @@ model_key = model.to_s.underscore
         </h2>
 
         <p param="count" if>
-          <ht key="<%= model_key %>.collection.count" count="&collection_count">
+          <ht key="<%= model_key %>.collection.count" count="&this.size">
             <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::UserBase
+is_user_model = model < Hobo::Model::User
 
 collection     = model.view_hints.primary_children
 if collection
@@ -124,10 +124,11 @@ end
 
 unless model.view_hints.secondary_children.empty?
   aside_collections = model.view_hints.secondary_children.map { |c| [model.reflections[c], model.reverse_reflection(c)] }
+  aside_collections.reject! { |refl, reverse| reverse.nil? }
 end
 -%>
 <def tag="show-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=sq_escape model_name %>'], :name => name(:no_wrapper => true) }">
+  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=sq_escape model_name %>'] }">
 
     <body: class="show-page <%= model_class %>" param/>
 
@@ -141,8 +142,8 @@ end
             <a:<%= back_link %> param="parent-link">&laquo; <ht key="<%= model_key %>.actions.back_to_parent" parent="<%= back_link_human_name %>" name="&this">Back to <name/></ht></a:<%= back_link %>>
 <% end -%>
             <h2 param="heading">
-              <ht key="<%= model_key %>.show.heading" name="#{name(:no_wrapper => true)}">
-                <%= model_name %> <name/>
+              <ht key="<%= model_key %>.show.heading" name="&this.respond_to?(:name) ? this.name : ''">
+                <name/>
               </ht>
             </h2>
 <% if boolean_fields -%>
@@ -159,7 +160,7 @@ end
 <% if edit_link -%>
 
             <a action="edit" if="&can_edit?" param="edit-link">
-              <ht key="<%= model_key %>.actions.edit" name="#{name(:no_wrapper => true)}">
+              <ht key="<%= model_key %>.actions.edit" name="&this.respond_to?(:name) ? this.name : ''">
                 Edit <%= model_name %>
               </ht>
             </a>
@@ -168,7 +169,7 @@ end
 
           <section param="content-body">
 <% if main_content -%>
-            <view:<%= main_content %> param="description" />
+            <view:<%= main_content %> param="description"/>
 <% end -%>
 <% if show_fields.any? -%>
             <field-list fields="<%= show_fields * ', ' %>" param/>
@@ -176,7 +177,7 @@ end
 <% if collection -%>
             <section param="collection-section">
               <h3 param="collection-heading">
-                <ht key="<%= collection_class.to_s.underscore %>.collection.heading" count="&this.<%= collection.to_s %>.count" >
+                <ht key="<%= collection.to_s.tableize %>.collection.heading" count="&this.<%= collection.to_s %>.count" >
                   <human-collection-name collection="<%= collection %>" your/>
                 </ht>
               </h3>
@@ -189,21 +190,21 @@ end
 <%   if add_link -%>
 
               <a:<%= collection %> action="new" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)" param="new-link">
-                <ht key="<%= collection_class.to_s.underscore %>.actions.new" count="1">
-                  New <%= collection_class.to_s.titleize %>
+                <ht key="<%= collection.to_s.tableize %>.actions.new" count="1">
+                  New <%= collection.to_s.singularize.titleize %>
                 </ht>
               </a:<%= collection %>>
 <%   elsif add_form -%>
 
               <section param="add-to-collection" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)">
                 <h3 param="add-form-heading">
-                  <ht key="<%= collection_class.to_s.underscore %>.collection.add_form_heading" count="1">
-                    Add <%= a_or_an collection_class.to_s.titleize %>
+                  <ht key="<%= collection.to_s.pluralize %>.collection.add_form_heading" count="1">
+                    Add <%= a_or_an collection.to_s.singularize.titleize %>
                   </ht>
                 </h3>
                 <form with="&@<%= collection_class.name.underscore %> || new_for_current_user(@<%= model.name.underscore %>.<%= collection %>)" owner="<%= owner %>" without-cancel param>
                   <field-list: skip="<%= owner %>"/>
-                  <submit: label="#{ht '<%= sq_escape collection_class.to_s.underscore %>.actions.add', :default=>['Add'] }"/>
+                  <submit: label="#{ht '<%= sq_escape collection.to_s.pluralize %>.actions.add', :default=>['Add'] }"/>
                 </form>
               </section>
 <%   end -%>
@@ -215,14 +216,14 @@ end
 
         <aside param>
 <%   for refl, reverse_refl in aside_collections -%>
-<%     if reverse_refl && linkable?(refl.klass, :"index_for_#{reverse_refl.name}") -%>
+<%     if linkable?(refl.klass, :"index_for_#{reverse_refl.name}") -%>
          <collection-preview:<%= refl.name %>.recent param="<%= refl.name %>-preview">
            <heading-content:><human-collection-name with="&this.origin" collection="<%= refl.name %>" your/></heading-content:>
          </collection-preview:<%= refl.name %>.recent>
 <%     else -%>
           <section param="<%= refl.name %>-collection-section">
             <h3 param="<%= refl.name %>-collection-heading">
-              <ht key="<%= refl.klass.to_s.underscore %>.collection.heading" count="&this.<%= refl.name.to_s %>.count" >
+              <ht key="<%= refl.name.to_s.tableize %>.collection.heading" count="&this.<%= refl.name.to_s %>.count" >
                 <human-collection-name collection="<%= refl.name %>" your/>
               </ht>
             </h3>
@@ -243,14 +244,14 @@ end
 name_attribute = model.name_attribute
 -%>
 <def tag="edit-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.edit.title', :default=>['Edit <%= sq_escape model_name %>'], :name => name(:no_wrapper => true) }">
+  <page merge title="#{ht '<%= model_key %>.edit.title', :default=>['Edit <%= sq_escape model_name %>'] }">
 
     <body: class="edit-page <%= model_class %>" param/>
 
     <content:>
       <section param="content-header">
         <h2 param="heading">
-          <ht key="<%= model_key %>.edit.heading" name="#{name(:no_wrapper => true)}">
+          <ht key="<%= model_key %>.edit.heading" name="&this.respond_to?(:name) ? this.name : ''">
             Edit <%= model_name %>
           </ht>
         </h2>
@@ -272,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::UserBase
+owner_is_user = owner_model < Hobo::Model::User
 
 owner = model.reflections[owner].macro == :has_many ? owner.to_s.singularize : owner.to_s
 -%>
@@ -282,7 +283,7 @@ new_link = :new.in?(actions)
 -%>
 <def tag="index-for-<%= owner.dasherize %>-page" polymorphic/>
 <def tag="index-for-<%= owner.dasherize %>-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.index_for_owner.title', :count=>100, :default=>['<%= sq_escape(model_name(:plural)) %> for']} #{name :with => @<%= owner %>, :no_wrapper => true}">
+  <page merge title="#{ht '<%= model_key %>.index_for_owner.title', :default=>['<%= sq_escape(model_name(:plural)) %> for']} #{name :with => @<%= owner %>, :no_wrapper => true}">
     <body: class="index-for-owner-page <%= owner.dasherize %> <%= model_class %>" param/>
     <content: param>
       <header param="content-header">
@@ -305,7 +306,7 @@ new_link = :new.in?(actions)
         </h3>
 <% end -%>
         <p param="count" if>
-          <ht key="<%= model_key %>.collection.count" count="&collection_count">
+          <ht key="<%= model_key %>.collection.count" count="&this.size">
             <count summary/>
           </ht>
         </p>
@@ -313,7 +314,7 @@ new_link = :new.in?(actions)
 
       <section param="content-body">
 <% if new_link -%>
-        <a action="new" to="&@<%= owner %>.<%= collection_name %>" param="new-link">
+        <a action="new" to="&model" param="new-link">
           <ht key="<%= model_key %>.actions.new" >New <%=model_name %></ht>
         </a>