hobo 0.9.0 → 0.9.100

data/lib/hobo/user.rb

@@ -31,7 +31,6 @@ module Hobo
           remember_token_expires_at :datetime
         end
 
-        validates_presence_of     :password_confirmation, :if => :new_password_required?
         validates_confirmation_of :password,              :if => :new_password_required?
         password_validations
         validate :validate_current_password_when_changing_password
@@ -167,7 +166,7 @@ module Hobo
 
 
     def validate_current_password_when_changing_password
-      changing_password? && !authenticated?(current_password) and errors.add :current_password, ht(:hobo.messages.current_password_is_not_correct, :default["is not correct"])
+      changing_password? && !authenticated?(current_password) and errors.add :current_password, Hobo::Translations.ht("hobo.messages.current_password_is_not_correct", :default => "is not correct")
     end
 
   end

data/lib/hobo/user_controller.rb

@@ -54,7 +54,13 @@ module Hobo
     private
 
     def hobo_login(options={})
-      (redirect_to home_page; return) if logged_in?
+      if logged_in?
+        respond_to do |wants|
+          wants.html { redirect_to home_page }
+          wants.js { hobo_ajax_response }
+        end
+        return
+      end
 
       login_attr = model.login_attribute.to_s.titleize.downcase
       options.reverse_merge!(:success_notice => ht(:"users.messages.login.success", :default=>["You have logged in."]),
@@ -73,14 +79,24 @@ module Hobo
           if !user.account_active?
             # account not activate - cancel this login
             self.current_user = old_user
-            render :action => :account_disabled unless performed?
+            unless performed?
+              respond_to do |wants|
+                wants.html {render :action => :account_disabled}
+                wants.js {hobo_ajax_response}
+              end
+            end
           else
             if params[:remember_me].present?
               current_user.remember_me
               create_auth_cookie
             end
             flash[:notice] ||= options[:success_notice]
-            redirect_back_or_default(options[:redirect_to] || home_page) unless performed?
+            unless performed?
+              respond_to do |wants|
+                wants.html {redirect_back_or_default(options[:redirect_to] || home_page) }
+                wants.js {hobo_ajax_response}
+              end
+            end
           end
         end
       end
@@ -98,13 +114,13 @@ module Hobo
       do_creator_action(:signup) do
         if valid?
           flash[:notice] = ht(:"users.messages.signup.success", :default=>["Thanks for signing up!"])
-          flash[:notice] << ht(:"users.messages.signup.must_activate", :default=>[" You must activate your account before you can log in. Please check your email."]) unless this.account_active?
         end
         response_block(&b) or if valid?
-                                if this.account_active?
-                                  self.current_user = this if this.account_active?
+                                self.current_user = this if this.account_active?
+                                respond_to do |wants|
+                                  wants.html { redirect_back_or_default(home_page) }
+                                  wants.js { hobo_ajax_response }
                                 end
-                                redirect_back_or_default(home_page)
                               end
       end
     end
@@ -127,7 +143,10 @@ module Hobo
         if user && (!block_given? || yield(user))
           user.lifecycle.request_password_reset!(:nobody)
         end
-        render_tag :forgot_password_email_sent_page
+        respond_to do |wants|
+          wants.html { render_tag :forgot_password_email_sent_page }
+          wants.js { hobo_ajax_response}
+        end
       end
     end
 
@@ -137,7 +156,10 @@ module Hobo
         response_block(&b) or if valid?
                                 self.current_user = this
                                 flash[:notice] = ht(:"users.messages.reset_password", :default=>["Your password has been reset"])
-                                redirect_to home_page
+                                respond_to do |wants|
+                                  wants.html { redirect_to(home_page) }
+                                  wants.js { hobo_ajax_response }
+                                end
                               end
       end
     end

data/lib/hobo/view_hints.rb

@@ -26,17 +26,29 @@ module Hobo
         end
       end
     end
-  
-    setter :model_name,  proc { name.sub(/Hints$/, "") }
-    
+
     setter :field_names, {}
     
     setter :field_help,  {}
     
-    setter :children,    proc { model.dependent_collections.sort_by(&:to_s) } do |*args|
+    setter :children,    [] do |*args|
+      # Setting children also gives a default parent using the reverse association
+      child_model = model.reflections[args.first].klass
+      if child_model.view_hints.parent.nil? and !child_model.view_hints.parent_defined
+        parent = model.reverse_reflection(args.first)
+        child_model.view_hints.parent(parent.name, :undefined => true) 
+      end
       args
     end
     
+    setter :parent,         nil do |*args|
+      options = args.extract_options!
+      parent_defined(true) unless options[:undefined]
+      args.first
+    end
+
+    setter :parent_defined, nil
+    
     setter :paginate?,    proc { !sortable? }
     
     setter :sortable?,    proc { defined?(ActiveRecord::Acts::List::InstanceMethods) && 
@@ -54,14 +66,34 @@ module Hobo
     # Accessors
 
     class << self
+
+      def _name
+        @_name ||= name.sub(/Hints$/, '')
+      end
       
+      def model_name(new_name=nil)
+        if new_name.nil?
+          @model_name ||= Hobo::Translations.ht("#{_name.tableize}.model_name", :default => _name.titleize)
+        else
+          @model_name = Hobo::Translations.ht("#{_name.tableize}.model_name", :default => new_name)
+        end
+      end
+                
+      def model_name_plural(new_name=nil)
+        if new_name.nil?
+          @model_name_plural ||= Hobo::Translations.ht("#{_name.tableize}.model_name_plural", :default => model_name.pluralize)
+        else
+          @model_name_plural = Hobo::Translations.ht("#{_name.tableize}.model_name_plural", :default => new_name)
+        end
+      end
+          
       def model
-        @model ||= name.sub(/Hints$/, "").constantize
+        @model ||= _name.constantize
       end
         
 
       def field_name(field)
-        field_names.fetch(field.to_sym, field.to_s.titleize)
+        Hobo::Translations.ht("#{_name.tableize}.#{field}", :default => field_names.fetch(field.to_sym, field.to_s.titleize))
       end
     
       def primary_children

data/rails_generators/hobo_model/templates/hints.rb

@@ -1,4 +1,7 @@
 class <%= class_name %>Hints < Hobo::ViewHints
 
-
+  # model_name "My Model"
+  # field_names :field1 => "First Field", :field2 => "Second Field"
+  # field_help :field1 => "Enter what you want in this field"
+  # children :primary_collection1, :aside_collection1, :aside_collection2
 end

data/rails_generators/hobo_model_controller/hobo_model_controller_generator.rb

@@ -1,7 +1,7 @@
 class HoboModelControllerGenerator < Rails::Generator::NamedBase
 
   def initialize(args, options)
-    args[0] = args[0].pluralize
+    args[0] = args[0].pluralize if args[0] && args[0]!='--help'
     super(args, options)
   end
   

data/rails_generators/hobo_rapid/hobo_rapid_generator.rb

@@ -21,7 +21,8 @@ class HoboRapidGenerator < Hobo::Generator
       create_all(m, "themes/clean/views", "app/views/taglibs/themes/clean")
       
       if with_admin_site?
-        options = ["--make-front-site", "admin"]
+        options = ["admin"]
+        options.unshift "--make-front-site" unless File.exist?('app/views/taglibs/front_site.dryml')
         options.unshift "--invite-only" if invite_only?
         m.dependency 'hobo_admin_site', options
       end

data/rails_generators/hobo_rapid/templates/hobo-rapid.js

@@ -193,6 +193,7 @@ var Hobo = {
                     onLeaveHover: null,
                     callback: function(form, val) {
                         old = val
+                        el.setAttribute("hobo-edit-text", val)
                         return (Hobo.fieldSetParam(el, val) + "&" + updateParams)
                     },
                     onFailure: function(_, resp) {
@@ -200,6 +201,10 @@ var Hobo = {
                     },
                     onEnterEditMode: function() {
                         var blank_message = el.getAttribute("hobo-blank-message")
+                        var editable_text = el.getAttribute("hobo-edit-text")
+                        if (editable_text) {
+                            el.innerHTML = editable_text
+                        }
                         if (el.innerHTML.gsub(" ", " ") == blank_message) {
                             el.innerHTML = "" 
                         } else {
@@ -785,6 +790,10 @@ Event.addBehavior({
                 rows: 2, handleLineBreaks: false, okButton: true, cancelLink: true, okText: "Save", submitOnBlur: false
             }
             var ipe = Hobo._makeInPlaceEditor(this, options) 
+            ipe.getText = function() {
+                // Be careful!  we're not calling unescapeHTML() here!
+                return this.element.innerHTML
+            }
         }
     },
 

data/rails_generators/hobo_rapid/templates/ie7-recalc.js

@@ -1,2 +1,166 @@
-/* IE7/IE8.js - copyright 2004-2008, Dean Edwards */
-(function(){if(!IE7.loaded)return;CLASSES=/\sie7_class\d+/g;IE7.CSS.extend({elements:{},handlers:[],reset:function(){this.removeEventHandlers();var a=this.elements;for(var b in a)a[b].runtimeStyle.cssText="";this.elements={};var a=IE7.Rule.elements;for(var b in a){with(a[b])className=className.replace(CLASSES,"")}IE7.Rule.elements={}},reload:function(){this.rules=[];this.getInlineStyles();this.screen.load();if(this.print)this.print.load();this.refresh();this.trash()},addRecalc:function(b,c,d,e){this.base(b,c,function(a){d(a);IE7.CSS.elements[a.uniqueID]=a},e)},recalc:function(){this.reset();this.base()},addEventHandler:function(a,b,c){a.attachEvent(b,c);this.handlers.push(arguments)},removeEventHandlers:function(){var a;while(a=this.handlers.pop()){a[0].detachEvent(a[1],a[2])}},getInlineStyles:function(){var a=document.getElementsByTagName("style"),b;for(var c=a.length-1;(b=a[c]);c--){if(!b.disabled&&!b.ie7){var d=b.cssText||b.innerHTML;this.styles.push(d);b.cssText=d}}},trash:function(){var a=document.styleSheets,b,c;for(c=0;c<a.length;c++){b=a[c];if(!b.ie7&&!b.cssText){b.cssText=b.cssText}}this.base()},getText:function(a){return a.cssText||this.base(a)}});IE7.CSS.addEventHandler(window,"onunload",function(){IE7.CSS.removeEventHandlers()});IE7.Rule.elements={};IE7.Rule.prototype.extend({add:function(a){this.base(a);IE7.Rule.elements[a.uniqueID]=a}});if(IE7.PseudoElement){IE7.PseudoElement.hash={};IE7.PseudoElement.prototype.extend({create:function(a){var b=this.selector+":"+a.uniqueID;if(!IE7.PseudoElement.hash[b]){IE7.PseudoElement.hash[b]=true;this.base(a)}}})}IE7.HTML.extend({elements:{},addRecalc:function(b,c){this.base(b,function(a){if(!this.elements[a.uniqueID]){c(a);this.elements[a.uniqueID]=a}})}});document.recalc=function(a){if(IE7.CSS.screen){if(a)IE7.CSS.reload();IE7.recalc()}}})();
+
+// =========================================================================
+// ie7-recalc.js
+// =========================================================================
+
+(function() {
+  /* ---------------------------------------------------------------------
+  
+    This allows refreshing of IE7 style rules. If you modify the DOM
+    you can update IE7 by calling document.recalc().
+  
+    This should be the LAST module included.
+  
+  --------------------------------------------------------------------- */
+  
+  if (!IE7.loaded) return;
+  
+  // remove all IE7 classes from an element
+  CLASSES = /\sie7_class\d+/g;
+  
+  IE7.CSS.extend({
+    // store for elements that have style properties calculated
+    elements: {},
+    handlers: [],
+    
+    // clear IE7 classes and styles
+    reset: function() {
+      this.removeEventHandlers();
+      // reset IE7 classes here
+      var elements = this.elements;
+      for (var i in elements) elements[i].runtimeStyle.cssText = "";
+      this.elements = {};
+      // reset runtimeStyle here
+      var elements = IE7.Rule.elements;
+      for (var i in elements) {
+        with (elements[i]) className = className.replace(CLASSES, "");
+      }
+      IE7.Rule.elements = {};
+    },
+    
+    reload: function() {
+      this.rules = [];
+      this.getInlineStyles();
+      this.screen.load();
+      if (this.print) this.print.load();
+      this.refresh();
+      this.trash();
+    },
+    
+    addRecalc: function(propertyName, test, handler, replacement) {
+      // call the ancestor method to add a wrapped recalc method
+      this.base(propertyName, test, function(element) {
+        // execute the original recalc method
+        handler(element);
+        // store a reference to this element so we can clear its style later
+        IE7.CSS.elements[element.uniqueID] = element;
+      }, replacement);
+    },
+    
+    recalc: function() {
+      // clear IE7 styles and classes
+      this.reset();
+      // execute the ancestor method to perform recalculations
+      this.base();
+    },
+    
+    addEventHandler: function(element, type, handler) {
+      element.attachEvent(type, handler);
+      // store the handler so it can be detached later
+      this.handlers.push(arguments);
+    },
+    
+    removeEventHandlers: function() {
+      var handler;
+       while (handler = this.handlers.pop()) {
+         handler[0].detachEvent(handler[1], handler[2]);
+       }
+    },
+    
+    getInlineStyles: function() {
+      // load inline styles
+      var styleSheets = document.getElementsByTagName("style"), styleSheet;
+      for (var i = styleSheets.length - 1; (styleSheet = styleSheets[i]); i--) {
+        if (!styleSheet.disabled && !styleSheet.ie7) {
+          var cssText = styleSheet.cssText || styleSheet.innerHTML;
+          this.styles.push(cssText);
+          styleSheet.cssText = cssText;
+        }
+      }
+    },
+    
+    trash: function() {
+      // trash the old style sheets
+      var styleSheets = document.styleSheets, styleSheet, i;
+      for (i = 0; i < styleSheets.length; i++) {
+        styleSheet = styleSheets[i];
+        if (!styleSheet.ie7 && !styleSheet.cssText && styleSheet.cssText != '') {
+          styleSheet.cssText = styleSheet.cssText;
+        }
+      }
+      this.base();
+    },
+    
+    getText: function(styleSheet) {
+      return styleSheet.cssText || this.base(styleSheet);
+    }
+  });
+  
+  // remove event handlers (they eat memory)
+  IE7.CSS.addEventHandler(window, "onunload", function() {
+     IE7.CSS.removeEventHandlers();
+  });
+  
+  // store all elements with an IE7 class assigned
+  IE7.Rule.elements = {};
+
+  IE7.Rule.prototype.extend({
+    add: function(element) {
+      // execute the ancestor "add" method
+      this.base(element);
+      // store a reference to this element so we can clear its classes later
+      IE7.Rule.elements[element.uniqueID] = element;
+    }
+  });
+
+  // store created pseudo elements
+  if (IE7.PseudoElement) {
+    IE7.PseudoElement.hash = {};
+  
+    IE7.PseudoElement.prototype.extend({
+      create: function(target) {
+        var key = this.selector + ":" + target.uniqueID;
+        if (!IE7.PseudoElement.hash[key]) {
+          IE7.PseudoElement.hash[key] = true;
+          this.base(target);
+        }
+      }
+    });
+  }
+  
+  IE7.HTML.extend({
+    elements: {},
+    
+    addRecalc: function(selector, handler) {
+      // call the ancestor method to add a wrapped recalc method
+      this.base(selector, function(element) {
+        if (!this.elements[element.uniqueID]) {
+          // execute the original recalc method
+          handler(element);
+          // store a reference to this element so that
+          //  it is not "fixed" again
+          this.elements[element.uniqueID] = element;
+        }
+      });
+    }
+  });
+  
+  // allow refreshing of IE7 fixes
+  document.recalc = function(reload) {
+    if (IE7.CSS.screen) {
+      if (reload) IE7.CSS.reload();
+      IE7.recalc();
+    }
+  };
+
+})();

data/rails_generators/hobo_user_model/templates/model.rb

@@ -3,14 +3,12 @@ class <%= class_name %> < ActiveRecord::Base
   hobo_user_model # Don't put anything above this
 
   fields do
-    name :string, :unique
+    name          :string, :required, :unique
     email_address :email_address, :login => true
     administrator :boolean, :default => false
     timestamps
   end
 
-  validates_presence_of :name
-
   # This gives admin rights to the first sign-up.
   # Just remove it if you don't want that
   before_create { |user| user.administrator = true if !Rails.env.test? && count == 0 }

data/taglibs/rapid.dryml

@@ -18,4 +18,5 @@ The Rapid tag library makes web development go fast. The Rapid tag library is yo
 <include src="rapid_plus"/>
 <include src="rapid_generics"/>
 <include src="rapid_lifecycles"/>
-<include src="rapid_summary"/>
+<include src="rapid_summary"/>
+<include src="rapid_user_pages"/>

data/taglibs/rapid_core.dryml

@@ -13,17 +13,19 @@
 
  - tag: The name of a tag to use inside the `<td>` to display the value. Defaults to `view`
  
- - show-non-editable: By default, if `tag` is set to `input`, fields for which the current user does not have edit permission
-   will be skipped (the entire row is skipped). Set this attribute to keep them. (Note that `<input>` automatically degrades
-   to `<view>` if the user does not have edit permission.)
-     
+ - no-edit: Controls the behavior of `<input>` tags when the user doesn't have edit permission for a field.
+   - view: render the current value using the `<view>` tag
+   - disable: render the input as normal, but add HTML's `disabled` attribute
+   - skip: render nothing at all. This will omit the entire row (including the label)
+   - ignore: render the input normally. That is, don't even perform the edit check.
+
 -->
 <def tag="field-list" attrs="tag, no-edit">
   <% tag ||= scope.in_form ? "input" : "view"; no_edit ||= "skip" %>
   <labelled-item-list merge-attrs="&attributes - attrs_for(:with_fields)">
     <with-fields merge-attrs="&attributes & attrs_for(:with_fields)">
     <% field_name = this_field_name 
-       input_attrs = {:no_edit => no_edit} if tag == "input" && no_edit == "disable"
+       input_attrs = {:no_edit => no_edit} if tag == "input"
     -%>
       <labelled-item unless="&tag == 'input' && no_edit == 'skip' && !can_edit?">
         <item-label param="#{this_field.to_s.sub('?', '')}-label" unless="&field_name.blank?">