hobo 1.3.0.RC4 → 1.3.0.pre10

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rake'
 require 'rake/rdoctask'
 require 'rake/testtask'
-require 'tmpdir'
 
 require 'active_record'
 ActiveRecord::ActiveRecordError # hack for https://rails.lighthouseapp.com/projects/8994/tickets/2577-when-using-activerecordassociations-outside-of-rails-a-nameerror-is-thrown
@@ -15,7 +14,7 @@ RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).
 RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 
 GEM_ROOT = File.expand_path('../', __FILE__)
-TESTAPP_PATH = File.join Dir.tmpdir, 'hobo_testapp'
+TESTAPP_PATH = '/tmp/hobo_testapp'
 BIN = File.expand_path('../bin/hobo', __FILE__)
 require 'hobo_support/common_tasks'
 include HoboSupport::CommonTasks
@@ -37,7 +36,8 @@ Rake::TestTask.new(:test) { |t|
 namespace "test" do
   desc "Run the doctests"
   task :doctest do |t|
-    files=Dir['doctests/**/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
+    files=Dir['doctest/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
+    # note, tests in doctest/hobo/ are out of date
     exit(1) if !system("#{RUBYDOCTEST} #{files}")
   end
 end

data/VERSION

@@ -1 +1 @@
-1.3.0.RC4
+1.3.0.pre10

data/app/controllers/dev_controller.rb

@@ -5,7 +5,7 @@ class DevController < ActionController::Base
   before_filter :developer_modes_only
 
   def set_current_user
-    model = params[:model] || Hobo::Model::UserBase.default_user_model
+    model = params[:model] || Hobo::Model::User.default_user_model
     self.current_user = if params[:login]
                           model.where(model.login_attribute => params[:login]).first
                         else
@@ -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/bin/hobo

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 require 'fileutils'
 
-if ENV["HOBODEV"]
-  dev_root = File.expand_path ENV["HOBODEV"], FileUtils.pwd
+if ENV["HOBO_DEV_ROOT"]
+  dev_root = File.expand_path ENV["HOBO_DEV_ROOT"], FileUtils.pwd
   $:.unshift "#{dev_root}/hobo_support/lib"
 else
   require 'rubygems'
@@ -12,7 +12,7 @@ begin
   require 'hobo_support/command'
 rescue LoadError
   puts "The 'hobo_support' gem is not installed.
-You probably need to set the HOBODEV environment variable to your local hobo git-repository path."
+You probably need to set the HOBO_DEV_ROOT environment variable to the local repository path."
   exit
 end
 

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' if Rails.application.config.hobo.developer_features
+  match 'dev/:action', :controller => 'dev', :as => 'dev_support'
 
 end

data/doctests/hobo/lifecycles.rdoctest

@@ -240,3 +240,4 @@ Requester cancels
         => "destroy"
 
 
+>> FileUtils.rm_rf  TEST_APP_ROOT

data/doctests/hobo/model.rdoctest

@@ -325,4 +325,9 @@ This provides a shortcut to the corresponding
     >> Post.view_hints
     => PostHints
 
+Cleanup
+{.hidden}
+
+    >> FileUtils.rm_rf  TEST_APP_ROOT
+{.hidden}
 

data/doctests/hobo/multi_model_forms.rdoctest

@@ -28,12 +28,13 @@ Contents
                                                :host => "localhost",
                                                :username => mysql_user,
                                                :password => mysql_password)
-    >> $:.unshift File.expand_path('../../../../hobo_support/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../hobo_fields/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../dryml/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../lib', __FILE__)
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo_fields/lib')
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo_support/lib')
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo/lib')
     >> gem 'will_paginate', ">= 3.0.pre"
     >> require 'will_paginate'
+    >> require 'hobo_support'
+    >> require 'hobo_fields'
     >> require 'hobo'
     >> ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(StringIO.new(''))
     >>

data/doctests/hobo/scopes.rdoctest

@@ -67,16 +67,17 @@ We also need to get ActiveRecord set up with a database connection
 Some load path manipulation:
 {.hidden}
 
-    >> $:.unshift File.expand_path('../../../../hobo_support/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../hobo_fields/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../dryml/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../lib', __FILE__)
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo_fields/lib')
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo_support/lib')
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../../hobo/lib')
 {.hidden}
 
 And we'll require hobo:
 {.hidden}
 
     >> require 'will_paginate'
+    >> require 'hobo_support'
+    >> require 'hobo_fields'
     >> require 'hobo'
 {.hidden}
 
@@ -285,14 +286,10 @@ Gives the N most recent items:
 
 ## include
 
-DEPRECATED: Automatic scope :include has been deprecated: use :includes instead.
+Adding the include function to your query chain has the same effect as
+the `:include` option to the `find` method.
 
-## includes
-
-    >> Person.search("B", :name).includes(:friends).*.name  # test LH#839
-    => ["Bryan", "Bethany"]
-
-    >> Person.includes(:friends).*.name
+    >> Person.include(:friends).*.name
     => ["Bryan", "Bethany"]
 
 ## search

data/doctests/prepare_testapp.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 system %(rake test:prepare_testapp)
-TESTAPP_PATH = '/tmp/hobo_testapp'
-FileUtils.chdir TESTAPP_PATH
+FileUtils.chdir '/tmp/hobo_testapp'
 require 'config/environment'
 require 'rails/generators'
 Rails::Generators.configure!

data/hobo.gemspec

@@ -1,6 +1,5 @@
 name = File.basename( __FILE__, '.gemspec' )
 version = File.read(File.expand_path('../VERSION', __FILE__)).strip
-require 'date'
 
 Gem::Specification.new do |s|
 
@@ -11,10 +10,11 @@ Gem::Specification.new do |s|
   s.summary = 'The web app builder for Rails'
   s.description = 'The web app builder for Rails'
 
+  s.add_runtime_dependency('rails', [">= 3.0.0"])
+  s.add_runtime_dependency('will_paginate', [">= 3.0.pre"])
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   s.add_runtime_dependency('hobo_fields', ["= #{version}"])
   s.add_runtime_dependency('dryml', ["= #{version}"])
-  s.add_runtime_dependency('will_paginate', [">= 3.0.0"])
 
   s.add_development_dependency('rubydoctest', [">= 0"])
   s.add_development_dependency('shoulda', [">= 0"])

data/lib/generators/hobo/admin_subsite/admin_subsite_generator.rb

@@ -5,8 +5,8 @@ module Hobo
     # overrides the default
     argument :name, :type => :string, :default => 'admin', :optional => true
 
+    include Generators::Hobo::Subsite
     include Generators::Hobo::InviteOnly
-    include Generators::HoboSupport::EvalTemplate
 
     def self.banner
       "rails generate hobo:admin_subsite [NAME=admin] [options]"
@@ -17,20 +17,26 @@ module Hobo
     end
 
     def generate_admin_user_controller
-      invoke "hobo:controller", ["#{file_name}/#{options[:user_resource_name].pluralize.underscore}"], options
+      invoke "hobo:controller", ["#{file_name}/#{options[:user_resource_name].pluralize.underscore}"]
       template "users_index.dryml", "app/views/#{file_name}/#{options[:user_resource_name].pluralize.underscore}/index.dryml"
     end
 
     def generate_site_taglib
-      invoke 'hobo:subsite_taglib', [name], options.merge(:admin => true)
+      invoke 'hobo:subsite_taglib', [name],
+                                    :user_resource_name => options[:user_resource_name],
+                                    :admin => true,
+                                    :invite_only => invite_only?
     end
 
     def append_admin_tag_into_application_taglib
+      source  = File.expand_path(find_in_source_paths('admin_tag_injection.erb'))
       destination = File.join(Rails.root, "app/views/taglibs/application.dryml")
-      append_file(destination) { eval_template('admin_tag_injection.erb') }
+      context = instance_eval('binding')
+      append_file destination do
+        ERB.new(::File.binread(source), nil, '-').result(context)
+      end
     end
 
-    include Generators::Hobo::Subsite
 
   end
 end

data/lib/generators/hobo/admin_subsite/templates/admin.css

@@ -1,20 +1,2 @@
-body {
-  background-color: #333;
-  background-image: none;
-}
-
-.page-header {
-  background: #555;
-}
-
-.page-header.sidemenu {
-  background: none;
-}
-
-.page-header h1 a {
-  color:#FCFFF5;
-}
-
-#main-nav-container {
-  background:#555555
-}
+html, body { background: #333;}
+.page-header { background: #555; }

data/lib/generators/hobo/admin_subsite/templates/admin_tag_injection.erb

@@ -2,9 +2,7 @@
 <extend tag="page">
   <old-page merge>
     <footer:>
-      <a href="&<%= file_name %>_<%= options[:user_resource_name].underscore.pluralize %>_url" if="&current_user.administrator?">
-        <t key="hobo.admin.subsite_name"><%= name.titleize %></t>
-      </a>
+      <a href="&<%= file_name %>_<%= options[:user_resource_name].underscore.pluralize %>_url" if="&current_user.administrator?">Admin</a>
     </footer:>
   </old-page>
 </extend>

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

@@ -1,13 +1,13 @@
 class <%= subsite_name %>::<%= subsite_name %>SiteController < ApplicationController
 
   hobo_controller
-
+  
   before_filter :admin_required
-
+  
   private
-
+  
   def admin_required
     redirect_to home_page unless current_user.administrator?
-  end
-
+  end  
+  
 end

data/lib/generators/hobo/admin_subsite/templates/users_index.dryml

@@ -1,7 +1,5 @@
 <index-page without-new-form>
   <after-count:>
-    <a with="&<%= options[:user_resource_name].camelize %>" action="invite">
-      <t key="hobo.admin.invite_new_user">Invite a new user</t>
-    </a>
+    <a with="&<%= options[:user_resource_name].camelize %>" action="invite">Invite a new user</a>
   </after-count:>
 </index-page>

data/lib/generators/hobo/basic/basic_generator.rb

@@ -0,0 +1,17 @@
+module Hobo
+  class BasicGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def self.banner
+      "rails generate hobo:basic"
+    end
+
+    def copy_rapid_files
+      template  'application.dryml.erb', 'app/views/taglibs/application.dryml'
+      copy_file 'application.css',       'public/stylesheets/application.css'
+      copy_file 'dryml-support.js',      'public/javascripts/dryml-support.js'
+      copy_file 'guest.rb',              'app/models/guest.rb'
+    end
+
+  end
+end

data/lib/generators/hobo/{assets → basic}/templates/application.dryml.erb

@@ -1,6 +1,6 @@
 <!-- Global taglib - these tags are shared across all subsites -->
 
-<include src="rapid" gem="hobo"/>
+<include src="rapid" plugin="hobo"/>
 
 <include src="taglibs/auto/rapid/cards"/>
 <include src="taglibs/auto/rapid/pages"/>

data/lib/generators/hobo/{assets → basic}/templates/dryml-support.js

@@ -1,5 +1,5 @@
 Event.addBehavior({
-    'body:click' : function(event) {
+    'body:click' : function(event) { 
         if (event.shiftKey && event.altKey) {
             Dryml.click(event)
             Event.stop(event)
@@ -122,7 +122,7 @@ var Dryml = {
     },
 
     removeMenu: function() {
-        if (Dryml.menu) {
+        if (Dryml.menu) { 
             $("dryml-menu-style").remove()
             Dryml.menu.remove()
             Dryml.menu = null

data/lib/generators/hobo/controller.rb

@@ -2,11 +2,7 @@ module Generators
   module Hobo
     Controller = classy_module do
 
-      # check_class_collision :suffix => 'Controller'
-
-      class_option :helpers, :type => :boolean,
-      :desc => "Generates helper files",
-      :default => !Rails.application.config.hobo.dryml_only_templates
+      check_class_collision :suffix => 'Controller'
 
       def self.banner
       "rails generate hobo:controller #{self.arguments.map(&:usage).join(' ')}"
@@ -22,7 +18,6 @@ module Generators
       end
 
       def generate_helper
-        return unless options[:helpers]
         invoke 'helper', [name], options
       end
 

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

@@ -32,8 +32,9 @@ module Hobo
       template 'controller.rb.erb', File.join('app/controllers',"#{file_path}_controller.rb")
     end
 
-    def generate_index
+    def generate_index_and_summary
       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
@@ -43,7 +44,7 @@ module Hobo
 
     def add_routes
       return unless options[:add_routes]
-      route "match 'search' => '#{file_path}#search', :as => 'site_search'"
+      route "match 'search' => '#{file_path}#search', :as => 'search'"
       if class_path.empty?
         route "root :to => '#{file_path}#index'"
       else

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

@@ -8,11 +8,12 @@
       <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'">
@@ -24,13 +25,15 @@
     </table>
 
 
-    <h3>Bundled Gems</h3>
+    <h3>Gems</h3>
     <table class="app-summary">
       <with-gems>
-        <tr if="&first_item?"><th></th><th>Version</th><th>Dependencies</th></tr>
+        <tr if="&first_item?"><th></th><th>Required</th><th>Installed</th><th>Status</th><th>Dependencies</th></tr>
         <tr>
           <td><gem-name/></td>
-          <td><gem-version/></td>
+          <td><gem-version-required/></td>
+          <td><gem-version/></td>          
+          <td><gem-frozen/></td>
           <td><gem-dependencies/></td>
         </tr>
       </with-gems>
@@ -72,8 +75,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">
@@ -99,4 +102,4 @@
     </with-models>
     </div>
   </content:>
-</page>
+</page>

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

@@ -0,0 +1,12 @@
+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

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