hobo 1.3.0.pre16 → 1.3.0.pre18

data/VERSION

@@ -1 +1 @@
-1.3.0.pre16
+1.3.0.pre18

data/app/controllers/dev_controller.rb

@@ -18,7 +18,7 @@ class DevController < ActionController::Base
 
   def developer_modes_only
     # Belt and braces. In addition to this check, the routes only get
-    # defined when developer_features? is true
+    # defined when developer_features is true
     render :text => "Permission Denied", :status => 403 unless Rails.application.config.hobo.developer_features
   end
 

data/{lib/generators/hobo/front_controller/templates → app/views/dev}/summary.dryml

@@ -8,12 +8,11 @@
       <tr> <td>Application Name</td>           <td><app-name/></td>         </tr>
       <tr> <td>Application Location</td>       <td><rails-root/></td>     </tr>
       <tr> <td>Rails Version</td>              <td><rails-version/></td>    </tr>
-      <tr> <td>Rails Location</td>             <td><rails-location/></td>     </tr>
       <tr> <td>Mode</td>                       <td><rails-env/></td> </tr>
     </table>
 
     <h3>Change Control</h3>
-    <table class="app-summary">      
+    <table class="app-summary">
       <tr> <th></th><th></th></tr>
       <tr> <td>Method</td>                 <td><cms-method/></td> </tr>
       <if test="&cms_method.strip=='git'">
@@ -25,15 +24,13 @@
     </table>
 
 
-    <h3>Gems</h3>
+    <h3>Bundled Gems</h3>
     <table class="app-summary">
       <with-gems>
-        <tr if="&first_item?"><th></th><th>Required</th><th>Installed</th><th>Status</th><th>Dependencies</th></tr>
+        <tr if="&first_item?"><th></th><th>Version</th><th>Dependencies</th></tr>
         <tr>
           <td><gem-name/></td>
-          <td><gem-version-required/></td>
-          <td><gem-version/></td>          
-          <td><gem-frozen/></td>
+          <td><gem-version/></td>
           <td><gem-dependencies/></td>
         </tr>
       </with-gems>
@@ -75,8 +72,8 @@
           <td><model-table-comment/></td>
         </tr>
       </with-models>
-    </table>        
-    
+    </table>
+
     <with-models>
       <h3 if="&this.try.table_name"><model-name /></h3>
       <table class="app-summary">
@@ -102,4 +99,4 @@
     </with-models>
     </div>
   </content:>
-</page>
+</page>

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
 
   match 'dryml/:action', :controller => 'dryml_support', :as => 'dryml_support'
-  match 'dev/:action', :controller => 'dev', :as => 'dev_support'
+  match 'dev/:action', :controller => 'dev', :as => 'dev_support' if Rails.application.config.hobo.developer_features
 
 end

data/lib/generators/hobo/{basic/basic_generator.rb → assets/assets_generator.rb}

@@ -1,9 +1,9 @@
 module Hobo
-  class BasicGenerator < Rails::Generators::Base
+  class AssetsGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
     def self.banner
-      "rails generate hobo:basic"
+      "rails generate hobo:assets"
     end
 
     def copy_rapid_files

data/lib/generators/hobo/front_controller/front_controller_generator.rb

@@ -32,9 +32,8 @@ module Hobo
       template 'controller.rb.erb', File.join('app/controllers',"#{file_path}_controller.rb")
     end
 
-    def generate_index_and_summary
+    def generate_index
       template("index.dryml", File.join('app/views', file_path, "index.dryml"))
-      template("summary.dryml", File.join('app/views', file_path, "summary.dryml"))
     end
 
     def remove_index_html

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

@@ -50,7 +50,7 @@
       email_address: &email_address "E-mail"
       name: "Name"
       password: "Palavra-chave"
-      remember_me: "Recordar-se de mim"
+      remember_me: "Gravar Login"
       login: "Login"
       signup: "Resgistar"
       forgot_password: &forgot_password "Esqueceu-se da senha?"
@@ -63,14 +63,14 @@
     forgot_password:
       title: *forgot_password
       heading: *forgot_password
-      text: "Introduza o seu endereço de e-mail, o mesmo com que se registou. Vamos enviar um endereço para gerar uma palavra-chave."
+      text: "Introduza o seu endereço de e-mail, o mesmo com que se registou. Vamos enviar uma mensagem para recuperar a palavra-chave."
       email: "E-mail"
       send: "Enviar"
 
     forgot_password_sent:
       title: "Recuperação da palavra-chave - e-mail enviado"
       heading: "Recuperação da palavra-chave - e-mail enviado"
