hobo 1.3.0.RC4 → 1.3.0.pre10

data/lib/generators/hobo/rapid/templates/themes/clean/views/clean.dryml

@@ -7,4 +7,4 @@
       <stylesheet name="application" param="app-stylesheet"/>
     </stylesheets:>
   </old-page>
-</extend>
+</extend>  

data/lib/generators/hobo/resource/resource_generator.rb

@@ -16,7 +16,7 @@ module Hobo
     def generate_hobo_model
       # is there any better way to pass attributes?
       attr = attributes.map{|a| "#{a.name}:#{a.type}"}
-      invoke 'hobo:model', [name, attr], options
+      invoke 'hobo:model', [name.singularize, attr], options
     end
 
   end

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

@@ -9,7 +9,7 @@ module Generators
         attr_reader :subsite, :controller, :model, :record, :records
 
         def initialize(subsite, controller)
-          raise ::Hobo::Error, "#{controller} is not a Hobo::Controller::Model" unless controller < ::Hobo::Controller::Model
+          raise "#{controller} is not a Hobo::Controller::Model" unless controller < ::Hobo::Controller::Model
           @subsite = subsite
           @controller = controller
           @model = controller.model
@@ -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.uniq
+          routes.compact
         end
 
         def resource_routes
@@ -53,7 +53,7 @@ module Generators
           routes = []
           controller.owner_actions.each_pair do |owner, actions|
             collection_refl = model.reverse_reflection(owner)
-            raise ::Hobo::Error, "Hob routing error -- can't find reverse association for #{model}##{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
@@ -92,7 +92,7 @@ module Generators
         end
 
         def user_routes
