hobo 0.6.1 → 0.6.2

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

@@ -27,7 +27,24 @@ module Hobo
     def not_in(association)
       not_(is_in(association))
     end
+    
+    
+    def sql(s)
+      WhereFragment.new(s)
+    end
+    
+    def block(b)
+      b && instance_eval(&b)
+    end
+    
+    
+    def all?(*args)
+      args.inject { |m, a| m & a }
+    end
 
+    def any?(*args)
+      args.inject { |m, a| m | a }
+    end
 
     def method_missing(name, *args)
       check_column = proc do |col|
@@ -46,28 +63,32 @@ module Hobo
           val = args[0]
         end
         return (if val.nil?
-                  WhereFragment.new("#{field} IS NULL")
+                  WhereFragment.new("#{_query_table}.#{field} IS NULL")
                 else
-                  WhereFragment.new("#{field} = ?", val)
+                  WhereFragment.new("#{_query_table}.#{field} = ?", val)
                 end)
       end
 
       m, field = *name.to_s.match(/^(.*)_contains$/)
       if m
         check_column[field]
-        return WhereFragment.new("#{field} like ?", "%#{args[0]}%")
+        return WhereFragment.new("#{_query_table}.#{field} like ?", "%#{args[0]}%")
       end
 
       m, field = *name.to_s.match(/^(.*)_starts$/)
       if m
         check_column[field]
-        return WhereFragment.new("#{field} like ?", "#{args[0]}%")
+        return WhereFragment.new("#{_query_table}.#{field} like ?", "#{args[0]}%")
       end
 
       m, field = *name.to_s.match(/^(.*)_ends$/)
       if m
         check_column[field]
-        return WhereFragment.new("#{field} like ?", "%#{args[0]}")
+        return WhereFragment.new("#{_query_table}.#{field} like ?", "%#{args[0]}")
+      end
+      
+      if (refl = model.reflections[name.to_sym]) && refl.macro == :belongs_to
+        return ModelQueries.new(refl.klass)
       end
 
       return WhereFragment.new(@model.send(name, *args))
@@ -86,6 +107,10 @@ module Hobo
         Object.instance_method(:instance_variable_get).bind(assoc).call("@finder_sql")
       end
     end
+    
+    def _query_table
+      model.table_name
+    end
 
   end
 

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

@@ -9,6 +9,7 @@ module Hobo
       
       def included(base)
         base.filter_parameter_logging "password"
+        base.skip_before_filter :login_required, :only => [:login]
         user_models << base.model
       end
     end
@@ -20,33 +21,43 @@ module Hobo
     def logout; hobo_logout; end
     
     def hobo_login(options={})
-      options = options.reverse_merge(:success_notice => "You have logged in.",
-                                      :failure_notice => "You did not provide a valid login and password.",
-                                      :redirect_to => {:action => "index"})
+      @user_model = model
+      options = LazyHash.new(options)
+      options.reverse_merge!(:success_notice => "You have logged in.",
+                             :failure_notice => "You did not provide a valid login and password.",
+                             :redirect_to => {:action => "index"})
       
       if request.post?
         user = model.authenticate(params[:login], params[:password])
-        if user
+        if user.nil?
+          flash[:notice] = options[:failure_notice]
+        else
+          old_user = current_user
           self.current_user = user
-          if params[:remember_me] == "1"
-            current_user.remember_me
-            create_auth_cookie
+          
+          # If supplied, a block can be used to test if this user is
+          # allowed to log in (e.g. the account may be disabled)
+          if block_given? && !yield
+            # block returned false - cancel this login
+            self.current_user = old_user
+          else
+            if params[:remember_me] == "1"
+              current_user.remember_me
+              create_auth_cookie
+            end
+            flash[:notice] ||= options[:success_notice]
+            redirect_back_or_default(options[:redirect_to]) unless performed?
           end
-          redirect_back_or_default(options[:redirect_to])
-          flash[:notice] = options[:success_notice]
-        else
-          flash[:notice] = options[:failure_notice]
-          hobo_render
         end
-      else
-        hobo_render
       end
+      hobo_render unless performed?
     end
 
     
     def hobo_signup(options={})
-      options = options.reverse_merge(:notice => "Thanks for signing up!",
-                                      :redirect_to => {:action => "index"})
+      options = LazyHash.new(options)
+      options.reverse_merge!(:notice => "Thanks for signing up!",
+                             :redirect_to => {:action => "index"})
       if request.post?
         begin
           @user = model.new(params[:user])

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

@@ -7,7 +7,12 @@ module Hobo
     end
 
     def &(rhs)
-      WhereFragment.new("(#{to_sql}) and (#{rhs.to_sql})")
+      # If either is nil, just return the other
+      if self.to_sql && rhs.to_sql
+        WhereFragment.new("(#{to_sql}) and (#{rhs.to_sql})")
+      else
+        self.to_sql || rhs.to_sql
+      end
     end
 
     def |(rhs)

