hobo 1.3.3 → 1.4.0.pre2

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

@@ -1,4 +1,5 @@
 require 'generators/hobo_support/thor_shell'
+require 'bundler/cli'
 module Hobo
   class SetupWizardGenerator < Rails::Generators::Base
 
@@ -9,6 +10,7 @@ module Hobo
     include Generators::Hobo::ActivationEmail
     include Generators::Hobo::TestOptions
     include Generators::Hobo::Taglib
+    include Generators::Hobo::Plugin
 
     def self.banner
       "rails generate hobo:setup_wizard [options]"
@@ -29,9 +31,6 @@ module Hobo
     class_option :admin_subsite_name, :type => :string,
                  :desc => "Admin Subsite Name", :default => 'admin'
 
-    class_option :make_front_site, :type => :boolean,
-                 :desc => "Rename application.dryml to front_site.dryml", :default => 'true'
-
     class_option :private_site, :type => :boolean,
                  :desc => "Make the site unaccessible to non-members"
 
@@ -140,14 +139,6 @@ EOI
       end
     end
 
-    def rapid
-      if wizard?
-        say_title 'Hobo Rapid'
-        say 'Installing Hobo Rapid and default theme...'
-      end
-      invoke 'hobo:rapid'
-    end
-
     def front_controller
       if wizard?
         say_title 'Front Controller'
@@ -164,12 +155,10 @@ 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')
-          @make_front_site    = yes_no?("Do you want to use a separate front_site.dryml?")
         end
       else
         if @invite_only || (@add_admin_subsite = options[:add_admin_subsite])
           @admin_subsite_name = options[:admin_subsite_name]
-          @make_front_site    = options[:make_front_site]
         end
       end
     end
@@ -185,10 +174,38 @@ EOI
         invoke 'hobo:admin_subsite', [@admin_subsite_name],
                                      :user_resource_name => @user_resource_name,
                                      :invite_only => @invite_only,
-                                     :make_front_site => @make_front_site
+                                     :make_front_site => false
       end
     end
 
+    def installing_plugins
+      say "Installing hobo_rapid plugin..."
+      install_plugin_helper('hobo_rapid', nil, :version => Hobo::VERSION)
+      say "Installing hobo_jquery plugin..."
+      install_plugin_helper('hobo_jquery', nil, :version => Hobo::VERSION)
+      say "Installing hobo_jquery_ui plugin..."
+      install_plugin_helper('hobo_jquery_ui', nil, :version => Hobo::VERSION)
+
+      say "Installing hobo_clean theme..."
+      inject_css_require("jquery-ui/redmond", "front", nil, true)
+      inject_css_require("jquery-ui/flick", "admin", nil, true) if @add_admin_subsite
+      if @add_admin_subsite
+        install_plugin_helper('hobo_clean', nil, :version => Hobo::VERSION, :subsite => "front", :comments => "The default Hobo theme", :css_top => true)
+        install_plugin_helper('hobo_clean_admin', nil, :version => Hobo::VERSION, :subsite => @admin_subsite_name, :css_top => true)
+      else
+        install_plugin_helper('hobo_clean', nil, :version => Hobo::VERSION, :comments => "The default Hobo theme", :subsite => "front", :css_top => true)
+      end
+
+      gem_with_comments("jquery-ui-themes", "~> 0.0.4")
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
+    end
+
+    def add_dev_tweaks
+      invoke 'hobo:dev_tweaks'
+    end
+
     def generate_migration
       if wizard?
         say_title 'DB Migration'

data/lib/generators/hobo/subsite.rb

@@ -29,15 +29,29 @@ module Generators
             say "Cannot rename application.dryml to #{file_name}_site.dryml"
             exit 1
           end
-          say "Renaming app/views/taglibs/application.dryml to app/views/taglibs/front_site.dryml" \
-              unless options[:quiet]
+          say "Renaming app/views/taglibs/application.dryml to app/views/taglibs/front_site.dryml"  unless options[:quiet]
           unless options[:pretend]
             FileUtils.mv('app/views/taglibs/application.dryml', "app/views/taglibs/front_site.dryml")
             copy_file "application.dryml", 'app/views/taglibs/application.dryml'
