hobo 0.5.3 → 0.6

data/hobo_files/plugin/README

@@ -1,4 +1,9 @@
-Hobo
-====
+== Welcome to Hobo
+Hobo is an Open Source extension to Ruby on Rails which helps you build full blown web applications incredibly quickly and easily. Available as a Gem or Rails plugin, Hobo provides a simple, clean and elegant development framework which allows for rapid prototyping or production of the most sophisticated web applications.
+
+== Main Features
+
+    * Rapid implementation of dynamic Ajax interfaces in your application with no extra programming.
+    * Switchable themes. Customise and tweak your application structure and layout to meet any design goals.
+    * Powerful mark-up language, DRYML, combines rapid development with ultimate design flexibility. The end of the cookie cutter blues!
 
-Description goes here

data/hobo_files/plugin/Rakefile

@@ -1,5 +1,9 @@
 require 'rake'
 require 'rake/rdoctask'
+require 'rake/testtask'
+
+desc 'Default: run unit tests.'
+task :default => :spec
 
 desc 'Generate documentation for the Hobo plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -9,3 +13,80 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 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 'spec/rake/spectask'
+require '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"
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{PLUGIN_DIR}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/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', "\"#{PLUGIN_DIR}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/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/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', "\"#{PLUGIN_DIR}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{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(PLUGIN_DIR, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
+end

data/hobo_files/plugin/generators/hobo/hobo_generator.rb

@@ -15,17 +15,17 @@ class HoboGenerator < Rails::Generator::Base
     end
 
     record do |m|
-      m.directory File.join("app/views/hobolib")
-      m.directory File.join("app/views/hobolib/themes")
+      m.directory File.join("app/views/taglibs")
+      m.directory File.join("app/views/taglibs/themes")
       m.directory File.join("public/hobothemes")
-      m.file "application.dryml", File.join("app/views/hobolib/application.dryml")
+      m.file "application.dryml", File.join("app/views/taglibs/application.dryml")
       m.file "guest.rb", File.join("app/models/guest.rb")
     end
   end
 
   protected
     def banner
-      "Usage: #{$0} generate [--add-routes]"
+      "Usage: #{$0} #{spec.name} [--add-routes]"
     end
 
     def add_options!(opt)

data/hobo_files/plugin/generators/hobo/templates/guest.rb

@@ -1,6 +1,6 @@
 class Guest
 
-  def display_name
+  def to_s
     "Guest"
   end
 

data/hobo_files/plugin/generators/hobo_front_controller/hobo_front_controller_generator.rb

@@ -73,7 +73,7 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
 
   protected
     def banner
-      "Usage: #{$0} generate <controller-name> [--add-routes] [--no-user] [--delete-index]"
+      "Usage: #{$0} #{spec.name} <controller-name> [--add-routes] [--no-user] [--delete-index]"
     end
 
     def add_options!(opt)

data/hobo_files/plugin/generators/hobo_front_controller/templates/index.dryml

@@ -1,43 +1,37 @@
-<page title="<%= app_name %>">
+<Page title="<%= app_name %>">
 
-  <:intro>
-    <h1 class="front_page_title"><%= app_name %></h1>
-  </:intro>
-  
-  <:main>
+  <main>
+    <header>
+      <h1 class="front_page_title"><%= app_name %></h1>
+    </header>
     <panel>
       <div style="margin-left: 40px; ">
         <h3>Congratulations! Your Hobo Rails App is up and running</h3>
         <ul>
           <li>To customise this page: edit app/views/<%= file_name %>/index.dryml </li>
-
-          <li>To change the nav-bar: define &lt;application_nav&gt;<br/>
-            See vendor/plugins/hobo/tags/rapid.dryml for an example</li>
-
-          <li>To change the logo: define &lt;application_logo&gt;.</li>
         </ul>
       </div>
     </panel>
 
-    <repeat obj="#Hobo.models">
+    <repeat with="&Hobo.models">
       <panel>
