hobo 2.0.0.pre1 → 2.0.0.pre2

data/CHANGES-1.4.txt

@@ -1,8 +1,8 @@
-Hobo 1.4 Changes
+Hobo 2.0 Changes
 {: .document-title}
 
-Documents the changes made in Hobo 1.4 and the changes required to
-migrate applications to Hobo 1.4
+Documents the changes made in Hobo 2.0 and the changes required to
+migrate applications to Hobo 2.0
 
 Contents
 {: .contents-heading}
@@ -12,9 +12,13 @@ Contents
 
 # Installation
 
+Meta tags:  note for collaborators.   A meta-tag looks like this {.done}.   It's added after a paragraph with no blank spaces.   The tags that we support are:  {.ruby} {.javascript} {.dryml} and {.diff} for code highlighting.   {.todo}, {.done}, {.check}, {.part} and {.nomove} indicate documentation progress moving into the Hobo manuals.  {.check} means that it's probably done.  {.part} means that it's partly done.  {.nomove} means that this section only needs to exist in this CHANGES document.   Finally, {.hidden} is used for paragraphs like this one that shouldn't show up on the website.
+{.hidden}
+
 ## Creating a new application
+{.part}
 
-Hobo 1.4 gems have not yet been released, so the standard instructions
+Final hobo 2.0 gems have not yet been released, so the standard instructions
 of "gem install hobo; hobo new foo" do not yet work.
 
 If you're on Linux you'll have to install a javascript runtime.
@@ -54,9 +58,10 @@ version strings for the hobo_* gems with `:git => "git://github.com/tablatom/hob
     $HOBODEV/hobo/bin/hobo new foo
 
 ## Updating a Hobo 1.3 application
+{.nomove}
 
 There are several changes that need to be made to your application to
-upgrade from Hobo 1.3 to Hobo 1.4.   Most of these changes are
+upgrade from Hobo 1.3 to Hobo 2.0.   Most of these changes are
 required by the addition of the asset pipeline which was introduced in
 Rails 3.1.
 
@@ -64,7 +69,7 @@ Follow the asset pipeline upgrade steps outlined here:
 http://guides.rubyonrails.org/asset_pipeline.html#upgrading-from-old-versions-of-rails
 
 The easiest way to upgrade an existing Hobo 1.3 application is to
-generate a new Hobo 1.4 application and copy differences from the new
+generate a new Hobo 2.0 application and copy differences from the new
 app into your existing app.
 
 ### Gemfile
@@ -77,31 +82,31 @@ Hobo has also gained several additional gems, so you will have to add
 dependencies for those.  hobo_rapid is the Hobo tag library,
 hobo_jquery is the javascript for hobo_rapid, and hobo_clean is the
 default theme.   Instead of or as well as hobo_clean you can use
-hobo_clean_admin or hobo_clean_sidemenu.  Hopefully there will be
-additional themes available soon.
+hobo_clean_admin or hobo_clean_sidemenu or hobo_bootstrap.
+
+You will also have to ensure that you are using Hobo's fork of will_paginate:
+
+    gem "will_paginate", :git => "git://github.com/Hobo/will_paginate.git"
 
 ### config/
 
 All of the changes in config/ are due to the assets pipeline.  See
 http://guides.rubyonrails.org/asset_pipeline.html#upgrading-from-old-versions-of-rails
 
-Additionally, the Hobo 1.4 generator installs the
-[rails-dev-tweaks](https://github.com/wavii/rails-dev-tweaks) gem.  We
-adjust the configuration so that rails-dev-tweaks applies only to
-assets, not to XHR.
-
 ### application.dryml or front_site.dryml
 
 Replace
 
     <set-theme name="clean"/>
-
+{.dryml}
+    
 with
 
     <include gem='hobo_rapid'/>
     <include gem='hobo_jquery'/>
     <include gem='hobo_jquery_ui'/>
     <include gem='hobo_clean'/>
+{.dryml}
 
 Note that the default Hobo generation now always creates both a
 front_site.dryml and an application.dryml, even if you don't create
@@ -111,10 +116,12 @@ Also be aware that application.dryml is no longer loaded automatically
 if you have a front_site.dryml.    Add
 
     <include src="application" />
+{.dryml}
 
 to your front_site.dryml, your admin_site.dryml, et cetera.
 
 ### move public/ to app/assets/
+{.todo}
 
 In Rails 3.1, images, javascripts and stylesheets are loaded from
 app/assets/ rather than from public/ so you'll have to move them.
@@ -137,9 +144,10 @@ on the corresponding subsite.
 # Changes from Hobo 1.3 & hobo-jquery 1.3
 
 ## Javascript framework changed to jQuery
+{.nomove}
 
 Hobo 1.3 and earlier versions used prototype.js for its Ajax support.
-In Hobo 1.4 all of our javascript code has been rewritten to use
+In Hobo 2.0 all of our javascript code has been rewritten to use
 jQuery instead of prototype.js.
 
 In the process of rewriting the code many tags have been updated to
@@ -148,43 +156,52 @@ been updated to use standard Hobo form AJAX.   The most visible of
 these changes have been to the editors.
 
 ## The Asset Pipeline
+{.todo}
+
+we should create a (small) chapter on the Hobo asset pipeline layout.  see above (move public/ to app/assets/)
+{.hidden}
 
-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
+Hobo 2.0 uses the asset pipeline features introduced in Rails 3.1.
+Hobo 2.0 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 so manually, there are no longer any rake
 tasks to do this for you.
 
 ## application.dryml is no longer loaded automatically
+{.todo}
 
 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
+front or admin or the name of the current subsite.  Hobo 2.0 only
 loads X_site.dryml.   If that fails, it loads application.dryml
 instead.
 
-A new application generated by Hobo 1.4 will have `<include
+A new application generated by Hobo 2.0 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
+{.todo}
 
 For correct behaviour, please ensure that all accessible associations
 have their :inverse_of option set in both directions.
 
 ## set-theme deprecated