+
+            # remove lines from front_site.dryml that exist in both front_site.dryml & application.dryml
+            front_site = File.readlines('app/views/taglibs/front_site.dryml') - File.readlines('app/views/taglibs/application.dryml').reject{|l| l.blank?}
+            File.open('app/views/taglibs/front_site.dryml', 'wb') do |file|
+              front_site.each do
+                |line| file.write(line)
+              end
+            end
           end
         end
 
+        template "site.css.erb", File.join('app/assets/stylesheets', "#{file_name}.css")
+        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"
+
         template "controller.rb.erb", File.join('app/controllers', file_name, "#{file_name}_site_controller.rb")
+
+        application "config.assets.precompile += %w(#{file_name}.css #{file_name}.js)"
       end
 
       hook_for :test_framework, :as => :controller do | instance, controller_test |

data/lib/generators/hobo/subsite/templates/site.css.erb

@@ -0,0 +1,9 @@
+/*
+ * This is the stylesheet manifest file for the <%= name %> subsite.
+ * Files or plugins referenced from here or placed in the <%= name %>/
+ * directory will be included.
+ *
+ *= require_self
+ *= require application
+ *= require_tree ./<%= name %>
+*/

data/lib/generators/hobo/subsite/templates/site.js.erb

@@ -0,0 +1,10 @@
+// This is a manifest file for the <%= name %> subsite.  It will be
+// compiled into including all the files listed below.  Add new
+// JavaScript/Coffee code in separate files in the <%= name %>
+// directory and they'll automatically be included in the compiled
+// file accessible from http://example.com/assets/<%= name %>.js It's
+// not advisable to add code directly here, but if you do, it'll
+// appear at the bottom of the the compiled file.
+//
+//= require application
+//= require_tree ./<%= name %>

data/lib/generators/hobo/subsite_taglib/templates/taglib.dryml.erb

@@ -1,26 +1,9 @@
 <!-- Tag definitions for the <%= file_name %> subsite -->
 
-<include src="rapid" gem="hobo"/>
-
 <include src="taglibs/auto/<%= file_name %>/rapid/cards"/>
 <include src="taglibs/auto/<%= file_name %>/rapid/pages"/>
 <include src="taglibs/auto/<%= file_name %>/rapid/forms"/>
 
-<set-theme name="clean"/>
-
-<% if options[:admin]%>
-
-<extend tag="page">
-  <old-page merge>
-    <append-stylesheets:>
-      <stylesheet name="<%= file_name %>"/>
-    </append-stylesheets:>
-    <footer:>
-      <a href="#{base_url}/"><t key="hobo.subsite.back_link">View Site</t></a>
-    </footer:>
-  </old-page>
-</extend>
-<% end -%>
 <% if invite_only? -%>
 
 <extend tag="card" for="<%= options[:user_resource_name].camelcase %>">

data/lib/generators/hobo/test_framework/test_framework_generator.rb

@@ -32,7 +32,7 @@ module Hobo
     def finalize_installation
       # add the block only if it's not the default
       add_generators_block unless (name == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
-      invoke Bundler::CLI, :update if options[:update] && @should_update
+      invoke(Bundler::CLI, :update, [], {}) if options[:update] && @should_update
       @finalize_hooks.each {|h| h.call }
     end
 

data/lib/hobo.rb

@@ -1,6 +1,7 @@
 require 'hobo_support'
 require 'hobo_fields'
 require 'dryml'
+gem 'will_paginate', ">= 3.0"
 require 'will_paginate'
 require 'hobo/extensions/enumerable'
 require 'hobo/extensions/array'
@@ -25,7 +26,7 @@ module Hobo
 
   class << self
 
-    attr_accessor :current_theme, :engines
+    attr_accessor :engines
 
     def raw_js(s)
       RawJs.new(s)
@@ -43,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 == "id" ? "CAST(#{column} AS varchar) #{like_operator} ?" : "#{column} #{like_operator} ?" }
+          column_queries = search_target.search_columns.map { |column| "#{column} #{like_operator} ?" }
           conditions << "(" + column_queries.join(" or ") + ")"
           parameters.concat(["%#{word}%"] * column_queries.length)
         end

