hobo 1.4.0.pre8 → 2.0.0.pre1

data/lib/generators/hobo/routes/templates/hobo_routes.rb.erb

@@ -6,18 +6,56 @@
 <% for subsite in subsites -%>
   <%- if subsite -%>
 
+  <%= "namespace :#{subsite} do" %>
+  <%- end -%>
+  <%- for controller in controllers_for(subsite) -%>
+    <%- router = router_for(subsite, controller) -%>
+
+
+<%= "  #{'  ' if subsite}# Resource routes for controller #{controller.controller_path}" %>
+<%= router.emit_hash(router.resources_hash, subsite ? "    " : "  ") -%>
+    <%- router.owner_actions.each do |owner_hash| -%>
+
+<%= "  #{'  ' if subsite}# Owner routes for controller #{controller.controller_path}" %>
+<%= router.emit_hash(owner_hash, subsite ? "    " : "  ") -%>
+    <%- end -%>
+    <%- unless (routes = router.user_routes).blank? -%>
+
+<%= "#{'  ' if subsite}  # User routes for controller #{controller.controller_path}" %>
+      <%- for route in routes -%>
+<%= "#{'  ' if subsite}  #{route}" %>
+      <%- end -%>
+    <%- end -%>
+  <%- end -%>
+  <%- if subsite -%>
+
+  end
+  <%- end -%>
+<%- end -%>
+
+<% unless Rails.configuration.hobo.dont_emit_deprecated_routes %>
+
+# These are the Hobo 1.3 style routes.   They've been included for backwards
+# compatibility reasons because the names of some named routes have been changed.
+# Please update your views to use the new named route names and then disable this
+# section by setting config.hobo.dont_emit_deprecated_routes = true.
+
+
+ <% for subsite in subsites -%>
+  <%- if subsite -%>
+
   <%= "namespace :#{subsite} do" %>
   <%- end -%>
   <%- for controller in controllers_for(subsite) -%>
     <%- router = router_for(subsite, controller)
-        groups = %w[ index_action lifecycle resource owner web_method show_action reorder user ] -%>
+        groups = %w[ index_action lifecycle owner web_method show_action reorder resource ] -%>
 
     <%- for group in groups -%>
     <%- gr = "#{group}_routes"
         routes = gr == 'lifecycle_routes' ? router.send(gr.to_sym, subsite) : router.send(gr.to_sym) -%>
     <%- unless routes.empty? -%>
 
