hobo 0.7.3 → 0.7.4

data/hobo_files/plugin/lib/hobo/scopes/defined_scope_proxy_extender.rb

@@ -8,6 +8,8 @@ module Hobo
       
       include AutomaticScopes
       
+      include ApplyScopes
+      
       def method_missing(name, *args, &block)
         if (scope = named_scope(name))
           association_proxy_for_scope(name, scope, args)
@@ -69,7 +71,7 @@ module Hobo
         options[:order]   = scope[:order]   if scope[:order]
         options[:include] = scope[:include] if scope[:include]
 
-        r = ScopeReflection.new(:has_many, name, options, proxy_owner.class, proxy_reflection.name)
+        r = ScopeReflection.new(:has_many, name, options, proxy_owner.class, proxy_reflection.association_name)
         
         @reflections ||= {}
         @reflections[name] = r

data/hobo_files/plugin/lib/hobo/scopes/scoped_proxy.rb

@@ -4,7 +4,7 @@ module Hobo
     
     class ScopedProxy
       
-      #include AutomaticScopes
+      include ApplyScopes
       
       def initialize(klass, scope)
         @klass = klass
@@ -22,10 +22,6 @@ module Hobo
         end
       end
       
-      def all
-        self.find(:all)
-      end
-      
       def first
         self.find(:first)
       end

data/hobo_files/plugin/taglibs/rapid.dryml

@@ -31,18 +31,20 @@
 
 <def tag="nil-view"><%= scope.nil_view || "(Not Available)" %></def>
 
-<def tag="ul">
+<def tag="ul" attrs="empty">
   <% if all_parameters.li? # don't use dryml if, because it will mess up <ul/><else> %>
-    <unless test="&this.empty?">
+    <if test="&empty || all_parameters[:head] || all_parameters[:foot] || !this.empty?">
       <% element "ul", attributes do %>
+      <do param="head"/>
       <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>
+      <do param="foot"/>
       <% end %>
-    </unless>
+    </if>
   <% else %>
     <%= element("ul", attributes, all_parameters.default) %>
   <% end %>      
@@ -162,6 +164,16 @@
   name = name.downcase if lowercase
   name
 %></def>
+     
+
+<def tag="name-for-collection" attrs="singular, lowercase"><%=
+  name = (attr = this.try.origin_attribute and attr.to_s) || type_name(:plural => true)
+  name = name.titleize
+  name = name.singularize if singular
+  name = name.downcase if lowercase
+  name
+%></def>
+
 
 
 <def tag="a" attrs="action, to, params, query-params, href, format, subsite"><%=
@@ -194,6 +206,7 @@
 
         add_classes!(attributes, "new-#{new_class_name.underscore}-link")
         content = "New #{new_class_name.titleize}" if content.blank?
+        Hobo::Dryml.last_if = true
         element(:a, attributes.update(:href => href), content)
       else
         Hobo::Dryml.last_if = false
@@ -209,7 +222,8 @@
         # This target is registered with ModelRouter as not linkable
         content
       else
-        add_classes!(attributes, "#{target.class.name.underscore}-link")
+        css_class = target.try.origin_attribute || target.class.name.underscore
+        add_classes!(attributes, "#{css_class}-link")
       
         href.sub!(/\?|$/, ".#{format}\\0") unless format.blank?
       
@@ -227,18 +241,18 @@
    
   res = if this.nil? && if_blank.nil?
           this_type.is_a?(Class) && this_type <= String ? "" : nil_view
-        elsif refl = this_field_reflection
-          if refl.macro == :belongs_to
-            belongs_to_view(attributes)
-          elsif refl.macro == :has_many
-            has_many_view(attributes)
-          end
+        elsif (refl = this_field_reflection) && refl.macro == :has_many
+          has_many_view(attributes)
         else
          
           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})"
+            if this.respond_to?(:to_html)
+              this.to_html
+            else
+              raise HoboError, "Cannot view: #{this.inspect} (field is #{this_field}, type is #{this.class})"
+            end
           else
             attrs = add_classes(attributes, "view", type_and_field)
             id = dom_id