-        <h2><%%= this.name.titlecase.pluralize %></h2>
+        <header><h2><%%= this.name.titlecase.pluralize %></h2></header>
         <section>
-          <if q="#this.count == 0">
+          <if test="&this.count == 0">
             <p>There are no <%%= this.name.titleize.pluralize %></p>
-            <if q="#can_create?(this) and this != Hobo.user_model">
-              <p>Create a <new_object_link for="#this"/>.</p>
+            <if test="&can_create?(this) and this != Hobo.user_model">
+              <p>Create a <a to="&this.new"/>.</p>
             </if>
           </if>
           <else>
-            <repeat obj="#this.find(:all, :limit => 3)">
-              <if_can_view><object_card/></if_can_view>
+            <repeat with="&this.find(:all, :limit => 3)">
+              <card if="&can_view?"/>
             </repeat>
-            <p><object_link>More</object_link> (<count/>)</p>
+            <p><a>More</a> (<count/>)</p>
           </else>
         </section>
       </panel>
     </repeat>
-  </:main>
-
-</page>
+  </main>
+  
+</Page>

data/hobo_files/plugin/generators/hobo_front_controller/templates/login.dryml

@@ -1,10 +1,8 @@
-<page title="<%= app_name %>">
+<Page title="<%= app_name %>">
 
-  <:intro>
+  <main>
     <h1 class="front_page_title"><%= app_name %></h1>
-  </:intro>
 
-  <:main>
     <panel>
       <h2>Login to <%= app_name %></h2>
       <section>
@@ -39,6 +37,6 @@
         Edit app/views/<%= full_class_path %>/login.dryml to customise this page
       </div>
     </panel>
-  </:main>
+  </main>
 
-</page>
+</Page>

data/hobo_files/plugin/generators/hobo_front_controller/templates/search.dryml

@@ -1,6 +1,7 @@
-<page title="Search" onload="Hobo.doSearch('search_field')">
+<Page title="Search">
+  <body onload="Hobo.applyEvents(); Hobo.doSearch('search_field')"/>
 
-  <:main>
+  <main>
     <panel class="red" style="margin-top: 40px">
       <h2>Search</h2>
       <div class='search' style='margin:10px'>
@@ -11,8 +12,8 @@
 
     <panel class="hidden" id="search_results_panel">
       <h2>Results</h2>
-      <section id="search_results"></section>
+      <section id="search_results">&nbsp;</section>
     </panel>
-  </:main>
+  </main>
 
-</page>
+</Page>

data/hobo_files/plugin/generators/hobo_front_controller/templates/signup.dryml

@@ -1,10 +1,8 @@
-<page title="<%= app_name %>">
+<Page title="<%= app_name %>">
 
-  <:intro>
+  <main>
     <h1 class="front_page_title"><%= app_name %></h1>
-  </:intro>
 
-  <:main>
     <panel>
       <h2>Sign Up</h2>
       <section>
@@ -39,7 +37,7 @@
         Edit app/views/<%= full_class_path %>/signup.dryml to customise this page
       </div>
     </panel>
-  </:main>
+  </main>
 
-</page>
+</Page>
 

data/hobo_files/plugin/generators/hobo_migration/hobo_migration_generator.rb