+{.nomove}
 
 The old Hobo theme support has never worked well, and has been
 replaced.   Themes are now Hobo plugins and work like every other Hobo
-1.4 plugin.
+2.0 plugin.
 
 Replace:
 
     <set-theme name="clean"/>
+{.dryml}
 
 with
 
     <include gem="hobo_clean"/>
+{.dryml}
 
 and add
 
@@ -195,12 +212,14 @@ include javascript which would require them to be added to front.js as
 well.
 
 ## default doctype changed
+{.nomove}
 
 The default doctype has been changed from `XHTML 1.0 TRANSITIONAL` to
 `html`, also known as "standards mode" in Internet Explorer 8 and 9
 and "html5" in other browsers.
 
 ## named routes' names changed to use standard Rails names
+{.nomove}
 
 The names of named routes generated by Hobo have changed to more
 closely match the default names generated by the Rails REST route
@@ -250,6 +269,7 @@ receive the following benefits:
 - code reduction in Hobo
 
 ## `remote-method-button` and `update-button` broken
+{.nomove}
 
 `remote-method-button`, `update-button` and similar buttons such as
 `delete-button` were written early in the history of Hobo, before
@@ -257,16 +277,18 @@ standard form/part ajax was supported. These tags are easy to replace
 with the much more flexible forms.
 
 For backwards compatibility, most of these buttons have been updated
-to 1.4. However, the little used `remote-method-button` and
-`update-button` have not been converted to the 1.4 form.
+to 2.0. However, the little used `remote-method-button` and
+`update-button` have not been converted to the 2.0 form.
 
 ## default field-list changed
+{.nomove}
 
 The default for `<field-list>` has changed to `<feckless-fieldset>`.
 The old behaviour is still available in `<field-list-v1>`.   Please
 provide feedback: we are open to reversion before final release.
 
 ## Helper rearrangement
+{.todo}
 
 In previous versions of Hobo, all Hobo helpers were available in both
 the controllers and the views.   In this version, some helpers are
@@ -286,16 +308,18 @@ config.hobo.include_deprecated_helper.
 
 ## Rails 3.2 required
 
-Hobo 1.4 currently requires Rails 3.2 for operation.
+Hobo 2.0 currently requires Rails 3.2 for operation.
 
 ## Enhancements
 
 ### Nested caching