-      text: "Foram enviadas para o e-mail %{email_address} as instruções de como gerar uma nova palavra-chave. Se não o receber, por favor verifique o filtro de spam."
+      text: "Foi enviada uma mensagem para %{email_address} com as instruções de como gerar uma nova palavra-chave. Se não o receber, por favor verifique o filtro de SPAM."
 
     account_disabled:
       title: "Conta não encontrada"
@@ -119,7 +119,7 @@
         success: "O %{model} foi removido"
       signup:
         success: "Obrigado por efectuar o registo!"
-        must_activate: "Deve ativar o seu registo antes de se identificar. Por favor, verifique na sua caixa de correio electrônico.
+        must_activate: "Deve ativar o seu registo antes de se identificar. Por favor, verifique na sua caixa de correio electrônico."
       login:
         success: "Está indetificado no sistema."
         error: "Não especificou um utilizador válido ({{login}}) e respectiva palavra-chave!"
@@ -178,7 +178,7 @@
 
     admin:
       subsite_name: "Administração"
-      invite_new_user: "Invitar Novo Utilizador"
+      invite_new_user: "Convidar Novo Utilizador"
 
     subsite:
       back_link: "Sítio Principal"

data/lib/generators/hobo/model/USAGE

@@ -10,7 +10,6 @@ Examples:
             Model:      app/models/account.rb
             Test:       test/unit/account_test.rb
             Fixtures:   test/fixtures/accounts.yml
-            Viewhints:  app/viewhints/account_hints.rb
 
     $ rails generate hobo:model post title:string body:text published:boolean
 

data/lib/generators/hobo/model/model_generator.rb

@@ -1,10 +1,11 @@
 require 'rails/generators/active_record'
+require 'generators/hobo_support/model'
 
 module Hobo
   class ModelGenerator < ActiveRecord::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
-    include Generators::Hobo::Model
+    include Generators::HoboSupport::Model
 
   end
 end

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

@@ -33,7 +33,7 @@ module Hobo
     :desc => "Generate migration only"
 
     class_option :migration_migrate, :type => :boolean,
-    :desc => "Generate migration and migrate"
+    :desc => "Generate migration and migrate", :default => true
 
     class_option :default_locale, :type => :string,
     :desc => "Sets the default locale"
@@ -51,9 +51,9 @@ module Hobo
     def startup
       if wizard?
         say_title options[:main_title] ? 'Hobo Setup Wizard' : 'Startup'
-        say 'Installing basic Hobo Files...'
+        say 'Installing Hobo assets...'
       end
-      invoke 'hobo:basic'
+      invoke 'hobo:assets'
     end
 
     def choose_test_framework
@@ -78,12 +78,12 @@ module Hobo
                                     :update => true
     end
 
-    def invite_only_option
+    def site_options
       if wizard?
         say_title 'Invite Only Option'
         return unless (@invite_only = yes_no?("Do you want to add the features for an invite only website?"))
-        private_site = yes_no?("Do you want to prevent all access to the site to non-members?")
-        say %( If you wish to prevent all access to some controller to non-members, add 'before_filter :login_required'
+        private_site = yes_no?("Do you want to prevent all access to the site to non-members?\n(Choose 'y' only if ALL your site will be private, choose 'n' if at least one controller will be public)")
+        say( %( If you wish to prevent all access to some controller to non-members, add 'before_filter :login_required'
 to the relevant controllers:
 
     include Hobo::Controller::AuthenticationSupport
@@ -92,7 +92,7 @@ to the relevant controllers:
 (note that the include statement is not required for hobo_controllers)
 
 NOTE: You might want to sign up as the administrator before adding this!
-), Color::YELLOW
+), Color::YELLOW) unless private_site
       else
         @invite_only = invite_only?
         private_site = options[:private_site]
@@ -113,7 +113,7 @@ EOI
       invoke 'hobo:rapid'
     end
 
-    def user_resource
+    def user_options
       if wizard?
         say_title 'User Resource'
         @user_resource_name = ask("Choose a name for the user resource [<enter>=user|<custom_name>]:", 'user')
@@ -158,10 +158,10 @@ EOI
                                    :invite_only => @invite_only
     end
 
-    def migration
+    def generate_migration
       if wizard?
         say_title 'DB Migration'
-        action = choose('Initial Migration: [s]kip, [g]enerate migration file only, generate and [m]igrate [s|g|m]:', /^(s|g|m)$/)
+        action = choose("Initial Migration: [s]kip, [g]enerate migration file only, generate and [m]igrate [s|g|m]:", /^(s|g|m)$/)
         opt = case action
               when 's'
                 return say('Migration skipped!')
@@ -172,8 +172,8 @@ EOI
               end
         say action == 'g' ? 'Generating Migration...' : 'Migrating...'
       else