@@ -282,20 +296,12 @@
 
 <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="markdown"><%= this.to_html %></def>
-
-<def tag="view" for="textile"><%= this.to_html %></def>
-
-<def tag="view" for="password">[password withheld]</def>
-
 <def tag="view" for="string"><%= h(this).gsub("\n", "<br/>") %></def>
 
 <def tag="view" for="boolean"><%= this ? 'Yes' : 'No' %></def>
 
+<def tag="view" for="ActiveRecord::Base"><a/></def>
+
 
 <def tag="count" attrs="label, prefix, if-any, lowercase"><%=
   raise Exception.new("asked for count of a string") if this.is_a?(String)
@@ -304,9 +310,11 @@
 
   label ||= if this.is_a?(Class)
               this.name
+            elsif (attr = this.try.origin_attribute)
+              attr.to_s.singularize
             else
-              (this.try.association_name || this.try.member_class._?.name)
-            end.to_s.singularize.titleize
+              this.member_class.name
+            end.titleize
 
   label = label.downcase if lowercase
    
@@ -378,7 +386,7 @@ in the future - use at your own risk. -->
 </def>
 
 
-<def tag="you" attrs="have, are, do, titleize"><if test="&this == current_user"><%= "#{titleize ? 'Y' : 'y'}ou #{'have' if have}#{'are' if are}#{'do' if do_}" %></if><else><do param="default"><name/> <%= "#{'has' if have}#{'is' if are}#{'does' if do_}" %></do></else></def>
+<def tag="you" attrs="have, are, do, titleize"><if test="&this == current_user"><%= "#{titleize ? 'Y' : 'y'}ou#{' have' if have}#{' are' if are}#{' do' if do_}" %></if><else><do param="default"><name/><%= "#{' has' if have}#{' is' if are}#{' does' if do_}" %></do></else></def>
 
 <def tag="You"><you merge titleize/></def>
 
@@ -417,6 +425,7 @@ in the future - use at your own risk. -->
 
 
 <def tag="filter-menu" attrs="param-name, options, no-filter">
+  <% no_filter ||= "All" %>
   <form action="&request.request_uri" method="get" class="filter-menu">
     <hidden-field name="filter-parameter" value="&param_name"/>
     <select-menu name="&param_name" options="&options" selected="&params[param_name.gsub('-', '_')]" first-option="&no_filter" merge-params/>

data/hobo_files/plugin/taglibs/rapid_editing.dryml

@@ -43,7 +43,7 @@
 
 <def tag="editor" for="big_integer"><%= in_place_editor "in_place_textfield_bhv", attributes %></def>
 
-<def tag="editor" for="Hobo::EnumString">
+<def tag="editor" for="HoboFields::EnumString">
  <string-select-editor values="&this_type.values" merge/>
 </def>
 
@@ -67,13 +67,14 @@
 </def>
 
 
-<def tag="belongs-to-menu-editor"><%
+<def tag="belongs-to-menu-editor" attrs="sort"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
   link_id = "#{dom_id}_editor" %>
-  <span id="#{link_id}" part="rapid-belongs-to-edit">
+  <span id="#{link_id}" part="rapid-belongs-to-edit" part-locals="sort">
     <% select_options = this_field_reflection.klass.find(:all).select {|x| can_view?(x)}.map {|x|
             [ name(:with => x, :no_wrapper => true), x.id ]
           }
+       select_options = select_options.sort if sort
        select_options.insert(0, ["(No #{this_type.name.to_s.titleize})", ""]) if this.nil?
        link_id = "#{dom_id}_editor"
        f = ajax_updater(object_url(this_parent),
@@ -84,8 +85,8 @@
                           } })
     %>
     <select onchange="#{f}">
-      <%= options_for_select(select_options.sort, this ? this.id : "") %>
-    </select>&nbsp;<a if="&this">View</a>
+      <%= options_for_select(select_options, this ? this.id : "") %>
+    </select>&nbsp;<a if="&this && linkable?">View</a>
   </span>
 </def>
 

