hobo 0.5.3 → 0.6

data/hobo_files/plugin/tags/core.dryml

@@ -1,6 +1,60 @@
-<taglib module="Hobo::Core"/>
+<def tag="call_tag" attrs="tag">
+  <%= send(tag, attributes) %>
+</def>
+
+
+<def tag="CallTemplate" attrs="template">
+  <%= send(template, attributes, all_parameters) %>
+</def>
 
-<def tag="theme_stylesheet">
-  <link href="<%= urlb %>/hobothemes/<%= Hobo.current_theme %>/stylesheets/application.css"
-        media="screen" rel="Stylesheet" type="text/css" />
+    
+<def tag="partial" attrs="as">
+   <%= render(:partial => find_partial(this, as), :locals => { :this => this }) %>
 </def>
+
+
+<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)))
+      end.join(join)
+    else
+      scope.new_scope do
+        scope[:even_odd] = "odd"
+        map_this do
+          res = tagbody.call
+          scope.even_odd = scope.even_odd == "even" ? "odd" : "even"
+          res
+        end.join(join)
+      end
+    end
+  else
+    ""
+  end
+%></def>
+
+
+<def tag="do"><tagbody/></def>
+<def tag="with"><tagbody/></def>
+
+
+<def tag="if" attrs="test"><%= 
+  test = all_attributes.fetch(:test, this)
+  res = (cond = !test.blank?) ? tagbody.call : ""
+  Hobo::Dryml.last_if = cond
+  res
+%></def>
+
+
+<def tag="else"><tagbody unless="&Hobo::Dryml.last_if"/></def>
+
+
+<def tag="unless" attrs="test"><%= 
+  test = all_attributes.fetch(:test, this)     
+  res = (cond = test.blank?) ? "" : tagbody.call
+  Hobo::Dryml.last_if = cond
+  res
+%></def>
+

data/hobo_files/plugin/tags/rapid.dryml

@@ -1,119 +1,307 @@
-<taglib module="Hobo::Rapid"/>
+<include module="Hobo::RapidHelper"/>
 
-<taglib src="rapid_pages"/>
-<taglib src="rapid_editing"/>
-<taglib src="rapid_navigation"/>
+<include src="rapid_support"/>
+<include src="rapid_document_tags"/>
+<include src="rapid_pages"/>
+<include src="rapid_editing"/>
+<include src="rapid_forms"/>
+<include src="rapid_navigation"/>
 
-<def tag="clearer"><div class='clearer'>&nbsp;</div></def>
+<def tag="FieldList" attrs="tag">
+  <% tag ||= (this.respond_to?(:new_record?) && this.new_record?) ? "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"><%= this_field.to_s.titleize %></item_label>
+        <item_value param="#{this_field.to_s.sub('?', '')}_view"><call_tag tag="&tag" /></item_value>
+      </field_list_item>
+    </with_fields>
+  </field_list>
+</def>
 
-<def tag="object_table" attrs="fields, skip, associations">
-  <% field_inner_tag_options, options = options.partition_hash {|k,v| k.to_s =~ /_label$|_editor$/ }
-     inner_tag_options.merge!(field_inner_tag_options)
-     fields = if fields.nil?
-                this.class.content_columns.every(:name) - %w{created_at updated_at}
-              else
-                comma_split(fields)
-              end
-     fields -= comma_split(skip) if skip
-     associations = if associations == '*'
-                      this.class.reflections.values.every(:name)
-                    elsif associations == 'belongs_to'
-                      this.class.reflections.values.oselect{macro == :belongs_to}.every(:name)
-                    else
-                      comma_split(associations)
-                    end   
-     associations -= comma_split(skip) if skip
-     options = add_classes(options, "object_table", ("new_record" if this.new_record?))
-     # force load
-     Hobo.models
-  %>
-  <table xattrs="">
-    <if q="#this.new_record? && 'type'.in?(this.class.column_names) && !this.class.send(:subclasses).empty?">
-      <tr>
-        <td class="field_label">Type:</td>
-        <td><sti_type_field/></td>
-      </tr>        
-    </if>
 
+<def tag="item"><% scope.items << tagbody.call %></def>
 