+{.todo}
 
 See the docs for `<nested-cache>` and the blog post I'm going to
 eventually write...
 
 ### push-state
+{.todo}
 
 AJAX now supports a new AJAX option 'push-state' if you have
 History.js installed.   It was inspired by [this
@@ -355,6 +379,7 @@ such as IE8, IE9 or Firefox 3, but results in strange looking URL's.   See
 the README for History.js for more details on that behaviour.
 
 ### plugin generators
+{.part}
 
 Hobo has gained two new generators.
 
@@ -368,6 +393,7 @@ skeleton for a new plugin.   See [the plugin manual page](FIXME) for
 more details.
 
 ### multiple parts
+{.todo}
 
 I've updated DRYML so that it emits a different DOM ID if you
 re-instantiate a part.  (The first use of a part retains the DOM
@@ -394,7 +420,57 @@ Example:
        </div>
      </collection>
 
+### Bottom-loading Javascript
+{.todo}
+
+The `<page>` tag has a new attribute: `bottom-load-javascript`. If
+set, Javascript is loaded via a deferred load at the bottom of the
+body rather than being loaded conventionally in the head.
+
+You probably want to enable this globally in your application by
+adding this to your application.dryml:
+
+    <extend tag="page">
+      <old-page bottom-load-javascript merge/>
+    </extend>
+
+Note that if this option is set, the custom-scripts parameter is no
+longer available. There is a new parameter called custom-javascript
+that can be used instead, though.
+
+Replace:
+
+    <custom-scripts:>
+      <script type="text/javascript">
+        $(document).ready(function() {
+          alert('hi');
+        });
+      </script>
+    </custom-scripts:>
+
+with:
+
+    <custom-javascript:>
+      alert('hi');
+    </custom-javascript:>
+
+If you wish to be compatible with both top & bottom loading use:
+
+    <custom-javascript:>
+      $(document).read(function() {
+        alert('hi');
+      })
+    </custom-javascript:>
+
+If you were previously loading files via custom-scripts, use the asset
+pipeline instead.
+
+Turning on bottom-load will prevent Rails from splitting front.js into
+multiple files even if you enable config.assets.debug in your
+environment.
+
 ### allowing errors in parts
+{.todo}
 
 Older versions of Hobo did not render a part update if the update did
 not pass validation.
@@ -408,6 +484,7 @@ supplied a block to hobo_update you will be responsible for
 implementing this functionality yourself.
 
 ### AJAX file uploads
+{.todo}
 
 If you have malsup's form plugin installed, Ajax file uploads should
 "just work", as long as you don't have debug_rjs turned on in your
@@ -418,6 +495,7 @@ Make sure you're form uses multipart encoding:
      <form multipart ajax/>
 
 ### AJAX events
+{.todo}
 
 The standard 'before', 'success', 'done' and 'error' callbacks may
 still be used.   Additionally, the AJAX code now triggers
@@ -439,6 +517,7 @@ itself, and passes the element as an argument.
       });
 
 ### before callback
+{.todo}
 
 A new callback has been added to the list of Ajax Callbacks: before.
 This callback fires before any Ajax is done.   If you return false
@@ -447,6 +526,7 @@ explicitly return true if you use it and don't want your ajax
 cancelled.
 
 ### callbacks
+{.todo}
 
 Normally in HTML you can attach either a snippet of javascript or a
 function to a callback.
@@ -465,6 +545,7 @@ Now you can just return the function name:
     <form ajax success="fbar"/>
 
 ### `hide` and `show` ajax options
+{.todo}
 
 There are two new ajax options: `hide` and `show`.  These are passed
 directly to the jQuery-UI `hide` and `show` functions.  See
@@ -490,6 +571,7 @@ These two options have global defaults which are TBD.  They may be overridden by
 To disable effects entirely:  FIXME.
 
 ### spinner options
+{.todo}
 
 By default, the spinner is now displayed next to the element being
 updated.  Besides the old `spinner-next-to` option, there are a number
