hobo 0.8.5 → 0.8.6

data/lib/hobo/permissions/associations.rb

@@ -33,7 +33,7 @@ module Hobo
           # and record in question are Hobo models
           def nullify_keys(records)
             if (user = acting_user)
-              records.each { |r| r.user_changes!(user, @reflection.primary_key_name => nil) if r.is_a?(Hobo::Model) }
+              records.each { |r| r.user_update_attributes!(user, @reflection.primary_key_name => nil) if r.is_a?(Hobo::Model) }
             end
 
             # Normal ActiveRecord implementatin

data/lib/hobo/scopes/association_proxy_extensions.rb

@@ -30,16 +30,15 @@ module Hobo
 
     HasManyThroughAssociationExtensions = classy_module do
 
-      def conditions_with_hobo_scopes
+      def build_conditions_with_hobo_scopes
         scope_conditions         = self.scope_conditions(@reflection)
         through_scope_conditions = self.scope_conditions(@reflection.through_reflection)
-        unscoped_conditions = conditions_without_hobo_scopes
+        unscoped_conditions = build_conditions_without_hobo_scopes
         combine_conditions(scope_conditions, through_scope_conditions, unscoped_conditions)
       end
-      alias_method_chain :conditions, :hobo_scopes
-      alias_method :sql_conditions, :conditions
-      public :conditions, :sql_conditions
-
+      alias_method_chain :build_conditions, :hobo_scopes
+      public :conditions
+      
     end
     
     AssociationCollectionExtensions = classy_module do

data/lib/hobo/scopes/automatic_scopes.rb

@@ -7,9 +7,12 @@ module Hobo
       def create_automatic_scope(name)
         ScopeBuilder.new(self, name).create_scope
       rescue ActiveRecord::StatementInvalid => e
-        # Problem with the database? Don't try to create automatic scopes
-        ActiveRecord::Base.logger.warn "!! Database exception during hobo auto-scope creation -- continuing automatic scopes"
-        ActiveRecord::Base.logger.warn "!! #{e.to_s}"
+        # Problem with the database? Don't try to create automatic
+        # scopes
+        if ActiveRecord::Base.logger
+          ActiveRecord::Base.logger.warn "!! Database exception during hobo auto-scope creation -- continuing automatic scopes"
+          ActiveRecord::Base.logger.warn "!! #{e.to_s}"
+        end
         false
       end
 
@@ -196,7 +199,7 @@ module Hobo
           end
 
          # active (a lifecycle state)
-        elsif @klass.has_lifecycle? && name.in?(@klass::Lifecycle.state_names)
+        elsif @klass.has_lifecycle? && name.to_sym.in?(@klass::Lifecycle.state_names)
 
           if @klass::Lifecycle.state_names.length == 1
             # nothing to check for - create a dummy scope

data/lib/hobo/tasks/rails.rb

@@ -0,0 +1,4 @@
+# This file is used to load the Hobo rake tasks when running Hobo as a gem
+
+tasks_home = File.join File.dirname(__FILE__), "..", "..", "..", "tasks"
+Dir["#{tasks_home}/**/*.rake"].sort.each { |ext| load ext }

data/lib/hobo/user.rb

@@ -39,7 +39,6 @@ module Hobo
         # Virtual attributes for setting and changing the password
         attr_accessor :current_password, :password, :password_confirmation, :type => :password
 
-
         before_save :encrypt_password
 
         never_show *AUTHENTICATION_FIELDS

data/lib/hobo/user_controller.rb

@@ -92,7 +92,9 @@ module Hobo
           flash[:notice] << " 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?
-                                self.current_user = this if this.account_active?
+                                if this.account_active?
+                                  self.current_user = this if this.account_active?
+                                end
                                 redirect_back_or_default(home_page)
                               end
       end

data/lib/hobo/view_hints.rb

@@ -7,16 +7,22 @@ module Hobo
     end
   
     def self.setter(name, default=nil, &block)
+      ivname = name.to_s.remove(/\?$/)
       metaclass.send :define_method, name do |*args|
         if args.empty?
-          instance_variable_get("@#{name}") || (default.is_a?(Proc) ? instance_eval(&default) : default)
+          val = instance_variable_get("@#{ivname}")
+          if val.nil?
+            val = default.is_a?(Proc) ? instance_eval(&default) : default
+            instance_variable_set("@#{ivname}", val)
+          end
+          val
         else 
           arg = if block
                   block[*args] 
                 else
                   args.first
                 end