-    <% for field in fields.select{|f| can_view?(this, f)} %>
-      <tr>
-        <td class="field_label" content_option="#field + '_label'"><%= no_break(field.titleize) %>:</td>
-        <td><edit attr="#field" replace_option="#field + '_editor'"/></td>
-      </tr>
-    <% end %>
 
-    <% for field in associations.select{|f| can_view?(this, f)} %>
-      <tr>
-        <td class="field_label" content_option="#field.to_s + '_label'"><%= no_break(field.to_s.titleize) %>:</td>
-        <td><edit attr="#field"  replace_option="#field.to_s + '_editor'"/></td>
-      </tr>
-    <% end %>
+<def tag="UL">
+  <ul merge_attrs unless="&this.empty?">
+    <repeat>
+      <li param if="&can_view?" class="#{scope.even_odd} #{this_type.name.underscore}"
+          hobo_model_id="#{dom_id this}">
+        <tagbody><a/></tagbody>
+      </li>
+    </repeat>
+  </ul>
+</def>
 
-    <tagbody/>
 
+<def tag="Table">
+  <table merge_attrs unless="&this.empty?">
+    <thead if="&all_parameters[:thead]" param/>
+    <tbody>
+      <repeat>
+        <tr param if="&can_view?"
+            class="#{scope.even_odd} #{this_type.name.underscore}"
+            hobo_model_id="#{dom_id(this)}">
+        </tr>
+      </repeat>      
+    </tbody>
+    <tfoot if="&all_parameters[:tfoot]" param/>
   </table>
 </def>
 
 
-<def tag="has_many_table" attrs="part_id, delete_buttons, headings, id">
-  <table_for headings="#headings" xattrs="">
-    <:empty>
-      <p>There are no <%= this_type.klass.name.titleize.pluralize.downcase %></p>
-    </:empty>
+<def tag="image" attrs="src">
+  <img src="#{base_url}/images/#{src}" merge_attrs/>
+</def>
 
-    <tagbody/>
 
-    <if q="#delete_buttons != false and can_delete?(this)">
-      <td><delete_button/></td>
-    </if>
-  </table_for>
-  <div>
-    <create_button update="#id || part_id"/>
-  </div>
+<def tag="spinner">
+  <img src="#{base_url}/hobothemes/#{Hobo.current_theme}/images/spinner.gif" class="hidden" merge_attrs/>
 </def>
 
 