-        return if options[:migration_generate].blank? && options[:migration_migrate].blank?
-        opt = options[:migration_migrate].blank? ? {:generate => true} : {:migrate => true}
+        return if !options[:migration_generate] && !options[:migration_migrate]
+        opt = options[:migration_migrate] ? {:migrate => true} : {:generate => true}
       end
       rake 'db:setup'
       invoke 'hobo:migration', ['initial_migration'], opt

data/lib/generators/hobo/subsite.rb

@@ -20,7 +20,7 @@ module Generators
           end
           say "Renaming app/views/taglibs/application.dryml to app/views/taglibs/front_site.dryml" \
               unless options[:quiet]
-          FileUtils.mv('app/views/taglibs/application.dryml', "app/views/taglibs/front_site.dryml")
+          FileUtils.mv('app/views/taglibs/application.dryml', "app/views/taglibs/front_site.dryml") unless options[:pretend]
           copy_file "application.dryml", 'app/views/taglibs/application.dryml'
         end
 

data/lib/generators/hobo/subsite/subsite_generator.rb

@@ -3,7 +3,7 @@ module Hobo
     source_root File.expand_path('../templates', __FILE__)
 
     def self.banner
-      "rails generate hobo:subsite [options]"
+      "rails generate hobo:subsite NAME [options]"
     end
 
     include Generators::Hobo::Subsite

data/lib/generators/hobo/user_mailer/templates/mailer.rb.erb

@@ -2,31 +2,24 @@ class <%= class_name -%>Mailer < ActionMailer::Base
   default :from => "no-reply@#{host}"
 
   def forgot_password(user, key)
-    set_variables(user, key)
+    @user, @key = user, key
     mail( :subject => "#{app_name} -- forgotten password",
           :to      => user.email_address )
   end
 
 <% if invite_only? -%>
   def invite(user, key)
-    set_variables(user, key)
+    @user, @key = user, key
     mail( :subject => "Invitation to #{app_name}",
           :to      => user.email_address )
   end
 
 <% elsif options[:activation_email] %>
   def activation(user, key)
-    set_variables(user, key)
+    @user, @key = user, key
     mail :subject => "#{app_name} -- activate",
          :to      => user.email_address
   end
 
 <% end -%>
-private
-
-  def set_variables(user, key)
-    @user = user
-    @key = key
-  end
-
 end

data/lib/generators/hobo/user_model/user_model_generator.rb

@@ -1,3 +1,4 @@
+require 'generators/hobo_support/model'
 module Hobo
   class UserModelGenerator < Rails::Generators::NamedBase
     source_root File.expand_path('../templates', __FILE__)
@@ -5,7 +6,7 @@ module Hobo
     # overrides the default
     argument :name, :type => :string, :default => 'user', :optional => true
 
-    include Generators::Hobo::Model
+    include Generators::HoboSupport::Model
     include Generators::Hobo::InviteOnly
     include Generators::Hobo::ActivationEmail
 

data/lib/hobo/controller/model.rb

@@ -356,9 +356,7 @@ module Hobo
     def re_render_form(default_action=nil)
       if params[:page_path]
         @invalid_record = this
-        opt = ActionController::Routing::Routes.recognize_path(params[:page_path])
-        controller = opt[:controller]
-        action = opt[:action]
+        controller, action = controller_action_from_page_path
 
         # Hack fix for Bug 477.  See also bug 489.
         if self.class.name == "#{controller.camelize}Controller" && action == "index"
@@ -399,16 +397,6 @@ module Hobo
     end
 
 
-    def url_for_page_path
-      url_for ActionController::Routing::Routes.recognize_path(params[:page_path])
-    end
-
-    # TODO: Get rid of this joke of an idea that fails miserably if you open another browser window.
-    def previous_page_path
-      session[:previous_page_path]
-    end
-
-
     def redirect_after_submit(*args)
       options = args.extract_options!
       o = options[:redirect]

data/lib/hobo/helper.rb

@@ -126,6 +126,18 @@ module Hobo
     end
 
 
+    def recognize_page_path
+      ActionController::Routing::Routes.recognize_path(params[:page_path])
+    end
+
+    def url_for_page_path(options={})
+      url_for recognize_page_path.merge(options)
+    end
+
+    def controller_action_from_page_path
+      recognize_page_path.values_at(:controller,:action)
+    end
+
     def _as_params(name, obj)
       if obj.is_a? Array
         obj.map {|x| _as_params("#{name}[]", x)}.join("&")

data/lib/hobo/model.rb

@@ -330,7 +330,15 @@ module Hobo
 
       def view_hints
         class_name = "#{name}Hints"
