hobo 0.6.2 → 0.6.3

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

@@ -54,7 +54,7 @@ module Hobo
 
       m, field = *name.to_s.match(/^(.*)_is$/)
       if m
-        if (refl = model.reflections[field.to_sym]) and refl.macro == :belongs_to
+        if (refl = model.reflections[field.to_sym]) && refl.macro == :belongs_to
           field = refl.primary_key_name
           val = args[0] && args[0].id
           raise HoboError.new("don't use self in query blocks") if val == self

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

@@ -0,0 +1,174 @@
+module Hobo
+  
+  class ModelRouter
+    
+    APP_ROOT = "#{RAILS_ROOT}/app"
+    
+    class << self
+      
+      def add_routes(map)
+        begin 
+          ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.active?
+        rescue
+          # No database, no routes
+          return
+        end
+
+        require "#{APP_ROOT}/controllers/application" unless Object.const_defined? :ApplicationController
+        require "#{APP_ROOT}/assemble.rb" if File.exists? "#{APP_ROOT}/assemble.rb"
+        
+        add_routes_for(map, nil)
+
+        # Any directory inside app/controllers defines a subsite
+        subsites = Dir["#{APP_ROOT}/controllers/*"].map { |f| File.basename(f) if File.directory?(f) }.compact
+        subsites.each { |subsite| add_routes_for(map, subsite) }
+      end
+      
+      
+      def add_routes_for(map, subsite)
+        module_name = subsite._?.camelize
+        Hobo.models.each do |model|
+          controller_name = "#{model.name.pluralize}Controller"
+          is_defined = if subsite 
+                         Object.const_defined?(module_name) && module_name.constantize.const_defined?(controller_name)
+                       else
+                         Object.const_defined?(controller_name)
+                       end
+          controller_filename = File.join(*["#{APP_ROOT}/controllers", subsite, "#{controller_name.underscore}.rb"].compact) 
+          if is_defined || File.exists?(controller_filename)
+            owner_module = subsite ? module_name.constantize : Object
+            controller = owner_module.const_get(controller_name)
+            ModelRouter.new(map, model, controller, subsite)
+          end
+        end
+      end
+    end
+    
+
+    def initialize(map, model, controller, subsite)
+      @map = map
+      @model = model
+      @controller = controller
+      @subsite = subsite
+      add_routes
+    end
+    
+
+    attr_reader :map, :model, :controller, :subsite
+    
+    
+    def plural
+      model.name.underscore.pluralize
+    end
+    
+    
+    def singular
+      model.name.underscore
+    end
+    
+    
+    def add_routes
+      # Simple support for composite models, we might later need a CompositeModelController
+      if model < Hobo::CompositeModel
+        map.connect "#{plural}/:id", :controller => plural, :action => 'show'
+
+      elsif controller < Hobo::ModelController
+        # index routes need to be first so the index names don't get
+        # taken as IDs
+        index_action_routes 
+        resource_routes
+        collection_routes
+        web_method_routes
+        show_action_routes
+        user_routes if controller < Hobo::UserController
+      end
+    end
+    
+    
+    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 })
+                                                                                                                          
+      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 })  
+                                                                                                                          
+      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 })
+    end
+    
+    
+    def collection_routes
+      controller.collections.each do |collection|
+        new_method = Hobo.simple_has_many_association?(model.reflections[collection])
+        named_route("#{singular}_#{collection}",
+                    "#{plural}/:id/#{collection}",
+                    :action => "show_#{collection}",
+                    :conditions => { :method => :get })
+
+        named_route("new_#{singular}_#{collection.to_s.singularize}",
+                    "#{plural}/:id/#{collection}/new",
+                    :action => "new_#{collection.to_s.singularize}",
+                    :conditions => { :method => :get }) if new_method
+      end
+    end
+    
+    
+    def web_method_routes
+      controller.web_methods.each do |method|
+        named_route("#{plural.singularize}_#{method}", "#{plural}/:id/#{method}",
+                    :action => method.to_s, :conditions => { :method => :post })
+      end
+    end
+    
+    
+    def index_action_routes
+      controller.index_actions.each do |view|
+        named_route("#{view}_#{plural}", "#{plural}/#{view}",
+                    :action => view.to_s, :conditions => { :method => :get })
+      end
+    end
+
+    
+    def show_action_routes
+      controller.show_actions.each do |view|
+        named_route("#{plural.singularize}_#{view}", "#{plural}/:id/#{view}",
+                    :action => view.to_s, :conditions => { :method => :get })
+      end
+    end
+    
+        
+    def user_routes
+      prefix = plural == "users" ? "" : "#{singular}_"
+      named_route("#{singular}_login",  "#{prefix}login",  :action => 'login')
+      named_route("#{singular}_logout", "#{prefix}logout", :action => 'logout')
+      named_route("#{singular}_signup", "#{prefix}signup", :action => 'signup')
+    end
+    
+    
+    def named_route(name, route, options={})
+      if controller.public_instance_methods.include?(options[:action].to_s)
+        options.reverse_merge!(:controller => route_with_subsite(plural))
+        name = name_with_subsite(name)
+        route = route_with_subsite(route)
+        map.named_route(name, route, options)
+        format_route = options.delete(:format) != false
+        map.named_route("formatted_#{name}", "#{route}.:format", options) if format_route
+      end
+    end
+    
+   
+    def name_with_subsite(name)
+      subsite ? "#{subsite}_#{name}" : name 
+    end
+    
+    
+    def route_with_subsite(route)
+      subsite ? "#{subsite}/#{route}" : route
+    end
+        
+  end
+  
+end

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