data/hobo_files/plugin/tags/rapid.dryml

@@ -6,9 +6,10 @@
 <include src="rapid_editing"/>
 <include src="rapid_forms"/>
 <include src="rapid_navigation"/>
+<include src="rapid_plus"/>
 
 <def tag="FieldList" attrs="tag">
-  <% tag ||= (this.respond_to?(:new_record?) && this.new_record?) ? "input" : "editor" %>
+  <% 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>
@@ -41,7 +42,7 @@
     <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="#{this.underscore}_heading"><%= this.titleize %></th>
+          <th param="#{scope.field_name}_heading"><%= scope.field_name.titleize %></th>
         </with_field_names>
         <th if="&all_parameters[:controls]" class="controls"/>
       </tr>
@@ -53,7 +54,7 @@
             hobo_model_id="#{dom_id(this)}">
           <if test="&fields">
             <with_fields merge_attrs="&all_attributes & attrs_for(:with_fields)">
-              <td><call_tag tag="&field_tag"/></td>
+              <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>
@@ -127,9 +128,9 @@
       count
     elsif this.is_a? Class and this < ActiveRecord::Base
       this.name.pluralize.titleize
-    elsif this.respond_to?(:name)
+    elsif this.respond_to?(:name) && can_view?(this, :name)
       view(merge_attrs(attributes, {:field => 'name'}))
-    elsif this.respond_to?(:title)
+    elsif this.respond_to?(:title) && can_view?(this, :title)
       view(merge_attrs(attributes, {:field => 'title'}))
     else
       this.to_s
@@ -155,24 +156,34 @@
   content = tagbody.call if tagbody
   
   if href || attributes[:name]
-    # Regular link - skip all this stuff
+    # Regular link
+    content_tag(:a, content, attributes.update(:href => href))
   else
     target = to || this
   
-    return "(Not Available)" if target.nil? 
-
-    if action == "new"
+    if target.nil?
+      Hobo::Dryml.last_if = false
+      "(Not Available)"
+    elsif 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}"
+      new_record = target.new
+      new_record.set_creator(current_user)
+      if can_create?(new_record)
+        
+        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}"
+        content_tag(:a, content, attributes.update(:href => href))
+      else
+        Hobo::Dryml.last_if = false
+        ""
+      end
     else
       # Link to an existing object
       
@@ -185,52 +196,58 @@
       
       # Set default link text if none given
       content ||= name
+      content_tag(:a, content, attributes.update(:href => href))
     end
   end
-  content_tag :a, content, attributes.update(:href => href)
 %></def>
 
+
         
-<def tag="view" attrs="inline, block, if_blank, no_wrapper"><%=
+<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?
    
-  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_id, 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
+  res = if this.nil? && if_blank.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_id, 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?
+
+            truncate = 30 if truncate == true
+            the_view = self.truncate(the_view, truncate.to_i) if truncate
+            
+            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
+   Hobo::Dryml.last_if = !res.blank?
+   res
 %></def>
 
     
@@ -238,7 +255,7 @@
 
 <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="Date" attrs="format"><%= 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>
 
@@ -344,4 +361,17 @@ in the future - use at your own risk. -->
   </with>
 </def>
 
+<def tag="restricted_page" attrs="require_login,error_message"><%
+  allowed = if require_login == false
+              true
+            elsif require_login == true
+              logged_in?
+            else
+              models = comma_split(require_login).map &it.titleize.constantize
+              current_user.is_a?(*models)
+            end
+  raise Hobo::ModelController::UserPermissionError.new(models), (error_message || "Permission Denied") unless allowed
+-%><tagbody/></def>
+
 
+<def tag="you_have"><if test="&this == current_user">You have</if><else><name/> has</else></def>

data/hobo_files/plugin/tags/rapid_document_tags.dryml

@@ -18,29 +18,29 @@
 <!-- section represents a generic document or application section. -->
 <def tag="section">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="section" merge_attrs if="&body"><tagbody/></div>
+  <div class="section" merge_attrs if="&body"><%= body %></div>
 </def>
 
 <def tag="aside">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="aside" merge_attrs if="&body"><tagbody/></div>
+  <div class="aside" merge_attrs if="&body"><%= body %></div>
 </def>
 
 <def tag="header">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="header" merge_attrs if="&body"><tagbody/></div>
+  <div class="header" merge_attrs if="&body"><%= body %></div>
 </def>
 
 <def tag="footer">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="footer" merge_attrs if="&body"><tagbody/></div>
+  <div class="footer" merge_attrs if="&body"><%= body %></div>
 </def>
 
 <!-- article represents an independent piece of content of a --> 
 <!-- document, such as a blog entry or newspaper article.    -->
 <def tag="article">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="article" merge_attrs if="&body"><tagbody/></div>
+  <div class="article" merge_attrs if="&body"><%= body %></div>
 </def>
 
 <!-- temporary tag -->

data/hobo_files/plugin/tags/rapid_editing.dryml

