hobo 0.8 → 0.8.1

data/CHANGES.txt

@@ -1,3 +1,59 @@
+=== Hobo 0.8.1 ===
+
+    Fixes to generating and loading subsite controllers
+
+    Add Rails routing monkey-patch to hobo generator
+
+    Fixed deprecated use of ActiveSupport Dependencies module
+
+    Migration generator -- fix to mysql limit problem in Rails 2.1.1
+
+    Migration generator -- fixed bug with validation of filename input by user
+
+    New lifecycle semantics.
+    
+      Lifecycle create and transition actions (blocks) now run *after* the create or transition, and not at all
+      if there are validation errors.
+    
+      To create a key, you can no longer call lifecycle.generate_key in the action, as the key timestamp will not
+      be saved (record has already been saved)
+    
+      Instead pass :new_key => true as an option to the create or transition, and access it in the block using
+      lifecycle.key
+
+    Fix usage of 'skip' on hidden-fields tag; wasn't comma-splitting input. Correctly skip search field in
+    table-plus search form.
+
+    Fix to viewable_by? helper
+
+    Partial fix #251 - add requirement that :id not be empty to resource routes
+
+    Fix for #256, generating user model not named 'User'
+
+    Maade request and app_name available by default
+
+    New user model method account_active? Default implementation is state == 'active' but this method is intended
+    as a hook that can be overridden as required.
+    
+        On signup, the user is only logged in if user has #account_active?
+
+    Rapid generators -- fixes for form cancel links
+
+    Rapid generators -- added parameter to show-page
+
+    Fixes to in-place-editors
+
+    Allow more advanced default ordering options like 'lower(users.last_name), lower(users.first_name)'
+
+    Fixed typo in dryml-generator lifecycle pages
+
+    show-page generator -- fix to test for create permission
+
+    Rapid generators -- fix for show-page generator, when the 'owner' association that goes with the page's
+    collection cannot be found
+    
+    
+    
 === Hobo 0.8 ===
 
 (There's a million changes in this release -- most of the fixes are *not* mentioned)

data/Manifest

@@ -69,6 +69,7 @@ rails_generators/hobo/templates/application.dryml
 rails_generators/hobo/templates/dryml-support.js
 rails_generators/hobo/templates/guest.rb
 rails_generators/hobo/templates/initializer.rb
+rails_generators/hobo/templates/patch_routing.rb
 rails_generators/hobo_front_controller/hobo_front_controller_generator.rb
 rails_generators/hobo_front_controller/templates/controller.rb
 rails_generators/hobo_front_controller/templates/functional_test.rb
@@ -121,6 +122,7 @@ rails_generators/hobo_user_model/templates/mailer.rb
 rails_generators/hobo_user_model/templates/model.rb
 rails_generators/hobo_user_model/templates/unit_test.rb
 rails_generators/hobo_user_model/USAGE
+Rakefile
 README
 script/destroy
 script/generate

data/Rakefile

@@ -0,0 +1,116 @@
+require 'rake'
+require 'rake/rdoctask'
+require 'rake/testtask'
+
+load "tasks/generate_tag_reference.rb"
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc 'Generate documentation for the Hobo plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Hobo'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+require 'echoe'
+
+Echoe.new('hobo') do |p|
+  p.author  = "Tom Locke"
+  p.email   = "tom@tomlocke.com"
+  p.summary = "The web app builder for Rails"
+  p.url     = "http://hobocentral.net/"
+  p.project = "hobo"
+
+  p.changelog = "CHANGES.txt"
+  p.version   = "0.8.1"
+
+  p.dependencies = [
+    'hobosupport >=0.8.1',
+    'hobofields >=0.8.1',
+    'rails =2.1',
+    'mislav-will_paginate >=2.2.1']
+end
+
+
+
+
+# --- RSpec --- #
+
+# In rails 1.2, plugins aren't available in the path until they're loaded.
+# Check to see if the rspec plugin is installed first and require
+# it if it is.  If not, use the gem version.
+PLUGIN_DIR = File.dirname(__FILE__)
+
+rspec_base = File.expand_path(PLUGIN_DIR + '/spec/rails_root/vendor/plugins/rspec/lib')
+$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
+require '../hobo_spec/rails_root/vendor/plugins/rspec/lib/spec/rake/spectask'
+require '../hobo_spec/rails_root/vendor/plugins/rspec/lib/spec/translator'
+
+spec_prereq = :noop # File.exist?(File.join(PLUGIN_DIR, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+task :noop do
+end
+
+task :stats => "spec:statsetup"
+
+SPEC_HOME = "#{PLUGIN_DIR}/../hobo_spec"
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{SPEC_HOME}/spec.opts\""]
+  t.spec_files = FileList["#{SPEC_HOME}/unit/**/*_spec.rb"]
+end
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{SPEC_HOME}/spec.opts\""]
+    t.spec_files = FileList["#{SPEC_HOME}/unit/**/*_spec.rb"]
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec', '--rails']
+  end
+
+  desc "Print Specdoc for all specs (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList["#{SPEC_HOME}/unit/**/*_spec.rb"]
+  end
+
+  [:models, :controllers, :views, :helpers].each do |sub|
+    desc "Run the specs under spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{SPEC_HOME}/spec.opts\""]
+      t.spec_files = FileList["#{SPEC_HOME}/#{sub}/**/*_spec.rb"]
+    end
+  end
+
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
+    ::CodeStatistics::TEST_TYPES << "Model specs"
+    ::CodeStatistics::TEST_TYPES << "View specs"
+    ::CodeStatistics::TEST_TYPES << "Controller specs"
+    ::CodeStatistics::TEST_TYPES << "Helper specs"
+    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+  end
+
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+      task :load => :environment do
+        require 'active_record/fixtures'
+        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(SPEC_HOME, 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures("#{SPEC_HOME}/fixtures", File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
+end

data/dryml_generators/rapid/forms.dryml.erb

@@ -1,14 +1,16 @@
 <% each_controller do -%>
 <%
 form_fields = standard_fields :belongs_to, :has_many
+
+cancel_to_show_page  = linkable?(:show)
+cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
 -%>
 <def tag="form" for="<%= model.name %>">
   <form merge param="default">
     <error-messages/>
     <field-list fields="<%= form_fields * ', ' %>" param/>
     <div param="actions">
-      <submit label="Save" param/>
-      <do param="cancel">or <a param="cancel-link">Cancel</a></do>
+      <submit label="Save" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>
@@ -20,7 +22,7 @@ form_fields = standard_fields :belongs_to, :has_many
   <form lifecycle="<%= creator.name %>">
     <field-list fields="<%= creator.parameters * ', ' %>" param/>
     <div param="actions">
-      <submit label="<%= creator.name.titleize %>" param/><do param="back-link"> or <a>Cancel</a></do>
+      <submit label="<%= creator.name.titleize %>" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>
@@ -33,7 +35,7 @@ form_fields = standard_fields :belongs_to, :has_many
     <input type="hidden" name="key" value="&this.lifecycle.provided_key" if="&this.lifecycle.provided_key"/>
     <field-list fields="<%= transition.parameters * ', ' %>" param/>
     <div param="actions">
-      <submit label="<%= transition.name.titleize %>" param/><do param="back-link"> or <a>Cancel</a></do>
+      <submit label="<%= transition.name.titleize %>" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>

data/dryml_generators/rapid/pages.dryml.erb

@@ -75,9 +75,11 @@ show_fields    = standard_fields(:belongs_to).*.to_s - [model.name_attribute, ma
 collection     = model.dependent_collections.sort_by(&:to_s).first
 if collection
   collection_class = model.reflections[collection].klass
-  owner            = model.reverse_reflection(collection).name
-  add_link = collection &&linkable?(collection_class, :"new_for_#{owner}")
-  add_form = !add_link && linkable?(collection_class, :"create_for_#{owner}", :method => :post)
+  owner            = model.reverse_reflection(collection)._?.name
+  if owner
+    add_link = collection &&linkable?(collection_class, :"new_for_#{owner}")
+    add_form = !add_link && linkable?(collection_class, :"create_for_#{owner}", :method => :post)
+  end
 end
 -%>
 <def tag="show-page" for="<%= model.name %>">
@@ -110,7 +112,7 @@ end
     
       <section param="content-body">
 <% if main_content -%>
-        <view:<%= main_content %>/>        
+        <view:<%= main_content %> param="primary-content"/>
 <% end -%>
 <% if show_fields.any? -%>
         <field-list fields="<%= show_fields * ', ' %>" param/>
@@ -126,12 +128,12 @@ end
 <% end -%>
 <% if add_link -%>
 
-          <a:<%= collection %> action="new" if="&can_create?" param="new-link">New <%= collection.to_s.singularize.titleize %></a>
+          <a:<%= collection %> action="new" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)" param="new-link">New <%= collection.to_s.singularize.titleize %></a>
 <% elsif add_form -%>
 
           <section param="add-to-collection" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)">
             <h3 param="add-form-heading">Add <%= a_or_an collection.to_s.singularize.titleize %></h3>
-            <form with="&@<%= collection_class.name.underscore %> || @<%= model_name.underscore %>.<%= collection %>.new" owner="<%= owner %>" method="post" without-or-cancel param>
+            <form with="&@<%= collection_class.name.underscore %> || @<%= model_name.underscore %>.<%= collection %>.new" owner="<%= owner %>" method="post" without-cancel param>
               <field-list: skip="<%= owner %>"/>
               <submit: label="Add"/>
             </form>
@@ -263,7 +265,7 @@ new_link = :new.in?(actions)
 <def tag="<%= transition.dasherize %>-page" for="<%= model.name %>">
   <page title="<%= transition.titleize %>" merge>
     
-    <body: class="lifecycle-transition-page #{transition.dasherize}-page" param/>
+    <body: class="lifecycle-transition-page <%= transition.dasherize -%>-page" param/>
     
     <content:>
       <header param="content-header">