-        class_name.safe_constantize or Object.class_eval("class #{class_name} < Hobo::ViewHints; end; #{class_name}")
+        class_name.safe_constantize or Object.class_eval("class #{class_name} < Hobo::Model::ViewHints; end; #{class_name}")
+      end
+
+      def children(*args)
+        view_hints.children *args
+      end
+
+      def inline_booleans(*args)
+        view_hints.inline_booleans *args
       end
 
       def table_exists?

data/lib/hobo/model/view_hints.rb

@@ -0,0 +1,102 @@
+module Hobo
+  module Model
+    class ViewHints
+
+      def self.setter(name, default=nil, &block)
+        ivname = name.to_s.remove(/\?$/)
+        metaclass.send :define_method, name do |*args|
+          if args.empty?
+            val = instance_variable_get("@#{ivname}")
+            if val.nil?
+              val = default.is_a?(Proc) ? instance_eval(&default) : default
+              instance_variable_set("@#{ivname}", val)
+            end
+            val
+          else
+            arg = if block
+                    instance_exec(*args, &block)
+                  else
+                    args.first
+                  end
+            instance_variable_set("@#{ivname}", arg)
+          end
+        end
+      end
+
+      setter :children,    [] do |*args|
+        # Setting children also gives a default parent using the reverse association
+        child_model = model.reflections[args.first].klass
+        if child_model.view_hints.parent.nil? and !child_model.view_hints.parent_defined
+          parent = model.reverse_reflection(args.first)
+          child_model.view_hints.parent(parent.name, :undefined => true) if parent
+        end
+        args
+      end
+
+      setter :parent,         nil do |*args|
+        options = args.extract_options!
+        parent_defined(true) unless options[:undefined]
+        args.first
+      end
+
+      setter :parent_defined, nil
+
+      setter :paginate?,    proc { !sortable? }
+
+      setter :sortable?,    proc { defined?(ActiveRecord::Acts::List::InstanceMethods) &&
+                                   model < ActiveRecord::Acts::List::InstanceMethods &&
+                                   model.new.try.scope_condition == "1 = 1" }
+
+      setter :inline_booleans, [] do |*args|
+       if args[0] == true
+         model.columns.select { |c| c.type == :boolean }.*.name
+       else
+         args.*.to_s
+       end
+      end
+
+      # Accessors
+
+      class << self
+
+        def _name
+          @_name ||= name.sub(/Hints$/, '')
+        end
+
+        def model
+          @model ||= _name.constantize
+        end
+
+        def primary_children
+          children.first
+        end
+
+        def secondary_children
+          children.rest
+        end
+
+
+  ##### LEGACY METHODS TO REMOVE #####
+
+        def model_name(*)
+          raise NotImplementedError, "ViewHints.model_name is no longer supported, please use model.model_name.human and set a the activerecord.models.<model_name> key in a locale file"
+        end
+
+        def model_name_plural(*)
+          raise NotImplementedError, "ViewHints.model_name_plural is no longer supported, please use model.model_name.human(:count => n) and set a the activerecord.models.<model_name> key in a locale file"
+        end
+
+        def field_name(*)
+          raise NotImplementedError, "ViewHints.field_name is no longer supported, please use model..human_attribute_name and set a the activerecord.attributes.<model_name>.<field_name> key in a locale file"
+        end
+
+        def field_names(*)
+          raise NotImplementedError, "ViewHints.field_names is no longer supported, please set the activerecord.attributes.<model_name>.<field_name> keys in a locale file"
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/hobo/rapid/taglibs/rapid_core.dryml

@@ -236,6 +236,8 @@ Provides a short hand way of displaying images in public/images
 
 <!-- Renders a human readable name of a collection
 
+This tag has been deprecated in favour of human-collection-name
+
 ### Details
 
  - Uses `this.origin_attribute` as the name.
@@ -417,7 +419,7 @@ Assuming the context is a blog post...
         <view:created_at no-wrapper/> -> June 09, 2008 15:36
 -->
 <def tag="view" attrs="inline, block, if-blank, no-wrapper, truncate"><%=
-  raise Hobo::Error, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless
+  raise Hobo::PermissionDeniedError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless
     can_view?
 
   res = if this.nil? && if_blank.nil?
@@ -644,6 +646,11 @@ that you add the keys in the correct namespaces.
 
  - capitalize: the first letter of the resulting sentence will be capitalized
 
+
+### Additional Notes
+
+The "titleize" attribute is deprecated: use "capitalize" instead.
+
 -->
 <def tag="you" attrs="titleize, capitalize">
   <% Rails.logger.warn "'titleize' is a deprecated attribute of the 'you' tag. Please, use 'capitalize' instead." -%>

