hobo 0.8.8 → 0.8.9

data/rails_generators/hobo_front_controller/templates/index.dryml

@@ -10,6 +10,22 @@
         <ul>
           <li>To customise this page: edit app/views/front/index.dryml</li>
         </ul>
+    
+        <%% if User.count == 0 -%>
+          <h3 style="margin-top: 20px;">There are no user accounts - please provide the details of the site administrator</h3>
+<% if invite_only? %>
+          <form with="&this || User.new" without-cancel>
+            <field-list: fields="name, email_address, password, password_confirmation"/>
+            <submit: label="Register Administrator"/>
+          </form>
+<% else -%>
+          <do with="&User.new"><%% this.exempt_from_edit_checks = true %>
+            <signup-form/>
+          </do>
+<% end -%>
+        <%% end -%>
+        
+      
       </section>
     </header>
 

data/rails_generators/hobo_rapid/hobo_rapid_generator.rb

@@ -19,6 +19,12 @@ class HoboRapidGenerator < Hobo::Generator
       m.file "hobo-rapid.css",     "public/stylesheets/hobo-rapid.css"
       create_all(m, "themes/clean/public", "public/hobothemes/clean")
       create_all(m, "themes/clean/views", "app/views/taglibs/themes/clean")
+      
+      if with_admin_site?
+        options = ["--make-front-site", "admin"]
+        options.unshift "--invite-only" if invite_only?
+        m.dependency 'hobo_admin_site', options
+      end
     end
   end
 
@@ -34,6 +40,18 @@ class HoboRapidGenerator < Hobo::Generator
 <set-theme name="clean"/>
 )
 
+    if with_admin_site?
+      tag += %(
+<extend tag="page">
+  <old-page merge>
+    <footer:>
+      <a href="&admin_users_url" if="&current_user.administrator?">Admin</a>
+    </footer:>
+  </old-page>
+</extend>
+) 
+    end
+
     src = File.read(path)
     return if src.include?(tag)
 
@@ -47,9 +65,17 @@ class HoboRapidGenerator < Hobo::Generator
   end
 
 
+  def with_admin_site?
+    options[:admin]
+  end
+  
+  def invite_only?
+    options[:admin] == :invite_only
+  end
+
   protected
     def banner
-      "Usage: #{$0} #{spec.name} [--import-tags]"
+      "Usage: #{$0} #{spec.name} [--import-tags] [--admin | --invite-only]"
     end
 
     def add_options!(opt)
@@ -59,5 +85,9 @@ class HoboRapidGenerator < Hobo::Generator
              "Modify taglibs/application.dryml to import hobo-rapid and theme tags ") do |v|
         options[:import_tags] = true
       end
+      opt.on("--admin",
+             "Generate an admin subsite") { |v| options[:admin] = true }
+      opt.on("--invite-only",
+             "Generate an admin subsite with features for an invite only app") { |v| options[:admin] = :invite_only }
     end
 end

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