-          instance_variable_set("@#{name}", arg)
+          instance_variable_set("@#{ivname}", arg)
         end
       end
     end
@@ -31,13 +37,21 @@ module Hobo
       args
     end
     
+    setter :paginate?,    proc { !sortable? }
+    
+    setter :sortable?,    proc { defined?(ActiveRecord::Acts::List::InstanceMethods) && 
+                                 model < ActiveRecord::Acts::List::InstanceMethods &&
+                                 model.new.try.scope_condition == "1 = 1" }
+
+    
     # Accessors
     
     class << self
       
       def model
-        model_name.constantize
+        @model ||= name.sub(/Hints$/, "").constantize
       end
+        
 
       def field_name(field)
         field_names.fetch(field.to_sym, field.to_s.titleize)

data/rails_generators/hobo/hobo_generator.rb

@@ -3,6 +3,7 @@ class HoboGenerator < Rails::Generator::Base
   def manifest
     if options[:add_gem]
       add_to_file "config/environment.rb", "Rails::Initializer.run do |config|", "  config.gem 'hobo'\n"
+      add_to_file "Rakefile", "require 'tasks/rails'", "\nrequire 'hobo/tasks/rails'"
     end
     
     if options[:add_routes]

data/rails_generators/hobo_front_controller/templates/functional_test.rb

@@ -1,16 +1,6 @@
 require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
-require '<%= file_path %>_controller'
-
-# Re-raise errors caught by the controller.
-class <%= class_name %>Controller; def rescue_action(e) raise e end; end
-
-class <%= class_name %>ControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = <%= class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
 
+class <%= class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/rails_generators/hobo_front_controller/templates/index.dryml

@@ -13,12 +13,7 @@
       </section>
     </header>
 
-    <section class="content-body" repeat="&front_models">
-      <div class="model">
-        <h3><type-name plural/></h3>
-        <collection:recent/>
-        <p if="&can_create? && linkable?(:new)">Create a <a to="&this" action="new"/>.</p>
-      </div>
+    <section class="content-body">
     </section>
   </content:>
   

data/rails_generators/hobo_rapid/hobo_rapid_generator.rb

@@ -13,6 +13,7 @@ class HoboRapidGenerator < Hobo::Generator
       m.file "hobo-rapid.js",      "public/javascripts/hobo-rapid.js"
       m.file "lowpro.js",          "public/javascripts/lowpro.js"
       m.file "IE7.js",             "public/javascripts/IE7.js"
+      m.file "ie7-recalc.js",      "public/javascripts/ie7-recalc.js"
       m.file "blank.gif",          "public/javascripts/blank.gif"
       m.file "reset.css",          "public/stylesheets/reset.css"
       m.file "hobo-rapid.css",     "public/stylesheets/hobo-rapid.css"

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

@@ -1,12 +1,12 @@
 /**** Default styling for Rapid ****/
 
 #ajax_progress {
-    color: grey;
+    color: gray;
     float: right;
     margin: 20px;
     position: fixed;
     background: white;
-    font-family: Tahoma "sans serif";
+    font-family: tahoma, sans-serif;
     display: none;
     z-index: 10;
 }
