hobo 0.6 → 0.6.1

data/bin/hobo

@@ -86,10 +86,9 @@ Dir.chdir(app_path) do
   if user_model
     puts "\nCreating #{user_model} model and controller...\n"
     command("#{gen} hobo_user_model #{user_model}")
-    command("#{gen} hobo_model_controller #{user_model}")
+    command("#{gen} hobo_user_controller #{user_model}")
   end
   
   puts "\nCreating standard pages...\n"
-  command("#{gen} hobo_front_controller front " +
-          "#{'--no-user' unless user_model} --delete-index --add-routes")
+  command("#{gen} hobo_front_controller front --delete-index --add-routes")
 end

data/hobo_files/plugin/CHANGES.txt

@@ -1,3 +1,142 @@
+=== Release 0.6.1 ===
+
+Multiple user models
+
+  Hobo now supports multiple user models, with independent sign-up /
+  log-in/out for each. 
+
+  The controller needs to declare hobo_user_controller instead of
+  hobo_model_controller (it still has all the hobo_model_controller
+  features). e.g.
+
+    class AdminsController; hobo_user_controller; end
+
+    Hobo routing will automatically give you
+
+      /admin_login
+      /admin_logout
+      /admin_signup
+
+    Note this controller will now filter loggin of passwords.
+
+  The model needs to include Hobo::AuthenticatedUser and declare a
+  login attribute with, e.g.
+
+    set_login_attr :email
+
+  The hobo_front_controller generator no longer generates anything
+  related to users - it's now just the fron page and search page.
+
+  There is a new hobo_user_model generator to create these
+  controllers.
+
+  The global value Hobo.user_model is gone
+
+  Rapid now has <LoginPage> and <SignupPage> templates. They're not so
+  customisable just now but you can of course replace them completely
+  with your own views.
+
+
+Misc fixes
+
+  Search was broken
+
+  The 'hobo' command tried to connect to the DB, which was a problem
+  as you'd had no chance to configure database.yml
+
+
+Rapid
+
+  Fix: reset_form and refocus form options
+
+  <Table> now supports @fields, allowing you to give a bunch of field
+  names and automatically have a table with a column for each of those
+  fields. There's also a <controls> param that can be used to have a
+  delete button and edit link on each row. As usual there's a ton of
+  customisation options - see the source.
+
+  <human_type> is now <type_name> and takes flags @plural and @lowercase
+
+  <editor> and <input> have better automatic css classes
+
+  Restored old behaviour where <page_nav/> would display nothing when
+  there's only one page.
+
+  Finally created <EditPage>
+
+  Small cleanups in the rapid pages
+
+  New tag <with_field_names/> used in <Table> to iterate over the
+  column headings.
+
+  <view> for Time objects now supports @format - a strftime style
+  format string.
+
+
+
+Migration generator
+
+  Fix: Edge Rails now dumps out in sexy format, which was freaking the
+  migration generator.
+
+  You can now configure the generator to completely ignore specified
+  tables and models. In environment.rb do
+
+    Hobo::Migrations.ignore = %w(red_fish blue_fish)
+
+    That will ignore the models RedFish and BlueFish, and the tables
+    red_fishes and blue_fishes
+
+    To ignore just tables, assign an array of their names to
+
+      Hobo::Migrations.ignore_tables
+
+    To ignore just models, assign an array of the class names to 
+
+      Hobo::Migrations.ignore_models
+
+New secure ajax parts mechanism
+
+  The new mechanism stores the part state in a base 64 encoded string,
+  complete with an SHA1 (by default) digest, so malicious tampering
+  with the part state is prevented.
+
+  Parts can now capture the state of local variables along with the
+  DRYML context. Give a list of locals you wish to capture in the
+  'part_locals' attribute. e.g.
+
+    <div part="my_part" part_locals="a, b"> ... </div>
+
+  (the inability to do this was a serious limitation of the previous
+  mechanism)
+
+
+Core extensions
+
+  Added Methodphitamine and removed omap, oselect, ofind, oany oall.
+
+    See http://jicksta.com/articles/2007/08/04/the-methodphitamine
+
+
+DRYML
+
+  merge_attrs fixed to not complain about nils
+
+  Fix: css classes were not accumulated in some template parameter
+  situations
+
+
+Hobo module
+
+  #type_name renamed to #type_id
+
+  #object_from_dom_id will now return classes when the id has no, er, id. As in
+
+    Hobo.object_from_dom_id("blog_post") #=> BlogPost
+
+  Similarly, #dom_id generates those kind of ID for classes
+
+
 === Release 0.6 ===
 
 DRYML

