hobo 1.4.0.pre4 → 1.4.0.pre5

data/CHANGES-1.4.txt

@@ -100,12 +100,20 @@ with
 
     <include gem='hobo_rapid'/>
     <include gem='hobo_jquery'/>
+    <include gem='hobo_jquery_ui'/>
     <include gem='hobo_clean'/>
 
 Note that the default Hobo generation now always creates both a
 front_site.dryml and an application.dryml, even if you don't create
 any subsites.
 
+Also be aware that application.dryml is no longer loaded automatically
+if you have a front_site.dryml.    Add
+
+    <include src="application" />
+
+to your front_site.dryml, your admin_site.dryml, et cetera.
+
 ### move public/ to app/assets/
 
 In Rails 3.1, images, javascripts and stylesheets are loaded from
@@ -144,7 +152,20 @@ these changes have been to the editors.
 Hobo 1.4 uses the asset pipeline features introduced in Rails 3.1.
 Hobo 1.4 does not work out of the box with the asset pipeline turned
 off.  It'd certainly be possible to copy all Hobo assets into public/,
-but you would have to do that manually.
+but you would have to do so manually, there are no longer any rake
+tasks to do this for you.
+
+## application.dryml is no longer loaded automatically
+
+Hobo 1.3 loaded application.dryml and then X_site.dryml, where X was
+front or admin or the name of the current subsite.  Hobo 1.4 only
+loads X_site.dryml.   If that fails, it loads application.dryml
+instead.
+
+A new application generated by Hobo 1.4 will have `<include
+src="application"/>` in X_site.dryml so that application.dryml is
+still loaded.   When it is loaded is now controlled by the the author
+rather than always loading first.
 
 ## :inverse_of recommended
 

data/TODO-1.4.txt

@@ -2,7 +2,7 @@
 
 ## regressions
 
- * after-submit, sortable-input-many and name-many do not work
+ * after-submit, sortable-input-many do not work
  * Hobo 1.4 breaks default_scope.  If you're setting the order, you
    can use Hobo's set_default_order as a stopgap although once it's
    fixed please switch back to default_scope as set_default_order
@@ -31,7 +31,6 @@
 
 ## Cookbook
 
- * captcha
  * search
  * actually use Hobo 1.4's new caching abilities
  * auto-link tags in manual
@@ -60,6 +59,7 @@ you notice any such omissions, please let us know, it is easy to fix..
  * trawl the lighthouse && pull requests
  * steal the tags from Portal
  * fixup hobo-contrib
+ * convert paperclip_with_hobo to gem
 
 ## would be nice:
 
@@ -67,3 +67,4 @@ you notice any such omissions, please let us know, it is easy to fix..
  * create a bootstrap theme
  * add theme chooser to setup wizard
  * add support for has-one
+ * convert old Hobo plugins:  imaginary-dryml, hoboyui

data/VERSION

@@ -1 +1 @@
-1.4.0.pre4
+1.4.0.pre5

data/lib/generators/hobo/admin_subsite/admin_subsite_generator.rb

@@ -17,11 +17,11 @@ module Hobo
       template "users_index.dryml", "app/views/#{file_name}/#{options[:user_resource_name].pluralize.underscore}/index.dryml"
     end
 
+    include Generators::Hobo::Subsite
+
     def generate_site_taglib
       invoke 'hobo:subsite_taglib', [name], options.merge(:admin => true)
     end
 
-    include Generators::Hobo::Subsite
-
   end
 end

data/lib/generators/hobo/admin_subsite/templates/application.dryml

@@ -1,3 +1,2 @@
-<!-- Global taglib - these tags are shared across all subsites -->
-
-<include src="rapid" gem="hobo"/>
+<!-- this file is included by front_site.dryml, admin_site.dryml et al, so
+you can place common code in this file. -->

data/lib/generators/hobo/assets/templates/application.dryml.erb

@@ -1,4 +1,3 @@
-<!-- Global taglib - these tags are shared across all subsites -->
-
-<include src="rapid" gem="hobo"/>
+<!-- this file is included by front_site.dryml, admin_site.dryml et al, so
+you can place common code in this file. -->
 

data/lib/generators/hobo/assets/templates/front_site.dryml.erb