@@ -3,3 +3,5 @@ class Hobo::PasswordString < String
   COLUMN_TYPE = :string
 
 end
+
+Hobo.field_types[:password] = Hobo::PasswordString

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

@@ -0,0 +1,14 @@
+module Hobo
+  
+  class Percentage < DelegateClass(Fixnum)
+    
+    COLUMN_TYPE = :integer
+    
+    def validate
+      "must be from 0 to 100" unless self.in?(0..100)
+    end
+        
+  end
+
+end
+Hobo.field_types[:percentage] = Hobo::Percentage

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

@@ -1,8 +1,8 @@
 module ::Hobo::Plugins
   class HoboPlugin
 
-    def initialize(opt=nil)
-      @opt = opt || Hash.new
+    def initialize(opt={})
+      @opt = opt
       set_up_options(self.class::PLUGIN_DEFAULTS)
 
       send @opt[:setup_using] || :default
@@ -37,7 +37,7 @@ module ::Hobo::Plugins
     end
 
     def hobo_model(name, &b)
-      make_class @opt[name], ActiveRecord::Base do
+      make_class(@opt ? @opt[name] : name, ActiveRecord::Base) do
         hobo_model
         class_eval &b if b
       end
@@ -61,7 +61,7 @@ module ::Hobo::Plugins
           @plugin_opt
         end
         def self.has_feature(name)
-          !@plugin_opt[name].nil? && @plugin_opt[name] != false
+          @plugin_opt[name]
         end
         def sym
           self.class.sym

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

@@ -19,7 +19,14 @@ module Hobo::RapidHelper
   def js_updates(updates)
     return '[]' unless updates
     updates = [updates] unless updates.is_a? Array
-    '[' + comma_split(updates).map{|u| js_str(u)}.join(', ') + ']'
+    updates = comma_split(updates).map do |u|
+      if u.to_s == "self"
+        "Hobo.partFor(this)"
+      else
+        js_str(u)
+      end
+    end
+    "[#{updates * ', '}]"
   end
   
   
@@ -77,7 +84,8 @@ module Hobo::RapidHelper
     attributes = add_classes(attributes, behaviour_class)
     attributes.update(:hobo_model_id => this_field_dom_id,
                       :hobo_blank_message => blank_message,
-                      :if_blank => blank_message)
+                      :if_blank => blank_message,
+                      :no_wrapper => false)
 
     update = attributes.delete(:update)
     attributes[:hobo_update] = update if update 

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

@@ -1,3 +1,3 @@
-class Hobo::Text < String
-  
-end
+class Hobo::Text < String; end
+
+Hobo.field_types[:text] = Hobo::Text

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

@@ -21,3 +21,5 @@ class RedCloth
     text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks && RedCloth::VERSION == "3.0.4"
   end 
 end
+
+Hobo.field_types[:textile] = Hobo::TextileString

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

@@ -2,8 +2,9 @@ module Hobo
 
   class Undefined
 
-    def initialize(klass=Object)
-      @klass = klass
+    def initialize(*args)
+      options = args.extract_options!
+      @klass = args.first || Object
     end
 
     def hobo_undefined?

data/hobo_files/plugin/lib/hobo/{authenticated_user.rb → user.rb}

@@ -2,7 +2,9 @@ require 'digest/sha1'
 
 module Hobo
 
-  module AuthenticatedUser
+  module User
+    
+    AUTHENTICATION_FIELDS = [:salt, :crypted_password, :remember_token, :remember_token_expires_at]
 
     # Extend the base class with AuthenticatedUser functionality
     # This includes:
@@ -29,7 +31,9 @@ module Hobo
       
         before_save :encrypt_password
         
-        never_show :salt, :crypted_password, :remember_token, :remember_token_expires_at
+        never_show *AUTHENTICATION_FIELDS
+        
+        attr_protected *AUTHENTICATION_FIELDS
         
         set_field_type :password => :password, :password_confirmation => :password
         
@@ -47,7 +51,10 @@ module Hobo
       
       def set_login_attr(attr)
         @login_attr = attr = attr.to_sym
-        alias_attribute(:login, attr) unless attr == :login
+        unless attr == :login
+          alias_attribute(:login, attr)
+          set_field_type :login => field_type(attr)
+        end
         
         if block_given?
           yield

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

@@ -21,11 +21,10 @@ module Hobo
     def logout; hobo_logout; end
     
     def hobo_login(options={})
-      @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"})
+                             :failure_notice => "You did not provide a valid #{model.login_attr.to_s.titleize.downcase} and password.",
+                             :disabled_notice => "You account is not currently available.")
       
       if request.post?
         user = model.authenticate(params[:login], params[:password])
@@ -40,50 +39,55 @@ module Hobo
           if block_given? && !yield
             # block returned false - cancel this login
             self.current_user = old_user
+            flash[:notice] ||= options[:disabled_notice]
           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?
+            redirect_back_or_default(options[:redirect_to] || home_page) unless performed?
           end
         end
+      else
+        hobo_render unless performed?
       end
-      hobo_render unless performed?
     end
 
     
-    def hobo_signup(options={})
-      options = LazyHash.new(options)
-      options.reverse_merge!(:notice => "Thanks for signing up!",
-                             :redirect_to => {:action => "index"})
+    def hobo_signup(&b)
       if request.post?
-        begin
-          @user = model.new(params[:user])
-          @this = @user
-          @user.save!
-          self.current_user = @user
-          redirect_back_or_default(options[:redirect_to])
-          flash[:notice] = options[:notice]
-        rescue ActiveRecord::RecordInvalid
-          hobo_render
-        end
+        @user = model.new(params[model.name.underscore])
+        @this = @user
+        save_and_set_status!(@user)
+        self.current_user = @user if valid?
+        response_block(&b) or
+          if valid?
+            flash[:notice] ||= "Thanks for signing up!"
+            redirect_back_or_default(home_page)
+          elsif invalid?
+            hobo_render
+          elsif not_allowed?
+            permission_denied
+          end
       else
-        hobo_render
+        @this = @user = model.new
+        yield if block_given?
+        hobo_render unless performed?
       end
     end
 
     
     def hobo_logout(options={})
       options = options.reverse_merge(:notice => "You have been logged out.",
-                                      :redirect_to => {:action => "index"})
+                                      :redirect_to => base_url)
         
       current_user.forget_me if logged_in?
       cookies.delete :auth_token
       reset_session
-      flash[:notice] = options[:notice]
-      redirect_back_or_default(options[:redirect_to])
+      yield if block_given?
+      flash[:notice] ||= options[:notice]
+      redirect_back_or_default(options[:redirect_to]) unless performed?
     end
     
   end

data/hobo_files/plugin/tags/core.dryml

@@ -1,5 +1,5 @@
 <def tag="call_tag" attrs="tag">
-  <%= send(tag, attributes) %>
+  <%= send(tag, attributes, &tagbody) %>
 </def>
 
 
@@ -7,6 +7,12 @@
   <%= send(template, attributes, all_parameters) %>
 </def>
 
+
+<def tag="wrap" attrs="tag, when">
+  <% body = tagbody.call %>
+  <%= when_ ? call_tag(tag, attributes, &proc { body }) : body %>
+</def>
+
     
 <def tag="partial" attrs="as">
    <%= render(:partial => find_partial(this, as), :locals => { :this => this }) %>
@@ -53,7 +59,7 @@
 
 <def tag="unless" attrs="test"><%= 
   test = all_attributes.fetch(:test, this)     
-  res = (cond = test.blank?) ? "" : tagbody.call
+  res = (cond = test.blank?) ? tagbody.call : ""
   Hobo::Dryml.last_if = cond
   res
 %></def>

data/hobo_files/plugin/tags/rapid.dryml

@@ -13,8 +13,12 @@
   <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>
+        <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>
@@ -23,12 +27,13 @@
 
 <def tag="item"><% scope.items << tagbody.call %></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}"
