hobo 1.4.0.pre8 → 2.0.0.pre1

data/CHANGES-1.4.txt

@@ -200,6 +200,66 @@ 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
+
+The names of named routes generated by Hobo have changed to more
+closely match the default names generated by the Rails REST route
+generator. The standard 7 REST routes have not changed, but some
+additional routes such as nested routes and lifecycle routes have been
+renamed.
+
+For the moment you can ask Hobo to emit both the new style and old
+style routes by not defining
+`config.hobo.dont_emit_deprecated_routes`.
+
+Note that paths and method names have not changed, only the named
+route has changed, so this change should not be visible to the user or
+impact controller code.
+
+The route name is leftmost column in `rake routes`.
+
+Here are some example changes:
+
+    create_task_path           => create_tasks_path       # tasks#create
+    create_task_for_story_path => create_story_tasks_path # tasks#create_for_story
+    foo_transition_path        => transition_foo_path     # foos lifecycle transition
+    foo_show2_path             => show2_foo_path          # show_action :show2 in foos_controller
+
+Note that in the second example, create_story_tasks_path, the
+controller method name is `create_for_story`. This is the same method
+name that Hobo 1.0 and 1.3 use; the default Rails method name would be
+just plain `create`.
+
+There are several named routes used in the user_mailer views generated
+in a new application. These must be fixed up when upgrading an old
+application. For instance, user_activate_url must be changed to
+activate_user_url in activation.erb.
+
+In exchange for the pain of updating some of your named routes, we
+receive the following benefits:
+
+- polymorphic_url works with nested routes and in more situations
+
+- url_for will work in more situations
+
+- the `<a>` tag and the many tags which use it now accept all the
+  `url_for` options, such as host and port.
+
+- hobo_routes.rb is easier to read and understand
+
+- code reduction in Hobo
+
+## `remote-method-button` and `update-button` broken
+
+`remote-method-button`, `update-button` and similar buttons such as
+`delete-button` were written early in the history of Hobo, before
+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.
+
 ## default field-list changed
 
 The default for `<field-list>` has changed to `<feckless-fieldset>`.
@@ -224,10 +284,9 @@ app/helpers/hobo_deprecated_helper.rb
 If your application depends on any of these, you can set
 config.hobo.include_deprecated_helper.
 
-## Rails 3.1 required
+## Rails 3.2 required
 
-Hobo 1.4 currently requires Rails 3.1 for operation.  We expect to be
-on Rails 3.2 before final release.
+Hobo 1.4 currently requires Rails 3.2 for operation.
 
 ## Enhancements
 
@@ -587,6 +646,23 @@ The signature for the function update_response and friends has changed.   This s
       end
     end
 
