hobo 0.6.4 → 0.7.0

data/hobo_files/plugin/lib/hobo/model_controller.rb

@@ -112,7 +112,7 @@ module Hobo
         options = options.reverse_merge(:limit => 15)
         options[:data_filters_block] = b
         @completers ||= HashWithIndifferentAccess.new
-        @completers[attr.to_sym] = opts
+        @completers[attr.to_sym] = options
       end
 
 
@@ -130,12 +130,16 @@ module Hobo
           # Make sure we have a copy of the options - it is being mutated somewhere
           opts = {}.merge(options)
           @this = find_instance(opts) unless opts[:no_find]
-          permission_denied unless Hobo.can_call?(current_user, @this, method)
-          if got_block
+          set_status(Hobo.can_call?(current_user, @this, method) ? :valid : :not_allowed)
+          # TODO - block should get to handle permission denied?
+          if not_allowed?
+            permission_denied
+          elsif got_block
             instance_eval(&block)
           else
             @this.send(method)
           end
+          
           hobo_ajax_response unless performed?
         end
       end
@@ -209,7 +213,7 @@ module Hobo
         else
           # Black list
           except = Array(@auto_actions[:except])
-          name.not_in?(except) || (collection_action && :collections.not_in?(except))
+          return !(name.in?(except) || (collection_action && :collections.in?(except)))
         end
       end
 
@@ -507,7 +511,7 @@ module Hobo
       @this.send(:clear_association_cache)
       
       changes = params[model.name.underscore]
-      @this.attributes = changes
+      @this.attributes = changes 
       save_and_set_status!(@this, original)
 
       # Ensure current_user isn't out of date
@@ -523,7 +527,7 @@ module Hobo
               redirect_to(params[:after_submit] || object_url(@this))
             end
             wants.js do
