hobo 0.7.3 → 0.7.4

data/hobo_files/plugin/generators/hobo_rapid/templates/lowpro.js

@@ -1,8 +1,8 @@
 LowPro = {};
 LowPro.Version = '0.5';
-LowPro.CompatibleWithPrototype = '1.6.0';
+LowPro.CompatibleWithPrototype = '1.6';
 
-if (Prototype.Version != LowPro.CompatibleWithPrototype && 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();
@@ -71,7 +71,8 @@ DOM.Builder.fromHTML = function(html) {
 // Event.onReady(callbackFunction);
 Object.extend(Event, {
   onReady : function(f) {
-    document.observe('dom:loaded', f);
+    if (document.body) f();
+    else document.observe('dom:loaded', f);
   }
 });
 
@@ -96,7 +97,7 @@ Event.addBehavior = function(rules) {
     Ajax.Responders.register({
       onComplete : function() { 
         if (Event.addBehavior.reassignAfterAjax) 
-          setTimeout(function() { ab.unload(); ab.load(ab.rules) }, 10);
+          setTimeout(function() { ab.reload() }, 10);
       }
     });
     ab.responderApplied = true;
@@ -145,6 +146,12 @@ Object.extend(Event.addBehavior, {
     this.cache = [];
   },
   
+  reload: function() {
+    var ab = Event.addBehavior;
+    ab.unload(); 
+    ab.load(ab.rules);
+  },
+  
   _wrapObserver: function(observer) {
     return function(event) {
       if (observer.call(this, event) === false) event.stop(); 
@@ -277,7 +284,7 @@ Remote.Form = Behavior.create(Remote.Base, {
   onclick : function(e) {
     var sourceElement = e.element();
     
-    if (sourceElement.nodeName.toLowerCase() == 'input' && 
+    if (['input', 'button'].include(sourceElement.nodeName.toLowerCase()) && 
         sourceElement.type == 'submit')
       this._submitButton = sourceElement;
   },

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/stylesheets/application.css

@@ -53,7 +53,7 @@ input.file_upload {
 .actions {height: 100%; overflow:hidden; font-size: 11px;}
 
 .flash {
-	margin: 0px 40px; padding: 10px 30px; border-width: 2px 0;
+	margin: 0 40px 10px; padding: 10px 30px; border-width: 2px 0;
 	color: white;
 }
 .flash.notice {border: 1px solid #829862; background: #92ab6e; text-shadow: #728852 1px 1px 0;}
@@ -91,9 +91,12 @@ input.file_upload {
 .content-header, .content-body {padding-bottom: 15px;}
 .content-footer {padding-bottom: 20px;}
 
+.page-content { margin-top: 20px; }
+
 /* aside layout */
 body.aside-layout {width: 960px;}
-.aside-layout .page-content {height: 100%; overflow: hidden;}
+.aside-layout .page-content {height: 100%; overflow: hidden; margin-top: 0px;}
+.aside-layout .main-content {margin-top: 20px;}
 .main-content {float: left; width: 670px;}
 .aside {float: right; width: 220px; padding: 20px 30px; background: #E5E5E5;}
 .aside-content {
@@ -106,7 +109,7 @@ body.aside-layout {width: 960px;}
 .aside, .main-content {padding-bottom: 10000px; margin-bottom: -10000px;}
 
 
-.page-header {position: relative; margin: 20px 0; padding: 20px 0 0; color: white; background: black;}
+.page-header {position: relative; margin-top: 20px; padding: 20px 0 0; color: white; background: black;}
 .page-header h1 {
 	margin: 0; padding: 0 30px 30px; 
 	font-family: "Arial Black", Tahoma, Arial, sans-serif; font-size: 36px; letter-spacing: -1.5pt;
@@ -154,7 +157,6 @@ ul.main-nav {float: left; margin: 0 10px;}
 	float: left; 
 	margin-left: 0; padding-left: 20px; 
 	color: #ddd;
-	text-shadow: #444 1px 1px 0;
 	list-style: none;
 }
 .account-nav a {font-weight: bold;}
@@ -186,9 +188,9 @@ form .actions {margin: 30px 0; width: 100%; text-align: center;}
 .aside-content .collection {padding-bottom: 10px;}
 
 .content-header .creation-details, .content-header .primary-collection-count {font-size: 11px; line-height: 11px;}
-.content-header .creator {margin-right: 5px;}
+.content-header .creator {margin-right: 15px;}
 .content-header .created-at {color: #444;}
-.content-header .primary-collection-count {margin-left: 15px; font-weight: bold;}
+.content-header .primary-collection-count {font-weight: bold;}
 
 .new-in-collection-page .content-header h2 {margin-top: 6px; font-size: 14px;}
 .new-in-collection-page .content-header h2, .new-in-collection-page .content-header h2 a {color: #222;}
@@ -203,18 +205,21 @@ form .actions {margin: 30px 0; width: 100%; text-align: center;}
 /* styling of generic elements */
 .creator {font-weight: bold;}
 .card {
-	clear: both;
 	height: 100%; overflow: hidden;
-	margin-bottom: 5px;	padding:10px 20px; border: 1px solid #e8e8e8;
+	margin: 10px 0;	padding: 12px 20px; border: 1px solid #e8e8e8;
 	background: #f5f5f5;
 }
+.card h3 {margin-top: 0;}
 .card a {background: #f5f5f5;}
 .card .creation-details {
 	display: block; color: #333; font-size: 11px; 
 }
 .card .datetime {color: #666;}
+.card a.edit { float: right;}
+.card .delete-button { float: right;}
+div.ordering-handle { float: left; background: #ccc; color: white; margin-right: 5px; cursor: move; padding: 0 2px;}
 
-.card.content {
+.card.content.with-owner {
 	padding: 0; margin: 10px 0 30px; border: none;
 	background: none; 
 	font-size: 11px;
@@ -224,7 +229,7 @@ form .actions {margin: 30px 0; width: 100%; text-align: center;}
 	line-height: 14px;
 }
 .card.content .creation-details .created-at {display: block;}
-.card.content .content {
+.card.content.with-owner .content {
 	float: right; width: 72%;
 }
 ul.collection li {clear: both; margin-left: 0; list-style: none;}
@@ -256,11 +261,23 @@ ul.collection li {clear: both; margin-left: 0; list-style: none;}
 .table-plus table td {
 	padding: 6px 10px; border-bottom: 1px solid #e2e2e2; color: #666;
 }
-.table-plus table td input.button {padding: 1px; margin-left: 10px; }
+.table-plus table td input.button, .collection .button {padding: 1px 3px; margin-left: 10px; margin-top: 0;}
 .table-plus table td.controls {width: 100px;}
 .table-plus .even {background: #f8f8f8;}
 .table-plus a {background: none;}
 
+/* <select-many> */
+
+div.select-many {border-top: 1px dotted #999;}
+div.select-many .items {margin-bottom: 10px;}
+div.select-many .item {
+	overflow:hidden; height: 100%; font-weight: bold;
+	border-bottom: 1px dotted #999; padding: 5px 10px; /*margin: 5px 25px 5px 0;*/
+}
+div.select-many .item span { float: left; }
+div.select-many .item .remove-item { float: right; }
+
+
 /*******************************************************/
 /* these styles are for the generated front index page */
 /* you can delete them if you over-ride it             */
@@ -273,3 +290,4 @@ ul.collection li {clear: both; margin-left: 0; list-style: none;}
 	font-size: 18px; line-height: 27px;
 }
 .front-page .content-body li {margin-left: 0; list-style: none;}
+

data/hobo_files/plugin/generators/hobo_user_model/templates/model.rb

@@ -1,6 +1,6 @@
 class <%= class_name %> < ActiveRecord::Base
 
-  hobo_user_model
+  hobo_user_model # Don't put anything above this
 
   fields do
     username :string, :login => true, :name => true
@@ -17,7 +17,7 @@ class <%= class_name %> < ActiveRecord::Base
   # def super_user?; true; end
 
   def creatable_by?(creator)
-    true
+    creator.administrator? || !administrator
   end
 
   def updatable_by?(updater, new)

data/hobo_files/plugin/init.rb

@@ -5,7 +5,6 @@ require 'hobosupport'
 HoboFields
 
 # Monkey patches, ooh ooh
-require 'rexml'
 require 'active_record/has_many_association'
 require 'active_record/has_many_through_association'
 require 'active_record/association_proxy'

data/hobo_files/plugin/lib/active_record/has_many_association.rb

@@ -28,14 +28,17 @@ module ActiveRecord::Associations
       proxy_reflection.klass
     end
     
+    
     def origin
       proxy_owner
     end
 
+    
     def origin_attribute
       proxy_reflection.association_name
     end
     
+    
     private
     
     def set_reverse_association(object)

data/hobo_files/plugin/lib/hobo.rb

@@ -171,9 +171,13 @@ module Hobo
       if object.is_a?(Class) and object < ActiveRecord::Base
         object = object.new
         object.set_creator(person)
-      elsif Hobo.simple_has_many_association?(object)
-        object = object.new
-        object.set_creator(person)
+      elsif (refl = object.try.proxy_reflection) && refl.macro == :has_many
+        if Hobo.simple_has_many_association?(object)
+          object = object.new
+          object.set_creator(person)
+        else
+          return false
+        end
       end
       check_permission(:create, person, object)
     end
@@ -210,13 +214,13 @@ module Hobo
           object.send("#{field}_editable_by?", person)
         elsif object.has_hobo_method?(:editable_by?)
           check_permission(:edit, person, object)
+        elsif refl._?.macro == :has_many
+          # The below technique to figure out edit permission based on
+          # update permission doesn't work for has_many associations
+          false
         else
           # Fake an edit test by setting the field in question to
           # Hobo::Undefined and then testing for update permission
-          
-          # This technique is not suitable for has_many associations
-          return false if refl._?.macro == :has_many
-          
           current = object.send(field)
           new = object.duplicate
 
@@ -333,7 +337,7 @@ module Hobo
                    when :edit;   :editable_by?
                    when :view;   :viewable_by?
                    end
-      p = if object.has_hobo_method?(obj_method)
+      p = if (obj_method.respond_to?(:has_hobo_method) ? object.has_hobo_method?(obj_method) : object.respond_to?(obj_method))
             begin
               object.send(obj_method, person, *args)
             rescue Hobo::UndefinedAccessError

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

@@ -167,7 +167,7 @@ module ::Hobo
     def create_controllers
       bundle = self
       self.class.controller_declarations.each do |model_name, block|
-        klass = make_class("#{new_name_for(model_name).to_s.pluralize}Controller", ApplicationController) do 
+        klass = make_class("#{new_name_for(model_name).to_s.pluralize}Controller", ::ApplicationController) do 
           hobo_model_controller
         end
         klass.class_eval(&block)

data/hobo_files/plugin/lib/hobo/dryml/dryml_builder.rb

@@ -54,7 +54,7 @@ module Hobo::Dryml
       ("def render_page(__page_this__, __local_assigns__); " +
             "#{locals} new_object_context(__page_this__) do " +
             src +
-           "; _erbout; end + part_contexts_storage_tag; end")
+           "; _erbout; end; end")
     end
     
     

data/hobo_files/plugin/lib/hobo/dryml/parser/attribute.rb

@@ -0,0 +1,41 @@
+module Hobo::Dryml::Parser
+  
+  class Attribute < REXML::Attribute
+    
+    def initialize(first, second=nil, parent=nil)
+      super
+      if first.is_a?(String) && second == true
+        @value = true
+      end
+    end
+    
+    def value
+      if has_rhs?
+        super
+      else
+        element.document.default_attribute_value
+      end
+    end
+
+    def to_string
+      if has_rhs?
+        super
+      else
+        @expanded_name
+      end
+    end
+    
+    def has_rhs?
+      @value != true
+    end
+
+    
+    # Override to supress Text.check call
+    def element=( element )
+      @element = element
+      self
+    end
+    
+  end
+
+end

data/hobo_files/plugin/lib/hobo/dryml/parser/base_parser.rb

@@ -0,0 +1,253 @@
+module Hobo::Dryml::Parser
+  
+  class BaseParser < REXML::Parsers::BaseParser
+    
+    REX_3_1_7_1 = REXML::VERSION == "3.1.7.1"
+    
+    DRYML_NAME_STR          = "#{NCNAME_STR}(?::(?:#{NCNAME_STR})?)?"
+    DRYML_ATTRIBUTE_PATTERN = if REX_3_1_7_1
+                                /\s*(#{NAME_STR})(?:\s*=\s*(["'])(.*?)\2)?/um
+                              else
+                                /\s*(#{NAME_STR})(?:\s*=\s*(["'])(.*?)\4)?/um
+                              end
+    DRYML_TAG_MATCH         = if REX_3_1_7_1
+                                /^<((?>#{DRYML_NAME_STR}))\s*((?>\s+#{NAME_STR}(?:\s*=\s*(["']).*?\3)?)*)\s*(\/)?>/um
+                              else
+                                /^<((?>#{DRYML_NAME_STR}))\s*((?>\s+#{NAME_STR}(?:\s*=\s*(["']).*?\5)?)*)\s*(\/)?>/um
+                              end
+    DRYML_CLOSE_MATCH       = /^\s*<\/(#{DRYML_NAME_STR})\s*>/um
+    
+    # For compatibility with REXML 3.1.7.3
+    IDENTITY = /^([!\*\w\-]+)(\s+#{NCNAME_STR})?(\s+["'](.*?)['"])?(\s+['"](.*?)["'])?/u 
+    
+    def pull
+      if @closed
+        x, @closed = @closed, nil
+        return [ :end_element, x, false ]
+      end
+      return [ :end_document ] if empty?
+      return @stack.shift if @stack.size > 0
+      #STDERR.puts @source.encoding
+      @source.read if @source.buffer.size<2
+      #STDERR.puts "BUFFER = #{@source.buffer.inspect}"
+      if @document_status == nil
+        #@source.consume( /^\s*/um )
+        word = @source.match( /^((?:\s+)|(?:<[^>]*>))/um ) #word = @source.match(/(<[^>]*)>/um)
+        word = word[1] unless word.nil?
+        #STDERR.puts "WORD = #{word.inspect}"
+        case word
+        when COMMENT_START
+          return [ :comment, @source.match( COMMENT_PATTERN, true )[1] ]
+        when XMLDECL_START
+          #STDERR.puts "XMLDECL"
+          results = @source.match( XMLDECL_PATTERN, true )[1]
+          version = VERSION.match( results )
+          version = version[1] unless version.nil?
+          encoding = ENCODING.match(results)
+          encoding = encoding[1] unless encoding.nil?
+          @source.encoding = encoding
+          standalone = STANDALONE.match(results)
+          standalone = standalone[1] unless standalone.nil?
+          return [ :xmldecl, version, encoding, standalone ]
+        when INSTRUCTION_START
+          return [ :processing_instruction, *@source.match(INSTRUCTION_PATTERN, true)[1,2] ]
+        when DOCTYPE_START
+          md = @source.match( DOCTYPE_PATTERN, true )
+          #@nsstack.unshift(curr_ns=Set.new)
+          identity = md[1]
+          close = md[2]
+          identity =~ IDENTITY
+          name = $1
+          raise REXML::ParseException.new("DOCTYPE is missing a name") if name.nil?
+          pub_sys = $2.nil? ? nil : $2.strip
+          long_name = $4.nil? ? nil : $4.strip
+          uri = $6.nil? ? nil : $6.strip
+          args = [ :start_doctype, name, pub_sys, long_name, uri ]
+          if close == ">"
+            @document_status = :after_doctype
+            @source.read if @source.buffer.size<2
+            md = @source.match(/^\s*/um, true)
+            @stack << [ :end_doctype ]
+          else
+            @document_status = :in_doctype
+          end
+          return args
+        when /^\s+/
+        else
+          @document_status = :after_doctype
+          @source.read if @source.buffer.size<2
+          md = @source.match(/\s*/um, true)
+          if @source.encoding == "UTF-8"
+            if @source.buffer.respond_to? :force_encoding
+              @source.buffer.force_encoding(Encoding::UTF_8)
+            end
+          end
+        end
+      end
+      if @document_status == :in_doctype
+        md = @source.match(/\s*(.*?>)/um)
+        case md[1]
+        when SYSTEMENTITY 
+          match = @source.match( SYSTEMENTITY, true )[1]
+          return [ :externalentity, match ]
+
+        when ELEMENTDECL_START
+          return [ :elementdecl, @source.match( ELEMENTDECL_PATTERN, true )[1] ]
+
+        when ENTITY_START
+          match = @source.match( ENTITYDECL, true ).to_a.compact
+          match[0] = :entitydecl
+          ref = false
+          if match[1] == '%'
+            ref = true
+            match.delete_at 1
+          end
+          # Now we have to sort out what kind of entity reference this is
+          if match[2] == 'SYSTEM'
+            # External reference
+            match[3] = match[3][1..-2] # PUBID
+            match.delete_at(4) if match.size > 4 # Chop out NDATA decl
+            # match is [ :entity, name, SYSTEM, pubid(, ndata)? ]
+          elsif match[2] == 'PUBLIC'
+            # External reference
+            match[3] = match[3][1..-2] # PUBID
+            match[4] = match[4][1..-2] # HREF
+            # match is [ :entity, name, PUBLIC, pubid, href ]
+          else
+            match[2] = match[2][1..-2]
+            match.pop if match.size == 4
+            # match is [ :entity, name, value ]
+          end
+          match << '%' if ref
+          return match
+        when ATTLISTDECL_START
+          md = @source.match( ATTLISTDECL_PATTERN, true )
+          raise REXML::ParseException.new( "Bad ATTLIST declaration!", @source ) if md.nil?
+          element = md[1]
+          contents = md[0]
+
+          pairs = {}
+          values = md[0].scan( ATTDEF_RE )
+          values.each do |attdef|
+            unless attdef[3] == "#IMPLIED"
+              attdef.compact!
+              val = attdef[3]
+              val = attdef[4] if val == "#FIXED "
+              pairs[attdef[0]] = val
+              if attdef[0] =~ /^xmlns:(.*)/
+                #@nsstack[0] << $1
+              end
+            end
+          end
+          return [ :attlistdecl, element, pairs, contents ]
+        when NOTATIONDECL_START
+          md = nil
+          if @source.match( PUBLIC )
+            md = @source.match( PUBLIC, true )
+            vals = [md[1],md[2],md[4],md[6]]
+          elsif @source.match( SYSTEM )
+            md = @source.match( SYSTEM, true )
+            vals = [md[1],md[2],nil,md[4]]
+          else
+            raise REXML::ParseException.new( "error parsing notation: no matching pattern", @source )
+          end
+          return [ :notationdecl, *vals ]
+        when CDATA_END
+          @document_status = :after_doctype
+          @source.match( CDATA_END, true )
+          return [ :end_doctype ]
+        end
+      end
+      begin
+        if @source.buffer[0] == ?<
+          if @source.buffer[1] == ?/
+            #@nsstack.shift
+            last_tag, line_no = @tags.pop
+            #md = @source.match_to_consume( '>', CLOSE_MATCH)
+            md = @source.match(DRYML_CLOSE_MATCH, true)
+            
+            valid_end_tag = last_tag =~ /^#{Regexp.escape(md[1])}(:.*)?/
+            raise REXML::ParseException.new( "Missing end tag for "+
+                                             "'#{last_tag}' (line #{line_no}) (got \"#{md[1]}\")", 
+                                             @source) unless valid_end_tag
+            return [ :end_element, last_tag, true ]
+          elsif @source.buffer[1] == ?!
+            md = @source.match(/\A(\s*[^>]*>)/um)
+            #STDERR.puts "SOURCE BUFFER = #{source.buffer}, #{source.buffer.size}"
+            raise REXML::ParseException.new("Malformed node", @source) unless md
+            if md[0][2] == ?-
+              md = @source.match( COMMENT_PATTERN, true )
+
+              case md[1]
+              when /--/, /-$/
+                raise REXML::ParseException.new("Malformed comment", @source)
+              end
+
+              return [ :comment, md[1] ] if md
+            else
+              md = @source.match( CDATA_PATTERN, true )
+              return [ :cdata, md[1] ] if md
+            end
+            raise REXML::ParseException.new( "Declarations can only occur "+
+                                             "in the doctype declaration.", @source)
+          elsif @source.buffer[1] == ??
+            md = @source.match( INSTRUCTION_PATTERN, true )
+            return [ :processing_instruction, md[1], md[2] ] if md
+            raise REXML::ParseException.new( "Bad instruction declaration",
+                                             @source)
+          else
+            # Get the next tag
+            md = @source.match(DRYML_TAG_MATCH, true)
+            unless md
+              # Check for missing attribute quotes
+              raise REXML::ParseException.new("missing attribute quote", @source) if @source.match(MISSING_ATTRIBUTE_QUOTES )
+              raise REXML::ParseException.new("malformed XML: missing tag start", @source) 
+              
+            end
+            attributes = {}
+            #@nsstack.unshift(curr_ns=Set.new)
+            if md[2].size > 0
+              attrs = md[2].scan(DRYML_ATTRIBUTE_PATTERN)
+              raise REXML::ParseException.new( "error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"", @source) if $' and $'.strip.size > 0
+              attrs.each { |a,b,c,d,e| 
+                val = REX_3_1_7_1 ? c : e
+                if attributes.has_key? a
+                  msg = "Duplicate attribute #{a.inspect}"
+                  raise REXML::ParseException.new( msg, @source, self)
+                end
+                attributes[a] = val || true
+              }
+            end
+            
+            if md[REX_3_1_7_1 ? 4 : 6]
+              @closed = md[1]
+              #@nsstack.shift
+            else
+              cl = @source.current_line
+              @tags.push( [md[1], cl && cl[2]] )
+            end
+            return [ :start_element, md[1], attributes, md[0],
+                     @source.respond_to?(:last_match_offset) && @source.last_match_offset ]
+          end
+        else
+          md = @source.match( TEXT_PATTERN, true )
+          if md[0].length == 0
+            @source.match( /(\s+)/, true )
+          end
+          #STDERR.puts "GOT #{md[1].inspect}" unless md[0].length == 0
+          #return [ :text, "" ] if md[0].length == 0
+          # unnormalized = Text::unnormalize( md[1], self )
+          # return PullEvent.new( :text, md[1], unnormalized )
+          return [ :text, md[1] ]
+        end
+      rescue REXML::ParseException
+        raise
+      rescue Exception, NameError => error
+        raise REXML::ParseException.new( "Exception parsing",
+                                         @source, self, (error ? error : $!) )
+      end
+      return [ :dummy ]
+    end
+  end
+  
+end