-          return [] unless controller < ::Hobo::Controller::UserBase
+          return [] unless controller < ::Hobo::Controller::User
           prefix = records == "users" ? "" : "#{record}_"
           [
           link("match '#{prefix}login(.:format)' => '#{records}#login', :as => '#{record}_login'",  'login'),

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

@@ -1,25 +1,14 @@
-require 'generators/hobo_support/eval_template'
-
 module Hobo
   class RoutesGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
-    include Generators::HoboSupport::EvalTemplate
-
     def self.banner
       "rails generate hobo:routes #{self.arguments.map(&:usage).join(' ')} [options]"
     end
 
     def generate_routes
       Hobo::Routes.reset_linkables
-      h = Hobo::Engine.config.hobo
-      template_name = 'hobo_routes.rb.erb'
-      if h.read_only_file_system
-        # just fill the @linkable_keys without writing any file
-        eval_template template_name
-      else
-        template template_name, h.routes_path
-      end
+      template "hobo_routes.rb.erb", Hobo::Engine.config.hobo.routes_path
     end
 
 private

data/lib/generators/hobo/routes/templates/hobo_routes.rb.erb

@@ -17,7 +17,7 @@
         routes = gr == 'lifecycle_routes' ? router.send(gr.to_sym, subsite) : router.send(gr.to_sym) -%>
     <%- unless routes.empty? -%>
 
-  <%= "  " if subsite %><%= %(# #{gr.humanize} for controller "#{controller.controller_path}") %>
+  <%= "  " if subsite %><%= "# #{gr.humanize} for controller :#{controller.controller_name}" %>
     <%- end -%>
       <%- for route in routes -%>
   <%= "  " if subsite %><%= route %>

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

@@ -23,46 +23,34 @@ 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"
+                 :desc => "Make the site unaccessible to non-mebers"
 
     class_option :migration_generate, :type => :boolean,
     :desc => "Generate migration only"
 
     class_option :migration_migrate, :type => :boolean,
-    :desc => "Generate migration and migrate", :default => true
+    :desc => "Generate migration and migrate"
 
     class_option :default_locale, :type => :string,
     :desc => "Sets the default locale"
 
     class_option :locales, :type => :array,
-    :desc => "Choose the locales", :default => %w[en]
+    :desc => "Choose the locales"
 
     class_option :git_repo, :type => :boolean,
     :desc => "Create the git repository with the initial commit"
 
-    class_option :gitignore_auto_generated_files, :type => :boolean,
-    :desc => "Add the auto-generated files to .gitignore", :default => true
-
-    class_option :dryml_only_templates, :type => :boolean,
-    :desc => "The application uses only dryml templates",
-    :default => Rails.application.config.hobo.dryml_only_templates
 
     def startup
       if wizard?
         say_title options[:main_title] ? 'Hobo Setup Wizard' : 'Startup'
-        say 'Installing Hobo assets...'
+        say 'Installing basic Hobo Files...'
       end
-      invoke 'hobo:assets'
+      invoke 'hobo:basic'
     end
 
     def choose_test_framework
@@ -76,7 +64,7 @@ module Hobo
         fixture_replacement = ask("Type your preferred fixture replacement or <enter> for no replacement:")
       else
         # return if it is all default so no invoke is needed
-        return if (options[:test_framework].to_s == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
+        return if (options[:test_framework] == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
         test_framework = options[:test_framework]
         fixtures = options[:fixtures]
         fixture_replacement = options[:fixture_replacement]
@@ -87,23 +75,12 @@ module Hobo
                                     :update => true
     end
 
-    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')
-        @activation_email = @invite_only ? false : yes_no?("Do you want to send an activation email to activate the user?")
-      else
-        @user_resource_name = options[:user_resource_name]
-        @activation_email = options[:activation_email]
-      end
-    end
-
-    def site_options
+    def invite_only_option
       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?\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'
+        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'
 to the relevant controllers:
 
     include Hobo::Controller::AuthenticationSupport
@@ -112,34 +89,19 @@ 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) unless private_site
+), Color::YELLOW
       else
         @invite_only = invite_only?
         private_site = options[:private_site]
       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_reset_password] do
-     login_required unless #{@user_resource_name.camelize}.count == 0
+  before_filter :except => :login do
+     login_required unless User.count == 0
   end
 EOI
     end
 
-    def dryml_only_templates_option
-      if wizard?
-        say_title 'Templates Option'
-        dryml_only_templates = yes_no?("Will your application use only hobo/dryml web page templates?\n(Choose 'n' only if you also plan to use plain rails/erb web page templates)")
-      else
-        dryml_only_templates = options[:dryml_only_templates]
-      end
-      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"
-      end
-    end
-
     def rapid
       if wizard?
         say_title 'Hobo Rapid'
@@ -148,10 +110,21 @@ EOI
       invoke 'hobo:rapid'
     end
 
+    def user_resource
+      if wizard?
+        say_title 'User Resource'
+        @user_resource_name = ask("Choose a name for the user resource [<enter>=user|<custom_name>]:", 'user')
+        @activation_email = @invite_only ? false : yes_no?("Do you want to send an activation email to activate the user?")
+      else
+        @user_resource_name = options[:user_resource_name]
+        @activation_email = options[:activation_email]
+      end
+    end
+
     def front_controller
       if wizard?
         say_title 'Front Controller'
-        front_controller_name = ask("Choose a name for the front controller: [<enter>=front|<custom_name>]", 'front')
+        front_controller_name = ask("Choose a name for the front controller [<enter>=front|<custom_name>]:", 'front')
         say "Installing #{front_controller_name} controller..."
       else
         front_controller_name = options[:front_controller_name]
@@ -160,17 +133,12 @@ EOI
     end
 
     def admin_subsite
+      return unless @invite_only
       if wizard?
         say_title 'Admin Subsite'
-        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
+        @admin_subsite_name = ask("Choose a name for the admin subsite [<enter>=admin|<custom_name>]:", 'admin')
       else
-        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
+        @admin_subsite_name = options[:admin_subsite_name]
       end
     end
 
@@ -180,19 +148,17 @@ EOI
                                    :invite_only => @invite_only,
                                    :activation_email => @activation_email,
                                    :admin_subsite_name => @admin_subsite_name
-      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
+
+      say "Installing admin subsite..."
+      invoke 'hobo:admin_subsite', [@admin_subsite_name],
+                                   :user_resource_name => @user_resource_name,
+                                   :invite_only => @invite_only
     end
 
-    def generate_migration
+    def 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!')
@@ -203,8 +169,8 @@ EOI
               end
         say action == 'g' ? 'Generating Migration...' : 'Migrating...'
       else
-        return if !options[:migration_generate] && !options[:migration_migrate]
-        opt = options[:migration_migrate] ? {:migrate => true} : {:generate => true}
+        return if options[:migration_generate].blank? && options[:migration_migrate].blank?
+        opt = options[:migration_migrate].blank? ? {:generate => true} : {:migrate => true}
       end
       rake 'db:setup'
       invoke 'hobo:migration', ['initial_migration'], opt
@@ -219,8 +185,8 @@ EOI
           $1
         end
         say "The Hobo supported locales are #{supported_locales * ' '} (please, contribute to more translations)"
-        locales = ask("Type the locales (space separated) you want to add to your application or <enter> for 'en':", 'en').split(/\s/)
-        unless locales.size == 1 && locales.first == 'en'
+        locales = ask "Type the locales (space separated) you want to add to your application or <enter> for 'en':", 'en'
+        unless locales == 'en'
           default_locale = ask "Do you want to set a default locale? Type the locale or <enter> to skip:"
         end
       else
@@ -231,35 +197,24 @@ EOI
         default_locale.gsub!(/\:/, '')
         environment "config.i18n.default_locale = #{default_locale.to_sym.inspect}"
       end
-      ls = (locales - %w[en]).map {|l| ":#{l}" }
-      lstr = ls.to_sentence
-      invoke 'hobo:i18n', locales
-      say(<<STR , Color::YELLOW) unless ls.empty?
-NOTICE: You should manually install in 'config/locales' also the official Rails locale #{ls.size==1 ? 'file' : 'files'} for #{lstr} that your application will use.
-Official rails I18n URLs:
-  - Readme:     https://github.com/svenfuchs/rails-i18n/blob/master/README.md
-  - locale dir: https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale/
-STR
+      invoke 'hobo:i18n', locales.split
+      say( "NOTICE: You should manually install in 'config/locales' also the official Rails locale file(s) that your application will use.", Color::YELLOW) unless locales == 'en'
     end
 
     def git_repo
       if wizard?
         say_title 'Git Repository'
         return unless yes_no?("Do you want to initialize a git repository now?")
-        gitignore_auto_generated = yes_no? "Do you want git to ignore the auto-generated files?\n(Choose 'n' only if you are planning to deploy on a read-only File System like Heroku)"
         say 'Initializing git repository...'
       else
         return unless options[:git_repo]
-        gitignore_auto_generated = options[:gitignore_auto_generated_files]
-      end
-      if gitignore_auto_generated
-        hobo_routes_rel_path = Hobo::Engine.config.hobo.routes_path.relative_path_from Rails.root
-        append_file '.gitignore', "app/views/taglibs/auto/**/*\n#{hobo_routes_rel_path}\n"
       end
+      hobo_routes_rel_path = Hobo::Engine.config.hobo.routes_path.relative_path_from Rails.root
+      append_file '.gitignore', "app/views/taglibs/auto/**/*\n#{hobo_routes_rel_path}\n"
       git :init
       git :add => '.'
       git :commit => '-m "initial commit"'
-      say("NOTICE: If you change the config.hobo.routes_path, you should update the .gitignore file accordingly.", Color::YELLOW) if gitignore_auto_generated
+      say "NOTICE: If you change the config.hobo.routes_path, you should update the .gitignore file accordingly.", Color::YELLOW
     end
 
     def finalize

data/lib/generators/hobo/subsite.rb

@@ -1,14 +1,4 @@
 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
@@ -17,11 +7,10 @@ module Generators
       include Generators::Hobo::Taglib
 
       class_option :make_front_site,
-                   :type => :boolean,
-                   :required => true,
-                   :desc => "Rename application.dryml to front_site.dryml"
+                 :type => :boolean,
+                 :desc => "Rename application.dryml to front_site.dryml"
 
-      # check_class_collision :suffix => 'SiteController'
+      check_class_collision :suffix => 'SiteController'
 
       def move_and_generate_files
         if options[:make_front_site]
@@ -31,10 +20,8 @@ module Generators
           end
           say "Renaming app/views/taglibs/application.dryml to app/views/taglibs/front_site.dryml" \
               unless options[:quiet]
-          unless options[:pretend]
-            FileUtils.mv('app/views/taglibs/application.dryml', "app/views/taglibs/front_site.dryml")
-            copy_file "application.dryml", 'app/views/taglibs/application.dryml'
-          end
+          FileUtils.mv('app/views/taglibs/application.dryml', "app/views/taglibs/front_site.dryml")
+          copy_file "application.dryml", 'app/views/taglibs/application.dryml'
         end
 
         template "controller.rb.erb", File.join('app/controllers', file_name, "#{file_name}_site_controller.rb")

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 NAME [options]"
+      "rails generate hobo:subsite [options]"
     end
 
     include Generators::Hobo::Subsite

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

@@ -1,5 +1,5 @@
 class <%= subsite_name %>::<%= subsite_name %>SiteController < ApplicationController
 
   hobo_controller
-
+  
 end

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

@@ -1,6 +1,6 @@
 <!-- Tag definitions for the <%= file_name %> subsite -->
 
-<include src="rapid" gem="hobo"/>
+<include src="rapid" plugin="hobo"/>
 
 <include src="taglibs/auto/<%= file_name %>/rapid/cards"/>
 <include src="taglibs/auto/<%= file_name %>/rapid/pages"/>
@@ -16,7 +16,7 @@
       <stylesheet name="<%= file_name %>"/>
     </append-stylesheets:>
     <footer:>
-      <a href="#{base_url}/"><t key="hobo.subsite.back_link">View Site</t></a>
+      <a href="#{base_url}/">View Site</a> |
     </footer:>
   </old-page>
 </extend>

data/lib/generators/hobo/test_framework/test_framework_generator.rb

@@ -42,10 +42,10 @@ private
     end
 
     def setup_rspec
-      gem 'rspec-rails', '>= 2.5.0', :group => [:test, :development]
+      gem 'rspec-rails', '>= 2.0.0.beta.10', :group => :test
       @should_update = true
       return unless options[:update]
-      @finalize_hooks << lambda {say "Finalizing rspec installation..."; system 'rails g rspec:install'}
+      @finalize_hooks << lambda {say "Finalizing rspec installation..."; invoke 'rspec:install'}
     end
 
     def setup_shoulda
@@ -60,11 +60,11 @@ private
 
     def add_generators_block
       n = name == 'rspec_with_shoulda' ? 'rspec' : name
-      block = "\n    config.generators do |g|"
-      block << "\n      g.test_framework :#{n}, :fixtures => #{options[:fixtures].inspect}" if !options[:fixtures] || name != 'test_unit'
-      block << "\n      g.fallbacks[:#{n}] = :test_unit" unless name == 'test_unit'
-      block << "\n      g.fixture_replacement = :#{options[:fixture_replacement]}" unless options[:fixture_replacement].blank?
-      block << "\n    end\n"
+      block = "  config.generators do |g|"
+      block << "\n    g.test_framework :#{n}, :fixtures => #{options[:fixtures].inspect}" if !options[:fixtures] || name != 'test_unit'
+      block << "\n    g.fallbacks[:#{n}] = :test_unit" unless name == 'test_unit'
+      block << "\n    g.fixture_replacement => :#{options[:fixture_replacement]}" unless options[:fixture_replacement].blank?
+      block << "\n  end"
       environment block
     end