-  <%= "  " if subsite %><%= %(# #{gr.humanize} for controller "#{controller.controller_path}") %>
+  <%= "  " if subsite %><%= "# DEPRECATED #{gr.humanize} for controller #{controller.controller_path}" %>
     <%- end -%>
       <%- for route in routes -%>
   <%= "  " if subsite %><%= route %>
@@ -28,6 +66,7 @@
 
   end
   <%- end -%>
-<%- end -%>
+ <%- end -%>
 
+<%- end -%>
 end

data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb

@@ -25,12 +25,24 @@ module Hobo
     class_option :front_controller_name, :type => :string,
     :desc => "Front Controller Name", :default => 'front'
 
+    class_option :front_theme, :type => :string,
+    :desc => "Front Theme", :default => 'clean'
+
+    class_option :front_ui_theme, :type => :string,
+    :desc => "Front jQuery-UI Theme", :default => 'redmond'
+
     class_option :add_admin_subsite, :type => :boolean,
                  :desc => "Add an Admin Subsite"
 
     class_option :admin_subsite_name, :type => :string,
                  :desc => "Admin Subsite Name", :default => 'admin'
 
+    class_option :admin_theme, :type => :string,
+                 :desc => "Admin Theme", :default => 'clean'
+
+    class_option :admin_ui_theme, :type => :string,
+                 :desc => "Admin jQuery-UI Theme", :default => 'redmond'
+
     class_option :invite_only, :type => :boolean,
                  :desc => "Require invitation to join site"
 
@@ -154,7 +166,19 @@ EOI
     end
 
     def install_default_plugins
-      invoke 'hobo:install_default_plugins', [], {:subsite => 'front', :theme => 'hobo_clean', :ui_theme => 'redmond', :skip_gem => false}
+      if wizard?
+        say_title 'Front Theme'
+        say "The currently available themes are clean, clean_admin, clean_sidemenu and bootstrap."
+        @front_theme = ask("Choose a theme for the front site: [<enter>=clean|<custom_name>]", 'clean')
+
+        say_title 'Front jQuery-UI Theme'
+        say "The currently available jQuery-UI themes are listed here: https://github.com/fatdude/jquery-ui-themes-rails/blob/master/README.markdown"
+        @front_ui_theme = ask("Choose a jQuery-UI theme for the front site: [<enter>=redmond|<custom_name>]", 'redmond')
+      else
+        @front_theme = options[:front_theme]
+        @front_ui_theme = options[:front_ui_theme]
+      end
+      invoke 'hobo:install_default_plugins', [], {:subsite => 'front', :theme => "hobo_#{@front_theme}", :ui_theme => @front_ui_theme, :skip_gem => false}
     end
 
     def admin_subsite
@@ -162,10 +186,18 @@ EOI
         say_title 'Admin Subsite'
         if @invite_only || (@add_admin_subsite = yes_no?("Do you want an admin subsite?"))
           @admin_subsite_name = ask("Choose a name for the admin subsite: [<enter>=admin|<custom_name>]", 'admin')
+
+          say "The currently available themes are clean, clean_admin, clean_sidemenu and bootstrap."
+          @admin_theme = ask("Choose a theme for the #{@admin_subsite_name} site: [<enter>=clean_admin|<custom_name>]", 'clean_admin')
+
+          say "The currently available jQuery-UI themes are listed here: https://github.com/fatdude/jquery-ui-themes-rails/blob/master/README.markdown"
+          @admin_ui_theme = ask("Choose a jQuery-UI theme for the admin site: [<enter>=flick|<custom_name>]", 'flick')
         end
       else
         if @invite_only || (@add_admin_subsite = options[:add_admin_subsite])
           @admin_subsite_name = options[:admin_subsite_name]
+          @admin_theme = options[:front_theme]
+          @admin_ui_theme = options[:front_ui_theme]
         end
       end
     end
@@ -181,7 +213,8 @@ EOI
         invoke 'hobo:admin_subsite', [@admin_subsite_name],
                                      :user_resource_name => @user_resource_name,
                                      :invite_only => @invite_only,
-                                     :make_front_site => false
+                                     :theme => @admin_theme,
+                                     :ui_theme => @admin_ui_theme
       end
     end
 

data/lib/generators/hobo/subsite.rb

@@ -19,7 +19,7 @@ module Generators
           end
         end
 
-        template "site.css.erb", File.join('app/assets/stylesheets', "#{file_name}.css")
+        template "site.scss.erb", File.join('app/assets/stylesheets', "#{file_name}.scss")
         copy_file "gitkeep", "app/assets/stylesheets/#{file_name}/.gitkeep"
         template "site.js.erb", File.join('app/assets/javascripts', "#{file_name}.js")
         copy_file "gitkeep", "app/assets/javascripts/#{file_name}/.gitkeep"

data/lib/generators/hobo/subsite/USAGE

@@ -8,17 +8,9 @@ Description:
     and two different sets of views for the same model.
 
     The subsite will use app/views/taglibs/<subsite_name>_site.dryml
-    as well as app/views/taglibs/application.dryml.  This allows you
-    to customize the look and feel of a portion of your site.  The
-    remaining views of your application that are not under a subsite
-    load both application.dryml and front_site.dryml.
-
-    It is thus recommended that you ensure that
-    <subsite_name>_site.dryml and application.dryml do not repeat
-    code, such as the inclusion of rapid or the setting of the theme.
-    One easy way of ensuring this is to use the --make-front-site
-    option.  If you have already accounted for this, use
-    --make-front-site=false.
+    for common tags. The assets that the subsite will load are
+    specified in app/assets/javascripts/<subsite_name>.js and
+    app/assets/stylesheets/<subsite_name>.[s]css
 
     The difference between hobo:admin_site and hobo:subsite is that
     hobo:admin_site limits the subsite to use by administrators only.

data/lib/generators/hobo/subsite/subsite_generator.rb

@@ -2,6 +2,9 @@ module Hobo
   class SubsiteGenerator < Rails::Generators::NamedBase
     source_root File.expand_path('../templates', __FILE__)
 
+    class_option :theme, :type => :string, :desc => "Theme", :default => 'clean_admin'
+    class_option :ui_theme, :type => :string, :desc => "jQuery-UI Theme", :default => 'flick'
+
     def self.banner
       "rails generate hobo:subsite NAME [options]"
     end

data/lib/generators/hobo/subsite_taglib/subsite_taglib_generator.rb

@@ -4,13 +4,16 @@ module Hobo
     include Generators::Hobo::InviteOnly
     include Generators::Hobo::Taglib
 
+    class_option :theme, :type => :string, :desc => "Theme", :default => 'clean_admin'
+    class_option :ui_theme, :type => :string, :desc => "jQuery-UI Theme", :default => 'flick'
+
     def self.banner
       "rails generate hobo:subsite_taglib NAME [options]"
     end
 
     def generate_taglib
       template "taglib.dryml.erb", File.join('app/views/taglibs', "#{file_name}_site.dryml")
-      Rails::Generators.invoke('hobo:install_default_plugins', ["--subsite=#{file_name}", "--theme=hobo_clean_admin", "--ui_theme=flick"])
+      Rails::Generators.invoke('hobo:install_default_plugins', ["--subsite=#{file_name}", "--theme=hobo_#{options[:theme]}", "--ui_theme=#{options[:ui_theme]}"])
     end
 
   end

data/lib/generators/hobo/user_mailer/templates/activation.erb

@@ -2,7 +2,7 @@
 
 To activate your account for <%%= @app_name %>, click on this link:
 
-  <%%= <%= name.underscore -%>_activate_url :id => @<%= name.underscore -%>, :key => @key %>
+  <%%= activate_<%= name.underscore -%>_url :id => @<%= name.underscore -%>, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_mailer/templates/forgot_password.erb

@@ -3,7 +3,7 @@
 If you have forgotten your password for <%%= @app_name %>, you can choose
 a new one by clicking on this link:
 
-  <%%= <%= name.underscore -%>_reset_password_url :id => @<%= name.underscore -%>, :key => @key %>
+  <%%= reset_password_<%= name.underscore -%>_url :id => @<%= name.underscore -%>, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_mailer/templates/invite.erb

@@ -2,7 +2,7 @@
 
 You have been invited to join <%%= @app_name %>. If you wish to accept, please click on the following link
 
-  <%%= <%= name.underscore %>_accept_invitation_url :id => @<%= name.underscore %>, :key => @key %>
+  <%%= accept_invitation_<%= name.underscore %>_url :id => @<%= name.underscore %>, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_model/templates/model_injection.rb.erb

@@ -7,6 +7,7 @@
     administrator :boolean, :default => false
     timestamps
   end
+  attr_accessible :name, :email_address, :password, :password_confirmation
 
   # This gives admin rights and an :active state to the first sign-up.
   # Just remove it if you don't want that

data/lib/hobo.rb

@@ -34,7 +34,7 @@ module Hobo
 
     def find_by_search(query, search_targets=[])
       if search_targets.empty?
-       search_targets = Hobo::Routes.models_with(:show).select {|m| m.search_columns.any? }
+       search_targets = Hobo::Model.all_models.select {|m| m.search_columns.any? }
       end
 
       query_words = ActiveRecord::Base.connection.quote_string(query).split
@@ -44,7 +44,7 @@ module Hobo
         parameters = []
         like_operator = ActiveRecord::Base.connection.adapter_name =~ /postgres/i ? 'ILIKE' : 'LIKE'
         query_words.each do |word|
-          column_queries = search_target.search_columns.map { |column| "#{column} #{like_operator} ?" }
+          column_queries = search_target.search_columns.map { |column| column == "id" ? "CAST(#{column} AS varchar) #{like_operator} ?" : "#{column} #{like_operator} ?" }
           conditions << "(" + column_queries.join(" or ") + ")"
           parameters.concat(["%#{word}%"] * column_queries.length)
         end

data/lib/hobo/controller.rb

@@ -81,9 +81,9 @@ module Hobo
 
       headers["Content-Type"] = options['content_type'] if options['content_type']
 
-      page = options[:preamble] || "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;\n"
+      page = options[:preamble] || ""
       for spec in render_specs
-        function = spec[:function] || "_update"
+        function = spec[:function] || "hjq.ajax.update"
         dom_id = spec[:id]
 
         if spec[:part_context]
@@ -97,6 +97,7 @@ module Hobo
         end
       end
       if renderer
+        options[:contexts_function] ||= "hjq.ajax.updatePartContexts" unless options[:no_contexts_function]
         if options[:contexts_function]
           storage = renderer.part_contexts_storage_uncoded
           page << "#{options[:contexts_function]}(#{storage.to_json});\n"
@@ -106,15 +107,6 @@ module Hobo
       render :js => page
     end
 
-    # use this function to send arbitrary bits of javascript
-    def ajax_response(response, options)
-      page = options[:preamble] || "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;\n"
-      page << response
-      page << options[:postamble] if options[:postamble]
-      render :js => page
-    end
-
-
     # dryml does not use layouts
     def action_has_layout?
       false

data/lib/hobo/controller/model.rb

@@ -1,6 +1,6 @@
 module Hobo
   module Controller
-	  module Model
+    module Model
 
     include Hobo::Controller
 
@@ -32,10 +32,14 @@ module Hobo
           rescue_from Hobo::PermissionDeniedError,         :with => :permission_denied
           rescue_from Hobo::Model::Lifecycles::LifecycleKeyError, :with => :permission_denied
 
+          respond_to :html
+
           alias_method_chain :render, :hobo_model
 
         end
         register_controller(base)
+        subsite = base.name.include?("::") ? base.name.split("::").first.underscore : nil
+        base.model.hobo_controller[subsite] = base
 
         Hobo::Controller.included_in_class(base)
       end
@@ -385,12 +389,25 @@ module Hobo
     end
 
 
-    def destination_after_submit(record=this, destroyed=false)
+    def destination_after_submit(*args)
+      options = args.extract_options!
+      destroyed = args[1]
       after_submit = params[:after_submit]
 
       # The after_submit post parameter takes priority
       (after_submit == "stay-here" ? url_for_page_path : after_submit) ||
 
+        # Then try options[:redirect]
+        ((o=options[:redirect]) && begin
+                                     if o.is_a?(Symbol)
+                                       object_url(@this, o)
+                                     elsif o.is_a?(String) || o.is_a?(Hash)
+                                       o
+                                     else
+                                       object_url(*Array(o))
+                                     end
+                                   end) ||
+
         # Then try the record's show page
         (!destroyed && object_url(@this)) ||
 
@@ -410,24 +427,6 @@ module Hobo
     end
 
 
-    def redirect_after_submit(*args)
-      options = args.extract_options!
-      o = options[:redirect]
-      if o
-        url = if o.is_a?(Symbol)
-                object_url(this, o)
-              elsif o.is_a?(String) || o.is_a?(Hash)
-                o
-              else
-                object_url(*Array(o))
-              end
-        redirect_to url
-      else
-        redirect_to destination_after_submit(*args)
-      end
-    end
-
-
     def response_block(&b)
       if b
         respond_to do |format|
@@ -520,6 +519,8 @@ module Hobo
       if request.xhr? && params[:render]
         hobo_ajax_response
         render :nothing => true unless performed?
+      else
+        respond_with(self.this)
       end
     end
 
@@ -527,6 +528,8 @@ module Hobo
       if request.xhr? && params[:render]
         hobo_ajax_response(:page => :blah)
         render :nothing => true unless performed?
+      else
+        respond_with(self.this)
       end
     end
 
@@ -546,6 +549,7 @@ module Hobo
         self.this = new_for_create(attributes)
         this.user_save(current_user)
       end
+      flash_notice (ht( :"#{@this.class.to_s.underscore}.messages.create.success", :default=>["The #{@this.class.model_name.human} was created successfully"])) if valid?
       response_block(&b) || create_response(:new, options)
     end
 
@@ -560,6 +564,7 @@ module Hobo
         self.this = association.new(attributes)
         this.save
       end
+      flash_notice (ht( :"#{@this.class.to_s.underscore}.messages.create.success", :default=>["The #{@this.class.model_name.human} was created successfully"])) if valid?
       response_block(&b) || create_response(:"new_for_#{name_of_auto_action_for(owner_association)}", options)
     end
 
@@ -586,30 +591,31 @@ module Hobo
     end
 
 
-    def create_response(new_action, options={}, &b)
-      flash_notice (ht( :"#{@this.class.to_s.underscore}.messages.create.success", :default=>["The #{@this.class.model_name.human} was created successfully"])) if valid?
+    def create_response(new_action, options={})
+      valid = valid?  # valid? can be expensive
+      if params[:render]
+        if (params[:render_options] && params[:render_options][:errors_ok]) || valid
+          hobo_ajax_response
 
-      response_block(&b) or begin
-                              valid = valid?  # valid? can be expensive
-                              if params[:render]
-                                if (params[:render_options] && params[:render_options][:errors_ok]) || valid
-                                  hobo_ajax_response
-
-                                  # Maybe no ajax requests were made
-                                  render :nothing => true unless performed?
-                                else
-                                  errors = @this.errors.full_messages.join('\n')
-                                  message = ht( :"#{this.class.to_s.underscore}.messages.create.error", :errors=>errors,:default=>["Couldn't create the #{this.class.name.titleize.downcase}.\n #{errors}"])
-                                  ajax_response("alert('#{message}');", params[:render_options])
-                                end
-                              else
-                                if valid
-                                  redirect_after_submit options
-                                else
-                                  re_render_form(new_action)
-                                end
-                              end
-                            end
+          # Maybe no ajax requests were made
+          render :nothing => true unless performed?
+        else
+          errors = @this.errors.full_messages.join('\n')
+          message = ht( :"#{this.class.to_s.underscore}.messages.create.error", :errors=>errors,:default=>["Couldn't create the #{this.class.name.titleize.downcase}.\n #{errors}"])
+          render :js => "alert(#{message.to_json});\n"
+        end
+      else
+        location = destination_after_submit(options)
+        respond_with(self.this, :location => location) do |format|
+          format.html do
+            if valid
+              redirect_to location
+            else
+              re_render_form(new_action)
+            end
+          end
+        end
+      end
     end
 
 
@@ -641,7 +647,7 @@ module Hobo
     #
     # parameters:
     #   valid is a cache of valid?
-    #   options is passed through to redirect_after_submit
+    #   options is passed through to destination_after_submit
     def update_response(valid=nil, options={})
       # valid? can be expensive, cache it
       valid = valid? if valid.nil?
@@ -655,15 +661,19 @@ module Hobo
           errors = @this.errors.full_messages.join('\n')
           message = ht(:"#{@this.class.to_s.underscore}.messages.update.error", :default=>["There was a problem with that change\\n#{errors}"], :errors=>errors)
 
-          ajax_response("alert('#{message}');", params[:render_options])
+          render :js => "alert(#{message.to_json});\n"
         end
       else
-        if valid
-          flash_notice (ht(:"#{@this.class.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"]))
-
-          redirect_after_submit options
-        else
-          re_render_form(:edit)
+        location = destination_after_submit(options)
+        respond_with(self.this, :location => location) do |format|
+          format.html do
+            if valid
+              flash_notice (ht(:"#{@this.class.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"]))
+              redirect_to location
+            else
+              re_render_form(:edit)
+            end
+          end
         end
       end
     end