+### default controller actions now use respond_with
+
+All Hobo model controller actions now use [respond_with](http://apidock.com/rails/ActionController/MimeResponds/respond_with) where appropriate.   This means that you can create an API interface for a controller simply by adding:
+
+    respond_to :html, :json, :xml
+
+See [respond_to](http://apidock.com/rails/ActionController/MimeResponds/ClassMethods/respond_to) and Google for "respond_with" for more information.
+
+Note that the JSON and XML interfaces will only use coarse grained
+model-level permission checking rather than fine grained attribute
+level permission checking.
+
+### before-unload
+
+`<form>` has gained a new option, before-unload, which adds an
+onbeforeunload helper to the page.
+
 ## Editors
 
 Editors are no longer special-cased, they now use the standard DRYML
@@ -668,6 +744,14 @@ environment no longer automatically imports ActionView::Helpers.
 All application helpers are now available in the template
 environment.
 
+## Attribute Whitelist
+
+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.
+
+Mass assignment protection is redundant in Hobo: your primary protection should come through the edit_permitted? function.   If all of your models have properly defined edit_permitted? then it is safe to turn off config.whitelist_attributes.
+
+If you choose not to turn off config.whitelist_attributes, any fields that are not in your attr_accessible declaration will not be available in forms.   Hobo's generators will now assist in the creation of attr_accessible declarations.
+
 # jQuery rewrite
 
 FIXME: pull into separate document, along with interface specs

data/TODO-1.4.txt

@@ -2,22 +2,17 @@
 
 ## regressions
 
- * sortable-input-many does not work
- * remote-method-button, create-button, update-button,
-   transition-button: normal usages of these tags work, but they do
+ * 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
- * remove-button, remote-method-button, create-button & update-button
-   used to display inline but now display as a block.   In other
-   words, they now display one per line rather than several in a
-   single line.
  * 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
@@ -50,9 +45,6 @@ you notice any such omissions, please let us know, it is easy to fix..
  * multiple file support for AJAX uploads
  * cache: redis support
  * fixup deprecation warnings
- * port to Rails 3.2 and/or 4.0
- * nuke any remaining prototype code
- * add a sane default for non-AJAX JSON requests.
  * trawl the lighthouse && pull requests
  * steal the tags from Portal
  * fixup hobo-contrib
@@ -64,4 +56,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
+ * convert old Hobo plugins:  imaginary-dryml, hoboyui, nice theme

data/VERSION

@@ -1 +1 @@
-1.4.0.pre8
+2.0.0.pre1

data/app/helpers/hobo_route_helper.rb

@@ -1,5 +1,16 @@
 module HoboRouteHelper
   extend HoboHelperBase
+    def object_url(obj, *args)
+      new_ = object_url_new(obj, *args)
+
+      unless Rails.configuration.hobo.dont_emit_deprecated_routes
+        old_ = object_url_old(obj, *args)
+        debugger if old_ != new_
+        raise Hobo::Error.new("new style url #{new_} does not match old style url #{old_}. obj: #{obj.inspect}.  args: #{args.inspect}.  backtrace: #{caller.inspect}") if old_ != new_
+      end
+      new_
+    end
+
   protected
     def base_url
       ENV['RAILS_RELATIVE_URL_ROOT'] || ''
@@ -20,7 +31,7 @@ module HoboRouteHelper
 
     IMPLICIT_ACTIONS = [:index, :show, :create, :update, :destroy]
 
-    def object_url(obj, *args)
+    def object_url_old(obj, *args)
       params = args.extract_options!
       action = args.first._?.to_sym
       options, params = params.partition_hash([:subsite, :method, :format])
@@ -78,29 +89,59 @@ module HoboRouteHelper
       end
     end
 
+    def object_url_new(obj, *args)
+      options = args.extract_options!
+      action = args.first._?.to_sym
+      options, params = options.partition_hash([:subsite, :method, :format])
+      options[:subsite] ||= self.subsite
+
+      if obj.respond_to?(:member_class)
+        if obj.respond_to?(:origin) && obj.origin
+          # Asking for URL of a collection, e.g. category/1/adverts or category/1/adverts/new
+          refl = obj.origin.class.reverse_reflection(obj.origin_attribute)
+          owner_name = refl.name.to_s
+          owner_name = owner_name.singularize if refl.macro == :has_many
+          poly = [owner_name, obj.member_class]
+          params[:"#{owner_name}_id"] = obj.origin
+        else
+          poly = [obj.member_class]
+        end
+      else
+        poly = [obj]
+      end
+
+      poly = [options[:subsite]] + poly if options[:subsite]
+
+      action ||= case options[:method].to_s
+                 when 'put';    :update
+                 when 'post';   :create
+                 when 'delete'; :destroy
+                 else; obj.is_a?(Class) ? :index : :show
+                 end
+
+      params[:action] = action unless action.in?(IMPLICIT_ACTIONS)
+
+      begin
+        url = polymorphic_path(poly, params)
+        # validate URL, since polymorphic URL may return a URL for a
+        # different method
+        Rails.application.routes.recognize_path(url, {:method => options[:method]})
+        url
+      rescue NoMethodError => e  # raised if polymorphic_url fails
+        nil
+      rescue ArgumentError => e  # raised from polymorphic_url
+        nil
+      rescue ActionController::RoutingError => e  # raised if recognize_path fails
+        nil
+      end
+
+    end
 
     def linkable?(*args)
       options = args.extract_options!
       target = args.empty? || args.first.is_a?(Symbol) ? this : args.shift
       action = args.first
-      return false if action.nil? && target.try.new_record?
-
-      if target.respond_to?(:member_class) && (origin = target.try.origin)
-        klass = origin.class
-        action = if action == :new
-                   "new_#{target.origin_attribute.to_s.singularize}"
-                 elsif action.nil?
-                   target.origin_attribute
-                 end
-      elsif target.is_a?(Class)
-        klass = target
-        action ||= :index
-      else
-        klass = target.class
-        action ||= :show
-      end
-
-      Hobo::Routes.linkable?(klass, action, options.reverse_merge(:subsite => subsite))
+      object_url_new(target, action, options)
     end
 
     def base_url_for(object, subsite, action)
@@ -173,7 +214,7 @@ module HoboRouteHelper
 
     # Sign-up url for a given user record or user class
     def signup_url(user_class=Hobo::Model::UserBase.default_user_model)
-      send("#{user_class.name.underscore}_signup_url") rescue nil
+      send("signup_#{user_class.name.underscore.pluralize}_url") rescue nil
     end
 
 

data/lib/generators/hobo/admin_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/admin_subsite/admin_subsite_generator.rb

@@ -5,6 +5,9 @@ module Hobo
     # overrides the default
     argument :name, :type => :string, :default => 'admin', :optional => true
 
+    class_option :theme, :type => :string, :desc => "Theme", :default => 'clean_admin'
+    class_option :ui_theme, :type => :string, :desc => "jQuery-UI Theme", :default => 'flick'
+
     include Generators::Hobo::InviteOnly
     include Generators::HoboSupport::EvalTemplate
 
@@ -14,7 +17,7 @@ module Hobo
 
     def generate_admin_user_controller
       invoke "hobo:controller", ["#{file_name}/#{options[:user_resource_name].pluralize.underscore}"], options
-      template "users_index.dryml", "app/views/#{file_name}/#{options[:user_resource_name].pluralize.underscore}/index.dryml"
+      template "users_index.dryml", "app/views/#{file_name}/#{options[:user_resource_name].pluralize.underscore}/index.dryml" if invite_only?
     end
 
     include Generators::Hobo::Subsite

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

@@ -14,9 +14,9 @@ module Hobo
       copy_file 'guest.rb',                     'app/models/guest.rb'
 
       FileUtils.mv 'app/assets/stylesheets/application.css', 'app/assets/stylesheets/application.css.orig'
-      copy_file 'application.css',                        'app/assets/stylesheets/application.css'
+      copy_file 'application.scss',                        'app/assets/stylesheets/application.scss'
       copy_file 'gitkeep',                                'app/assets/stylesheets/application/.gitkeep'
-      copy_file 'front.css',                              'app/assets/stylesheets/front.css'
+      copy_file 'front.scss',                              'app/assets/stylesheets/front.scss'
       copy_file 'gitkeep',                                'app/assets/stylesheets/front/.gitkeep'
 
       FileUtils.mv 'app/assets/javascripts/application.js', 'app/assets/javascripts/application.js.orig'

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

@@ -7,6 +7,7 @@
 <% end -%>
     timestamps
   end
+  attr_accessible <%= accessible_attributes.map {|a| ":#{a.name}"}.join ", " %>
 
 <% for bt in bts -%>
   belongs_to :<%= bt %>

data/lib/generators/hobo/plugin.rb

@@ -68,7 +68,9 @@ module Generators
       end
 
       def inject_css_require(name, subsite, comments)
-        application_file = "app/assets/stylesheets/#{subsite}.css"
+        application_file = "app/assets/stylesheets/#{subsite}.scss"
+        application_file = "app/assets/stylesheets/#{subsite}.css" unless exists?(application_file)
+        raise Thor::Error, "Couldn't find #{subsite}.css!" unless exists?(application_file)
         opts = {:before => /\*=(?!.*\*=).*?$/m}
 
         raise Thor::Error, "Couldn't find #{subsite}.css!" unless exists?(application_file)

data/lib/generators/hobo/routes/router.rb

@@ -17,12 +17,121 @@ module Generators
           @record = @records.singularize
         end
 
+        def emit_hash(hash, prefix)
+          s = ""
+          hash.each do |key, val|
+            s << "#{prefix}#{key}"
+            unless val.blank?
+              s << " do\n"
+              val.each do |sub|
+                if sub.is_a?(Hash)
+                  s << emit_hash(sub, prefix + "  ")
+                else
+                  s << "#{prefix}  #{sub}\n"
+                end
+              end
+              s << "#{prefix}end\n"
+            else
+              s << "\n"
+            end
+          end
+          s
+        end
+
+        def resources_hash
+          collections = []
+          collections += index_actions
+          collections += lifecycle_collection_actions
+          collections << "post 'reorder'" if controller.public_method_defined?(:reorder)
+          members = []
+          members += show_actions
+          members += web_methods
+          members += lifecycle_member_actions
+          right = []
+          right << {"collection" => collections} unless collections.blank?
+          right << {"member" => members} unless members.blank?
+          {basic_resources => right}
+        end
+
+        def basic_resources
+          actions = %w(index new edit show create update destroy).select {|action| controller.public_method_defined?(action)}
+          if actions.length == 7
+            "resources :#{records}"
+          else
+            "resources :#{records}, :only => [#{actions.map{|a| ':'+a}.join(', ')}]"
+          end
+        end
+
+        def index_actions
+          controller.index_actions.map do |action|
+            "get '#{action}'"
+          end
+        end
+
+        def show_actions
+          controller.show_actions.map do |action|
+            "get '#{action}'"
+          end
+        end
+
+        def lifecycle_collection_actions
+          return [] unless defined? model::Lifecycle
+          model::Lifecycle.creators.values.where.routable_for?(@subsite).*.name.map do |creator|
+            ["post '#{creator}', :action => 'do_#{creator}'",
+             "get '#{creator}'" ]
+          end.flatten
+        end
+
+        def lifecycle_member_actions
+          return [] unless defined? model::Lifecycle
+          model::Lifecycle.transitions.where.routable_for?(@subsite).*.name.map do |transition|
+            ["put '#{transition}', :action => 'do_#{transition}'",
+             "get '#{transition}'"]
+          end.flatten
+        end
+
+        def web_methods
+          controller.web_methods.map do |action|
+            "post '#{action}'"
+          end
+        end
+
+        def owner_actions
+          controller.owner_actions.map do |owner, actions|
+            collection_refl = model.reverse_reflection(owner)
+            raise ::Hobo::Error, "Hob routing error -- can't find reverse association for #{model}##{owner} " +
+                             "(e.g. the :has_many that corresponds to a :belongs_to)" if collection_refl.nil?
+            collection         = collection_refl.name
+            owner_class        = model.reflections[owner].klass.name.underscore
+            owner = owner.to_s.singularize if model.reflections[owner].macro == :has_many
+            collection_path = "#{owner_class.pluralize}/:#{owner}_id/#{collection}"
+
+            routes = []
+            routes << "get 'new', :on => :new, :action => 'new_for_#{owner}'" if actions.include?(:new)
+            collection_routes = []
+            collection_routes << "get 'index', :action => 'index_for_#{owner}'" if actions.include?(:index)
+            collection_routes << "post 'create', :action => 'create_for_#{owner}'" if actions.include?(:create)
+            routes << {"collection" => collection_routes} unless collection_routes.empty?
+
+            { "resources :#{owner_class.pluralize}, :as => :#{owner}, :only => []" =>
+              [ "resources :#{collection}, :only => []" => routes]
+            }
+          end
+        end
+
+        def emit_resources
+          "# #{@resource_hash.inspect}\n"+
+          "# #{owner_actions.inspect}"
+        end
+
+        # deprecated
         def index_action_routes
           controller.index_actions.map do |action|
             link( "get '#{records}/#{action}(.:format)', :as => '#{action}_#{records}'", action )
           end.compact
         end
 
+        # deprecated
         def lifecycle_routes(subsite)
           return [] unless defined? model::Lifecycle
           routes = []
@@ -37,6 +146,7 @@ module Generators
           routes.compact.uniq
         end
 
+        # deprecated
         def resource_routes
           [
           link("get '#{records}(.:format)' => '#{records}#index', :as => '#{records}'", 'index'),
@@ -49,6 +159,7 @@ module Generators
           ].compact
         end
 
+        # deprecated
         def owner_routes
           routes = []
           controller.owner_actions.each_pair do |owner, actions|
@@ -75,22 +186,26 @@ module Generators
           routes.compact
         end
 
+        # deprecated
         def web_method_routes
           controller.web_methods.map do |action|
             link("post '#{records}/:id/#{action}(.:format)' => '#{records}##{action}', :as => '#{record}_#{action}'", action, :post)
           end.compact
         end
 
+        # deprecated
         def show_action_routes
           controller.show_actions.map do |action|
             link("get '#{records}/:id/#{action}(.:format)' => '#{records}##{action}', :as => '#{record}_#{action}'", action)
           end.compact
         end
 
+        # deprecated
         def reorder_routes
           [ link("post '#{records}/reorder(.:format)', :as => 'reorder_#{records}'", 'reorder', :post) ].compact
         end
 
+        # NOT deprecated
         def user_routes
           return [] unless controller < ::Hobo::Controller::UserBase
           prefix = records == "users" ? "" : "#{record}_"