@@ -0,0 +1,237 @@
+class HoboMigrationGenerator < Rails::Generator::Base
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @migration_name = runtime_args.first || begin
+                                              i = Dir["#{RAILS_ROOT}/db/migrate/*hobo_migration*"].length
+                                              "hobo_migration_#{i+1}"
+                                            end
+  end
+
+  def manifest
+    connection = ActiveRecord::Base.connection
+    @types = connection.native_database_types
+    
+    # Force load of hobo models
+    Hobo.models
+    
+    models = ActiveRecord::Base.send(:subclasses).reject {|c| c.name.starts_with?("CGI::") }
+    table_models = models.index_by {|m| m.table_name}
+    model_table_names = models.every(:table_name)
+    
+    to_create = model_table_names - connection.tables
+    to_drop = connection.tables - model_table_names - ['schema_info']
+    to_change = connection.tables & model_table_names
+    
+    to_rename = rename_or_drop!(to_create, to_drop, "table")
+    
+    renames = to_rename.map do |old_name, new_name|
+      "rename_table :#{old_name}, :#{new_name}"
+    end * "\n"
+    undo_renames = to_rename.map do |old_name, new_name|
+      "rename_table :#{new_name}, :#{old_name}"
+    end * "\n"
+
+    drops = to_drop.map do |t|
+      "drop_table :#{t}"
+    end * "\n"
+    undo_drops = to_drop.map do |t|
+      revert_table(t)
+    end * "\n\n"
+
+    creates = to_create.map do |t|
+      create_table(table_models[t])
+    end * "\n\n"
+    undo_creates = to_create.map do |t|
+      "drop_table :#{t}"
+    end * "\n"
+    
+    changes = []
+    undo_changes = []
+    to_change.each do |t|
+      change, undo = change_table(table_models[t])
+      changes << change
+      undo_changes << undo
+    end
+    
+    up = [renames, drops, creates, changes * "\n\n"].select{|s|!s.blank?} * "\n\n"
+    down = [undo_renames, undo_drops, undo_creates, undo_changes * "\n\n"].select{|s|!s.blank?} * "\n\n"
+    
+    puts "\n---------- Up Migration ----------", up, "----------------------------------"
+    puts "\n---------- Down Migration --------", down, "----------------------------------"
+    
+    return record {|m| } if up.blank?
+    
+    up.gsub!("\n", "\n    ")
+    down.gsub!("\n", "\n    ")
+    
+    action = input("What now: [g]enerate migrations, generate and [m]igrate now or [c]ancel?", %w(g m c))
+
+    if action == 'c'
+      # record nothing to keep the generator happy
+      record {|m| }
+    else
+      at_exit { system "rake db:migrate" } if action == 'm' 
+      
+      up.gsub!("\n", "\n    ")
+      down.gsub!("\n", "\n    ")
+
+      record do |m|
+        m.migration_template 'migration.rb', 'db/migrate', 
+                             :assigns => { :up => up, :down => down, :migration_name => @migration_name.camelize }, 
+                             :migration_file_name => @migration_name
+      end
+    end
+  end
+  
+  def rename_or_drop!(to_create, to_drop, kind_str, name_prefix="")
+    to_rename = {}
+    rename_to_choices = to_create
+    to_drop.dup.each do |t|
+      if rename_to_choices.empty?
+        puts "\nCONFIRM DROP! #{kind_str} #{name_prefix}#{t}"
+        resp = input("Enter 'drop #{t}' to confirm:")
+        if resp.strip != "drop " + t.to_s
+          to_drop.delete(t)
+        end
+      else
+        puts "\nDROP or RENAME?: #{kind_str} #{name_prefix}#{t}"
+        puts "Rename choices: #{to_create * ', '}"
+        resp = input("Enter either 'drop #{t}' or one of the rename choices:")
+        resp.strip!
+        
+        if resp == "drop " + t
+          # Leave things as they are
+        else
+          to_drop.delete(t)
+          if resp.in?(rename_to_choices)
+            to_rename[t] = resp
+            to_create.delete(resp)
+            rename_to_choices.delete(resp)
+          end
+        end
+      end
+    end
+    to_rename
+  end
+
+  def create_table(model)
+    longest_field_name = model.field_specs.values.map { |f| f.sql_type.to_s.length }.max
+    (["create_table :#{model.table_name} do |t|"] +
+     model.field_specs.values.sort_by{|f| f.position}.map {|f| create_field(f, longest_field_name)} +
+     ["end"]) * "\n"
+  end
+  
+  def create_field(field_spec, field_name_width)
+    args = [field_spec.name.inspect] + format_options(field_spec.options, field_spec.sql_type)
+    "  t.%-*s %s" % [field_name_width, field_spec.sql_type, args.join(', ')]
+  end
+  
+  def change_table(model)
+    table_name = model.table_name
+    db_columns = model.connection.columns(model.table_name).index_by{|c|c.name} - [model.primary_key]
+    model_column_names = model.field_specs.keys.every(:to_s)
+    db_column_names = db_columns.keys.every(:to_s)
+    
+    to_add = model_column_names - db_column_names
+    to_remove = db_column_names - model_column_names - [model.primary_key.to_sym]
+
+    to_rename = rename_or_drop!(to_add, to_remove, "column", "#{table_name}.")
+
+    db_column_names -= to_rename.keys
+    db_column_names |= to_rename.values
+    to_change = db_column_names & model_column_names
+    
+    renames = to_rename.map do |old_name, new_name|
+      "rename_column :#{table_name}, :#{old_name}, :#{new_name}"
+    end
+    undo_renames = to_rename.map do |old_name, new_name|
+      "rename_column :#{table_name}, :#{new_name}, :#{old_name}"
+    end
+    
+    to_add = to_add.sort_by{|c| model.field_specs[c].position }
+    adds = to_add.map do |c|
+      spec = model.field_specs[c]
+      args = [":#{spec.sql_type}"] + format_options(spec.options, spec.sql_type)
+      "add_column :#{table_name}, :#{c}, #{args * ', '}"
+    end
+    undo_adds = to_add.map do |c|
+      "remove_column :#{table_name}, :#{c}"
+    end
+    
+    removes = to_remove.map do |c|
+      "remove_column :#{table_name}, :#{c}"
+    end
+    undo_removes = to_remove.map do |c|
+      revert_column(table_name, c)
+    end
+    
+    old_names = to_rename.invert
+    changes = []
+    undo_changes = []
+    to_change.each do |c|
+      col_name = old_names[c] || c
+      col = db_columns[col_name]
+      spec = model.field_specs[c]
+      if spec.different_to?(col)
+        change_spec = {}
+        change_spec[:limit]     = spec.limit if !spec.limit.nil?
+        change_spec[:precision] = spec.precision if !spec.precision.nil?
+        change_spec[:scale]     = spec.scale if !spec.scale.nil?
+        change_spec[:null]      = false unless spec.null
+        change_spec[:default]   = spec.default if !spec.default.nil?
+        
+        changes << "change_column :#{table_name}, :#{c}, " + 
+          ([":#{spec.sql_type}"] + format_options(change_spec, spec.sql_type)).join(", ")
+        back = change_column_back(table_name, c)
+        undo_changes << back unless back.blank?
+      else
+        nil
+      end
+    end.compact
+    
+    [(renames + adds + removes + changes) * "\n",
+     (undo_renames + undo_adds + undo_removes + undo_changes) * "\n"]
+  end
+  
+  
+  def format_options(options, type)
+    options.map do |k, v|
+      next if k == :limit && (type == :decimal || v == @types[type][:limit])
+      next if k == :null && v == true
+      "#{k.inspect} => #{v.inspect}" 
+      end.compact
+  end
+  
+  
+  def revert_table(table)
+    res = StringIO.new
+    ActiveRecord::SchemaDumper.send(:new, ActiveRecord::Base.connection).send(:table, table, res)
+    res.string.strip.gsub("\n  ", "\n")
+  end
+  
+  
+  def change_column_back(table, column)
+    _, type, options = *revert_table(table).match(/\s*t\.column\s+"#{column}",\s+(:[a-zA-Z0-9_]+)(?:,\s+(.*?)$)?/m)
+    "change_column :#{table}, :#{column}, #{type}#{', ' + options.strip if options}"
+  end
+
+  def revert_column(table, column)
+    "add_column :#{table}, :#{column}, " + revert_table(table).match(/\s*t\.column\s+"#{column}",\s+(.*?)$/m)[1].strip
+  end
+  
+  
+  def input(prompt, options=nil)
+    print(prompt + " ")
+    if options
+      while !(response = STDIN.readline.strip.downcase).in?(options); 
+        print(prompt + " ")
+      end
+      response
+    else
+      STDIN.readline
+    end
+  end
+  
+end
+