-<def tag="ul_for" attrs="else">
-  <if q="#this.empty? and else_">
-    <%= else_ %>
-  </if>
-  <else>
-    <ul xattrs="">
-      <% even_odd = "odd" %>
-      <repeat>
-        <if_can_view>
-          <li class="<%= even_odd %> <%= this_type.name.underscore %>" hobo_model_id="<%= dom_id this %>">
-            <%= tagbody.nil? ? object_link : tagbody.call %>
-          </li>
-        </if_can_view>
-        <% even_odd = even_odd == "even" ? "odd" : "even" %>
-      </repeat>
-    </ul>
-  </else>
+<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"><human_type/>: <a/></div>
+</def>
+  
+
+<def tag="hobo_rapid_javascripts" attrs="tiny_mce"><%=
+    res = javascript_include_tag("hobo_rapid")
+    res += '<script type="text/javascript">'
+    unless Hobo.all_controllers.empty?
+      res += "var controllerNames = {" +
+        Hobo.all_controllers.map {|c| "#{c.singularize}: '#{c}'"}.join(', ') +
+        "}; "
+    end
+    res += "urlBase = '#{base_url}'; hoboPartPage = '#{view_name}'</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',
+                       theme_advanced_buttons1 : "bold, italic, separator, " +
+                                                 "bullist, outdent, indent, separator, " +
+                                                 "undo, redo, separator, link, unlink",
+                       theme_advanced_buttons2 : "",
+                       theme_advanced_buttons3 : ""
+                 });
+               </script>}
+    end
+    res
+%></def>
+
+
+<def tag="name"><%= 
+  if this.nil?
+    "(not available)"
+  else
+    name_tag = find_polymorphic_tag("name")
+    if name_tag != "name"
+      send(name_tag)
+    elsif this.is_a?(Array) && this.respond_to?(:proxy_reflection)
+      count
+    elsif this.is_a? Class and this < ActiveRecord::Base
+      this.name.pluralize.titleize
+    elsif this.respond_to?(:name)
+      view(merge_attrs(attributes, {:field => 'name'}))
+    elsif this.respond_to?(:title)
+      view(merge_attrs(attributes, {:field => 'title'}))
+    else
+      this.to_s
+    end
+  end
+%></def>
+
+
+<def tag="a" attrs="action, to, params, resource_type, href"><%=
+  content = tagbody.call if tagbody
+  
+  if href || attributes[:name]
+    # Regular link - skip all this stuff
+  else
+    target = to || this
+  
+    return "(Not Available)" if target.nil? 
+
+    if action == "new"
+      # Link to a new object form
+      
+      new_class_name = if target.respond_to?(:proxy_reflection)
+                         target.proxy_reflection.klass.name
+                       else
+                         target.name
+                       end
+
+      href = object_url(target, "new")
+      add_classes!(attributes, "new_#{new_class_name.underscore}_link")
+      content ||= "New #{new_class_name.titleize}"
+    else
+      # Link to an existing object
+      
+      href = if resource_type
+               send("formatted_#{model.to_s.downcase}_url", this, resource_type.downcase)
+             else
+               object_url(target, action, params)
+             end
+      add_classes!(attributes, "#{target.class.name.underscore}_link")
+      
+      # Set default link text if none given
+      content ||= name
+    end
+  end
+  content_tag :a, content, attributes.update(:href => href)
+%></def>
+
+        
+<def tag="view" attrs="inline, block, if_blank, no_wrapper"><%=
+  raise HoboError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless
+    can_view?
+   
+  if this == nil
+    this_type.is_a?(Class) && this_type <= String ? "" : "(Not Available)"
+  elsif this_type.respond_to?(:macro)
+    if this_type.macro == :belongs_to
+      belongs_to_view(attributes)
+    elsif this_type.macro == :has_many
+      has_many_view(attributes)
+    end
+  else
+    attrs = add_classes(attributes, "view", type_name, type_and_field)
+    attrs[:hobo_model_id] = this_field_dom_id if this_parent && this_parent.respond_to?(:typed_id)
+
+    view_tag = find_polymorphic_tag("view")
+    
+    if view_tag == "view" # i.e. it didn't find a type specific tag
+      raise HoboError, "Cannot view: #{this.inspect} (field is #{this_field}, type is #{this.class})"
+    else
+      view_attrs = attrs_for(view_tag)
+      the_view = send(view_tag, attrs & view_attrs)
+      
+      the_view = if_blank if if_blank && the_view.blank?
+      
+      if no_wrapper
+        the_view
+      else
+        wrapper = if inline
+                    :span
+                  elsif block || (this.class.const_defined?(:COLUMN_TYPE) && this.class::COLUMN_TYPE == :text)
+                    :div
+                  else
+                    :span
+                  end
+        content_tag(wrapper, the_view, attrs - view_attrs)
+      end
+    end
+  end
+%></def>
+
+    
+<def tag="belongs_to_view"><a/></def>
+
+<def tag="has_many_view"><%= this.empty? ? "(none)" : map_this { a }.join(", ") %></def>
+
+<def tag="view" for="Date"><%= this.to_s(:long) %></def>
+
+<def tag="view" for="Time"><%= this.to_s(:long) %></def>
+
+<def tag="view" for="Numeric" attrs="format"><%= format ? format % this : this.to_s %></def>
+
+<def tag="view" for="Hobo::Text"><%= h(this).gsub("\n", "<br/>") %></def>
+
+<def tag="view" for="html"><%= this %></def>
+
+<def tag="view" for="Hobo::MarkdownString"><%= this.to_html %></def>
+
+<def tag="view" for="Hobo::TextileString"><%= this.to_html %></def>
+
+<def tag="view" for="Hobo::PasswordString">[password withheld]</def>
+
+<def tag="view" for="String"><%= h(this).gsub("\n", "<br/>") %></def>
+
+<def tag="view" for="TrueClass"><%= this ? 'Yes' : 'No' %></def>
+
+<def tag="human_type" attrs="style"><%= 
+      if can_view?
+        res = if this.respond_to? :proxy_reflection
+                this.proxy_reflection.klass.name.pluralize
+              elsif this.is_a? Class
+                this.name
+              else
+                this.class.name
+              end
+        res.underscore.humanize.send(style || :titleize)
+      end
+%></def>
+
+
+<def tag="count" attrs="label, prefix, unless_none"><%=
+  raise Exception.new("asked for count of a string") if this.is_a?(String)
+   
+  if this.is_a?(Class) and this < ActiveRecord::Base
+    c = this.count
+    label ||= this.name.titleize
+  else
+    label ||= this.respond_to?(:proxy_reflection) && this.proxy_reflection.name.to_s.singularize.titleize
+    c = if this.is_a?(Fixnum)
+          this
+        elsif this.respond_to?(:count)
+          this.count
+        else
+          this.length
+        end
+  end
+   
+  Dryml.last_if = c > 0 if unless_none
+  if unless_none && c == 0
+    ""
+  else
+    main = label.blank? ? c : pluralize(c, label)
+   
+    if prefix.in? %w(are is)
+      p = c == 1 ? "is" : "are"
+      p + ' ' + main
+    else
+      main
+    end
+  end
+%></def>
+
+
+<def tag="theme_stylesheet">
+  <link href="<%= base_url %>/hobothemes/<%= Hobo.current_theme %>/stylesheets/application.css"
+        media="screen" rel="Stylesheet" type="text/css" />
 </def>
 
 