@@ -512,15 +594,18 @@ These options may be overridden globally by adding them as attributes to the `pa
      </extend>
 
 ### hjq-datepicker
+{.done}
 
 hjq-datepicker now automatically sets dateFormat to the value
 specified in your translations:  (I18n.t :"date.formats.default").
 
 ### sortable-collection
+{.done}
 
 sortable-collection now supports the standard Ajax callbacks
 
 ### delete-button
+{.done}
 
 The new `delete-button` behaviour is not as much different from the
 old `delete-button` as a comparison of the documentation would have
@@ -530,6 +615,7 @@ The `fade` attribute is no longer supported.   Instead use the new
 standard ajax attribute `hide`.
 
 ### autocomplete
+{.done}
 
 `hjq-autocomplete` has been renamed to `autocomplete`.  It has gained
 the attribute `nil-value` and the ability to work with the standard
@@ -539,6 +625,7 @@ Hobo autocomplete and hobo_completions controller actions.
 `autocomplete`.
 
 ### input-many
+{.done}
 
 `hjq-input-many` and `input-many` have been merged into `input-many`.
 The new standard ajax attributes `hide` and `show` are also now
@@ -556,15 +643,18 @@ Differences from `hjq-input-many`:
 - new attributes: hide, show
 
 ### filter-menu
+{.done}
 
 filter-menu now accepts AJAX attributes.
 
 ### a
+{.done}
 
 the a tag now accepts AJAX attributes.  This is especially useful with
 the new 'push-state' option.
 
 ### dialog-box
+{.done}
 
 `hjq-dialog` has been renamed to `dialog-box`.  (`dialog` has already
 been taken in HTML5).
@@ -577,11 +667,13 @@ Dialog positioning has been updated and should work better now.   See
 the documentation for more details.
 
 ### search-filter
+{.done}
 
 The table-plus search filter has been extracted into its own tag for
 use outside of table-plus. It has also gained a "clear" button.
 
 ### live-search
+{.part}
 
 `live-search` works in a substantially different fashion now, it has
 almost completely lost its magic, instead using standard ajax forms
@@ -595,10 +687,12 @@ in hjq-live-search.js -- the hard part will probably be in doing it in
 a way that works in all possible browsers.
 
 ### hot-input
+{.done}
 
 see tag documentation
 
 ### page-nav
+{.done}
 
 The params attribute now defaults to
 recognize_page_path.slice(:controller,:action,:id).
@@ -607,6 +701,7 @@ Standard form ajax attributes are now also supported, and behave
 similar to `<a>`.
 
 ### query_params
+{.todo}
 
 The old query_params helper has been removed.   You can use
 Rails (request.query_parameters | request.request_parameters) instead
@@ -629,6 +724,7 @@ field is named "project.title", parse_sort_param will sort on the
 column "projects.title".
 
 ### controller actions
+{.todo}
 
 Hobo no longer attempts to perform its part-based AJAX actions when
 sent an xhr request. Instead, Hobo performs part-based AJAX when
@@ -659,11 +755,13 @@ model-level permission checking rather than fine grained attribute
 level permission checking.
 
 ### before-unload
+{.check}
 
 `<form>` has gained a new option, before-unload, which adds an
 onbeforeunload helper to the page.
 
 ## Editors
+{.todo}
 
 Editors are no longer special-cased, they now use the standard DRYML
 part mechanism.
@@ -692,11 +790,13 @@ using a form would allow reasonable javascript-disabled behaviour.
 ## Changes behind the scenes
 
 ### reloading of part context
+{.todo}
 
 [This change](https://github.com/tablatom/hobo/commit/6048925) ensures that
 DRYML does not reload the part context if it is already in `this`.
 
 ### i18n
+{.todo}
 
 These commits will require translation updates for languages other
 than English.  (Presumably this list will get larger because right now
@@ -705,6 +805,7 @@ the change is one I could do myself...)
 - https://github.com/tablatom/hobo/commit/e9460d336ef85388af859e5082763bfae0ad01f5
 
 ### controller changes
+{.todo}
 
 Due to limitations on Ajax file uploads, multipart forms are not sent with the proper Ajax headers.   If your controller action may receive multipart forms, rather than using:
 
@@ -724,17 +825,19 @@ use
 for more information see http://jquery.malsup.com/form/#file-upload
 
 ### hobo_ajax_response
+{.todo}
 
 the `hobo_ajax_response` function now has a different signature.
 Standard usage doesn't supply any arguments to hobo_ajax_response.
 This use case has not changed.
 
 However, if you have code that supplied arguments to
-hobo_ajax_response, that code likely will need to be updated for 1.4.
+hobo_ajax_response, that code likely will need to be updated for 2.0.
 
 FIXME: pointer to AJAX background documentation.
 
 ### Dryml.render
+{.todo}
 
 Dryml.render now has an additional argument: imports.   The template
 environment no longer automatically imports ActionView::Helpers.
@@ -745,6 +848,7 @@ All application helpers are now available in the template
 environment.
 
 ## Attribute Whitelist
+{.todo}
 
 Rails 3.2.3 and later changed the default for config.whitelist_attributes to true, so any newly generated Hobo apps will have this feature turned on.  Hobo heavily depends on mass attribute assignation, so this may cause inconveniences.
 
@@ -757,10 +861,12 @@ If you choose not to turn off config.whitelist_attributes, any fields that are n
 FIXME: pull into separate document, along with interface specs
 
 ## Framework Agnosticism
+{.dontmove}
 
 jQuery support is being written in a manner that should make it easier to support other frameworks if we ever decide to do so.   Basically all this means is that we're annotating our HTML and the javascript is picking up the information from the annotations rather than calling functions or setting variables.
 
 ## Unobtrusiveness
+{.todo}
 
 The agnosticism is a side benefit -- really the main reason its written this way is so that we're coding using "unobtrusive javascript" techniques.
 
@@ -800,6 +906,7 @@ contains a typed_id of the current context.  This is used to assist
 tags like `delete-button` with DOM manipulation.
 
 ## Compatibility
+{.dontmove}
 
 Obviously compatibility with hobo-rapid.js is not going to be
 maintained, since that's written in prototype.
@@ -809,24 +916,4 @@ switched to using a more standard jQuery plugin style.
 
 # Running the integration tests:
 
-hobo-jquery is being tested using capybara & qunit.js.
-
-Unfortunately, 2 of the integration tests fails on firefox, which
-works out of the box, so we also have to install capybara-webkit and
-selenium-chrome.
-
-     $ git clone -b hobo-1.4 git://github.com/Hobo/agility-gitorial.git
-     $ cd agility-gitorial
-
-Make sure you have the prerequisites for capybara-webkit:
-https://github.com/thoughtbot/capybara-webkit/wiki/Installing-QT
-
-     $ bundle install
-     $ rake db:migrate
-
-Download the selenium-chrome server and place in your path:
-http://code.google.com/p/chromedriver/downloads/list
-
-     $ rake test:integration
-
-Email the list and/or bryan@larsen.st if you get any failures.
+see https://github.com/tablatom/hobo/integration_tests/agility/README

data/Gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+gem 'rubydoctest', :git => 'git://github.com/bryanlarsen/rubydoctest.git'
+gem 'rails', '3.2.8'
+gemspec :path => "../dryml"
+gemspec :path => "../hobo_support"
+gemspec :path => "../hobo_fields"
+gemspec
+gem 'will_paginate', :git => 'git://github.com/Hobo/will_paginate.git'

data/VERSION

@@ -1 +1 @@
-2.0.0.pre1
+2.0.0.pre2

data/hobo.gemspec

@@ -18,7 +18,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rubydoctest', [">= 1.1.3"])
   s.add_development_dependency('shoulda', [">= 0"])
-  s.add_development_dependency('irt', [">= 1.2.10"])
+  s.add_development_dependency('irt', ["= 1.2.11"])
+  s.add_development_dependency('mocha')
+  s.add_development_dependency('sqlite3')
+  s.add_development_dependency('yard')
 
   s.executables = ["hobo"]
   s.files = `git ls-files -x #{name}/* -z`.split("\0")