data/lib/hobo/controller.rb

@@ -14,7 +14,6 @@ module Hobo
 
       def included_in_class(klass)
         klass.extend(ClassMethods)
-        klass.send(:include, Hobo::Helper::Translations)
         klass.class_eval do
           before_filter :login_from_cookie
           alias_method_chain :redirect_to, :object_url
@@ -29,7 +28,10 @@ module Hobo
           @included_taglibs = []
           rescue_from ActionController::RoutingError, :with => :not_found unless Rails.env.development?
         end
-        Hobo::Helper.add_to_controller(klass)
+        HoboRouteHelper.add_to_controller(klass)
+        HoboTranslationsHelper.add_to_controller(klass)
+        HoboTranslationsNormalizerHelper.add_to_controller(klass)
+        HoboPermissionsHelper.add_to_controller(klass)
       end
 
     end
@@ -56,11 +58,10 @@ module Hobo
     end
 
 
-    def hobo_ajax_response(*args)
-      results = args.extract_options!
+    def hobo_ajax_response(options={})
       r = params[:render]
       if r
-        ajax_update_response(r.values, results)
+        ajax_update_response(r.values, options[:results] || {}, options || params[:render_options])
         true
       else
         false
@@ -75,26 +76,41 @@ module Hobo
                                                  false,
                                                  view_context.lookup_context.instance_variable_get('@details')).identifier
       renderer = Dryml.page_renderer(view_context, identifier, [], controller)
-
-      render :update do |page|
-        page << (options[:preamble] || "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;")
-        for spec in render_specs
-          function = spec[:function] || "_update"
-          dom_id = spec[:id]
-
-          if spec[:part_context]
-            part_content = renderer.refresh_part(spec[:part_context], session, dom_id)
-            page.call(function, dom_id, part_content)
-          elsif spec[:result]
-            result = results[spec[:result].to_sym]
-            page.call(function, dom_id, result)
-          else
-            # spec didn't specify any action :-/
-          end
+      options = options.with_indifferent_access
+
+      headers["Content-Type"] = options['content_type'] if options['content_type']
+
+      page = options[:preamble] || "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;\n"
+      for spec in render_specs
+        function = spec[:function] || "_update"
+        dom_id = spec[:id]
+
+        if spec[:part_context]
+          part_content = renderer.refresh_part(spec[:part_context], session, dom_id)
+          page << "#{function}(#{dom_id.to_json}, #{part_content.to_json})\n"
+        elsif spec[:result]
+          result = results[spec[:result].to_sym]
+          page << "#{function}(#{dom_id.to_json}, #{result.to_json})\n"
+        else
+          page << "alert('ajax_update_response: render_spec did not provide action');\n"
+        end
+      end
+      if renderer
+        if options[:contexts_function]
+          storage = renderer.part_contexts_storage_uncoded
+          page << "#{options[:contexts_function]}(#{storage.to_json});\n"
         end
-        page << renderer.part_contexts_storage if renderer
-        page << options[:postamble] if options[:postamble]
       end
+      page << options[:postamble] if options[:postamble]
+      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
 
 
@@ -134,7 +150,10 @@ module Hobo
     def site_search(query)
       results_hash = Hobo.find_by_search(query)
       all_results = results_hash.values.flatten.select { |r| r.viewable_by?(current_user) }
-      if all_results.empty?
+      if params["search_version"]
+        @search_results = all_results
+        hobo_ajax_response
+      elsif all_results.empty?
         render :text => "<p>"+ t("hobo.live_search.no_results", :default=>["Your search returned no matches."]) + "</p>"
       else
         # TODO: call one tag that renders all the search results with headings for each model

data/lib/hobo/controller/model.rb

@@ -475,8 +475,8 @@ module Hobo
     def hobo_index(*args, &b)
       options = args.extract_options!
       finder = args.first || model
-      self.this = find_or_paginate(finder, options)
-      response_block(&b)
+      self.this ||= find_or_paginate(finder, options)
+      index_response(&b)
     end
 
 
@@ -484,15 +484,21 @@ module Hobo
       options = args.extract_options!
       owner, association = find_owner_and_association(owner)
       finder = args.first || association