@@ -1,6 +1,9 @@
-<!-- Global taglib - these are the tags for your front site -->
+<!-- Global taglib - these are the tags for your front / main site -->
+
+<include gem="hobo_rapid"/>
 
 <include src="taglibs/auto/rapid/cards"/>
 <include src="taglibs/auto/rapid/pages"/>
 <include src="taglibs/auto/rapid/forms"/>
 
+<include src="application"/>

data/lib/generators/hobo/install_default_plugins/USAGE

@@ -0,0 +1,3 @@
+Description:
+
+    Installs the default set of Hobo plugins to a subsite.   It is called from the wizard and subsite generators, it is not likely to be useful on its own.

data/lib/generators/hobo/install_default_plugins/install_default_plugins_generator.rb

@@ -0,0 +1,37 @@
+require 'bundler/cli'
+module Hobo
+  class InstallDefaultPluginsGenerator < Rails::Generators::Base
+
+    include Generators::Hobo::Plugin
+
+    class_option :subsite, :type => :string, :aliases => '-e', :required => true, :desc => "Subsite name (without '_site') or 'all'"
+    class_option :theme, :type => :string, :default => "hobo_clean", :desc => "the theme to install"
+    class_option :ui_theme, :type => :string, :default => "redmond", :desc => "the jquery-ui theme to require"
+    class_option :skip_gem, :type => :boolean, :desc => "add to Gemfile"
+
+    def install_default_plugins
+      opts = options.dup
+      opts[:version => Hobo::VERSION]
+      say "Installing default plugins for #{opts[:subsite]}..."
+      say "Installing hobo_rapid plugin..."
+      install_plugin_helper('hobo_rapid', nil, opts)
+      say "Installing hobo_jquery plugin..."
+      install_plugin_helper('hobo_jquery', nil, opts)
+      say "Installing hobo_jquery_ui plugin..."
+      install_plugin_helper('hobo_jquery_ui', nil, opts)
+
+      say "Installing #{opts[:theme]} theme..."
+      inject_css_require("jquery-ui/#{opts[:ui_theme]}", opts[:subsite], nil)
+      install_plugin_helper(opts[:theme], nil, opts)
+
+      unless opts[:skip_gem]
+        gem_with_comments("jquery-ui-themes", "~> 0.0.4")
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
+      end
+
+    end
+  end
+end
+

data/lib/generators/hobo/install_plugin/install_plugin_generator.rb

@@ -11,9 +11,6 @@ to get it.  If the second argument is not supplied, it is installed
 from rubygems.org or any other gem source listed in your Gemfile.  If
 the second argument contains a colon (:), it is assumed to be a git
 URL.  Otherwise it is considered to be a path.