@@ -1,4 +1,4 @@
-<def tag="editor"><%= 
+<def tag="editor" ><%= 
   if !can_edit?
     view(attributes)
   elsif this_type.respond_to?(:macro)
@@ -11,10 +11,10 @@
     attrs = add_classes(attributes, "#{type_and_field}", "#{type_id}", "editor")
     call_polymorphic_tag("editor", attrs) or
       raise HoboError.new("<editor> not implemented for #{this.class.name}\##{this_field} " +
-                            "(#{this.inspect}:#{this_type})")
+                          "(#{this.inspect}:#{this_type})")
   end
 %></def>
-  
+
 
 <def tag="has_many_editor">
   <% #TODO: Implement %>

data/hobo_files/plugin/tags/rapid_forms.dryml

@@ -1,17 +1,17 @@
-<def tag="hidden_fields" attrs="fields, skip"><%= 
-  hiddens = case fields
-            when '*', nil
-              this.class.column_names - ['type', 'created_at', 'updated_at']
-            else
-              comma_split(fields)
-            end
-  hiddens -= comma_split(skip)
-  pname = this.class.name.underscore
-  hidden_tags = hiddens.map do |h|
-    val = this.send(h)
-    name = "#{pname}[#{h}]"
-    hidden_field_tag(name, val.to_s) if val
-  end.join("\n")
+<def tag="hidden_fields" attrs="fields, skip, for_query_string"><%= 
+  pairs = if for_query_string
+            query_params.to_a
+          else
+            hiddens = case fields
+                      when '*', nil
+                        this.class.column_names - ['type', 'created_at', 'updated_at']
+                      else
+                        comma_split(fields)
+                      end
+            pname = this.class.name.underscore
+            hiddens.map { |h| [ "#{pname}[#{h}]", this.send(h) ] }
+          end
+  pairs.map {|n, v| hidden_field_tag(n, v.to_s) if v && n.not_in?(skip)}.compact.join("\n")
 %></def>
 
 
@@ -40,7 +40,10 @@
     html_attrs[:onsubmit] = [html_attrs[:onsubmit], "#{function}; return false;"].compact.join("; ")
   end
 
-  body, field_names = with_form_context { tagbody.call }
+  body, field_names = scope.new_scope do
+    scope[:in_form] = true
+    with_form_context { tagbody.call }
+  end
 
   hiddens = hidden_fields(:fields => hidden_fields, :skip => field_names) if new_record
      
@@ -69,7 +72,7 @@
         has_many_input(attributes)
       end
     else
-      attrs = add_classes(attributes, "#{type_and_field}", "#{type_id}")
+      attrs = add_classes(attributes, type_and_field, type_id)
       attrs[:name] ||= param_name_for_this
       the_input = call_polymorphic_tag('input', attrs) or
         raise HoboError, ("No input tag for #{this_field}:#{this_type} (this=#{this.inspect})")
@@ -98,12 +101,14 @@
   <%= text_area_tag(name, this, add_classes(attributes, :tiny_mce)) %>
 </def>
 
-<def tag="input" for="date">
-  <%= select_date(this || Time.now, :prefix => param_name_for_this) %>
+<def tag="input" for="date" attrs="order">
+  <% order = order.nil? ? [:year, :month, :day] : comma_split(order).every(:to_sym) -%>
+  <%= select_date(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
-<def tag="input" for="datetime">
-  <%= select_datetime(this || Time.now, :prefix => param_name_for_this) %>
+<def tag="input" for="datetime" attrs="order">
+  <% order = order.nil? ? [:year, :month, :day, :hour, :minute] : comma_split(order).every(:to_sym) -%>
+  <%= select_datetime(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
 <def tag="input" for="integer" attrs="name">
@@ -199,16 +204,20 @@
 %></def>
 
 
-<def tag="belongs_to_menu_input" attrs="include_none"><%
+<def tag="belongs_to_menu_input" attrs="include_none, none_message, options"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
+   
+  none_message ||= "(No #{this_type.name.to_s.titleize})"
+  options ||= this_type.klass.find(:all).select {|x| can_view?(x)}
   #Todo: switch to autocompleter for id_name when too many records, and id_name supported
-  select_options = this_type.klass.find(:all).select {|x| can_view?(x)}.map { |x|
+  select_options = options.map { |x|
             [ name(:with => x, :no_wrapper => true), x.id ]
-          }
-  select_options.insert(0, ["(No #{this_type.name.to_s.titleize})", ""]) if this.nil? || include_none
+          }.sort
+  select_options.insert(0, [none_message, ""]) if this.nil? || include_none
+  attributes = add_classes(attributes, "input", type_and_field)
   %>
-  <select name="#{param_name_for_this(true)}">
-    <%= options_for_select(select_options.sort, this ? this.id : "") %>
+  <select name="#{param_name_for_this(true)}" merge_attrs>
+    <%= options_for_select(select_options, this ? this.id : "") %>
   </select>
 </def>