data/lib/generators/hobo/assets/assets_generator.rb

@@ -25,7 +25,9 @@ module Hobo
       copy_file 'front.js',                              'app/assets/javascripts/front.js'
       copy_file 'gitkeep',                               'app/assets/javascripts/front/.gitkeep'
 
+      application "#"
       application "config.assets.precompile += %w(front.css front.js)"
+      application "# Hobo: the front subsite loads front.css & front.js"
     end
 
   end

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

@@ -14,11 +14,11 @@ module Hobo
       opts[:version] = Hobo::VERSION
       say "Installing default plugins for #{opts[:subsite]}..."
       say "Installing hobo_rapid plugin..."
-      install_plugin_helper('hobo_rapid', nil, opts.merge(:skip_dryml => true))
+      install_plugin_helper('hobo_rapid', nil, opts.merge(:skip_dryml => true, :skip_gem => true))
       say "Installing hobo_jquery plugin..."
-      install_plugin_helper('hobo_jquery', nil, opts)
+      install_plugin_helper('hobo_jquery', nil, opts.merge(:skip_gem => true))
       say "Installing hobo_jquery_ui plugin..."
-      install_plugin_helper('hobo_jquery_ui', nil, opts)
+      install_plugin_helper('hobo_jquery_ui', nil, opts.merge(:skip_gem => true))
 
       say "Installing #{opts[:theme]} theme..."
       inject_css_require("jquery-ui/#{opts[:ui_theme]}", opts[:subsite], nil)

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