data/lib/hobo/rapid/taglibs/rapid_forms.dryml

@@ -652,7 +652,7 @@ For situations where there are too many target records to practically include in
 
   -->
 <def tag="select-one" attrs="include-none, blank-message, options, sort, limit, text-method"><%
-  raise Hobo::Error.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit?
+  raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit? 
   blank_message ||= ht("#{this_type.name.tableize}.message.no", :default=>"(No #{this_type.model_name.human})")
   limit ||= 100
 

data/lib/hobo/rapid/taglibs/rapid_generics.dryml

@@ -21,7 +21,7 @@
   <unless test="&this.member_class.nil?">
     <div class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
       <ht key="#{this.member_class.name.tableize}.collection.empty_message">
-        No <collection-name lowercase/> to display
+        No <human-collection-name count="0"/> to display
       </ht>
     </div>
   </unless>

data/lib/hobo/rapid/taglibs/rapid_i18n.dryml

@@ -17,8 +17,7 @@ There is a default :count => 1
   I18n.t(k, {:default=>all_parameters.default}.merge(options)).html_safe
 %></def>
 
-<!-- Wrapper around ActiveModel::Name#human with added sugar.
-It dynamically pluralizes the human name by using the implicit model.count.
+<!-- Wrapper around ActiveModel::Name#human
 
 #### Attributes
 

data/lib/hobo/rapid/taglibs/rapid_plus.dryml

@@ -28,7 +28,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
           <% col = sort_columns[scope.field_path] || scope.field_path
              sort = sort_field == col && sort_direction == 'asc' ?
                       "-#{col}" : col
-             sort_url = url_for(params.merge(:sort => sort) - [:page])
+             sort_url = url_for_page_path(params.merge(:sort => sort) - [:page])
              col_heading_name = this.member_class.try.human_attribute_name(scope.field_name, :default=> scope.field_name.titleize) %>
 
           <th param="#{scope.field-name}-heading">
@@ -45,7 +45,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
     </table>
     <empty-collection-message param="empty-message"/>
 
-    <page-nav param if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
+    <page-nav param params="&recognize_page_path.slice(:controller,:action)" if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
   </div>
 </def>
 

data/lib/hobo/rapid/taglibs/rapid_summary.dryml

@@ -5,11 +5,6 @@
   <%= Rails.version -%>
 </def>
 
-<!-- returns "vendor" or "gem" -->
-<def tag="rails-location">
-  <%= Rails.vendor_rails? ? "vendor" : "gem" -%>
-</def>
-
 <!-- `Rails.root` -->
 <def tag="rails-root">
   <%= Rails.root -%>
@@ -84,13 +79,7 @@
 
 <!-- repeats on Rails.configuration.gems, including dependent gems -->
 <def tag="with-gems">
-  <% gems = ActiveSupport::OrderedHash.new -%>
-  <% Rails.configuration.gems.each do |gem|
-       gems[name] ||= gem
-       gem.dependencies.each do |dep|
-         gems[dep] ||= dep
-       end
-     end -%>
+  <% gems = Bundler::LockfileParser.new(File.read('Gemfile.lock')).specs -%>
   <repeat with="&gems">
     <do param="default"/>
   </repeat>
@@ -101,37 +90,19 @@
   <%= this.name -%>
 </def>
 
-<def tag="gem-version-requirement">
-  <unless test="this.nil?"><%=
-    this.requirements.map{|l| l.first+l.second.to_s}.join(",")
--%></unless>
-</def>
-
-<!-- inside `<with-gems>`, returns the version required -->
-<def tag="gem-version-required">
-  <gem-version-requirement:version-requirements />
-</def>
-
 <!-- inside `<with-gems>`, returns the version -->
 <def tag="gem-version">
-  <%= this.specification.version.to_s -%>
-</def>
-
-<!-- inside `<with-gems>`, returns 'frozen', 'installed' or 'missing' -->
-<def tag="gem-frozen">
-  <%= this.frozen? ? "frozen" : (this.installed? ? "installed" : "missing") -%>
+  <%= this.version.to_s -%>
 </def>
 
 <!-- inside `<with-gems>`, returns the gem dependencies -->
 <def tag="gem-dependencies">
-  <repeat with="&this.dependencies">
-    <%= this.name -%><gem-version-requirement with="&this.requirement || this.version_requirements" />
-  </repeat>
+    <%= this.dependencies(&it.to_s).safe_join('<br>'.html_safe) -%>
 </def>
 
 <!-- repeats on the plugins used by the application -->
 <def tag="with-plugins">