-              if changes.size == 1
+              if changes.size == 1 && params[:render]
                 # Decreasingly hacky support for the scriptaculous in-place-editor
                 new_val = Hobo::Dryml.render_tag(@template, "view",
                                                  :with => @this, :field => changes.keys.first,
@@ -648,7 +652,7 @@ module Hobo
     def permission_denied(options={})
       if respond_to? :permission_denied_response
         permission_denied_response
-      elsif render_tag("PermissionDeniedPage", { :with => @this }, :status => 403)
+      elsif render_tag("permission-denied-page", { :with => @this }, :status => 403)
         # cool
       else
         message = options[:message] || "Permission Denied"
@@ -660,7 +664,7 @@ module Hobo
     def not_found
       if respond_to? :not_found_response
         not_found_response
-      elsif render_tag("NotFoundPage", { :with => @this }, :status => 404)
+      elsif render_tag("not-found-page", { :with => @this }, :status => 404)
         # cool
       else
         render(:text => "The page you requested cannot be found.", :status => 404)
@@ -680,7 +684,7 @@ module Hobo
           true
         else
           # This returns false if no such tag exists
-          render_tag("#{page_kind.to_s.camelize}Page", :with => @this)
+          render_tag("#{page_kind.to_s.dasherize}-page", :with => @this)
         end
       rescue ActionView::TemplateError => wrapper
         e = wrapper.original_exception if wrapper.respond_to? :original_exception

data/hobo_files/plugin/lib/hobo/model_router.rb

@@ -2,10 +2,20 @@ module Hobo
   
   class ModelRouter
     
+    @linkable = Hash.new {|h, k| h[k] = Hash.new {|h, k| h[k] = {} } }
+    
     APP_ROOT = "#{RAILS_ROOT}/app"
     
     class << self
       
+      def linkable(subsite, klass, action)
+        @linkable[subsite][klass.name][action] = true
+      end
+      
+      def linkable?(subsite, klass, action)
+        @linkable[subsite][klass.name][action]
+      end
+      
       def add_routes(map)
         begin 
           ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.active?
@@ -17,6 +27,7 @@ module Hobo
         require "#{APP_ROOT}/controllers/application" unless Object.const_defined? :ApplicationController
         require "#{APP_ROOT}/assemble.rb" if File.exists? "#{APP_ROOT}/assemble.rb"
         
+        # Add non-subsite routes
         add_routes_for(map, nil)
 
         # Any directory inside app/controllers defines a subsite
@@ -88,15 +99,16 @@ module Hobo
     def resource_routes
       # We re-implement resource routing - routes are not created for
       # actions that the controller does not provide
-      named_route(plural,                plural,               :action => "index",   :conditions => { :method => :get })
+      linkable_route(plural, plural, :index, :conditions => { :method => :get })
                                                                                                                           
-      named_route("new_#{singular}",     "#{plural}/new",      :action => "new",     :conditions => { :method => :get })  
-      named_route("edit_#{singular}",    "#{plural}/:id/edit", :action => "edit",    :conditions => { :method => :get })  
-      named_route(singular,              "#{plural}/:id",      :action => "show",    :conditions => { :method => :get })  
+      linkable_route("new_#{singular}",  "#{plural}/new",      :new,  :conditions => { :method => :get })  
+      linkable_route("edit_#{singular}", "#{plural}/:id/edit", :edit, :conditions => { :method => :get })  
+      
+      linkable_route(singular, "#{plural}/:id", :show, :conditions => { :method => :get })
                                                                                                                           
-      named_route("create_#{singular}",  plural,               :action => "create",  :conditions => { :method => :post })
-      named_route("update_#{singular}",  "#{plural}/:id",      :action => "update",  :conditions => { :method => :put }) 
-      named_route("destroy_#{singular}", "#{plural}/:id",      :action => "destroy", :conditions => { :method => :delete })
+      linkable_route("create_#{singular}",  plural,          :create,  :conditions => { :method => :post })
+      linkable_route("update_#{singular}",  "#{plural}/:id", :update,  :conditions => { :method => :put }) 
+      linkable_route("destroy_#{singular}", "#{plural}/:id", :destroy, :conditions => { :method => :delete })
     end
     
     
@@ -156,9 +168,17 @@ module Hobo
         map.named_route(name, route, options)
         format_route = options.delete(:format) != false
         map.named_route("formatted_#{name}", "#{route}.:format", options) if format_route
+        true
+      else
+        false
       end
     end
     
+    
+    def linkable_route(name, route, action, options)
+      named_route(name, route, options.merge(:action => action.to_s)) and self.class.linkable(subsite, model, action)
+    end
+    
    
     def name_with_subsite(name)
       subsite ? "#{subsite}_#{name}" : name 

data/hobo_files/plugin/lib/hobo/static_tags

@@ -74,7 +74,6 @@ strong
 style
 sub
 sup
-table
 tbody
 td
 textarea
@@ -85,5 +84,4 @@ title
 tr
 tt
 u
-ul
 var

data/hobo_files/plugin/lib/hobo/user.rb

@@ -71,9 +71,9 @@ module Hobo
         u = find(:first, :conditions => ["#{@login_attr} = ?", login]) # need to get the salt
         
         if u && u.authenticated?(password)
-          if u.respond_to?(:last_login_at) || u.respond_to?(:logins_count)
+          if u.respond_to?(:last_login_at) || u.respond_to?(:login_count)
             u.last_login_at = Time.now if u.respond_to?(:last_login_at)
-            u.logins_count = (u.logins_count.to_i + 1) if u.respond_to?(:logins_count)
+            u.login_count = (u.login_count.to_i + 1) if u.respond_to?(:login_count)
             u.save
           end
           u
@@ -126,7 +126,7 @@ module Hobo
     # Before filter that encrypts the password before having it stored in the database.
     def encrypt_password
       return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
+      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if salt.blank?
       self.crypted_password = encrypt(password)
     end
 

data/hobo_files/plugin/lib/rexml.rb

@@ -34,9 +34,10 @@ module REXML
     
     class BaseParser
       
+      DRYML_NAME_STR= "#{NCNAME_STR}(?::(?:#{NCNAME_STR})?)?"
       DRYML_ATTRIBUTE_PATTERN = /\s*(#{NAME_STR})(?:\s*=\s*(["'])(.*?)\2)?/um
-      
-      DRYML_TAG_MATCH = /^<((?>#{NAME_STR}))\s*((?>\s+#{NAME_STR}(?:\s*=\s*(["']).*?\3)?)*)\s*(\/)?>/um
+      DRYML_TAG_MATCH = /^<((?>#{DRYML_NAME_STR}))\s*((?>\s+#{NAME_STR}(?:\s*=\s*(["']).*?\3)?)*)\s*(\/)?>/um
+      DRYML_CLOSE_MATCH = /^\s*<\/(#{DRYML_NAME_STR})\s*>/um
       
       attr_writer :dryml_mode
       def dryml_mode?
@@ -171,7 +172,7 @@ module REXML
             if @source.buffer[1] == ?/
               last_tag, line_no = @tags.pop
               #md = @source.match_to_consume('>', CLOSE_MATCH)
-              md = @source.match(CLOSE_MATCH, true)
+              md = @source.match(dryml_mode? ? DRYML_CLOSE_MATCH : CLOSE_MATCH, true)
               
               valid_end_tag = if dryml_mode?
                                 last_tag =~ /^#{Regexp.escape(md[1])}(:.*)?/
@@ -339,6 +340,10 @@ module REXML
       @has_end_tag
     end
     
+    def parameter_tag?
+      expanded_name =~ /:$/
+    end
+    
   end
   
   class Attribute
@@ -379,6 +384,8 @@ end
 
 module Hobo::Dryml
 
+  
+  # A REXML source that keeps track of where in the buffer it is
   class RexSource < REXML::Source
     
     def initialize(src)

data/hobo_files/plugin/tags/core.dryml

@@ -1,15 +1,10 @@
-<def tag="call_tag" attrs="tag">
-  <%= send(tag, attributes, &tagbody) %>
-</def>
-
-
-<def tag="CallTemplate" attrs="template">
-  <%= send(template, attributes, all_parameters) %>
+<def tag="call-tag" attrs="tag">
+  <%= send(tag, attributes, parameters) %>
 </def>
 
 
 <def tag="wrap" attrs="tag, when">
-  <% body = tagbody.call %>
+  <% body = parameters.default %>
   <%= when_ ? call_tag(tag, attributes, &proc { body }) : body %>
 </def>
 
@@ -19,18 +14,18 @@
 </def>
 
 
-<def tag="repeat" attrs="even_odd, join"><%= 
+<def tag="repeat" attrs="even-odd, join"><%= 
   if !this.blank? 
     if even_odd
       map_this do
         klass = [attributes[:class], cycle("even", "odd")].compact.join(' ')
-        content_tag(even_odd, tagbody.call, attributes.merge(:class => klass, :hobo_model_id => dom_id(this)))
+        element(even_odd, attributes.merge(:class => klass, "hobo-model-id" => dom_id(this)), parameters.default)
       end.join(join)
     else
       scope.new_scope do
         scope[:even_odd] = "odd"
         map_this do
-          res = tagbody.call
+          res = parameters.default
           scope.even_odd = scope.even_odd == "even" ? "odd" : "even"
           res
         end.join(join)
@@ -42,24 +37,24 @@
 %></def>
 
 
-<def tag="do"><tagbody/></def>
-<def tag="with"><tagbody/></def>
+<def tag="do"><%= parameters.default %></def>
+<def tag="with"><%= parameters.default %></def>
 
 
 <def tag="if" attrs="test"><%= 
   test = all_attributes.fetch(:test, this)
-  res = (cond = !test.blank?) ? tagbody.call : ""
+  res = (cond = !test.blank?) ? parameters.default : ""
   Hobo::Dryml.last_if = cond
   res
 %></def>
 
 
-<def tag="else"><tagbody unless="&Hobo::Dryml.last_if"/></def>
+<def tag="else"><%= parameters.default unless Hobo::Dryml.last_if %></def>
 
 
 <def tag="unless" attrs="test"><%= 
   test = all_attributes.fetch(:test, this)     
-  res = (cond = test.blank?) ? tagbody.call : ""
+  res = (cond = test.blank?) ? parameters.default : ""
   Hobo::Dryml.last_if = cond
   res
 %></def>

data/hobo_files/plugin/tags/rapid.dryml

@@ -8,107 +8,124 @@
 <include src="rapid_navigation"/>
 <include src="rapid_plus"/>
 
-<def tag="FieldList" attrs="tag">
+<def tag="field-list" attrs="tag">
   <% tag ||= scope.in_form ? "input" : "editor" %>
-  <field_list merge_attrs="&attributes - attrs_for(:with_fields)">
-    <with_fields merge_attrs="&attributes & attrs_for(:with_fields)">
-      <field_list_item>
-        <item_label param="#{this_field.to_s.sub('?', '')}_label">
+  <labelled-item-list merge-attrs="&attributes - attrs_for(:with_fields)">
+    <with-fields merge-attrs="&attributes & attrs_for(:with_fields)">
+      <labelled-item>
+        <item-label param="#{this_field.to_s.sub('?', '')}-label">
           <do param="label"><%= this_field.to_s.titleize %></do>
-        </item_label>
-        <item_value param="#{this_field.to_s.sub('?', '')}_view">
-          <do param="view"><call_tag tag="&tag" param="#{this_field.to_s.sub('?', '')}_tag"/></do>
-        </item_value>
-      </field_list_item>
-    </with_fields>
-  </field_list>
+        </item-label>
+        <item-value param="#{this_field.to_s.sub('?', '')}-view">
+          <do param="view"><call-tag tag="&tag" param="#{this_field.to_s.sub('?', '')}-tag"/></do>
+        </item-value>
+      </labelled-item>
+    </with-fields>
+  </labelled-item-list>
 </def>
 
 
-<def tag="item"><% scope.items << tagbody.call %></def>
+<def tag="item"><% scope.items << parameters.default %></def>
 
-<def tag="nil_view"><%= scope.nil_view || "(Not Available)" %></def>
+<def tag="nil-view"><%= scope.nil_view || "(Not Available)" %></def>
 
-<def tag="UL">
-  <ul merge_attrs unless="&this.empty?">
-    <repeat>
-      <li param if="&can_view?" class="#{scope.even_odd} #{this_type.name.underscore}"
-          merge_attrs="&{:hobo_model_id => dom_id(this)} if this.respond_to?(:typed_id)">
-        <tagbody><a/></tagbody>
-      </li>
-    </repeat>
-  </ul>
+<def tag="ul">
+  <% if all_parameters.li? # don't use dryml if, because it will mess up <ul/><else> %>
+    <unless test="&this.empty?">
+      <% element "ul", attributes do %>
+      <repeat>
+        <li param if="&can_view?" class="#{scope.even_odd} #{this_type.name.underscore.dasherize}"
+            merge-attrs="&{'hobo-model-id' => dom_id(this)} if this.respond_to?(:typed_id)">
+          <do param="default"><a/></do>
+        </li>
+      </repeat>
+      <% end %>
+    </unless>
+  <% else %>
+    <%= element("ul", attributes, all_parameters.default) %>
+  <% end %>      
 </def>
 
 
-<def tag="Table" attrs="fields, field_tag, empty">
-  <% field_tag ||= "view" %>
-  <table merge_attrs="&attributes - attrs_for(:with_fields)" unless="&this.empty? && !empty">
-    <thead if="&all_parameters[:thead] || fields" param>
-      <tr param="field_heading_row">
-        <with_field_names merge_attrs="&all_attributes & attrs_for(:with_fields)">
-          <th param="#{scope.field_name}_heading"><%= scope.field_name.titleize %></th>
-        </with_field_names>
-        <th if="&all_parameters[:controls]" class="controls"/>
-      </tr>
-    </thead>
-    <tbody>
-      <repeat>
-        <tr param if="&can_view?"
-            class="#{scope.even_odd} #{this_type.name.underscore}"
-            hobo_model_id="#{dom_id(this)}">
-          <if test="&fields">
-            <with_fields merge_attrs="&all_attributes & attrs_for(:with_fields)">
-              <td param="#{this_field.to_s.sub('?', '').gsub('.', '_')}_view"><call_tag tag="&field_tag"/></td>
-            </with_fields>
-            <td class="controls" param="controls" if="&all_parameters[:controls]">
-              <a param="edit_link">Edit</a>
-              <delete_button param/>
-            </td>
-          </if>
+<def tag="table" attrs="fields, field-tag, empty">
+  <if test="&!(fields || all_parameters.tr?)">
+    <%= element("table", attributes, all_parameters.default) %>
+  </if>
+  <else>
+    <% field_tag ||= "view" %>
+    <unless test="&this.empty? && !empty">
+      <% element "table", attributes - attrs_for(:with_fields) do %>
+      <thead if="&all_parameters[:thead] || fields" param>
+        <tr param="field-heading-row">
+          <with-field-names merge-attrs="&all_attributes & attrs_for(:with_fields)">
+            <th param="#{scope.field_name}-heading"><%= scope.field_name.titleize %></th>
+          </with-field-names>
+          <th if="&all_parameters[:controls]" class="controls"/>
         </tr>
-      </repeat>      
-    </tbody>
-    <tfoot if="&all_parameters[:tfoot]" param/>
-  </table>
+      </thead>
+      <tbody>
+        <repeat>
+          <tr param if="&can_view?"
+              class="#{scope.even_odd} #{this_type.name.underscore}"
+              hobo-model-id="#{dom_id(this)}">
+            <if test="&fields">
+              <with-fields merge-attrs="&all_attributes & attrs_for(:with_fields)" force-all>
+                <td param="#{this_field.to_s.sub('?', '').gsub('.', '-')}-view"><call-tag tag="&field_tag"/></td>
+              </with-fields>
+              <td class="controls" param="controls" if="&all_parameters[:controls]">
+                <a param="edit-link">Edit</a>
+                <delete-button param/>
+              </td>
+            </if>
+          </tr>
+        </repeat>      
+      </tbody>
+      <tfoot if="&all_parameters[:tfoot]" param/>
+      <% end %>
+    </unless>
+  </else>
 </def>
 
 
 <def tag="image" attrs="src">
-  <img src="#{base_url}/images/#{src}" merge_attrs/>
+  <img src="#{base_url}/images/#{src}" merge-attrs/>
 </def>
 
 
 <def tag="spinner">
-  <img src="#{base_url}/hobothemes/#{Hobo.current_theme}/images/spinner.gif" class="hidden" merge_attrs/>
+  <img src="#{base_url}/hobothemes/#{Hobo.current_theme}/images/spinner.gif" class="hidden" merge-attrs/>
 </def>
 
 
-<def tag="theme_image" attrs="src">
-  <img src="#{theme_asset('images/' + src)}" merge_attrs/>
+<def tag="theme-image" attrs="src">
+  <img src="#{theme_asset('images/' + src)}" merge-attrs/>
 </def>
 
 
 <def tag="card">
   <%= poly = call_polymorphic_tag('card', attributes) %>
-  <div class="card" unless="&poly"><type_name/>: <a/></div>
+  <div class="card" unless="&poly"><type-name/>: <a/></div>
 </def>
   
 
-<def tag="hobo_rapid_javascripts" attrs="tiny_mce"><%=
-    res = '<script type="text/javascript">var hoboParts = {};'
-    unless Hobo.all_models.empty?
-      # Tell JS code how to pluralize names, unless they follow the simple rule
-      names = Hobo.all_models.map do |m|
-        "#{m}: '#{m.pluralize}'" unless m.pluralize == m + 's'
-      end.compact
-      res += "var pluralisations = {#{names * ', '}}; "
-    end
-    base = [base_url, subsite].compact.join("/")
-    res += "urlBase = '#{base}'; hoboPagePath = '#{view_name}'</script>"
-    
-    if tiny_mce
-      res += javascript_include_tag("tiny_mce/tiny_mce_src") + %{
+<def tag="hobo-rapid-javascripts" attrs="tiny-mce"><%=
+   res = '<script type="text/javascript">var hoboParts = {};'
+   unless Hobo.all_models.empty?
+     # Tell JS code how to pluralize names, unless they follow the simple rule
+     names = Hobo.all_models.map do |m|
+                                "#{m}: '#{m.pluralize}'" unless m.pluralize == m + 's'
+                              end.compact
+     res << "var pluralisations = {#{names * ', '}}; "
+   end
+   base = [base_url, subsite].compact.join("/")
+   res << "urlBase = '#{base}'; hoboPagePath = '#{view_name}'"
+   if request_forgery_protection_token
+     res << "; formAuthToken = { name: '#{request_forgery_protection_token}', value: '#{form_authenticity_token}' }"
+   end
+   res << "</script>"
+   
+   if tiny_mce
+     res += javascript_include_tag("tiny_mce/tiny_mce_src") + %{
                <script type="text/javascript">
                  tinyMCE.init({ mode: "textareas", editor_selector: "tiny_mce",
                        plugins: 'save',
@@ -119,8 +136,8 @@
                        theme_advanced_buttons3 : ""
                  });
                </script>}
-    end
-    res
+   end
+   res
 %></def>
 
 
@@ -145,7 +162,7 @@
   end
 %></def>
 
-<def tag="type_name" attrs="type, plural, lowercase"><%=
+<def tag="type-name" attrs="type, plural, lowercase"><%=
   type ||= if this.is_a?(Class)
              this
            elsif this.respond_to? :proxy_reflection
@@ -160,15 +177,15 @@
 %></def>
 
 
-<def tag="a" attrs="action, to, params, query_params, href, format, subsite"><%=
-  content = tagbody.call if tagbody
+<def tag="a" attrs="action, to, params, query-params, href, format, subsite"><%=
+  content = parameters.default
    
   params = self.query_params.merge(params || HashWithIndifferentAccess.new) if query_params
   
   if href || attributes[:name]
     # Regular link
     href += "?" + params.map { |n, v| "#{n}=#{v}" }.join('&') if params
-    content_tag(:a, content, attributes.update(:href => href))
+    element(:a, attributes.update(:href => href), content)
   else
     target = to || this
   
@@ -188,9 +205,9 @@
                          end
 
         href = object_url(target, "new", params._?.merge(:subsite => subsite))
-        add_classes!(attributes, "new_#{new_class_name.underscore}_link")
+        add_classes!(attributes, "new-#{new_class_name.underscore}-link")
         content = "New #{new_class_name.titleize}" if content.blank?
-        content_tag(:a, content, attributes.update(:href => href))
+        element(:a, attributes.update(:href => href), content)
       else
         Hobo::Dryml.last_if = false
         ""
@@ -203,20 +220,29 @@
         target = target.member_class
       end
       
-      href = object_url(target, action, params._?.merge(:subsite => subsite))
-      add_classes!(attributes, "#{target.class.name.underscore}_link")
+      content = name if content.blank?
       
-      href.sub!(/\?|$/, ".#{format}\\0") unless format.blank?
+      # Do we want automatic disabling of links to thinks that are not
+      # linkable?
+      only_if_linkable = format.blank?
+      href = object_url(target, action, (params || {}).merge(:subsite => subsite, :if_available => only_if_linkable))
+      if href.nil?
+        # This target is registered with ModelRouter as not linkable
+        content
+      else
+        add_classes!(attributes, "#{target.class.name.underscore}-link")
       
-      # Set default link text if none given
-      content = name if content.blank?
-      content_tag(:a, content, attributes.update(:href => href))
+        href.sub!(/\?|$/, ".#{format}\\0") unless format.blank?
+      
+        # Set default link text if none given
+        element(:a, attributes.update(:href => href), content)
+      end
     end
   end
 %></def>
 
         
-<def tag="view" attrs="inline, block, if_blank, no_wrapper, truncate"><%=
+<def tag="view" attrs="inline, block, if-blank, no-wrapper, truncate"><%=
   raise HoboError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless
     can_view?
    
@@ -230,7 +256,7 @@
           end
         else
           attrs = add_classes(attributes, "view", type_id, type_and_field)
-          attrs[:hobo_model_id] = this_field_dom_id if this_parent && this_parent.respond_to?(:typed_id)
+          attrs['hobo-model-id'] = this_field_dom_id if this_parent && this_parent.respond_to?(:typed_id)
          
           view_tag = find_polymorphic_tag("view")
           
@@ -256,7 +282,7 @@
                         else
                           :span
                         end
-              content_tag(wrapper, the_view, attrs - view_attrs)
+              element(wrapper, attrs - view_attrs, the_view)
             end
           end
         end
@@ -265,13 +291,13 @@
 %></def>
 
     
-<def tag="belongs_to_view"><a/></def>
+<def tag="belongs-to-view"><a/></def>
 
-<def tag="has_many_view"><%= this.empty? ? "(none)" : map_this { a }.join(", ") %></def>
+<def tag="has-many-view"><%= this.empty? ? "(none)" : map_this { a }.join(", ") %></def>
 
-<def tag="view" for="Date" attrs="format"><%= format ? this.strftime(format) : this.to_s(:long) %></def>
+<def tag="view" for="Date" attrs="format"><%= this && (format ? this.strftime(format) : this.to_s(:long)) %></def>
 
-<def tag="view" for="Time" attrs="format"><%= format ? this.strftime(format) : this.to_s(:long) %></def>
+<def tag="view" for="Time" attrs="format"><%= this && (format ? this.strftime(format) : this.to_s(:long)) %></def>
 
 <def tag="view" for="Numeric" attrs="format"><%= format ? format % this : this.to_s %></def>
 
@@ -289,8 +315,7 @@
 
 <def tag="view" for="TrueClass"><%= this ? 'Yes' : 'No' %></def>
 
-<def tag="count" attrs="label, prefix, unless_none, if_any"><%=
-  if_any = unless_none if if_any.nil?
+<def tag="count" attrs="label, prefix, if-any"><%=
   raise Exception.new("asked for count of a string") if this.is_a?(String)
    
   if this.is_a?(Class) and this < ActiveRecord::Base
@@ -307,8 +332,8 @@
         end
   end
    
-  Hobo::Dryml.last_if = c > 0 if unless_none
-  if unless_none && c == 0
+  Hobo::Dryml.last_if = c > 0 if if_any
+  if if_any && c == 0
     ""
   else
     main = label.blank? ? c : pluralize(c, label)
@@ -323,8 +348,9 @@
 %></def>
 
 
-<def tag="theme_stylesheet">
-  <link href="<%= base_url %>/hobothemes/<%= Hobo.current_theme %>/stylesheets/application.css"
+<def tag="theme-stylesheet" attrs="name">
+  <% name ||= 'application' -%>
+  <link href="<%= base_url %>/hobothemes/<%= Hobo.current_theme %>/stylesheets/<%= name %>.css"
         media="screen" rel="Stylesheet" type="text/css" />
 </def>
 
@@ -335,25 +361,25 @@
 <!-- The Tags defined below here are a bit rough and will be improved
 in the future - use at your own risk. -->
 
-<def tag="has_many_table" attrs="part_id, delete_buttons, headings, id">
-  <table_for headings="&headings" merge_attrs="&true">
+<def tag="has-many-table" attrs="part-id, delete-buttons, headings, id">
+  <table-for headings="&headings" merge-attrs="&true">
 
-    <tagbody/>
+    <do param="default"/>
 
     <if test="&delete_buttons != false and can_delete?(this)">
-      <td><DeleteButton/></td>
+      <td><delete-button/></td>
     </if>
-  </table_for>
+  </table-for>
   <else>
     <p>There are no <%= this_type.klass.name.titleize.pluralize.downcase %></p>
   </else>
   <div>
-    <CreateButton update="&id || part_id"/>
+    <create-button update="&id || part_id"/>
   </div>
 </def>
 
 
-<def tag="add_by_name" attrs="action_name, add_text, update, part_id">
+<def tag="add-by-name" attrs="action-name, add-text, update, part-id">
   <% add_to = this
      refl = this_type
      joins = this_parent.send(refl.through_reflection.name)
@@ -363,13 +389,13 @@ in the future - use at your own risk. -->
                   "enter its name"
      source = refl.source_reflection.name
   %>
-  <tagbody with="&joins"/>
+  <do param="default" with="&joins"/>
   <with with="&joins.new_without_appending">
     <if test="can_create?">
-       <form update="&[update, part_id]" message="&action_name" hidden_fields="*">
+       <form update="&[update, part_id]" message="&action_name" hidden-fields="*">
          <p>
            <%= add_text %>:
-           <belongs_to_autocompleting_field field="&source" where_not_in="&dom_id(add_to)" class="autosubmit"/>
+           <belongs-to-autocompleting-field field="&source" where-not-in="&dom_id(add_to)" class="autosubmit"/>
          </p>
        </form>
     </if>
@@ -379,11 +405,22 @@ in the future - use at your own risk. -->
 
 <def tag="you" attrs="have, are">
   <if test="&this == current_user">you <%= if have then 'have' elsif are then 'are' end %></if>
-  <else><tagbody><name/> <%= if have then 'has' elsif are then 'is' end %></tagbody></else>
+  <else><do param="default"><name/> <%= if have then 'has' elsif are then 'is' end %></do></else>
 </def>
 
 
 <def tag="You" attrs="have, are">
   <if test="&this == current_user">You <%= if have then 'have' elsif are then 'are' end %></if>
-  <else><tagbody><name/> <%= if have then 'has' elsif are then 'is' end %></tagbody></else>
+  <else><do param="default"><name/> <%= if have then 'has' elsif are then 'is' end %></do></else>
+</def>
+
+<def tag="your">
+  <if test="&this == current_user">your</if>
+  <else><do param="default"><%= n = name; n.ends_with?('s') ? "#{n}'" : "#{n}'s" %></do></else>
+</def>
+
+
+<def tag="Your">
+  <if test="&this == current_user">Your</if>
+  <else><do param="default"><%= n = name; n.ends_with?('s') ? "#{n}'" : "#{n}'s" %></do></else>
 </def>