@@ -32,6 +32,7 @@ div.completions_popup {
     border:1px solid #888;
     margin:0px;
     padding:0px;
+    z-index:100;
 }
 div.completions_popup ul {
     list-style-type:none;

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

@@ -380,9 +380,10 @@ var Hobo = {
         }
         if (e = $('ajax-progress')) {
             if (nextTo) {
-                var pos = $(nextTo).cumulativeOffset()
-                e.style.top = pos.top - nextTo.offsetHeight + "px"
-                e.style.left = (pos.left + nextTo.offsetWidth + 5) + "px"
+                var e_nextTo = $(nextTo);
+                var pos = e_nextTo.cumulativeOffset()
+                e.style.top = pos.top - e_nextTo.offsetHeight + "px"
+                e.style.left = (pos.left + e_nextTo.offsetWidth + 5) + "px"
             }
             e.style.display = "block";
         }
@@ -569,13 +570,16 @@ new HoboBehavior("ul.input-many", {
       this.updateButtons()
       this.updateInputNames()
       
+      ul.fire("rapid:add", { element: newItem })
+      ul.fire("rapid:change", { element: newItem })
+      
       new Effect.BlindDown(newItem, {duration: 0.3})
   },
   
   removeOne: function(ev, el) {
       Event.stop(ev)
       var self = this;
-      var li = el.up('li')
+      var ul = el.up('ul'), li = el.up('li')
       if (li.parentNode.childElements().length == 1) {
           // It's the last one - don't remove it, just clear it
           this.clearInputs(li)
@@ -586,11 +590,15 @@ new HoboBehavior("ul.input-many", {
               self.updateInputNames()
           } });
       }
+      ul.fire("rapid:remove")
+      ul.fire("rapid:change")
   },
+
   
   clearInputs: function(item) {
-      $(item).select('input').each(function(input){
-          if (input.getAttribute('type').toLowerCase() == 'hidden') {
+      $(item).select('input,select,textarea').each(function(input){
+          t = input.getAttribute('type')
+          if (t && t.match(/hidden/i)) {
               input.remove()
           } else {
               input.value = ""
@@ -603,15 +611,15 @@ new HoboBehavior("ul.input-many", {
       var addButton    = "<button class='add-item'>+</button>"
 
       var ul = this.element
-      if (ul.childElements().length == 1) {
-          ul.down('li').down('div.buttons').innerHTML = removeButton + ' ' + 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
+      var children = ul.childElements();
+      // assumption: only get here after add or remove, so only second last button needs the "+" removed
+      if(children.length > 1) {
+          // cannot use .down() because that's a depth-first search.  Did I mention that I hate Prototype?
+          children[children.length-2].childElements().last().innerHTML = removeButton;
+      }
+      if(children.length > 0) {
+          children[children.length-1].childElements().last().innerHTML = removeButton + ' ' + addButton;
       }
-      
       Event.addBehavior.reload()
   },
   
@@ -720,6 +728,7 @@ AutocompleteBehavior = Behavior.create({
 
 
 
+Event.addBehavior.reassignAfterAjax = true;
 Event.addBehavior({
     
     'div.section-group' : function() {
@@ -746,7 +755,7 @@ 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' :
+    '.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 (ev) {
 
          var ipe = Hobo._makeInPlaceEditor(this)

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

@@ -56,6 +56,10 @@ a:hover {
 }
 h1 a, h2 a, h3 a {border: none; background: none;}
 
+pre, code {
+    font-family:  "Courier New", Courier, monospace;
+}
+
 input.text, input.string, input.email-address, input.password, input.search, input.integer, input.float, textarea {
 	border-top:1px solid #7c7c7c;
 	border-left:1px solid #c3c3c3;
@@ -77,7 +81,7 @@ input.file_upload {
 	margin-top: 10px;
 }
 .button:hover {cursor: pointer;}
-form .actions {height: 100%; overflow: hidden; font-size: 11px;}
+form .actions {_zoom: 1; overflow: hidden; font-size: 11px;}
 form .actions input { margin: 0; }
 
 .flash {
@@ -107,7 +111,7 @@ form .actions input { margin: 0; }
 	padding: 8px 20px 8px 40px;
 	border: 1px solid #444;
 	background: black url(../images/spinner.gif) no-repeat 10px 8px;
-	
+	color: white;
 }
 
 .article {margin: 20px 0; border-top: 1px dotted #ccc;}
@@ -121,9 +125,9 @@ form .actions input { margin: 0; }
 .content-body {padding: 15px 0;}
 .content-footer {padding-bottom: 20px;}
 
-.page-header {position: relative; margin-top: 25px; padding: 20px 0 0;}
+.page-header {margin-top: 25px; padding: 0 0 0;}
 .page-header h1 {
-	margin: 0; padding: 0 30px 30px; 
+	margin: 0; padding: 20px 30px 30px; 
 	font-family: "Arial Black", Tahoma, Arial, sans-serif; font-size: 36px; letter-spacing: -1.5pt;
 }
 .page-header ul {zoom: 1; overflow: hidden;}
@@ -136,9 +140,9 @@ form .actions input { margin: 0; }
  {border: none; color: white; background: none;}
 
 .page-header div.search {
-	position: absolute; top: 10px; right: 5px;
-	padding: 6px 30px 8px 15px; 
-}
+ 	float: right;
+ 	padding: 0 30px 8px 15px; 
+ }
 .page-header div.search label {
 	padding-right: 10px; 
 	font: bold 9px Arial, sans-serif; text-transform: uppercase; letter-spacing: 1.0pt;
@@ -164,7 +168,8 @@ form .actions input { margin: 0; }
 }
 
 .account-nav {
-	position: absolute; top: -20px; right: 35px;
+    float:right;
+    margin: -22px 5px 0 0;
 	font-size: 11px;
 }
 .account-nav li {
@@ -196,7 +201,7 @@ form .actions input { margin: 0; }
 .login-page .content-header { position: relative; }
 .login-page .forgot-password {font-size: 11px; margin-left: 160px;}
 
-.edit-page .content-header {overflow: hidden; height: 100%;}
+.edit-page .content-header {overflow: hidden; _zoom: 1;}
 .edit-page .content-header h1 {float: left;}
 .edit-page .content-header .delete-button {float: right; margin-top: 25px;}
 form .actions {margin: 30px 0; width: 100%; text-align: center;}
@@ -221,7 +226,7 @@ form .actions {margin: 30px 0; width: 100%; text-align: center;}
 /* styling of generic elements */
 .creator {font-weight: bold;}
 .card {
-	height: 100%; overflow: hidden;
+	overflow: hidden; _zoom: 1;
 	margin: 10px 0;	padding: 12px; border: 1px solid #e8e8e8;
 	background: #f5f5f5;
 	position: relative;
@@ -257,7 +262,7 @@ ul.collection > li { margin-left: 0; list-style: none;}
 	padding: 15px 0; margin-bottom: 20px; border-bottom: 1px dotted #888;
 }
 
-.table-plus .header {height: 100%; overflow: hidden;}
+.table-plus .header {_zoom: 1; overflow: hidden;}
 .table-plus .header a {float: left; margin-right: 20px;}
 .table-plus div.search {float: right;}
 .table-plus div.search span {color: #444;}
@@ -284,7 +289,7 @@ ul.collection > li { margin-left: 0; list-style: none;}
 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;
+	overflow:hidden; _zoom: 1; font-weight: bold;
 	border-bottom: 1px dotted #999; padding: 5px 10px; /*margin: 5px 25px 5px 0;*/
 }
 div.select-many .item span { float: left; }

data/rails_generators/hobo_rapid/templates/themes/clean/public/stylesheets/rapid-ui.css

@@ -87,5 +87,9 @@ textarea.tall { height: 350px; }
 
 .field-list input.percentage {width: 25px; display: inline; margin-right: 5px; padding: 1px 3px;}
 
-select.dev-user-changer { opacity: 0.3; position: absolute; top: -22px; left: 0; }
-select.dev-user-changer:hover { opacity: 1; }
+select.dev-user-changer { opacity: 0.3; }
+select.dev-user-changer:hover { opacity: 1; }
+
+.part-wrapper {
+    display: inline;  /* don't mess up layout when wrapping something */
+}

data/rails_generators/hobo_rapid/templates/themes/clean/views/clean.dryml

@@ -4,7 +4,7 @@
       <stylesheet name="reset"/>
       <theme-stylesheet/>
       <theme-stylesheet name="rapid-ui"/>
-      <stylesheet name="application"/>
-    </stylesheets>
+      <stylesheet name="application" param="app-stylesheet"/>
+    </stylesheets:>
   </old-page>
 </extend>  

data/rails_generators/hobo_user_model/templates/forgot_password.erb

@@ -1,10 +1,10 @@
 <%%= @user %>,
 
-If you have forgotten your password for <%%= @app_name %>, you can chose
+If you have forgotten your password for <%%= @app_name %>, you can choose
 a new one by clicking on this link:
 
   <%%= <%= name -%>_reset_password_url :host => @host, :id => @user, :key => @key %>
 
-Thanks very much,
+Thank you,
 
 The <%%= @app_name %> team.

data/rails_generators/hobo_user_model/templates/model.rb

@@ -11,7 +11,7 @@ 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 count == 0 }
+  before_create { |user| user.administrator = true if RAILS_ENV != "test" && count == 0 }
   
   
   # --- Signup lifecycle --- #
@@ -29,7 +29,7 @@ class <%= class_name %> < ActiveRecord::Base
     end
 
     transition :reset_password, { :active => :active }, :available_to => :key_holder,
-               :update => [ :password, :password_confirmation ]
+               :params => [ :password, :password_confirmation ]
 
   end
   

data/taglibs/rapid.dryml

@@ -1,8 +1,9 @@
 <!--
 
 The Rapid tag library makes web development go fast. The Rapid tag library is your friend.  
-  
-(This taglib defines no tags - it just includes all the other taglibs. More along. Nothing to see here.)
+
+(This taglib defines no tags - it just includes all the other taglibs. Move along. Nothing to see here.)
+
 -->
 
 <include module="Hobo::RapidHelper"/>