@@ -628,9 +628,11 @@ new HoboBehavior("ul.input-many", {
       
       this.element.selectChildren('li').each(function(li, index) {
           li.select('*[name]').each(function(control) {
-              var changeId = control.id == control.name
-              control.name   = control.name.sub(new RegExp("^" + RegExp.escape(prefix) + "\[[0-9]+\]"), prefix + '[' + index +']')
-              if (changeId) control.id = control.name
+              if(control.name) {
+                  var changeId = control.id == control.name;
+                  control.name   = control.name.sub(new RegExp("^" + RegExp.escape(prefix) + "\[[0-9]+\]"), prefix + '[' + index +']');
+                  if (changeId) control.id = control.name;
+              }
           })
       })
   }

data/rails_generators/hobo_rapid/templates/lowpro.js

@@ -2,7 +2,7 @@ LowPro = {};
 LowPro.Version = '0.5';
 LowPro.CompatibleWithPrototype = '1.6';
 
-if (Prototype.Version.indexOf(LowPro.CompatibleWithPrototype) != 0 && console && console.warn)
+if (Prototype.Version.indexOf(LowPro.CompatibleWithPrototype) != 0 && window.console && window.console.warn)
   console.warn("This version of Low Pro is tested with Prototype " + LowPro.CompatibleWithPrototype + 
                   " it may not work as expected with this version (" + Prototype.Version + ")");
 
@@ -15,19 +15,19 @@ DOM = {};
 // DOMBuilder for prototype
 DOM.Builder = {
 	tagFunc : function(tag) {
-	  return function() {
-	    var attrs, children; 
-	    if (arguments.length>0) { 
-	      if (arguments[0].nodeName || 
-	        typeof arguments[0] == "string") 
-	        children = arguments; 
-	      else { 
-	        attrs = arguments[0]; 
-	        children = Array.prototype.slice.call(arguments, 1); 
-	      };
-	    }
-	    return DOM.Builder.create(tag, attrs, children);
-	  };
+    return function() {
+     var attrs, children;
+     if (arguments.length>0) {
+       if (arguments[0].constructor == Object) {
+         attrs = arguments[0];
+         children = Array.prototype.slice.call(arguments, 1);
+       } else {
+         children = arguments;
+       };
+       children = $A(children).flatten()
+     }
+     return DOM.Builder.create(tag, attrs, children);
+    };
   },
 	create : function(tag, attrs, children) {
 		attrs = attrs || {}; children = children || []; tag = tag.toLowerCase();
@@ -109,6 +109,14 @@ Event.addBehavior = function(rules) {
   
 };
 
+Event.delegate = function(rules) {
+  return function(e) {
+      var element = $(e.element());
+      for (var selector in rules)
+        if (element.match(selector)) return rules[selector].apply(this, $A(arguments));
+    }
+}
+
 Object.extend(Event.addBehavior, {
   rules : {}, cache : [],
   reassignAfterAjax : false,
@@ -122,9 +130,9 @@ Object.extend(Event.addBehavior, {
         var match = sel.match(/^([^:]*)(?::(.*)$)?/), css = match[1], event = match[2];
         $$(css).each(function(element) {
           if (event) {
-            observer = Event.addBehavior._wrapObserver(observer);
-            $(element).observe(event, observer);
-            Event.addBehavior.cache.push([element, event, observer]);
+            var wrappedObserver = Event.addBehavior._wrapObserver(observer);
+            $(element).observe(event, wrappedObserver);
+            Event.addBehavior.cache.push([element, event, wrappedObserver]);
           } else {
             if (!element.$$assigned || !element.$$assigned.include(observer)) {
               if (observer.attach) observer.attach(element);
@@ -198,7 +206,6 @@ var Behavior = {
       parent = properties.shift();
 
       var behavior = function() { 
-        var behavior = arguments.callee;
         if (!this.initialize) {
           var args = $A(arguments);
 
@@ -245,13 +252,17 @@ var Behavior = {
       return new this(element, Array.prototype.slice.call(arguments, 1));
     },
     _bindEvents : function(bound) {
-      for (var member in bound)
-        if (member.match(/^on(.+)/) && typeof bound[member] == 'function')
-          bound.element.observe(RegExp.$1, Event.addBehavior._wrapObserver(bound[member].bindAsEventListener(bound)));
+      for (var member in bound) {
+        var matches = member.match(/^on(.+)/);
+        if (matches && typeof bound[member] == 'function')
+          bound.element.observe(matches[1], Event.addBehavior._wrapObserver(bound[member].bindAsEventListener(bound)));
+      }
     }
   }
 };
 
+
+
 Remote = Behavior.create({
   initialize: function(options) {
     if (this.element.nodeName == 'FORM') new Remote.Form(this.element, options);
@@ -264,11 +275,19 @@ Remote.Base = {
     this.options = Object.extend({
       evaluateScripts : true
     }, options || {});
+    
+    this._bindCallbacks();
   },
   _makeRequest : function(options) {
     if (options.update) new Ajax.Updater(options.update, options.url, options);
     else new Ajax.Request(options.url, options);
     return false;
+  },
+  _bindCallbacks: function() {
+    $w('onCreate onComplete onException onFailure onInteractive onLoading onLoaded onSuccess').each(function(cb) {
+      if (Object.isFunction(this.options[cb]))
+        this.options[cb] = this.options[cb].bind(this);
+    }.bind(this));
   }
 }
 

data/rails_generators/hobo_rapid/templates/themes/clean/public/stylesheets/clean.css

@@ -1,7 +1,15 @@
 html, body {color: #193440; background: url(../images/300-ACD3E6-fff.png) repeat-x #fff; }
-.page-header {color: white; background: url(../images/100-3B5F87-ACD3E6.png) repeat-x #3F606E;}
-.page-header .navigation.main-nav a {background: #5B8BA0;}
-.page-header .navigation.main-nav li.current a {background: #FCFFF4; color: #222;}
+.page-header {color: white; background: url(../images/101-3B5F87-ACD3E6.png) repeat-x #3F606E;}
+.page-header .navigation.main-nav a {
+  background: url(../images/30-3E547A-242E42.png) repeat-x #242E42;
+}
+.page-header .navigation.main-nav li.current a {
+  color: #222;
+  background: url(../images/30-DBE1E5-FCFEF5.png) repeat-x #FCFEF5;
+  border-top: 1px solid white;
+  border-left: 1px solid white;
+  border-right: 1px solid white;
+}
 .page-header .navigation.main-nav a:hover {background: #193440;}
 .section.content {background: #FCFFF5;}
 .button {color: white; background: #5B8BA0;}
@@ -77,7 +85,7 @@ form .actions input { margin: 0; }
 	margin: 0 40px 10px; padding: 10px 30px; border-width: 2px 0;
 	color: white;
 }
-.flash.notice {background: #92ab6e;}
+.flash.notice {background: #4E6A8F;}
 .flash.error {background: #BC1C3D;}
 .section.with-flash { padding-top: 20px; }
 

data/rails_generators/hobo_subsite/hobo_subsite_generator.rb

@@ -39,7 +39,7 @@ class HoboSubsiteGenerator < Rails::Generator::NamedBase
         end
         puts "Renaming app/views/taglibs/application.dryml to app/views/taglibs/front_site.dryml"
         FileUtils.mv('app/views/taglibs/application.dryml', 'app/views/taglibs/front_site.dryml')
-        m.template "application.dryml", File.join('app/views/taglibs/application.dryml')  
+        m.template "application.dryml", File.join('app/views/taglibs/application.dryml')
       end
       
       m.directory File.join('app', 'controllers', file_name)

data/rails_generators/hobo_user_controller/hobo_user_controller_generator.rb

@@ -38,6 +38,28 @@ class HoboUserControllerGenerator < Rails::Generator::NamedBase
         m.template 'view.rhtml', path,
           :assigns => { :action => action, :path => path }
       end
+      
+      if invite_only?
+        m.template "accept_invitation.dryml", File.join('app/views', class_path, file_name, "accept_invitation.dryml")
+      end
     end
   end
+  
+  def invite_only?
+    options[:invite_only]
+  end
+
+  protected
+    def banner
+      "Usage: #{$0} #{spec.name} ModelName [--invite-only]"
+    end
+    
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--invite-only", "Add features for an invite only website") do |v|
+        options[:invite_only] = true
+      end
+    end    
+  
 end

data/rails_generators/hobo_user_controller/templates/accept_invitation.dryml

@@ -0,0 +1,5 @@
+<accept-invitation-page>
+  <after-heading:>
+    <p>Welcome to <app-name/>, <name/>. To accept your invitation, please choose your password.</p>
+  </after-heading:>
+</accept-invitation-page>

data/rails_generators/hobo_user_controller/templates/controller.rb

@@ -3,5 +3,27 @@ class <%= class_name %>Controller < ApplicationController
   hobo_user_controller
 
   auto_actions :all, :except => [ :index, :new, :create ]
+<% if invite_only? -%>
+
+  def create
+    hobo_create do
+      if valid?
+        self.current_user = this
+        this.password = this.password_confirmation = nil # don't trigger password change validations
+        this.state = 'active'
+        this.save
+        flash[:notice] = "You are now the site administrator"
+        redirect_to home_page
+      end
+    end
+  end
+
+  def do_accept_invitation
+    do_transition_action :accept_invitation do
+      self.current_user = this
+      flash[:notice] = "You have signed up"
+    end
+  end
+<% end -%>
 
 end

data/rails_generators/hobo_user_model/hobo_user_model_generator.rb

@@ -19,12 +19,28 @@ class HoboUserModelGenerator < Rails::Generator::NamedBase
 
       m.template 'mailer.rb',           File.join('app/models', class_path, "#{file_name}_mailer.rb")
       m.template 'forgot_password.erb', File.join(mailer_dir, "forgot_password.erb")
+      
+      if invite_only?
+        m.template 'invite.erb', File.join(mailer_dir, "invite.erb")
+      end
     end
   end
+  
+  def invite_only?
+    options[:invite_only]
+  end
 
   protected
     def banner
-      "Usage: #{$0} #{spec.name} ModelName"
+      "Usage: #{$0} #{spec.name} ModelName [--invite-only]"
+    end
+    
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--invite-only", "Add features for an invite only website") do |v|
+        options[:invite_only] = true
+      end
     end
 
 end

data/rails_generators/hobo_user_model/templates/invite.erb

@@ -0,0 +1,9 @@
+<%%= @user %>,
+
+You have been invited to join <%%= @app_name %>. If you wish to accept, please click on the following link
+
+  <%%= user_accept_invitation_url :host => @host, :id => @user, :key => @key %>
+
+Thank you,
+
+The <%%= @app_name %> team.

data/rails_generators/hobo_user_model/templates/mailer.rb

@@ -10,5 +10,20 @@ class <%= class_name -%>Mailer < ActionMailer::Base
     @sent_on    = Time.now
     @headers    = {}
   end
+<% if invite_only? -%>
   
+  def invite(user, key)
+    host = Hobo::Controller.request_host
+    app_name = Hobo::Controller.app_name || host
+    # FIXME - nasty hack 
+    app_name.remove!(/ - Admin$/)
+    @subject    = "Invitation to #{app_name}"
+    @body       = { :user => user, :key => key, :host => host, :app_name => app_name }
+    @recipients = user.email_address
+    @from       = "no-reply@#{host}"
+    @sent_on    = Time.now
+    @headers    = {}
+  end
+<% end -%>
+
 end

data/rails_generators/hobo_user_model/templates/model.rb

@@ -11,19 +11,39 @@ class <%= class_name %> < ActiveRecord::Base
 
   # 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 }
-  
+  before_create { |user| user.administrator = true if !Rails.env.test? && count == 0 }
+
+<% if invite_only? -%>
+  validates_confirmation_of :password,              :if => "User.count == 0"
+<% end -%>
   
   # --- Signup lifecycle --- #
 
   lifecycle do
 
+<% if invite_only? -%>
+    state :invited, :default => true
+    state :active
+
+    create :invite,
+           :available_to => "acting_user if acting_user.administrator?",
+           :params => [:name, :email_address],
+           :new_key => true,
+           :become => :invited do
+       UserMailer.deliver_invite(self, lifecycle.key)
+    end
+  
+    transition :accept_invitation, { :invited => :active }, :available_to => :key_holder,
+               :params => [ :password, :password_confirmation ]
+  
+<% else -%>
     state :active, :default => true
 
     create :signup, :available_to => "Guest",
            :params => [:name, :email_address, :password, :password_confirmation],
            :become => :active
-
+             
+<% end -%>
     transition :request_password_reset, { :active => :active }, :new_key => true do
       <%= class_name %>Mailer.deliver_forgot_password(self, lifecycle.key)
     end
@@ -37,11 +57,18 @@ class <%= class_name %> < ActiveRecord::Base
   # --- Permissions --- #
 
   def create_permitted?
+<% if invite_only? -%>
+    # Only the initial admin user can be created, from there it's invite-only
+    User.count == 0
+<% else -%>
     false
+<% end -%>
   end
 
   def update_permitted?
-    acting_user.administrator? || (acting_user == self && only_changed?(:crypted_password, :email_address))
+    acting_user.administrator? || 
+      (acting_user == self && only_changed?(:email_address, :crypted_password,
+                                            :current_password, :password, :password_confirmation))
     # Note: crypted_password has attr_protected so although it is permitted to change, it cannot be changed
     # directly from a form submission.
   end