@@ -150,10 +150,22 @@ EOI
       if dryml_only_templates
         remove_file 'app/views/layouts/application.html.erb'
         remove_file 'app/helpers/application_helper.rb'
-        environment "\n  config.hobo.dryml_only_templates = true\n"
+        environment "#"
+        environment "config.hobo.dryml_only_templates = true"
+        environment "# Hobo: remove support for ERB templates"
       end
     end
 
+    def quiet_assets
+      say "Adding quiet_assets gem"
+      gem_with_comments('quiet_assets', :group => :development, :comments => "\n# Hobo has a lot of assets.   Stop cluttering the log in development mode.")
+    end
+
+    def will_paginate
+      say "Adding will_paginate gem"
+      gem_with_comments('will_paginate', :git => "git://github.com/Hobo/will_paginate.git", :comments => "\n# Hobo's version of will_paginate is required.")
+    end
+
     def front_controller
       if wizard?
         say_title 'Front Controller'
@@ -218,8 +230,10 @@ EOI
       end
     end
 
-    def add_dev_tweaks
-      invoke 'hobo:dev_tweaks'
+    def active_reload_dryml
+      environment "#", :env => :development
+      environment "config.watchable_dirs[File.join(config.root, 'app/view')] = ['dryml']", :env => :development
+      environment "# Hobo: tell ActiveReload about dryml", :env => :development
     end
 
     def generate_migration
@@ -262,7 +276,9 @@ EOI
       end
       unless default_locale.blank?
         default_locale.gsub!(/\:/, '')
+        environment "#"
         environment "config.i18n.default_locale = #{default_locale.to_sym.inspect}"
+        environment "#"
       end
       ls = (locales - %w[en]).map {|l| ":#{l}" }
       lstr = ls.to_sentence

data/lib/generators/hobo/subsite.rb

@@ -26,7 +26,9 @@ module Generators
 
         template "controller.rb.erb", File.join('app/controllers', file_name, "#{file_name}_site_controller.rb")
 
+        application "#"
         application "config.assets.precompile += %w(#{file_name}.css #{file_name}.js)"
+        application "# Hobo: the #{file_name} subsite loads #{file_name}.css & #{file_name}.js"
       end
 
       hook_for :test_framework, :as => :controller do | instance, controller_test |

data/lib/hobo.rb

@@ -4,7 +4,6 @@ require 'dryml'
 gem 'will_paginate', ">= 3.0"
 require 'will_paginate'
 require 'hobo/extensions/enumerable'
-require 'hobo/extensions/array'
 
 ActiveSupport::Dependencies.autoload_paths |= [File.dirname(__FILE__)]
 ActiveSupport::Dependencies.autoload_once_paths |= [File.dirname(__FILE__)]
@@ -42,7 +41,7 @@ module Hobo
       search_targets.build_hash do |search_target|
         conditions = []
         parameters = []
-        like_operator = ActiveRecord::Base.connection.adapter_name =~ /postgres/i ? 'ILIKE' : 'LIKE'
+        like_operator = ActiveRecord::Base.connection.adapter_name =~ /postg/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} ?" }
           conditions << "(" + column_queries.join(" or ") + ")"