data/hobo_files/plugin/generators/hobo_front_controller/hobo_front_controller_generator.rb

@@ -34,7 +34,7 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
                  File.join('app/helpers', class_path, "#{file_name}_helper.rb"))
 
 
-      pages = options[:no_user] ? %w{index search} : %w{index search login signup}
+      pages = options[:no_user] ? %w{index search} : %w{index search}
       for page in pages
         m.template("#{page}.dryml", File.join('app/views', class_path, file_name, "#{page}.dryml"))
       end
@@ -51,11 +51,6 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
 
     route = ("  map.search  'search', :controller => '#{name}', :action => 'search'\n" +
              "  map.homepage '', :controller => '#{name}', :action => 'index'")
-    unless options[:no_user]
-      route += ("\n  map.login   'login',  :controller => '#{name}', :action => 'login'\n" +
-                "  map.logout  'logout',  :controller => '#{name}', :action => 'logout'\n" +
-                "  map.signup  'signup', :controller => '#{name}', :action => 'signup'")
-    end
 
     route_src = File.read(routes_path)
     return if route_src.include?(route)
@@ -81,8 +76,6 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
       opt.separator 'Options:'
       opt.on("--add-routes",
              "Modify config/routes.rb to support the front controller") { |v| options[:add_routes] = true }
-      opt.on("--no-user",
-             "Don't create the login and signup pages") { |v| options[:no_user] = true }
       opt.on("--delete-index",
              "Delete public/index.html") { |v| options[:delete_index] = true }
     end

data/hobo_files/plugin/generators/hobo_front_controller/templates/controller.rb

@@ -2,50 +2,12 @@ class <%= class_name %>Controller < ApplicationController
 
   hobo_controller
   
-  filter_parameter_logging "password"
-
   def index; end
 
   def search
-    if request.post?
+    if params[:query]
       site_search(params[:query])
     end
   end
 
-  def login
-    return unless request.post?
-    user = Hobo.user_model.authenticate(params[:login], params[:password])
-    if user
-      self.current_user = user
-      if params[:remember_me] == "1"
-        self.current_user.remember_me
-        cookies[:auth_token] = { :value => self.current_user.remember_token ,
-                                 :expires => self.current_user.remember_token_expires_at }
-      end
-      redirect_back_or_default(:action => 'index')
-      flash[:notice] = "You have logged in"
-    else
-      flash[:notice] = "You did not provide a valid login and password"
-    end
-  end
-
-  def signup
-    @user = Hobo.user_model.new(params[:user])
-    return unless request.post?
-    @user.save!
-    self.current_user = @user
-    redirect_back_or_default(:action => 'index')
-    flash[:notice] = "Thanks for signing up!"
-  rescue ActiveRecord::RecordInvalid
-    render :action => 'signup'
-  end
-
-  def logout
-    self.current_user.forget_me if logged_in?
-    cookies.delete :auth_token
-    reset_session
-    flash[:notice] = "You have been logged out."
-    redirect_back_or_default(:action => 'index')
-  end
-
 end

data/hobo_files/plugin/generators/hobo_front_controller/templates/index.dryml

@@ -19,8 +19,8 @@
         <section>
           <if test="&this.count == 0">
             <p>There are no <%%= this.name.titleize.pluralize %></p>
-            <if test="&can_create?(this) and this != Hobo.user_model">
-              <p>Create a <a to="&this.new"/>.</p>
+            <if test="&can_create?(this)">
+              <p>Create a <a to="&this" action="new"/>.</p>
             </if>
           </if>
           <else>

data/hobo_files/plugin/generators/hobo_migration/hobo_migration_generator.rb