data/hobo_files/plugin/taglibs/rapid_forms.dryml

@@ -58,7 +58,7 @@
      
     hiddens = hidden_fields(:fields => hidden_fields, :skip => field_names) if new_record
      
-    auth_token = if request_forgery_protection_token.nil?
+    auth_token = if method.nil? || method == 'get' || request_forgery_protection_token.nil?
                    ''
                  else
                    element(:input, :type => "hidden", 
@@ -107,10 +107,10 @@
     attrs = add_classes(attributes, type_id, type_and_field)
     the_input = if (refl = this_field_reflection)
                   if refl.macro == :belongs_to
-                    belongs_to_input(attrs)
+                    select_one(attrs)
                   elsif refl.macro == :has_many
                     if refl.options[:through]
-                      has_many_through_input(attrs)
+                      select_many(attrs)
                     else
                       has_many_input(attrs)
                     end
@@ -145,13 +145,21 @@
   <%= text_area_tag(name, this, add_classes(attributes, :tiny_mce)) %>
 </def>
 
+<def tag="input" for="markdown" attrs="name">
+  <%= text_area_tag(name, this, attributes) %>
+</def>
+
+<def tag="input" for="textile" attrs="name">
+  <%= text_area_tag(name, this, attributes) %>
+</def>
+
 <def tag="input" for="date" attrs="order">
   <% order = order.nil? ? [:year, :month, :day] : comma_split(order).*.to_sym -%>
   <%= select_date(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
 <def tag="input" for="datetime" attrs="order">
-  <% order = order.nil? ? [:year, :month, :day, :hour, :minute] : comma_split(order).*.to_sym -%>
+  <% order = order.nil? ? [:year, :month, :day ] : comma_split(order).*.to_sym -%>
   <%= select_datetime(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
@@ -179,16 +187,8 @@
   </select>
 </def>
 
-<def tag="input" for="percentage" attrs="name">
-  <%= text_field_tag(name, this, attributes.merge(:size => '3', :maxlength => '3')) %>%
-</def>
-
 
-<def tag="belongs-to-input">
-  <%= belongs_to_menu_input(attributes) %>
-</def>
-
-<!--- Buttons --->
+<!-- Buttons -->
 
 <def tag="remote-method-button" attrs="method, update, label"><%= 
   ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
@@ -219,7 +219,7 @@
 
 
 <def tag="delete-button" attrs="label, update, in-place, image, confirm, fade, subsite"><%=
-  in_place = false if in_place.nil? && this == @this
+  in_place = false if in_place.nil? && this == @this && !request.xhr?
   url = object_url(this, :method => :delete, :subsite => subsite)
   if (Hobo::Dryml.last_if = url && can_delete?)
     attributes = attributes.merge(if image
@@ -240,6 +240,7 @@
         button_to(label, url, attributes)
       else
         fade = true if fade.nil?
+        scope.collection_contains_delete_button = true if fade
         attributes[:value] = label
         attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: #{confirm.inspect}})"
         element(:input, attributes)
@@ -277,16 +278,17 @@
 %></def>
 
 
-<def tag="belongs-to-menu-input" attrs="include-none, blank-message, options"><%
+<def tag="select-one" attrs="include-none, blank-message, options, sort"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
    
   blank_message ||= "(No #{this_type.name.to_s.titleize})"
   conditions = ActiveRecord::Associations::BelongsToAssociation.new(this, this_field_reflection).conditions
-  options ||= this_field_reflection.klass.find(:all, :conditions => conditions).select {|x| can_view?(x)}
+  options ||= this_field_reflection.klass.all(:conditions => conditions).select {|x| can_view?(x)}
     #Todo: switch to autocompleter for id_name when too many records, and id_name supported
   select_options = options.map { |x|
             [ name(:with => x, :no_wrapper => true), x.id ]
-          }.sort
+          }
+  select_options = select_options.sort if sort
   select_options.insert(0, [blank_message, ""]) if include_none || (this.nil? && include_none != false)
   attributes = add_classes(attributes, "input", "belongs_to", type_and_field)
   %>
@@ -335,29 +337,33 @@
 </def>
 
 
-<def tag="name-array-input" attrs="targets, remove-label">
+<def tag="select-many" attrs="options, targets, remove-label, prompt">
   <%
-  all ||= this.member_class.find(:all)
+  prompt ||= "Add a #{this_field.titleize.singularize}"
+  options ||= this.member_class.all
   values = this
   %>
-  <div class="input has-many-through" merge-attrs>
+  <div class="input select-many" merge-attrs>
     <div style="display:none" class="item-proto">
-      <div class="item">
+      <div class="item" param="proto-item">
         <span></span>
-        <input type="hidden" name="#{param_name_for_this}[]" />
-        <input type="button" class="remove-item" value="#{remove_label || 'Remove'}"/>
+        <input type="hidden" name="#{param_name_for_this}[]" param="proto-hidden"/>
+        <input type="button" class="remove-item" value="#{remove_label || 'Remove'}" param="proto-remove-button"/>
       </div>
     </div>
     <div class="items">
-      <div class="item" repeat>
-        <span><%= this %></span>
-        <input type="hidden" name="#{param_name_for_this}[]" value="#{this}"/>
-        <input type="button" class="remove-item" value="#{remove_label || 'Remove'}"/>
-      </div>
+      <set param-name="&param_name_for_this"/>
+      <repeat>
+        <div class="item" param="item">
+          <span><%= this %></span>
+          <input type="hidden" name="#{param_name}[]" value="#{this}" param="hidden"/>
+          <input type="button" class="remove-item" value="#{remove_label || 'Remove'}" param="remove-button"/>
+        </div>
+      </repeat>
     </div>
     <select>
-      <option value="">Add a <%= this_field.titleize.singularize %></option>
-      <option repeat="&all.sort_by {|x| name(:no_wrapper => true, :with => x).downcase}" 
+      <option value=""><prompt/></option>
+      <option repeat="&options.sort_by {|x| name(:no_wrapper => true, :with => x).downcase}" 
               merge-attrs="&{:style => 'display:none'} if this.in?(values)"><name/></option>
     </select>
   </div>
@@ -377,6 +383,6 @@
 <def tag="select-menu" attrs="options, selected, first-option, first-value">
   <select merge-attrs param="default">
     <option value="#{first_value}" unless="&first_option.nil?"><first-option/></option>
-    <do param="options"><%= options_for_select(options, selected) %></do>
+    <do param="options"><% options_for_select(options.*.to_s, selected) %></do>
   </select>
 </def>

data/hobo_files/plugin/taglibs/rapid_generics.dryml

@@ -1,8 +1,8 @@
 <def tag="creation-details">
-  <span class="creation-details">
-    <view field="&this.class.creator_attribute" class="creator" if="&this.class.creator_attribute" />
-    <view:created_at class="created-at" if="&this.respond_to?(:created_at)"/>
-  </span>
+  <div class="creation-details">
+    <view field="&this.class.creator_attribute" class="creator" if="&this.class.creator_attribute" param="by"/>
+    <view:created_at class="created-at" if="&this.respond_to?(:created_at)" param="at"/>
+  </div>
 </def>
 
 <def tag="primary-content">
@@ -17,9 +17,15 @@
 
 <def tag="base-card">
   <if test="&can_view?">
-    <div class="card #{linkable? ? 'linkable' : 'content'} #{type_name :dasherize => true}" merge-attrs>
-      <h3 param="title"><a if="&linkable?"/></h3>
-      <div class="content" param="content" if="&!linkable?">
+    <set has-heading="&this.class.name_attribute || all_parameters[:heading]"/>
+    <set has-link="&has_heading && linkable?"/>
+    <div class="card #{has_link ? 'linkable' : 'content'} #{'with-owner' if this.class.creator_attribute} #{type_name :dasherize => true}" 
+         merge-attrs>
+      <a action="edit" class="edit" if="&!has_link && linkable?(:edit)" param="edit-link">Edit</a>
+      <delete-button label="X" unless="&linkable?(:edit)" param/>
+
+      <h3 param="heading" if="&has_heading"><a><name/></a></h3>
+      <div class="content" param="content" unless="&has_link">
         <primary-content/>
       </div>
       <creation-details param/>
@@ -29,7 +35,6 @@
           <span class="dependents"><count field="&primary_collection"/></span>
         </if>
       </do>
-      <delete-button label="X" unless="&linkable?(this, :edit)" param/>
     </div>
   </if>
 </def>
@@ -47,28 +52,64 @@
 </def>
 
 <def tag="collection">
-  <%= poly = call_polymorphic_tag('collection', attributes, parameters) %>
-  <ul class="collection" merge-attrs unless="&poly">
-    <li:><card param/></li:>
+  <set-scoped collection-contains-delete-button="&false">
+    <%= poly = call_polymorphic_tag('collection', attributes, parameters) %>
+    <base-collection if="&poly.nil?" merge/>
+    <p class="empty-collection-message" 
+       if="&this.empty? || scope.collection_contains_delete_button" 
+       style="#{'display:none' if !this.empty?}"
+       param="empty-message">
+      There are no <name-for-collection lowercase/>
+    </p>
+  </set-scoped>
+</def>
+
+
+<def tag="base-collection" attrs="sortable, sortable-options"><% 
+  sortable = (sortable != false and
+              first = this.first and
+              first.respond_to?(:position_column) and
+              reorder_url = object_url(this.member_class, :reorder, :method => :post) and
+              can_edit?(first, first.position_column))
+  if sortable
+    singular_name = first.class.name.underscore
+    attributes[:id] ||= "#{singular_name}_ordering"
+  end
+  %>
+  <ul class="collection #{this.origin_attribute.to_s.gsub('_', '-')}" merge-attrs>
+    <li: id="&%(#{singular_name}_#{this.id}) if sortable" param>
+      <div class="ordering-handle" param="handle" if="&sortable">&uarr;<br/>&darr;</div>
+      <card param/>
+    </li:>
   </ul>
-  <p class="empty-collection-message" if="&this.empty?" param="empty-message">
-    <% label = if (refl = this.try.proxy_reflection)
-                 refl.association_name.to_s.humanize.downcase
-               elsif (klass = this.try.member_class)
-                 klass.name.humanize.downcase.pluralize
-               else
-                 type_name(:plural => true).pluralize.humanize.downcase.to_s 
-               end %>
-    There are no <%= label.pluralize %>
-  </p>
+  <%= if sortable && Hobo::Dryml.last_if
+        opts = { :url => reorder_url,
+                 :constraint => :vertical,
+                 :overlap => :vertical,
+                 :scroll => :window,
+                 :handle => 'ordering-handle',
+                 :complete => [visual_effect(:highlight, attributes[:id])]
+                } 
+        opts.reverse_merge!(sortable_options) if sortable_options
+        sortable_element attributes[:id], opts
+      end
+   %>
 </def>
 
+
 <def tag="collection-preview" attrs="limit">
   <% limit ||= 6 %>
-  <div class="collection-preview" merge-attrs>
-    <h2><do param="heading"><this-field.titleize/></do> <span param="show-all-link" if="&linkable?">(<a>show all</a>)</span></h2>
-    <collection with="&this.limit(limit)" merge-params>
-      <card: class="small"/>
-    </collection>
-  </div>
+  <do with="&this.is_a?(Class) ? this.limit(limit).all : this.limit(limit)">
+    <set collection-name="&(this.try.origin_attribute || this.member_class.name.pluralize).to_s"/>
+    <div class="collection-preview" merge-attrs>
+      <h2>
+        <do param="heading"><collection-name.titleize/></do> 
+        <span param="show-all-link" if="&this.any? && linkable?">(<a>show all</a>)</span>
+      </h2>
+      <collection merge-params>
+        <card: class="small"/>
+      </collection>
+    </div>
+  </do>
 </def>
+