-          hobo_model_id="#{dom_id this}">
+          merge_attrs="&{:hobo_model_id => dom_id(this)} if this.respond_to?(:typed_id)">
         <tagbody><a/></tagbody>
       </li>
     </repeat>
@@ -36,9 +41,9 @@
 </def>
 
 
-<def tag="Table" attrs="fields, field_tag">
+<def tag="Table" attrs="fields, field_tag, empty">
   <% field_tag ||= "view" %>
-  <table merge_attrs="&attributes - attrs_for(:with_fields)" unless="&this.empty?">
+  <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)">
@@ -91,14 +96,16 @@
   
 
 <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(', ') +
-        "}; "
+    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
-    res += "urlBase = '#{base_url}'; hoboPartPage = '#{view_name}'</script>"
+    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") + %{
@@ -119,7 +126,7 @@
 
 <def tag="name"><%= 
   if this.nil?
-    "(not available)"
+    nil_view
   else
     name_tag = find_polymorphic_tag("name")
     if name_tag != "name"
@@ -132,7 +139,7 @@
       view(merge_attrs(attributes, {:field => 'name'}))
     elsif this.respond_to?(:title) && can_view?(this, :title)
       view(merge_attrs(attributes, {:field => 'title'}))
-    else
+    elsif can_view?(this)
       this.to_s
     end
   end
@@ -152,18 +159,22 @@
   name
 %></def>
 
-<def tag="a" attrs="action, to, params, resource_type, href"><%=
+
+<def tag="a" attrs="action, to, params, query_params, href, format, subsite"><%=
   content = tagbody.call if tagbody
+   
+  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))
   else
     target = to || this
   
     if target.nil?
       Hobo::Dryml.last_if = false
-      "(Not Available)"
+      nil_view
     elsif action == "new"
       # Link to a new object form
       new_record = target.new
@@ -176,9 +187,9 @@
                            target.name
                          end
 
-        href = object_url(target, "new")
+        href = object_url(target, "new", params._?.merge(:subsite => subsite))
         add_classes!(attributes, "new_#{new_class_name.underscore}_link")
-        content ||= "New #{new_class_name.titleize}"
+        content = "New #{new_class_name.titleize}" if content.blank?
         content_tag(:a, content, attributes.update(:href => href))
       else
         Hobo::Dryml.last_if = false
@@ -186,29 +197,31 @@
       end
     else
       # Link to an existing object
+
+      if target.is_a?(Array) && !target.respond_to?(:proxy_reflection) && target.respond_to?(:member_class)
+        # Not much to go on here - last guess is that this is an index page
+        target = target.member_class
+      end
       
-      href = if resource_type
-               send("formatted_#{model.to_s.downcase}_url", this, resource_type.downcase)
-             else
-               object_url(target, action, params)
-             end
+      href = object_url(target, action, params._?.merge(:subsite => subsite))
       add_classes!(attributes, "#{target.class.name.underscore}_link")
       
+      href.sub!(/\?|$/, ".#{format}\\0") unless format.blank?
+      
       # Set default link text if none given
-      content ||= name
+      content = name if content.blank?
       content_tag(:a, content, attributes.update(:href => href))
     end
   end
 %></def>
 
-
         
 <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?
    
   res = if this.nil? && if_blank.nil?
-          this_type.is_a?(Class) && this_type <= String ? "" : "(Not Available)"
+          this_type.is_a?(Class) && this_type <= String ? "" : nil_view
         elsif this_type.respond_to?(:macro)
           if this_type.macro == :belongs_to
             belongs_to_view(attributes)
@@ -231,6 +244,7 @@
 
             truncate = 30 if truncate == true
             the_view = self.truncate(the_view, truncate.to_i) if truncate
+            the_view = the_view.strip
             
             if no_wrapper
               the_view
@@ -275,7 +289,8 @@
 
 <def tag="view" for="TrueClass"><%= this ? 'Yes' : 'No' %></def>
 
-<def tag="count" attrs="label, prefix, unless_none"><%=
+<def tag="count" attrs="label, prefix, unless_none, if_any"><%=
+  if_any = unless_none if if_any.nil?
   raise Exception.new("asked for count of a string") if this.is_a?(String)
    
   if this.is_a?(Class) and this < ActiveRecord::Base
@@ -292,7 +307,7 @@
         end
   end
    
-  Dryml.last_if = c > 0 if unless_none
+  Hobo::Dryml.last_if = c > 0 if unless_none
   if unless_none && c == 0
     ""
   else
@@ -361,17 +376,14 @@ 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" 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>
+</def>
 
 
-<def tag="you_have"><if test="&this == current_user">You have</if><else><name/> has</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>
+</def>