-      self.this = find_or_paginate(finder, options)
-      response_block(&b)
+      self.this ||= find_or_paginate(finder, options)
+      index_response(&b)
     end
 
 
     def hobo_show(*args, &b)
       options = args.extract_options!
-      self.this ||= args.first || find_instance(options)
-      response_block(&b)
+      self.this ||= args.first
+      if this.nil?
+        self.this = find_instance(options)
+        unless (parms=attribute_parameters).blank?
+          this.with_acting_user(current_user) { this.attributes = parms }
+        end
+      end
+      show_response(&b)
     end
 
     def hobo_edit(*args, &b)
@@ -500,15 +506,34 @@ module Hobo
     end
 
     def hobo_new(record=nil, &b)
-      self.this = record || model.user_new(current_user)
-      response_block(&b)
+      self.this = record || model.user_new(current_user, attribute_parameters)
+      show_response(&b)
+    end
+
+    def show_response(&b)
+      response_block(&b) or
+        begin
+          if request.xhr? && params[:render]
+            hobo_ajax_response
+            render :nothing => true unless performed?
+          end
+        end
     end
 
+    def index_response(&b)
+      response_block(&b) or
+        begin
+          if request.xhr? && params[:render]
+            hobo_ajax_response(:page => :blah)
+            render :nothing => true unless performed?
+          end
+        end
+    end
 
     def hobo_new_for(owner, record=nil, &b)
       owner, association = find_owner_and_association(owner)
-      self.this = record || association.user_new(current_user)
-      response_block(&b)
+      self.this = record || association.user_new(current_user, attribute_parameters)
+      show_response(&b)
     end
 
 
@@ -603,38 +628,29 @@ module Hobo
 
       flash_notice (ht(:"#{@this.class.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"])) if valid?
 
-      response_block(&b) or
-        if valid?
-          respond_to do |wants|
-            wants.html do
-              redirect_after_submit options
-            end
-            wants.js do
-              if in_place_edit_field
-                # Decreasingly hacky support for the scriptaculous in-place-editor
-                new_val = call_dryml_tag("view", :field => in_place_edit_field, :no_wrapper => true)
-                hobo_ajax_response(this, :new_field_value => new_val)
-              else
-                hobo_ajax_response(this)
-              end
-
-              # Maybe no ajax requests were made
-              render :nothing => true unless performed?
-            end
-          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(:edit) }
-            wants.js { render(:status => 500,
-                              :text => ht(:"#{@this.class.to_s.underscore}.messages.update.error",:default=>["There was a problem with that change.\n#{errors}"], :errors=>errors)
-                             ) }
-          end
-        end
+      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.update.error",:default=>["There was a problem with that change\\n#{errors}"], :errors=>errors)
+                                  ajax_response("alert('#{message}');", params[:render_options])
+                                end
+                              else
+                                if valid
+                                  redirect_after_submit options
+                                else
+                                  re_render_form(:edit)
+                                end
+                              end
+                            end
     end
 
-
     def hobo_destroy(*args, &b)
       options = args.extract_options!
       self.this ||= args.first || find_instance
@@ -732,7 +748,8 @@ module Hobo
     # --- Miscelaneous Actions --- #
 
     def hobo_completions(attribute, finder, options={})
-      options = options.reverse_merge(:limit => 10, :param => :query, :query_scope => "#{attribute}_contains")
+      options = options.reverse_merge(:limit => 10, :query_scope => "#{attribute}_contains")
+      options[:param] ||= params[:query].nil? ? :term : :query
       finder = finder.limit(options[:limit]) unless finder.try.limit_value
 
       begin
@@ -745,7 +762,11 @@ module Hobo
           items += finder2.find(:all).select { |r| r.viewable_by?(current_user) }
         end
       end
-      render :text => "<ul>\n" + items.map {|i| "<li>#{i.send(attribute)}</li>\n"}.join + "</ul>"
+      if request.xhr?
+        render :json => items.map {|i| i.send(attribute)}
+      else
+        render :text => "<ul>\n" + items.map {|i| "<li>#{i.send(attribute)}</li>\n"}.join + "</ul>"
+      end
     end