hobo 0.8.2 → 0.8.3

data/lib/hobo/model_router.rb

@@ -173,26 +173,23 @@ module Hobo
 
     def owner_routes
       controller.owner_actions.each_pair do |owner, actions|
-        collection     = model.reverse_reflection(owner).name
-        owner_singular = model.reflections[owner].klass.name.underscore
-        owner_plural   = owner_singular.pluralize
-        
+        collection         = model.reverse_reflection(owner).name
+        owner_class        = model.reflections[owner].klass.name.underscore
+
+        owner = owner.to_s.singularize if model.reflections[owner].macro == :has_many
+
+        collection_path = "#{owner_class.pluralize}/:#{owner_class}_id/#{collection}"
+
         actions.each do |action| 
           case action
           when :index
-            linkable_route("#{plural}_for_#{owner}",
-                           "#{owner_plural}/:#{owner_singular}_id/#{collection}",
-                           "index_for_#{owner}",
+            linkable_route("#{plural}_for_#{owner}",          collection_path,          "index_for_#{owner}",
                            :conditions => { :method => :get })
           when :new
-            linkable_route("new_#{singular}_for_#{owner}",
-                           "#{owner_plural}/:#{owner_singular}_id/#{collection}/new",
-                           "new_for_#{owner}",
+            linkable_route("new_#{singular}_for_#{owner}",    "#{collection_path}/new", "new_for_#{owner}",
                            :conditions => { :method => :get })
           when :create
-            linkable_route("create_#{singular}_for_#{owner}",
-                           "#{owner_plural}/:#{owner_singular}_id/#{collection}",
-                           "create_for_#{owner}",
+            linkable_route("create_#{singular}_for_#{owner}", collection_path,          "create_for_#{owner}",
                            :conditions => { :method => :post })
           end
         end

data/lib/hobo/user.rb

@@ -31,21 +31,20 @@ module Hobo
           remember_token_expires_at :datetime
         end
 
-        validates_confirmation_of :password, :if => :password_required?
+        validates_confirmation_of :password, :if => :new_password_required?
+        password_validations
+        validate :validate_current_password_when_changing_password
 
         # Virtual attributes for setting and changing the password
         attr_accessor :current_password, :password, :password_confirmation, :type => :password
 
 
-        validate :validate_current_password_when_changing_password
-
         before_save :encrypt_password
 
         never_show *AUTHENTICATION_FIELDS
 
         attr_protected *AUTHENTICATION_FIELDS
 
-        password_validations
 
       end
     end
@@ -55,7 +54,7 @@ module Hobo
 
       # Validation of the plaintext password
       def password_validations
-        validates_length_of :password, :within => 4..40, :if => :password_required?
+        validates_length_of :password, :within => 4..40, :if => :new_password_required?
       end
 
       def login_attribute=(attr, validate=true)
@@ -98,7 +97,7 @@ module Hobo
     end
 
     def account_active?
-      !self.class.has_lifecycle? || !'active'.in?(self.class::Lifecycle.state_names) || state == 'active'
+      lifecycle.active_state?
     end
 
     # Encrypts the password with the user salt
@@ -138,10 +137,6 @@ module Hobo
       true
     end
 
-    def changing_password?
-      crypted_password? && (password || password_confirmation) && !lifecycle.valid_key?
-    end
-
     protected
     # Before filter that encrypts the password before having it stored in the database.
     def encrypt_password
@@ -151,9 +146,14 @@ module Hobo
     end
 
 
-    # Is a password required for login? (or do we have an empty password?)
-    def password_required?
-      (crypted_password.blank? && password != nil) || !password.blank? || changing_password?
+    def changing_password?
+      crypted_password? && (password || password_confirmation) && !lifecycle.valid_key?
+    end
+
+
+    # Is a new password (and confirmation) required? (i.e. signing up or changing password)
+    def new_password_required?
+      (account_active? && crypted_password.blank?) || password || password_confirmation
     end
 
 

data/rails_generators/hobo_model/hobo_model_generator.rb

@@ -21,5 +21,9 @@ class HoboModelGenerator < Rails::Generator::NamedBase
     def banner
       "Usage: #{$0} #{spec.name} ModelName [field:type, field:type]"
     end
+    
+    def max_attribute_length
+      attributes.*.name.*.length.max
+    end
 
 end

data/rails_generators/hobo_model/templates/model.rb

@@ -4,7 +4,7 @@ class <%= class_name %> < ActiveRecord::Base
 
   fields do
 <% for attribute in attributes -%>
-    <%= attribute.name %> :<%= attribute.type %>
+    <%= "%-#{max_attribute_length}s" % attribute.name %> :<%= attribute.type %>
 <% end -%>
     timestamps
   end

data/rails_generators/hobo_rapid/hobo_rapid_generator.rb

@@ -14,8 +14,6 @@ class HoboRapidGenerator < Hobo::Generator
       m.file "lowpro.js",          "public/javascripts/lowpro.js"
       m.file "IE7.js",             "public/javascripts/IE7.js"
       m.file "blank.gif",          "public/javascripts/blank.gif"
-      m.file "nicedit.js",         "public/javascripts/nicedit.js"
-      m.file "nicEditorIcons.gif", "public/images/nicEditorIcons.gif"
       m.file "reset.css",          "public/stylesheets/reset.css"
       m.file "hobo-rapid.css",     "public/stylesheets/hobo-rapid.css"
       create_all(m, "themes/clean/public", "public/hobothemes/clean")

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

@@ -219,21 +219,6 @@ var Hobo = {
         return new Ajax.InPlaceEditor(el, Hobo.putUrl(el), opts)
     },
 
-    nicEditorOptions: { buttonList : ['bold','italic',
-                                      'left','center','right',
-                                      'ul',
-                                      'fontFormat',
-                                      'indent','outdent',
-                                      'link','unlink',
-                                      'image', 'removeLink']},
-
-    makeNicEditor: function(element) {
-        if (!Hobo.nicEditorOptions.iconsPath) { Hobo.nicEditorOptions.iconsPath = urlBase + '/images/nicEditorIcons.gif' }
-        var nic = new nicEditor(Hobo.nicEditorOptions)
-        nic.panelInstance(element, {hasPanel : true})
-        return nic.instanceById(element)
-    },
-
 
     doSearch: function(el) {
         el = $(el)
@@ -242,6 +227,15 @@ var Hobo = {
         var search_results_panel = $(el.getAttribute("search-results-panel") || "search-results-panel")
         var url = el.getAttribute("search-url") || (urlBase + "/search")
 
+        var clear = function() { Hobo.hide(search_results_panel); el.clear() }
+
+        // Close window on [Escape]
+        Event.observe(el, 'keypress', function(ev) { 
+            if (ev.keyCode == 27) clear()
+        });
+
+        Event.observe(search_results_panel.down('.close-button'), 'click', clear)
+
         var value = $F(el)
         if (Hobo.searchRequest) { Hobo.searchRequest.transport.abort() }
         if (value.length >= 3) {
@@ -348,7 +342,7 @@ var Hobo = {
 
 
     parseId: function(id) {
-        m = id.gsub('-', '_').match(/^([a-z_]+)_([0-9]+)(?:_([a-z_]+))?$/)
+        m = id.gsub('-', '_').match(/^([a-z_]+)(?:_([0-9]+))?(?:_([a-z_]+))?$/)
         if (m) return { name: m[1], id: m[2], field: m[3] }
     },
 
@@ -497,7 +491,115 @@ Element.Methods.$$ = function(e, css) {
     return new Selector(css).findElements(e)
 }
 
-// --- has_many_through_input --- //
+
+HoboBehavior = Class.create({
+    
+    initialize: function(mainSelector, features) {
+        this.mainSelector = mainSelector
+        this.features = features
+        this.addEvents(mainSelector, features.events)
+    },
+    
+    addEvents: function(parentSelector, events) {
+        var self = this
+        
+        for (selector in events) {
+            fullSelector = parentSelector + ' ' + selector
+            var rhs = events[selector]
+            if (Object.isString(rhs)) {
+                this.addBehavior(fullSelector, this.features[rhs])
+            } else {
+                this.addEvents(fullSelector, rhs)
+            }
+        }
+        
+    },
+    
+    addBehavior: function(selector, handler) {
+        var self = this
+        behavior = {}
+        behavior[selector] = function(ev) {
+            self.features.element = this.up(self.mainSelector)
+            handler.call(self.features, ev, this)
+        }
+        Event.addBehavior(behavior)
+    }
+    
+})
+
+
+new HoboBehavior("ul.input-many", {
+  
+  events: {
+      "> li > div.buttons": {
+          ".add-item:click":    'addOne',
+          ".remove-item:click": 'removeOne'
+      }
+  },
+  
+  addOne: function(ev, el) {
+      Event.stop(ev)
+      var ul = el.up('ul'), li = el.up('li')
+      
+      var thisItem = li.down('div.input-many-item')
+      var newItem = "<li style='display:none'><div class='input-many-item'>" + 
+                    thisItem.innerHTML + 
+                    "</div>" + 
+                    "<div class='buttons' />" +
+                    "</div></li>"
+      var newItem = DOM.Builder.fromHTML(newItem)
+      ul.appendChild(newItem);
+      $(newItem).select('input').each(function(input){ input.value="" })
+      
+      this.updateButtons()
+      this.updateInputNames()
+      
+      new Effect.BlindDown(newItem, {duration: 0.3})
+  },
+  
+  removeOne: function(ev, el) {
+      Event.stop(ev)
+      var self = this;
+      var li = el.up('li')
+      new Effect.BlindUp(li, { duration: 0.3, afterFinish: function (ef) {
+          li.remove() 
+          self.updateButtons()
+          self.updateInputNames()
+      } });
+  },
+  
+  updateButtons: function() {
+      var removeButton = "<button class='remove-item'>-</button>"
+      var addButton = "<button class='add-item'>+</button>"
+      
+      
+      var ul = this.element
+      if (ul.childElements().length == 1) {
+          ul.down('li').down('div.buttons').innerHTML = addButton
+      } else {
+          var add = ul.selectChildren('li').selectChildren('div.buttons').down('button.add-item')
+          if (add) add.remove()
+          ul.selectChildren('li:first-child').child('div.buttons').innerHTML = removeButton
+          ul.selectChildren('li:last-child').child('div.buttons').innerHTML = removeButton + ' ' + addButton
+      }
+      
+      Event.addBehavior.reload()
+  },
+  
+  updateInputNames: function() {
+      var prefix = Hobo.getClassData(this.element, 'input-many-prefix')
+      
+      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
+          })
+      })
+  }
+  
+})
+
 
 SelectManyInput = Behavior.create({
 
@@ -588,16 +690,10 @@ Event.addBehavior({
         if (Prototype.Browser.IE) Hobo.fixSectionGroup(this);
     },
 
-    'textarea.html' : function(e) {
-        if (typeof(nicEditors) != "undefined") {
-            Hobo.makeNicEditor(this)
-        }
-    },
-
     'div.select-many.input' : SelectManyInput(),
 
     '.association-count:click' : function(e) {
-	new Effect.ScrollTo('primary-collection', {duration: 1.0, offset: -20, transition: Effect.Transitions.sinoidal});
+	    new Effect.ScrollTo('primary-collection', {duration: 1.0, offset: -20, transition: Effect.Transitions.sinoidal});
 	    Event.stop(e);
     },
 
@@ -616,38 +712,28 @@ Event.addBehavior({
     '.autocompleter' : AutocompleteBehavior(),
 
     '.string.in-place-edit, .datetime.in-place-edit, .date.in-place-edit, .integer.in-place-edit, .float.in-place.edit, big-integer.in-place-edit' :
-     function (e) {
+     function (ev) {
         var ipe = Hobo._makeInPlaceEditor(this)
         ipe.getText = function() {
             return this.element.innerHTML.gsub(/<br\s*\/?>/, "\n").unescapeHTML()
         }
     },
 
-    '.text.in-place-edit, .markdown.in-place-edit, .textile.in-place-edit' : function (e) {
+    '.text.in-place-edit, .markdown.in-place-edit, .textile.in-place-edit' : function (ev) {
         var ipe = Hobo._makeInPlaceEditor(this, {rows: 2})
         ipe.getText = function() {
             return this.element.innerHTML.gsub(/<br\s*\/?>/, "\n").unescapeHTML()
         }
     },
 
-    ".html.in-place-edit" : function (e) {
-        var nicEditPresent = typeof(nicEditor) != "undefined"
-        var options = { rows: 2, handleLineBreaks: false, okButton: true, cancelLink: true, okText: "Save" }
-        if (nicEditPresent) options["submitOnBlur"] = false
-        var ipe = Hobo._makeInPlaceEditor(this, options) 
-        if (nicEditPresent) {
-            ipe.afterEnterEditMode = function() {
-                var editor = this._controls.editor
-                var id = editor.id = Hobo.uid()
-                var nicInstance = Hobo.makeNicEditor(editor)
-                var panel = this._form.down(".nicEdit-panel")
-                panel.appendChild(this._controls.cancel)
-                panel.appendChild(this._controls.ok)
-                bkLib.addEvent(this._controls.ok,'click', function () {
-                    nicInstance.saveContent()
-                    setTimeout(function() {nicInstance.remove()}, 1)
-                })
+    ".html.in-place-edit" : function (ev) {
+        if (Hobo.makeInPlaceHtmlEditor) {
+            Hobo.makeInPlaceHtmlEditor(this)
+        } else {
+            var options = { 
+                rows: 2, handleLineBreaks: false, okButton: true, cancelLink: true, okText: "Save", submitOnBlur: false
             }
+            var ipe = Hobo._makeInPlaceEditor(this, options) 
         }
     },
 
@@ -665,3 +751,54 @@ Event.addBehavior({
 
 
 });
+
+ElementSet = Class.create(Enumerable, {
+    
+    initialize: function(array) {
+        this.items = array
+    },
+    
+    _each: function(fn) {
+        return this.items.each(fn)
+    },
+    
+    selectChildren: function(selector) {
+        return new ElementSet(this.items.invoke('selectChildren', selector).pluck('items').flatten())
+    },
+    
+    child: function(selector) {
+        return this.selectChildren(selector).first()
+    },
+    
+    select: function(selector) {
+        return new ElementSet(this.items.invoke('select', selector).flatten())
+    },
+    
+    down: function(selector) {
+        for (var i = 0; i < this.items.length; i++) {
+            var match = this.items[i].down(selector)
+            if (match) return match
+        }
+        return null
+    },
+    
+    size: function() {
+        return this.items.length
+    },
+    
+    first: function() {
+        return this.items.first()
+    },
+
+    last: function() {
+        return this.items.last()
+    }
+    
+})
+
+Element.addMethods({
+    selectChildren: function(element, selector) {
+        return new ElementSet(Selector.matchElements(element.childElements(), selector))
+    }
+})
+

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

@@ -75,7 +75,7 @@ input.file_upload {
 	font-size: 11px; font-weight: bold;
 }
 .button:hover {cursor: pointer;}
-.actions {zoom: 1; overflow: hidden; font-size: 11px;}
+.actions {height: 100%; overflow: hidden; font-size: 11px;}
 
 .flash {
 	margin: 0 40px 10px; padding: 10px 30px; border-width: 2px 0;
@@ -149,7 +149,7 @@ input.file_upload {
 	color: black; background: #f2f2f2;
 }
 #search-results-panel .card.linkable a {color: black;}
-#search-spinner {position: absolute; top: 6px; right: 7px;}
+#search-spinner {background:black;border:1px solid #666666;opacity:0.6;padding:2px;position:absolute;right:4px;top:6px;}
 
 .main-nav {padding: 0 30px;}
 .main-nav li {margin-right: 10px;}
@@ -222,8 +222,7 @@ form .actions {margin: 30px 0; width: 100%; text-align: center;}
 	background: #f5f5f5;
 	position: relative;
 }
-.card h4 {margin-top: 0; margin-bottom: 0;}
-.card .body {margin-top: 6px;}
+.card h4 {margin-top: 0;}
 .card a {background: #f5f5f5;}
 .card .creation-details {
 	display: block; color: #333; font-size: 11px; 
@@ -287,6 +286,10 @@ div.select-many .item {
 div.select-many .item span { float: left; }
 div.select-many .item .remove-item { float: right; }
 
+/* <live-search> */
+
+#search-results-panel { postition: relative; }
+#search-results-panel .close-button { cursor: pointer; text-decoration: underline; position: absolute; top: 3px; right: 6px;}
 
 /*******************************************************/
 /* these styles are for the generated front index page */
@@ -301,3 +304,21 @@ div.select-many .item .remove-item { float: right; }
 }
 .front-page ul.models li {margin-left: 0; list-style: none;}
 
+ul.input-many {list-style-type: none;}
+ul.input-all  {list-style-type: none;}
+
+ul.input-many > li { overflow:hidden; zoom:1;}
+ul.input-many .input-many-item {float:left;}
+ul.input-many div.buttons {float:left; margin-left:10px;}
+
+
+
+
+
+
+
+
+
+
+
+