@@ -15,13 +15,19 @@ class HoboMigrationGenerator < Rails::Generator::Base
     # Force load of hobo models
     Hobo.models
     
+    ignore_tables = Hobo::Migrations.ignore_tables + Hobo::Migrations.ignore.every(:pluralize)
+    ignore_models = (Hobo::Migrations.ignore + Hobo::Migrations.ignore_models).every(:underscore)
+    
+    db_tables = connection.tables - ignore_tables
+    
     models = ActiveRecord::Base.send(:subclasses).reject {|c| c.name.starts_with?("CGI::") }
+    models = models.reject {|m| m.name.underscore.in?(ignore_models) }
     table_models = models.index_by {|m| m.table_name}
     model_table_names = models.every(:table_name)
     
-    to_create = model_table_names - connection.tables
-    to_drop = connection.tables - model_table_names - ['schema_info']
-    to_change = connection.tables & model_table_names
+    to_create = model_table_names - db_tables
+    to_drop = db_tables - model_table_names - ['schema_info']
+    to_change = db_tables & model_table_names
     
     to_rename = rename_or_drop!(to_create, to_drop, "table")
     
@@ -54,8 +60,8 @@ class HoboMigrationGenerator < Rails::Generator::Base
       undo_changes << undo
     end
     
-    up = [renames, drops, creates, changes * "\n\n"].select{|s|!s.blank?} * "\n\n"
-    down = [undo_renames, undo_drops, undo_creates, undo_changes * "\n\n"].select{|s|!s.blank?} * "\n\n"
+    up = [renames, drops, creates, changes].flatten.select{|s|!s.blank?} * "\n\n"
+    down = [undo_renames, undo_drops, undo_creates, undo_changes].flatten.select{|s|!s.blank?} * "\n\n"
     
     puts "\n---------- Up Migration ----------", up, "----------------------------------"
     puts "\n---------- Down Migration --------", down, "----------------------------------"
@@ -210,14 +216,28 @@ class HoboMigrationGenerator < Rails::Generator::Base
     res.string.strip.gsub("\n  ", "\n")
   end
   
+  def column_options_from_reverted_table(table, column)
+    revert = revert_table(table)
+    if (md = revert.match(/\s*t\.column\s+"#{column}",\s+(:[a-zA-Z0-9_]+)(?:,\s+(.*?)$)?/m))
+      # Ugly migration
+      _, type, options = *md
+    elsif (md = revert.match(/\s*t\.([a-z_]+)\s+"#{column}"(?:,\s+(.*?)$)?/m))
+      # Sexy migration
+      _, type, options = *md
+      type = ":#{type}"
+    end
+    [type, options]
+  end
+  
   
   def change_column_back(table, column)
-    _, type, options = *revert_table(table).match(/\s*t\.column\s+"#{column}",\s+(:[a-zA-Z0-9_]+)(?:,\s+(.*?)$)?/m)
+    type, options = column_options_from_reverted_table(table, column)
     "change_column :#{table}, :#{column}, #{type}#{', ' + options.strip if options}"
   end
 
   def revert_column(table, column)
-    "add_column :#{table}, :#{column}, " + revert_table(table).match(/\s*t\.column\s+"#{column}",\s+(.*?)$/m)[1].strip
+    type, options = column_options_from_reverted_table(table, column)
+    "add_column :#{table}, :#{column}, #{type}#{', ' + options.strip if options}"
   end
   
   

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