-  <% plugins = Rails.configuration.plugin_loader.new(Hobo.rails_initializer).plugins %>
+  <% plugins = Rails.application.railties.plugins %>
   <repeat with="&plugins">
     <do param="default" />
   </repeat>
@@ -139,31 +110,31 @@
 
 <!-- within `<with-plugins>`, returns the plugin name -->
 <def tag="plugin-name">
-  <%= this.name -%>
+  <%= this.name.to_s -%>
 </def>
 
 <!-- within `<with-plugins>`, returns the plugin location (directory) -->
 <def tag="plugin-location">
-  <%= this.directory -%>
+  <%= this.root.to_s -%>
 </def>
 
 <def tag="plugin-git-clean">
-  <git-clean dir="&this.directory"/>
+  <git-clean dir="&this.root.to_s"/>
 </def>
 
 <def tag="plugin-git-version">
-  <git-version dir="&this.directory"/>
+  <git-version dir="&this.root.to_s"/>
 </def>
 
 <!-- within `<with-plugins>`, try and determine the method that was used to install the plugin.   Returns "braid", "symlink", "git-submodule" or "other" -->
 <def tag="plugin-method">
   <%=
       braids = File.open("#{Rails.root}/.braids") {|f| YAML::load(f) } rescue {}
-      if !braids[this.directory.gsub(Rails.root+"/", "")].nil?
+      if !braids[this.root.to_s.gsub(Rails.root+"/", "")].nil?
         "braid"
-      elsif File.lstat(this.directory).symlink?
+      elsif File.lstat(this.root.to_s).symlink?
         "symlink"
-      elsif File.exist?(this.directory+"/.git")
+      elsif File.exist?(this.root.to_s+"/.git")
         "git-submodule"
       else
         "other"
@@ -281,7 +252,7 @@
 <!-- given a column in the context and the model as an attribute, returns the comment for the column.  It returns the SQL comment if that is available (using the activerecord-comments plugin).  If that is not available, it returns the HoboFields comment.  -->
 
 <def tag="model-column-comment" attrs="model">
-  <%= this.try.comment || model.try.field_specs.try.get(this.name).try.comment -%>
+  <%= this.try.comment || model.try.field_specs.try.get(this.name).try.first.try.comment -%>
 </def>
 
 <!-- given a model, repeats on the associations -->

data/test/irt/generators/admin_subsite.irt

@@ -1,7 +1,7 @@
 require File.expand_path('../helper.rb', __FILE__)
 
 