@@ -673,16 +683,16 @@ module Hobo
       self.this ||= args.first || find_instance
       this.user_destroy(current_user)
       flash_notice ht( :"#{model.to_s.underscore}.messages.destroy.success", :default=>["The #{model.name.titleize.downcase} was deleted"])
-      destroy_response(options, &b)
+      response_block(&b) || destroy_response(options, &b)
     end
 
 
-    def destroy_response(options={}, &b)
-      response_block(&b) or
-        respond_to do |wants|
-          wants.html { redirect_after_submit(this, true, options) }
-          wants.js   { hobo_ajax_response || render(:nothing => true) }
-        end
+    def destroy_response(options={})
+      if params[:render]
+        hobo_ajax_response || render(:nothing => true)
+      else
+        respond_with(self.this, :location => destination_after_submit(this, true, options))
+      end
     end
 
 
@@ -700,26 +710,32 @@ module Hobo
     def do_creator_action(name, options={}, &b)
       @creator = model::Lifecycle.creator(name)
       self.this = @creator.run!(current_user, attribute_parameters)
-      response_block(&b) or
-        if valid?
-          respond_to do |wants|
-            wants.html { redirect_after_submit(options) }
-            wants.js   { hobo_ajax_response || render(:nothing => true) }
-          end
+      response_block(&b) || do_creator_response(name, options)
+    end
+
+    def do_creator_response(name, options)
+      if valid?
+        if params[:render]
+          hobo_ajax_response || render(:nothing => true)
         else