@@ -48,9 +48,8 @@ var Hobo = {
         if (updates.length > 0) {
             updates.each(function(dom_id) {
                 if (!hoboParts[dom_id]) { throw "Update of dom-id that is not a part: " + dom_id }
-                params.push("render["+i+"][part]=" + hoboParts[dom_id][0])
+                params.push("render["+i+"][part_context]=" + hoboParts[dom_id])
                 params.push("render["+i+"][id]=" + dom_id)
-                params.push("render["+i+"][object]=" + hoboParts[dom_id][1])
                 i += 1
             })
             params.push("part_page=" + hoboPartPage)

data/hobo_files/plugin/generators/hobo_user_controller/USAGE

@@ -0,0 +1,34 @@
+Description:
+
+    The controller generator creates a controller geared up to handle
+    login and signup for a specific user model. It can also be used as
+    a regular hobo_model_controller.
+
+    The generator takes a controller name and a list of views as
+    arguments.  The controller name may be given in CamelCase or
+    under_score and should not be suffixed with 'Controller'.  To
+    create a controller within a module, specify the controller name
+    as 'module/controller'.
+
+    The generator creates a controller class in app/controllers with view
+    templates in app/views/controller_name, a helper class in app/helpers,
+    and a functional test suite in test/functional.
+
+Example:
+    ./script/generate controller CreditCard open debit credit close
+
+    Credit card controller with URLs like /credit_card/debit.
+        Controller: app/controllers/credit_card_controller.rb
+        Views:      app/views/credit_card/debit.rhtml [...]
+        Helper:     app/helpers/credit_card_helper.rb
+        Test:       test/functional/credit_card_controller_test.rb
+
+Modules Example:
+    ./script/generate hobo_user_controller 'admin/credit_card' suspend late_fee
+
+    Credit card admin controller with URLs /admin/credit_card/suspend.
+        Controller: app/controllers/admin/credit_card_controller.rb
+        Views:      app/views/admin/credit_card/debit.rhtml [...]
+        Helper:     app/helpers/admin/credit_card_helper.rb
+        Test:       test/functional/admin/credit_card_controller_test.rb
+

data/hobo_files/plugin/generators/hobo_user_controller/hobo_user_controller_generator.rb

@@ -0,0 +1,43 @@
+class HoboUserControllerGenerator < Rails::Generator::NamedBase
+
+  def initialize(args, options)
+    args[0] = args[0].pluralize
+    super(args, options)
+  end
+
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
+
+      # Controller, helper, views, and test directories.
+      m.directory File.join('app/controllers', class_path)
+      m.directory File.join('app/helpers', class_path)
+      m.directory File.join('app/views', class_path, file_name)
+      m.directory File.join('test/functional', class_path)
+
+      # Controller class, functional test, and helper class.
+      m.template 'controller.rb',
+                  File.join('app/controllers',
+                            class_path,
+                            "#{file_name}_controller.rb")
+
+      m.template 'functional_test.rb',
+                  File.join('test/functional',
+                            class_path,
+                            "#{file_name}_controller_test.rb")
+
+      m.template 'helper.rb',
+                  File.join('app/helpers',
+                            class_path,
+                            "#{file_name}_helper.rb")
+
+      # View template for each action.
+      actions.each do |action|
+        path = File.join('app/views', class_path, file_name, "#{action}.rhtml")
+        m.template 'view.rhtml', path,
+          :assigns => { :action => action, :path => path }
+      end
+    end
+  end
+end

data/hobo_files/plugin/generators/hobo_user_controller/templates/controller.rb

@@ -0,0 +1,5 @@
+class <%= class_name %>Controller < ApplicationController
+
+  hobo_user_controller
+
+end

data/hobo_files/plugin/generators/hobo_user_controller/templates/functional_test.rb

@@ -0,0 +1,18 @@
+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
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/hobo_files/plugin/generators/hobo_user_controller/templates/helper.rb

@@ -0,0 +1,2 @@
+module <%= class_name %>Helper
+end

data/hobo_files/plugin/generators/hobo_user_controller/templates/view.rhtml

@@ -0,0 +1,2 @@
+<h1><%= class_name %>#<%= action %></h1>
+<p>Find me in <%= path %></p>

data/hobo_files/plugin/init.rb

@@ -24,6 +24,12 @@ ActionView::Base.register_template_handler("dryml", Hobo::Dryml::TemplateHandler
 
 class ActionController::Base
 
+  def self.hobo_user_controller(model=nil)
+    include Hobo::ModelController
+    self.model = model if model
+    include Hobo::UserController
+  end
+
   def self.hobo_model_controller(model=nil)
     include Hobo::ModelController
     self.model = model if model
@@ -43,6 +49,4 @@ end
 
 # Default settings
 
-Hobo.user_model ||= (User rescue (Person rescue nil))
-
 Hobo.developer_features = ["development", "test"].include?(RAILS_ENV) if Hobo.developer_features? == nil