data/lib/hobo/controller.rb

@@ -62,7 +62,7 @@ module Hobo
     def hobo_ajax_response(options={})
       r = params[:render]
       if r
-        ajax_update_response(r.values, options[:results] || {}, options || params[:render_options])
+        ajax_update_response(r.is_a?(String) ? [] : r.values, options[:results] || {}, options || params[:render_options])
         true
       else
         false

data/lib/hobo/model.rb

@@ -1,6 +1,7 @@
 module Hobo
   module Model
     require 'will_paginate/active_record'
+    require 'will_paginate/array'
 
     class NoNameError < RuntimeError; end
 
@@ -14,8 +15,6 @@ module Hobo
 
       register_model(base)
 
-      patch_will_paginate
-
       base.class_eval do
         inheriting_cattr_reader :default_order
         alias_method_chain :attributes=, :hobo_type_conversion
@@ -43,27 +42,6 @@ module Hobo
       included_in_class_callbacks(base)
     end
 
-    def self.patch_will_paginate
-      if defined?(WillPaginate::Collection) && !WillPaginate::Collection.respond_to?(:member_class)
-
-        WillPaginate::Collection.class_eval do
-          attr_accessor :member_class, :origin, :origin_attribute
-
-          # make paginate_by_sql, etc. carry metadata
-          def replace_with_hobo_metadata(array)
-            result = replace_without_hobo_metadata(array)
-            self.member_class = array.try.member_class
-            self.origin = array.try.origin
-            self.origin_attribute = array.try.origin_attribute
-            result
-          end
-          alias_method_chain :replace, :hobo_metadata
-        end
-
-      end
-    end
-
-
     def self.register_model(model)
       @model_names ||= Set.new
       @model_names << model.name

data/lib/hobo/model/accessible_associations.rb

@@ -92,7 +92,7 @@ module Hobo
       def finder_for_belongs_to(record, name)
         refl = record.class.reflections[name]
         conditions = ActiveRecord::Associations::BelongsToAssociation.new(record, refl).reflection.send(:conditions)
-        finder = refl.klass.scoped(:conditions => conditions)
+        conditions == [[]] || conditions == [[],[]] ? refl.klass : refl.klass.scoped(:conditions => conditions)
       end
 
     end

data/lib/hobo/model/scopes/automatic_scopes.rb

@@ -319,7 +319,7 @@ module Hobo
             return true if check_only
 
             def_scope do |query, *fields|
-              match_keyword = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
+              match_keyword = %w(PostgreSQL PostGIS).include?(::ActiveRecord::Base.connection.adapter_name) ? "ILIKE" : "LIKE"
 
               words = query.split
               args = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo_support
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0.pre2
 - !ruby/object:Gem::Dependency
   name: hobo_fields
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0.pre2
 - !ruby/object:Gem::Dependency
   name: dryml
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0.pre2
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -109,12 +109,28 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: irt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.11
+- !ruby/object:Gem::Dependency
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The web app builder for Rails
 email: tom@tomlocke.com
 executables:
@@ -133,10 +181,10 @@ files:
 - CHANGES-1.1.txt
 - CHANGES-1.3.txt
 - CHANGES-1.4.txt
+- Gemfile
 - LICENSE.txt
 - README
 - Rakefile
-- TODO-1.4.txt
 - VERSION
 - app/controllers/dryml_support_controller.rb
 - app/helpers/hobo_debug_helper.rb
@@ -179,7 +227,6 @@ files:
 - lib/generators/hobo/controller/USAGE
 - lib/generators/hobo/controller/controller_generator.rb
 - lib/generators/hobo/controller/templates/controller.rb.erb
-- lib/generators/hobo/dev_tweaks/dev_tweaks_generator.rb
 - lib/generators/hobo/front_controller/USAGE
 - lib/generators/hobo/front_controller/front_controller_generator.rb
 - lib/generators/hobo/front_controller/templates/controller.rb.erb
@@ -271,7 +318,6 @@ files:
 - lib/hobo/extensions/active_record/permissions.rb
 - lib/hobo/extensions/active_record/relation_with_origin.rb
 - lib/hobo/extensions/active_support/cache/file_store.rb