-invoke 'hobo:basic', %w[ -q ]
+invoke 'hobo:assets', %w[ -q ]
 invoke 'hobo:admin_subsite', %w[ -q ]
 desc "Admin Subsite files exist"
 files_exist? %w[ app/controllers/admin/admin_site_controller.rb

data/test/irt/generators/{basic.irt → assets.irt}

@@ -1,8 +1,8 @@
 require File.expand_path('../helper.rb', __FILE__)
 
 
-desc "hobo:basic invoke"
-invoke 'hobo:basic', %w(-q)
+desc "hobo:assets invoke"
+invoke 'hobo:assets', %w(-q)
 
 files_exist? %w[ app/views/taglibs/application.dryml
                  public/stylesheets/application.css

data/test/irt/generators/front_controller.irt

@@ -7,8 +7,7 @@ files_exist? %w[ app/controllers/front_controller.rb
                  app/helpers/front_helper.rb
                  test/unit/helpers/front_helper_test.rb
                  test/functional/front_controller_test.rb
-                 app/views/front/index.dryml
-                 app/views/front/summary.dryml ]
+                 app/views/front/index.dryml ]
 test_value_eql? true
 
 desc "public/index.html removed"
@@ -20,7 +19,6 @@ desc "front_controller.rb content matches"
 file_include? 'app/controllers/front_controller.rb',
               'hobo_controller',
               'def index',
-              'def summary',
               'def search'
 test_value_eql? true
 

data/test/irt/generators/subsite.irt

@@ -21,7 +21,7 @@ eval_file '../partials/_subsite_taglib_noopt.rb'
 
 git_reset_app
 
-invoke 'hobo:basic', %w[ -q ]
+invoke 'hobo:assets', %w[ -q ]
 invoke 'hobo:subsite', %w[ subs -q --make-front-site]
 desc "Subsite with make-front-site files exist"
 files_exist? %w[ app/views/taglibs/front_site.dryml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637175965
+  hash: -1637175967
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre16
-  version: 1.3.0.pre16
+  - pre18
+  version: 1.3.0.pre18
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -04:00
+date: 2010-11-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175965
+        hash: -1637175967
         segments: 
         - 1
         - 3
         - 0
-        - pre16
-        version: 1.3.0.pre16
+        - pre18
+        version: 1.3.0.pre18
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175965
+        hash: -1637175967
         segments: 
         - 1
         - 3
         - 0
-        - pre16
-        version: 1.3.0.pre16
+        - pre18
+        version: 1.3.0.pre18
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175965
+        hash: -1637175967
         segments: 
         - 1
         - 3
         - 0
-        - pre16
-        version: 1.3.0.pre16
+        - pre18
+        version: 1.3.0.pre18
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -162,6 +162,7 @@ files:
 - VERSION
 - app/controllers/dev_controller.rb
 - app/controllers/dryml_support_controller.rb
+- app/views/dev/summary.dryml
 - bin/hobo
 - config/initializers/inflections.rb
 - config/routes.rb
@@ -177,13 +178,13 @@ files:
 - lib/generators/hobo/admin_subsite/templates/admin_tag_injection.erb
 - lib/generators/hobo/admin_subsite/templates/controller.rb.erb
 - lib/generators/hobo/admin_subsite/templates/users_index.dryml
-- lib/generators/hobo/basic/basic_generator.rb
-- lib/generators/hobo/basic/templates/application.css
-- lib/generators/hobo/basic/templates/application.dryml.erb
-- lib/generators/hobo/basic/templates/dryml-support.js
-- lib/generators/hobo/basic/templates/dryml_taglibs_initializer.rb
-- lib/generators/hobo/basic/templates/en_injection.yml
-- lib/generators/hobo/basic/templates/guest.rb
+- lib/generators/hobo/assets/assets_generator.rb
+- lib/generators/hobo/assets/templates/application.css
+- lib/generators/hobo/assets/templates/application.dryml.erb
+- lib/generators/hobo/assets/templates/dryml-support.js
+- lib/generators/hobo/assets/templates/dryml_taglibs_initializer.rb
+- lib/generators/hobo/assets/templates/en_injection.yml
+- lib/generators/hobo/assets/templates/guest.rb
 - lib/generators/hobo/controller.rb
 - lib/generators/hobo/controller/controller_generator.rb
 - lib/generators/hobo/controller/templates/controller.rb.erb
@@ -191,10 +192,6 @@ files:
 - lib/generators/hobo/front_controller/front_controller_generator.rb
 - lib/generators/hobo/front_controller/templates/controller.rb.erb
 - lib/generators/hobo/front_controller/templates/index.dryml
-- lib/generators/hobo/front_controller/templates/summary.dryml
-- lib/generators/hobo/hints/hints_generator.rb
-- lib/generators/hobo/hints/templates/hints.rb.erb
-- lib/generators/hobo/hints/templates/model_injection.rb.erb
 - lib/generators/hobo/i18n/i18n_generator.rb
 - lib/generators/hobo/i18n/templates/app.en.yml
 - lib/generators/hobo/i18n/templates/app.es-DO.yml
@@ -205,7 +202,6 @@ files:
 - lib/generators/hobo/i18n/templates/hobo.it.yml
 - lib/generators/hobo/i18n/templates/hobo.pt-PT.yml
 - lib/generators/hobo/invite_only.rb
-- lib/generators/hobo/model.rb
 - lib/generators/hobo/model/USAGE
 - lib/generators/hobo/model/model_generator.rb
 - lib/generators/hobo/model/templates/model_injection.rb.erb
@@ -296,6 +292,7 @@ files:
 - lib/hobo/model/scopes/apply_scopes.rb
 - lib/hobo/model/scopes/automatic_scopes.rb
 - lib/hobo/model/user.rb
+- lib/hobo/model/view_hints.rb
 - lib/hobo/rapid/generators/rapid/cards.dryml.erb
 - lib/hobo/rapid/generators/rapid/forms.dryml.erb
 - lib/hobo/rapid/generators/rapid/pages.dryml.erb
@@ -317,10 +314,9 @@ files:
 - lib/hobo/rapid/taglibs/rapid_user_pages.dryml
 - lib/hobo/routes.rb
 - lib/hobo/undefined.rb
-- lib/hobo/view_hints.rb
 - test/doctest/hobo/hobo_helper.rdoctest
 - test/irt/generators/admin_subsite.irt
-- test/irt/generators/basic.irt
+- test/irt/generators/assets.irt
 - test/irt/generators/controller.irt
 - test/irt/generators/front_controller.irt
 - test/irt/generators/helper.rb

data/lib/generators/hobo/hints/hints_generator.rb

@@ -1,12 +0,0 @@
-module Hobo
-  class HintsGenerator < Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
-
-    check_class_collision :suffix => 'Hints'
-
-    def generate_hints
-      template 'hints.rb.erb', File.join("app/viewhints", "#{file_path}_hints.rb")
-    end
-
-  end
-end

data/lib/generators/hobo/hints/templates/hints.rb.erb

@@ -1,5 +0,0 @@
-class <%= class_name %>Hints < Hobo::ViewHints
-
-  # children :primary_collection1, :aside_collection1, :aside_collection2
-
-end

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

@@ -1,36 +0,0 @@
-
-  hobo_model # Don't put anything above this
-
-  fields do
-<% for attribute in field_attributes -%>
-    <%= "%-#{max_attribute_length}s" % attribute.name %> :<%= attribute.type %>
-<% end -%>
-    timestamps
-  end
-
-<% for bt in bts -%>
-  belongs_to :<%= bt %>
-<% end -%>
-<%= "\n" unless bts.empty? -%>
-<% for hm in hms -%>
-  has_many :<%= hm %>, :dependent => :destroy
-<% end -%>
-<%= "\n" unless hms.empty? -%>
-  # --- Permissions --- #
-
-  def create_permitted?
-    acting_user.administrator?
-  end
-
-  def update_permitted?
-    acting_user.administrator?
-  end
-
-  def destroy_permitted?
-    acting_user.administrator?
-  end
-
-  def view_permitted?(field)
-    true
-  end
-

data/lib/generators/hobo/model.rb

@@ -1,13 +0,0 @@
-require 'generators/hobo_support/model'
-module Generators
-  module Hobo
-    Model = classy_module do
-      include Generators::HoboSupport::Model
-
-      def generate_hint_file
-        invoke 'hobo:hints', [name]
-      end
-
-    end
-  end
-end

data/lib/hobo/view_hints.rb

@@ -1,101 +0,0 @@
-module Hobo
-
-  class ViewHints
-
-    def self.setter(name, default=nil, &block)
-      ivname = name.to_s.remove(/\?$/)
-      metaclass.send :define_method, name do |*args|
-        if args.empty?
-          val = instance_variable_get("@#{ivname}")
-          if val.nil?
-            val = default.is_a?(Proc) ? instance_eval(&default) : default
-            instance_variable_set("@#{ivname}", val)
-          end
-          val
-        else
-          arg = if block
-                  instance_exec(*args, &block)
-                else
-                  args.first
-                end
-          instance_variable_set("@#{ivname}", arg)
-        end
-      end
-    end
-
-    setter :children,    [] do |*args|
-      # Setting children also gives a default parent using the reverse association
-      child_model = model.reflections[args.first].klass
-      if child_model.view_hints.parent.nil? and !child_model.view_hints.parent_defined
-        parent = model.reverse_reflection(args.first)
-        child_model.view_hints.parent(parent.name, :undefined => true) if parent
-      end
-      args
-    end
-
-    setter :parent,         nil do |*args|
-      options = args.extract_options!
-      parent_defined(true) unless options[:undefined]
-      args.first
-    end
-
-    setter :parent_defined, nil
-
-    setter :paginate?,    proc { !sortable? }
-
-    setter :sortable?,    proc { defined?(ActiveRecord::Acts::List::InstanceMethods) &&
-                                 model < ActiveRecord::Acts::List::InstanceMethods &&
-                                 model.new.try.scope_condition == "1 = 1" }
-
-    setter :inline_booleans, [] do |*args|
-     if args[0] == true
-       model.columns.select { |c| c.type == :boolean }.*.name
-     else
-       args.*.to_s
-     end
-    end
-
-    # Accessors
-
-    class << self
-
-      def _name
-        @_name ||= name.sub(/Hints$/, '')
-      end
-
-      def model
-        @model ||= _name.constantize
-      end
-
-      def primary_children
-        children.first
-      end
-
-      def secondary_children
-        children.rest
-      end
-
-
-##### LEGACY METHODS TO REMOVE #####
-
-      def model_name(*)
-        raise NotImplementedError, "ViewHints.model_name is no longer supported, please use model.model_name.human and set a the activerecord.models.<model_name> key in a locale file"
-      end
-
-      def model_name_plural(*)
-        raise NotImplementedError, "ViewHints.model_name_plural is no longer supported, please use model.model_name.human(:count => n) and set a the activerecord.models.<model_name> key in a locale file"
-      end
-
-      def field_name(*)
-        raise NotImplementedError, "ViewHints.field_name is no longer supported, please use model..human_attribute_name and set a the activerecord.attributes.<model_name>.<field_name> key in a locale file"
-      end
-
-      def field_names(*)
-        raise NotImplementedError, "ViewHints.field_names is no longer supported, please set the activerecord.attributes.<model_name>.<field_name> keys in a locale file"
-      end
-
-    end
-
-  end
-
-end