-          this.exempt_from_edit_checks = true
-          respond_to do |wants|
-  			# errors is used by the translation helper, ht, below.
-			errors = this.errors.full_messages.join("\n")
+          location = destination_after_submit(options)
+          respond_with(self.this, :location => location)
+        end
+      else
+        this.exempt_from_edit_checks = true
+        if params[:render] && params[:render_options] && params[:render_options][:errors_ok]
+          hobo_ajax_response
+          render :nothing => true unless performed?
+        else
+          # errors is used by the translation helper, ht, below.
+          errors = this.errors.full_messages.join("\n")
+          respond_with(self.this) do |wants|
             wants.html { re_render_form(name) }
-            wants.js   { render(:status => 500,
-                                :text => ht(:"#{@this.class.to_s.underscore}.messages.creator.error", :default=>["Couldn't do creator #{name}.\n#{errors}"], :name=>name, :errors=>errors)
-                               )}
           end
         end
+      end
     end
 
-
     def prepare_transition(name, options)
       key = options.delete(:key) || params[:key]
 
@@ -743,25 +759,9 @@ module Hobo
       options = args.extract_options!
       @transition = prepare_transition(name, options)
       @transition.run!(this, current_user, attribute_parameters)
-      response_block(&b) or
-        if valid?
-          respond_to do |wants|
-            wants.html { redirect_after_submit(options) }
-            wants.js   { hobo_ajax_response || render(:nothing => true) }
-          end
-        else
-          respond_to do |wants|
-  			# errors is used by the translation helper, ht, below.
-			errors = this.errors.full_messages.join("\n")
-            wants.html { re_render_form(name) }
-            wants.js   { render(:status => 500,
-                                :text => ht(:"#{@this.class.to_s.underscore}.messages.transition.error", :default=>["Couldn't do transition #{name}.\n#{errors}"], :name=>name, :errors=>errors)
-                               )}
-          end
-        end
+      response_block(&b) || update_response(nil, options)
     end
 
-
     # --- Miscelaneous Actions --- #
 
     # Hobo 1.3's name one uses params[:query], jQuery-UI's autocomplete