-
-If you are installing a Hobo theme, you probably want to use the options
-`--subsite=front --css-top`.
 """
 
     argument :name, :desc => "the plugin name"
@@ -23,12 +20,13 @@ If you are installing a Hobo theme, you probably want to use the options
     class_option :skip_css, :type => :boolean, :aliases => '-C', :desc => "doesn't add require to application.css"
     class_option :version, :type => :string, :aliases => '-v', :desc => "Gemspec version string"
     class_option :comments, :type => :string, :desc => "comments to add before require/include"
-    class_option :subsite, :type => :string, :aliases => '-e', :default => "application", :desc => "Subsite name (without '_site') or 'all' or 'application'"
-    class_option :css_top, :type => :boolean, :desc => "add the require statement to the top of the CSS file rather tahn the bottom."
+    class_option :subsite, :type => :string, :aliases => '-e', :default => "all", :desc => "Subsite name (without '_site') or 'all'"
 
     def install_plugin
       if install_plugin_helper(name, git_path, options)
-        invoke(Bundler::CLI, :update, [], {})
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
       end
     end
   end

data/lib/generators/hobo/plugin.rb

@@ -34,19 +34,15 @@ module Generators
           need_update = gem_with_comments(plugin, options[:version], gem_options)
         end
 
-        if options[:subsite] == "all"
-          if Hobo.subsites.blank?
-            subsites = ['application']
-          else
-            subsites = ['front'] + Hobo.subsites
-          end
+        if options[:subsite].nil? || options[:subsite] == "all"
+          subsites = ['front'] + Hobo.subsites
         else
-          subsites = [options[:subsite] || 'application']
+          subsites = [options[:subsite]]
         end
 
         subsites.each do |subsite|
           inject_js_require(name, subsite, options[:comments]) unless options[:skip_js]
-          inject_css_require(name, subsite, options[:comments], options[:css_top]) unless options[:skip_css]
+          inject_css_require(name, subsite, options[:comments]) unless options[:skip_css]
           inject_dryml_include(name, subsite, options[:comments])
         end
 
@@ -71,13 +67,9 @@ module Generators
         end
       end
 
-      def inject_css_require(name, subsite, comments, css_top)
+      def inject_css_require(name, subsite, comments)
         application_file = "app/assets/stylesheets/#{subsite}.css"
-        if css_top
-          opts = {:after => /^\/\*.*?\*=.*?\n /m}
-        else
-          opts = {:before => /\*=(?!.*\*=).*?$/m}
-        end
+        opts = {:before => /\*=(?!.*\*=).*?$/m}
 
         raise Thor::Error, "Couldn't find #{subsite}.css!" unless exists?(application_file)
 
@@ -91,7 +83,7 @@ module Generators
       def inject_dryml_include(name, subsite, comments)
         subsite = "#{subsite}_site" unless subsite=="application"
         application_file = "app/views/taglibs/#{subsite}.dryml"
-        pattern          = /\<include.*?\>(?!.*\<include.*?\>).*?\n/m
+        pattern          = /\<include gem=.*?\>(?!.*\<include gem=.*?\>).*?\n/m
 
         raise Thor::Error, "Couldn't find #{subsite}.dryml!" unless exists?(application_file)
 

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

@@ -150,6 +150,10 @@ EOI
       invoke 'hobo:front_controller', [front_controller_name], :user_resource_name => @user_resource_name, :invite_only => @invite_only
     end
 
+    def install_default_plugins
+      invoke 'hobo:install_default_plugins', [], {:subsite => 'front', :theme => 'hobo_clean', :ui_theme => 'redmond', :skip_gem => false}
+    end
+
     def admin_subsite
       if wizard?
         say_title 'Admin Subsite'
@@ -178,30 +182,6 @@ EOI
       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

data/lib/generators/hobo/subsite.rb

@@ -1,14 +1,6 @@
 require 'fileutils'
 require 'thor/parser/option'
 
-# we want the option :make_front_site required even if it is boolean
-# Thor does not allow it, so we patch it
-class  Thor
-  class Option
-    def validate!; end
-  end
-end
-
 module Generators
   module Hobo
     Subsite = classy_module do
@@ -16,31 +8,14 @@ module Generators
       include Generators::Hobo::InviteOnly
       include Generators::Hobo::Taglib
 
-      class_option :make_front_site,
-                   :type => :boolean,
-                   :required => true,
-                   :desc => "Rename application.dryml to front_site.dryml"
-
       # check_class_collision :suffix => 'SiteController'
 
       def move_and_generate_files
-        if options[:make_front_site]
-          unless can_mv_application_to_front_site?
-            say "Cannot rename application.dryml to #{file_name}_site.dryml"
-            exit 1
-          end
+        if can_mv_application_to_front_site?
           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
 

data/lib/generators/hobo/subsite/templates/application.dryml

@@ -1 +1,2 @@
-<!-- Global taglib - these tags are shared across all subsites -->
+<!-- this file is included by front_site.dryml, admin_site.dryml et al, so
+you can place common code in this file. -->

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

@@ -10,6 +10,7 @@ module Hobo
 
     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", "--skip_gem"])
     end
 
   end

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

@@ -1,9 +1,13 @@
 <!-- Tag definitions for the <%= file_name %> subsite -->
 
+<include gem="hobo_rapid"/>
+
 <include src="taglibs/auto/<%= file_name %>/rapid/cards"/>
 <include src="taglibs/auto/<%= file_name %>/rapid/pages"/>
 <include src="taglibs/auto/<%= file_name %>/rapid/forms"/>
 
+<include src="application"/>
+
 <% if invite_only? -%>
 
 <extend tag="card" for="<%= options[:user_resource_name].camelcase %>">

data/lib/hobo/controller/model.rb

@@ -747,9 +747,11 @@ module Hobo
 
     # --- Miscelaneous Actions --- #
 
+    # Hobo 1.3's name one uses params[:query], jQuery-UI's autocomplete
+    # uses params[:term] and jQuery Tokeninput uses params[:q]
     def hobo_completions(attribute, finder, options={})
       options = options.reverse_merge(:limit => 10, :query_scope => "#{attribute}_contains")
-      options[:param] ||= params[:query].nil? ? :term : :query
+      options[:param] ||= [:term, :q, :query].find{|k| !params[k].nil?}
       finder = finder.limit(options[:limit]) unless finder.try.limit_value
 
       begin
@@ -763,7 +765,11 @@ module Hobo
         end
       end
       if request.xhr?
-        render :json => items.map {|i| i.send(attribute)}
+        if options[:param] == :q
+          render :json => items.map {|i| {:id => "@#{i.send(i.class.primary_key)}", :name => i.send(attribute)}}
+        else
+          render :json => items.map {|i| i.send(attribute)}
+        end
       else
         render :text => "<ul>\n" + items.map {|i| "<li>#{i.send(attribute)}</li>\n"}.join + "</ul>"
       end

data/lib/hobo/extensions/active_record/relation_with_origin.rb

@@ -11,8 +11,10 @@ module ActiveRecord
   module SpawnMethods
     def merge_with_origin(r)
       merged = merge_without_origin(r)
-      merged.origin ||= r.respond_to?(:origin) && r.origin
-      merged.origin_attribute ||= r.respond_to?(:origin_attribute) && r.origin_attribute
+      # LH#1002:  cannot call respond_to? because default_scope ends
+      # up calling merge and we end up with infinite recursion
+      merged.origin = r.origin rescue nil unless merged.instance_variable_defined?("@origin")
+      merged.origin_attribute = r.origin_attribute rescue nil unless merged.instance_variable_defined?("@origin_attribute")
       merged
     end
 

data/lib/hobo/model/accessible_associations.rb

@@ -71,9 +71,9 @@ module Hobo
           # Due to the way that rails works, there's no good way to tell
           # the difference between an empty array and a params hash that
           # just isn't making any updates to the array.  So we're
-          # hacking this in: if you pash an empty string where an array
+          # hacking this in: if you pass an empty string where an array
           # is expected, we assume you wanted an empty array.
-          []
+          array_or_hash.split(',')
         else
           array_or_hash
         end
@@ -91,7 +91,7 @@ module Hobo
 
       def finder_for_belongs_to(record, name)
         refl = record.class.reflections[name]
-        conditions = ActiveRecord::Associations::BelongsToAssociation.new(record, refl).send(:conditions)
+        conditions = ActiveRecord::Associations::BelongsToAssociation.new(record, refl).reflection.send(:conditions)
         finder = refl.klass.scoped(:conditions => conditions)
       end
 

data/test/irt/generators/partials/_subsite_taglib_variables.rb

@@ -1,6 +1,4 @@
-tags = %(<!-- Tag definitions for the subs subsite -->
-
-<include src="taglibs/auto/subs/rapid/cards"/>
+tags = %(<include src="taglibs/auto/subs/rapid/cards"/>
 <include src="taglibs/auto/subs/rapid/pages"/>
 <include src="taglibs/auto/subs/rapid/forms"/>
 )

metadata

@@ -2,7 +2,7 @@
 name: hobo
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.4.0.pre4
+  version: 1.4.0.pre5
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-28 00:00:00 Z
+date: 2012-04-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hobo_support
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre4
+        version: 1.4.0.pre5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre4
+        version: 1.4.0.pre5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre4
+        version: 1.4.0.pre5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -170,6 +170,8 @@ files:
 - lib/generators/hobo/i18n/templates/hobo.nb.yml
 - lib/generators/hobo/i18n/templates/hobo.pt-PT.yml
 - lib/generators/hobo/i18n/templates/hobo.ru.yml
+- lib/generators/hobo/install_default_plugins/USAGE
+- lib/generators/hobo/install_default_plugins/install_default_plugins_generator.rb
 - lib/generators/hobo/install_plugin/USAGE
 - lib/generators/hobo/install_plugin/install_plugin_generator.rb
 - lib/generators/hobo/invite_only.rb