-- lib/hobo/extensions/array.rb
 - lib/hobo/extensions/enumerable.rb
 - lib/hobo/extensions/i18n.rb
 - lib/hobo/model.rb

data/TODO-1.4.txt

@@ -1,59 +0,0 @@
-# TODO
-
-## regressions
-
- * remote-method-button, update-button: normal usages of these tags work, but they do
-   not work if you ask them to do AJAX
- * live-search works, but it's not 'live'.  You have to press return
-   to start the search
- * the rapid_summary tags have been moved out
-   of core Hobo into their own plugin,
-   https://github.com/Hobo/hobo_summary, which is not yet in a working state
-
-## documentation
-
- * touchpunch for mobile sortables
- * document themes/plugins
- * FAQ
- * agility
- * admin subsite
- * books
- * ajax manual section
- * miscellaneous controller extensions
- * there's some nice stuff in HoboFields::Model that should be documented & tested
-
-## Cookbook
-
- * search
- * actually use Hobo 1.4's new caching abilities
- * auto-link tags in manual
- * create fakedef manual entries for DRYML tags not in taglibs entry
-
-## new features that aren't "done"
-
- * clean_sidemenu -> plugin
- * cache: csrf warning
- * monkey patch will_paginate if my patches are not upstreamed
-
-It's quite likely that some of the new tag definitions are missing
-useful id, class, merge or param attributes.  This doesn't impact core
-functionality, but it does limit your ability to extend the tags.  If
-you notice any such omissions, please let us know, it is easy to fix..
-
-## stuff that we really want to do
-
- * multiple file support for AJAX uploads
- * cache: redis support
- * fixup deprecation warnings
- * trawl the lighthouse && pull requests
- * steal the tags from Portal
- * fixup hobo-contrib
- * convert paperclip_with_hobo to gem
-
-## would be nice:
-
- * parametrize the clean theme
- * create a bootstrap theme
- * add theme chooser to setup wizard
- * add support for has-one
- * convert old Hobo plugins:  imaginary-dryml, hoboyui, nice theme

data/lib/generators/hobo/dev_tweaks/dev_tweaks_generator.rb

@@ -1,31 +0,0 @@
-require 'bundler/cli'
-module Hobo
-  class DevTweaksGenerator < Rails::Generators::Base
-
-    include Generators::Hobo::Plugin
-
-    desc "install the rails-dev-tweaks plugin & configure it"
-    def add_dev_tweaks
-      say "Adding rails-dev-tweaks gem"
-      gem_with_comments('rails-dev-tweaks', :version => "~> 0.6.1", :comments => "\n# The asset pipeline in Rails is really slow in development mode.\n# Hobo has a lot of assets, so speed it up with rails-dev-tweaks", :group => :development)
-      Bundler.with_clean_env do
-        run "bundle install"
-      end
-
-      # environment :env => :development action is broken
-      inject_into_file "config/environments/development.rb", :before => /end(?!.*end)/m do
-        """
-  # By default, rails-dev-tweaks also applies to XHR, but that's not a great default for Hobo
-  config.dev_tweaks.autoload_rules do
-    keep :all
-
-    skip '/favicon.ico'
-    skip :assets
-    keep :xhr
-    keep :forced
-  end
-"""
-      end
-    end
-  end
-end

data/lib/hobo/extensions/array.rb

@@ -1,27 +0,0 @@
-# Add support for type metadata to arrays
-
-require 'will_paginate/array'
-
-class Array
-
-  attr_accessor :member_class, :origin, :origin_attribute
-
-  def to_url_path
-    base_path = origin.try.to_url_path
-    "#{base_path}/#{origin_attribute}" unless base_path.blank?
-  end
-
-  def typed_id
-    origin and origin_id = origin.try.typed_id and "#{origin_id}:#{origin_attribute}"
-  end
-
-  def paginate_with_hobo_metadata(*args, &block)
-    collection = paginate_without_hobo_metadata(*args, &block)
-    collection.member_class     = member_class
-    collection.origin           = try.proxy_owner
-    collection.origin_attribute = try.proxy_association._?.reflection._?.name
-    collection
-  end
-  alias_method_chain :paginate, :hobo_metadata
-
-end