-<def tag="table_for" attrs="headings, row_class, footer, else">
-  <if q="#this.empty? and else_">
-    <%= else_ %>
-  </if>
+<def tag="clearer"><div class='clearer'>&nbsp;</div></def>
+
+
+<!-- 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">
+
+    <tagbody/>
+
+    <if test="&delete_buttons != false and can_delete?(this)">
+      <td><DeleteButton/></td>
+    </if>
+  </table_for>
   <else>
-    <table xattrs="">
-      <if q="#headings"><tr><%= headings %></tr></if>
-      <% even_odd = "odd" %>
-      <repeat>
-        <if_can_view>
-          <tr class="<%= even_odd %> <%= row_class %> <%= this_type.name.underscore %>"
-              hobo_model_id="<%= dom_id(this) %>">
-            <%= tagbody && tagbody.call %>
-          </tr>
-        <% even_odd = even_odd == "even" ? "odd" : "even" %>
-        </if_can_view>
-      </repeat>
-      <%= footer %>
-    </table>
+    <p>There are no <%= this_type.klass.name.titleize.pluralize.downcase %></p>
   </else>
+  <div>
+    <CreateButton update="&id || part_id"/>
+  </div>
 </def>
 
 
@@ -127,51 +315,17 @@
                   "enter its name"
      source = refl.source_reflection.name
   %>
-  <tagbody obj="#joins"/>
-  <with obj="#joins.new_without_appending">
-    <if_can_create>
-       <object_form update="#[update, part_id]" message="#action_name" hidden_fields="*">
+  <tagbody with="&joins"/>
+  <with with="&joins.new_without_appending">
+    <if test="can_create?">
+       <form update="&[update, part_id]" message="&action_name" hidden_fields="*">
          <p>
            <%= add_text %>:
-           <belongs_to_autocompleting_field attr="#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>
-       </object_form>
-    </if_can_create>
+       </form>
+    </if>
   </with>
 </def>
 
 
-<def tag="spinner">
-  <img src="<%= urlb %>/hobothemes/<%= Hobo.current_theme %>/images/spinner.gif" class="hidden" xattrs=""/>
-</def>
-
-
-<def tag="image" attrs="src">
-  <img src="<%= urlb %>/images/<%= src %>" xattrs=""/>
-</def>
-
-
-<def tag="theme_img" attrs="src">
-  <img src="<%= theme_asset('images/' + src)%>" xattrs=""/>
-</def>
-
-
-<def tag="search_result">
-  <div class='search_result'>
-    <human_type/>: <object_link/>
-  </div>
-</def>
-
-
-<def tag="object_card">
-  <div class="object_card">
-    <object_link/>
-  </div>
-</def>
-
-
-<def tag="section_if">
-  <% body = tagbody.call %>
-  <%= body.blank? ? "" : section{body} %>
-</def>
-