hobo 1.3.0.pre31 → 1.3.0

data/lib/generators/hobo/i18n/templates/hobo.pt-PT.yml

@@ -91,6 +91,7 @@
       save: "Gravar %{model}"
       cancel: "Cancelar"
       edit: "Editar %{model}"
+      edit_control: "Editar"
       back: "Voltar para"
       back_to_parent: "Voltar para %{parent} %{name}"
       send: "Enviar"

data/lib/generators/hobo/i18n/templates/hobo.ru.yml

@@ -95,6 +95,7 @@ ru:
       save: "Сохранить"
       cancel: "Отменить"
       edit: "Изменить %{model}"
+      edit_control: "Изменить"
       back: "Назад к"
       back_to_parent: "Назад к %{parent} %{name}"
       send: "Отослать"

data/lib/generators/hobo/model/USAGE

@@ -15,5 +15,5 @@ Examples:
 
         creates a Post model with a string title, text body, and published flag.
 
-After the model is created, and the fields are specified, use hobo:migration
-to create the migrations incrementally.
+    After the model is created, and the fields are specified, use hobo:migration
+    to create the migrations incrementally.

data/lib/generators/hobo/rapid/templates/hobo-rapid.js

@@ -34,6 +34,7 @@ var Hobo = {
         var params = Hobo.fieldSetParam(el, val)
         var p = el.getAttribute("hobo-ajax-params")
         if (p) params = params + "&" + p
+        params = params + '&_method=PUT'
 
         var opts = Object.merge(options || {}, { params: params, message: el.getAttribute("hobo-ajax-message")})
         Hobo.ajaxRequest(Hobo.putUrl(el), updates, opts)
@@ -257,8 +258,9 @@ var Hobo = {
 
 
     putUrl: function(el) {
+        /* we used to append _method=put here, but it doesn't work in Rails 3 */
         var spec = Hobo.modelSpecForElement(el)
-        return urlBase + "/" + Hobo.pluralise(spec.name) + "/" + spec.id + "?_method=PUT"
+        return urlBase + "/" + Hobo.pluralise(spec.name) + "/" + spec.id
     },
 
 
@@ -444,23 +446,6 @@ var Hobo = {
     },
 
 
-    fixSectionGroup: function(e) {
-	    rows = e.childElements().map(function(e, i) {
-    	    cells = e.childElements().map(function(e, i) {
-        	    return e.outerHTML.sub("<DIV", "<td  valign='top'").sub(/<\/DIV>$/i, "</td>")
-            }).join('')
-
-            var attrs = e.outerHTML.match(/<DIV([^>]+)/)[1]
-            return "<tr" + attrs + ">" + cells + "</tr>"
-	    }).join("\n")
-
-        var attrs = e.outerHTML.match(/<DIV([^>]+)/)[1]
-
-	    var table= "<table cellpadding='0' cellspacing='0' border='0' style='border-collapse: collapse; border-spacing: 0'" + attrs + ">" +
-	               rows + "</table>"
-	    e.outerHTML = table
-    },
-
     makeHtmlEditor: function(textarea) {
         // do nothing - plugins can overwrite this method
     }
@@ -571,17 +556,21 @@ HoboInputMany = {
 
   initialize: function(ev) {
       /* the second clause should be sufficient, but it isn't in IE7.  See bug 603  */
-      Element.select(ev.target, ".input-many-template input:hidden, .input-many-template select:hidden, .input-many-template textarea:hidden, .input-many-template button:hidden").each(function(input) {
-          if(!input.disabled) {
-              input.disabled = true;
-              input.addClassName("input_many_template_input");
-          }
+      Element.select(ev.target, ".input-many-template").each(function  (templ) {
+          templ.select("input:hidden,select:hidden,textarea:hidden,button:hidden").each(function(input) {
+              if(!input.disabled) {
+                  input.disabled = true;
+                  input.addClassName("input_many_template_input");
+              }
+          })
       });
 
       // disable all elements inside our template, and mark them so we can find them later.
-      Element.select(ev.target, ".input-many-template input:enabled, .input-many-template select:enabled, .input-many-template textarea:enabled, .input-many-template button:enabled").each(function(input) {
-          input.disabled = true;
-          input.addClassName("input_many_template_input");
+      Element.select(ev.target, ".input-many-template").each(function (templ) {
+          templ.select("input:enabled,select:enabled,textarea:enabled,button:enabled").each(function(input) {
+              input.disabled = true;
+              input.addClassName("input_many_template_input");
+          });
       });
 
       Element.select(ev.target, ".sortable-input-many").each(function(el) {
@@ -909,10 +898,6 @@ AutocompleteBehavior = Behavior.create({
 Event.addBehavior.reassignAfterAjax = true;
 Event.addBehavior({
 
-    'div.section-group' : function() {
-        if (Prototype.Browser.IE) Hobo.fixSectionGroup(this);
-    },
-
     'div.select-many.input' : SelectManyInput(),
 
     'textarea.html' : function() {

data/lib/generators/hobo/rapid/templates/themes/clean/public/stylesheets/clean.css

@@ -14,6 +14,7 @@ body {color: #193440; background: url(../images/300-ACD3E6-fff.png) repeat-x #ff
 .section.content {background: #FCFFF5;}
 .button {color: white; background: #5B8BA0;}
 .button:hover {background-color: #193440;}
+.button[disabled] { background-color: #CCCCCC; }
 .add-to-collection {background: #E6E7DE;}
 .aside { background: #E5E5E5;}
 

data/lib/generators/hobo/resource/USAGE

@@ -0,0 +1,39 @@
+Description:
+    The model generator creates stubs for a new model, corresponding
+    controller and it's views.
+
+    The generator takes a model name as its argument.  The model name
+    may be given in CamelCase or under_score and should not be
+    suffixed with anything.
+
+    As additional parameters, the generator will take attribute pairs
+    described by name and type. These attributes will be used to
+    prepopulate the migration to create the table for the model and
+    give you a set of predefined fixture. You don't have to think up
+    all attributes up front, but it's a good idea to add just the
+    baseline of what's needed to start really working with the
+    resource.
+
+    The generator creates a model class in app/models, a test suite in
+    test/unit and test fixtures in test/fixtures/singular_name.yml.
+    The generator creates a controller class in app/controllers with
+    view templates in app/views/controller_name, a helper class in
+    app/helpers, and a functional test suite in test/functional.
+
+Examples:
+    rails generate hobo:resource account
+
+        This will create an Account model:
+            Model:      app/models/account.rb
+            Controller: app/controllers/accounts_controller.rb
+            Helper:     app/helpers/accounts_helper.rb
+            Views:      app/views/accounts
+            Test:       test/unit/account_test.rb
+            Test:       test/functions/accounts_controller_test.rb
+            Fixtures:   test/fixtures/accounts.yml
+
+    (files generated may vary depending on test suite & fixture configuration)
+
+    rails generate hobo:resource post title:string created_on:date body:text published:boolean
+
+        Creates post model, controller & views with predefined attributes.

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

@@ -34,7 +34,7 @@ module Generators
             routes << link("put '#{records}/:id/#{transition}(.:format)' => '#{records}#do_#{transition}', :as => 'do_#{record}_#{transition}'", transition, :put)
             routes << link("get '#{records}/:id/#{transition}(.:format)' => '#{records}##{transition}', :as => '#{record}_#{transition}'", transition)
           end
-          routes.compact
+          routes.compact.uniq
         end
 
         def resource_routes
@@ -92,7 +92,7 @@ module Generators
         end
 
         def user_routes
-          return [] unless controller < ::Hobo::Controller::User
+          return [] unless controller < ::Hobo::Controller::UserBase
           prefix = records == "users" ? "" : "#{record}_"
           [
           link("match '#{prefix}login(.:format)' => '#{records}#login', :as => '#{record}_login'",  'login'),

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

@@ -23,9 +23,15 @@ module Hobo
     class_option :front_controller_name, :type => :string,
     :desc => "Front Controller Name", :default => 'front'
 
+    class_option :add_admin_subsite, :type => :boolean,
+                 :desc => "Add an Admin Subsite"
+
     class_option :admin_subsite_name, :type => :string,
                  :desc => "Admin Subsite Name", :default => 'admin'
 
+    class_option :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"
 
@@ -113,7 +119,8 @@ NOTE: You might want to sign up as the administrator before adding this!
       end
       inject_into_file 'app/controllers/application_controller.rb', <<EOI, :after => "protect_from_forgery\n" if private_site
   include Hobo::Controller::AuthenticationSupport
-  before_filter :except => [:login, :forgot_password, :accept_invitation, :do_accept_invitation, :reset_password] do
+  before_filter :except => [:login, :forgot_password, :accept_invitation, :do_accept_invitation, :reset_password,
+:do_reset_password] do
      login_required unless #{@user_resource_name.camelize}.count == 0
   end
 EOI
@@ -153,12 +160,17 @@ EOI
     end
 
     def admin_subsite
-      return unless @invite_only
       if wizard?
         say_title 'Admin Subsite'
-        @admin_subsite_name = ask("Choose a name for the admin subsite: [<enter>=admin|<custom_name>]", 'admin')
+        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
-        @admin_subsite_name = options[:admin_subsite_name]
+        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
 
@@ -168,11 +180,13 @@ EOI
                                    :invite_only => @invite_only,
                                    :activation_email => @activation_email,
                                    :admin_subsite_name => @admin_subsite_name
-      return unless @invite_only
-      say "Installing admin subsite..."
-      invoke 'hobo:admin_subsite', [@admin_subsite_name],
-                                   :user_resource_name => @user_resource_name,
-                                   :invite_only => @invite_only
+      if @invite_only || @add_admin_subsite
+        say "Installing admin subsite..."
+        invoke 'hobo:admin_subsite', [@admin_subsite_name],
+                                     :user_resource_name => @user_resource_name,
+                                     :invite_only => @invite_only,
+                                     :make_front_site => @make_front_site
+      end
     end
 
     def generate_migration

data/lib/generators/hobo/subsite.rb

@@ -1,4 +1,14 @@
 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
@@ -7,8 +17,9 @@ module Generators
       include Generators::Hobo::Taglib
 
       class_option :make_front_site,
-                 :type => :boolean,
-                 :desc => "Rename application.dryml to front_site.dryml"
+                   :type => :boolean,
+                   :required => true,
+                   :desc => "Rename application.dryml to front_site.dryml"
 
       # check_class_collision :suffix => 'SiteController'
 

data/lib/generators/hobo/subsite/USAGE

@@ -0,0 +1,24 @@
+Description:
+
+    Creates a subsite, a namespaced section of your application.
+
+    Controllers for the subsite are created in
+    app/controllers/<subsite_name>/ and views are also in their own
+    subdirectory.   This allows you to have two different controllers
+    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.
+
+    The difference between hobo:admin_site and hobo:subsite is that
+    hobo:admin_site limits the subsite to use by administrators only.

data/lib/generators/hobo/subsite_taglib/USAGE

@@ -0,0 +1,4 @@
+Description:
+    This generator is used to generate
+    app/views/taglibs/<subsite_name>_site.dryml, and is used by the
+    subsite and admin_site generators.  Do not use directly.

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

@@ -1,6 +1,6 @@
 <!-- Tag definitions for the <%= file_name %> subsite -->
 
-<include src="rapid" plugin="hobo"/>
+<include src="rapid" gem="hobo"/>
 
 <include src="taglibs/auto/<%= file_name %>/rapid/cards"/>
 <include src="taglibs/auto/<%= file_name %>/rapid/pages"/>

data/lib/generators/hobo/test_framework/USAGE

@@ -0,0 +1,2 @@
+Description:
+    This generator is used by the setup_wizard generator to set up the test framework.

data/lib/generators/hobo/user_controller/USAGE

@@ -0,0 +1,3 @@
+USAGE:
+    This generator is used by the user_resource generator to generate
+    app/controllers/users_controller.rb

data/lib/generators/hobo/user_controller/templates/controller.rb.erb

@@ -4,6 +4,9 @@ class <%= class_name %>Controller < ApplicationController
 
   auto_actions :all, :except => [ :index, :new, :create ]
 
+  # Normally, users should be created via the user lifecycle, except
+  #  for the initial user created via the form on the front screen on
+  #  first run.  This method creates the initial user.
   def create
     hobo_create do
       if valid?

data/lib/generators/hobo/user_mailer/USAGE

@@ -0,0 +1,2 @@
+Description:
+    This generator is used by the user_resource generator to generate user_mailer.rb.

data/lib/generators/hobo/user_model/USAGE

@@ -1,12 +1,5 @@
 Description:
-    The model generator creates stubs for a new user model.
 
-    The generator takes a model name as its argument.  The
-    model name may be given in CamelCase or under_score and
-    should not be suffixed with 'Model'.
+    This generator is used by the user_resource generator to generate a
+    user model file into app/models.
 
-    The generator creates a model class in app/models, invokes
-    the hobo:user_mailer andgenerator the test framework.
-
-Examples:
-    $ rails generate hobo:user_model User

data/lib/generators/hobo/user_resource/USAGE

@@ -0,0 +1,10 @@
+Description:
+
+    This generator invokes the user_model, user_mailer and
+    user_controller generators.  It is invoked by the setup_wizard
+    generator.
+
+Usage:
+
+    rails generate hobo:user_resource [NAME=user] [options]
+

data/lib/hobo.rb

@@ -6,7 +6,7 @@ require 'hobo/extensions/enumerable'
 require 'hobo/extensions/array'
 
 ActiveSupport::Dependencies.autoload_paths |= [File.dirname(__FILE__)]
-
+ActiveSupport::Dependencies.autoload_once_paths |= [File.dirname(__FILE__)]
 
 module Hobo
 

data/lib/hobo/controller/authentication_support.rb

@@ -50,28 +50,6 @@ module Hobo
         end
       end
 
-      # Redirect as appropriate when an access request fails.
-      #
-      # The default action is to redirect to the login screen.
-      #
-      # Override this method in your controllers if you want to have special
-      # behavior in case the user is not authorized
-      # to access the requested action.  For example, a popup window might
-      # simply close itself.
-      def access_denied(user_model)
-        respond_to do |accepts|
-          accepts.html do
-            store_location
-            redirect_to(login_url(user_model))
-          end
-          accepts.xml do
-            headers["Status"]           = "Unauthorized"
-            headers["WWW-Authenticate"] = %(Basic realm="Web Password")
-            render :text => t("hobo.messages.unauthenticated", :default=>["Couldn't authenticate you"]), :status => '401 Unauthorized'
-          end
-        end
-        false
-      end
 
       # Store the URI of the current request in the session.
       #

data/lib/hobo/controller/model.rb

@@ -129,13 +129,15 @@ module Hobo
       def auto_actions(*args)
         options = args.extract_options!
 
-        @auto_actions = case args.first
+        @auto_actions = args.map do |arg|
+                          case arg
                           when :all        then available_auto_actions
-                          when :write_only then available_auto_write_actions     + args.rest
-                          when :read_only  then available_auto_read_actions      + args.rest
-                          when :lifecycle  then available_auto_lifecycle_actions + args.rest
-                          else args
-                        end
+                          when :write_only then available_auto_write_actions
+                          when :read_only  then available_auto_read_actions
+                          when :lifecycle  then available_auto_lifecycle_actions
+                          else arg
+                          end
+                        end.flatten.uniq
 
         except = Array(options[:except])
         except_actions = except.map do |arg|
@@ -143,9 +145,9 @@ module Hobo
             when :lifecycle   then available_auto_lifecycle_actions
             else arg
           end
-        end
+        end.flatten.uniq
 
-        @auto_actions -= except_actions.flatten
+        @auto_actions -= except_actions
 
         def_auto_actions
       end
@@ -785,16 +787,16 @@ module Hobo
 
 
     def this
-      @this ||= (instance_variable_get("@#{model.name.underscore}") ||
-                 instance_variable_get("@#{model.name.underscore.pluralize}"))
+      @this ||= (instance_variable_get("@#{model.name.demodulize.underscore}") ||
+                 instance_variable_get("@#{model.name.demodulize.underscore.pluralize}"))
     end
 
 
     def this=(object)
-      ivar = if object.is_a?(Array)
-               (object.try.member_class || model).name.underscore.pluralize
+      ivar = if object.is_a?(Array) || object.respond_to?(:member_class)
+               (object.try.member_class || model).name.demodulize.underscore.pluralize
              else
-               object.class.name.underscore
+               object.class.name.demodulize.underscore
              end
       @this = instance_variable_set("@#{ivar}", object)
     end