hobo 1.3.3 → 1.4.0.pre2

data/{doctests → test/doctest}/hobo/scopes.rdoctest

@@ -1,3 +1,6 @@
+    doctest: prepare testapp environment
+    doctest_require: '../prepare_testapp'
+
 Hobo Scopes
 {: .document-title}
 
@@ -31,55 +34,6 @@ that you skip down to the [fixture definitions](#fixture_definition).
 Nobody but the computer needs to read the rest of this section.
 {.hidden}
 
-To test Hobo scopes, we're going to need a connection to the database
-and some sample data.  This takes a few lines of code to set up when
-starting from a blank irb session.
-{.hidden}
-
-First off we need to configure ActiveSupport for auto-loading
-{.hidden}
-
-    >> require 'rubygems'
-    >> require 'active_support'
-    >> require 'active_record'
-    >> require 'action_pack'
-    >> require 'action_view'
-    >> require 'action_controller'
-{.hidden}
-
-We also need to get ActiveRecord set up with a database connection
-{.hidden}
-
-    >> mysql_adapter = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'
-    >> mysql_user = 'root'; mysql_password = ''
-    >> mysql_login = "-u #{mysql_user} --password='#{mysql_password}'"
-    >> mysql_database = "hobo_fields_doctest"
-    >> system "mysqladmin #{mysql_login} --force drop #{mysql_database} 2> /dev/null"
-    >> system("mysqladmin #{mysql_login} create #{mysql_database}") or raise "could not create database"
-    >> ActiveRecord::Base.establish_connection(:adapter => mysql_adapter,
-                                               :database => mysql_database,
-                                               :host => "localhost",
-                                               :username => mysql_user,
-                                               :password => mysql_password)
-    >> ActiveRecord::Base.logger = ActiveSupport::BufferedLogger::new(StringIO.new(''))
-{.hidden}
-
-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__)
-{.hidden}
-
-And we'll require hobo:
-{.hidden}
-
-    >> require 'will_paginate'
-    >> require 'hobo'
-{.hidden}
-
 Let's set up a few models for our testing:
 
     >>
@@ -397,8 +351,4 @@ Like named scopes, Hobo scopes can be chained:
     >> Bryan.inactive_friends.inactive.*.name
     => ["Bethany"]
 
-Clean up our test database:
-{.hidden}
-
-    >> system  "mysqladmin --force drop #{mysql_database} 2> /dev/null"
 {.hidden}

data/test/doctest/prepare_testapp.rb

@@ -0,0 +1,11 @@
+require 'fileutils'
+require 'tmpdir'
+
+TESTAPP_PATH = ENV['TESTAPP_PATH'] || File.join(Dir.tmpdir, 'hobo_testapp')
+system %(rake test:prepare_testapp TESTAPP_PATH=#{TESTAPP_PATH})
+system %(echo "gem 'mocha'" >> #{TESTAPP_PATH}/Gemfile)
+FileUtils.chdir TESTAPP_PATH
+require "#{TESTAPP_PATH}/config/environment"
+require 'rails/generators'
+Rails::Generators.configure!
+

data/test/irt/generators/admin_subsite.irt

@@ -1,27 +1,9 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
 invoke 'hobo:assets', %w[ -q ]
-invoke 'hobo:admin_subsite', %w[ -q ]
+invoke 'hobo:admin_subsite', %w[ -q --make-front-site=false ]
 desc "Admin Subsite files exist"
 files_exist? %w[ app/controllers/admin/admin_site_controller.rb
-                 test/functional/admin_site_controller_test.rb
-                 public/stylesheets/admin.css
                  app/controllers/admin/users_controller.rb
                  app/helpers/admin/users_helper.rb
-                 test/unit/helpers/admin/users_helper_test.rb
                  app/views/taglibs/admin_site.dryml
 ]
 test_value_eql? true
-
-desc "application.dryml injection matches"
-file_include? "app/views/taglibs/application.dryml",
-%(<extend tag="page">
-  <old-page merge>
-    <footer:>
-      <a href="&admin_users_url" if="&current_user.administrator?">Admin</a>
-    </footer:>
-  </old-page>
-</extend>
-)
-test_value_eql? true

data/test/irt/generators/assets.irt

@@ -1,16 +1,11 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
 desc "hobo:assets invoke"
 invoke 'hobo:assets', %w(-q)
 
 files_exist? %w[ app/views/taglibs/application.dryml
-                 public/stylesheets/application.css
-                 public/javascripts/dryml-support.js
+                 app/assets/stylesheets/application.css
+                 app/assets/stylesheets/front.css
+                 app/assets/javascripts/application.js
+                 app/assets/javascripts/front.js
                  app/models/guest.rb
 ]
 test_value_eql? true
-
-desc "Application.dryml content matches"
-file_include? 'app/views/taglibs/application.dryml', '<set-theme name="clean"/>'
-test_value_eql? true

data/test/irt/generators/controller.irt

@@ -1,6 +1,3 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
 invoke 'hobo:controller' , %w(houses -q)
 
 eval_file '../partials/_house_controller_tests.rb'

data/test/irt/generators/front_controller.irt

@@ -1,12 +1,7 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
 invoke 'hobo:front_controller', %w[ -q ]
 desc "All files exist"
 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 ]
 test_value_eql? true
 

data/test/irt/generators/{helper.rb → irt_helper.rb}

@@ -1,4 +1,4 @@
-irt_at_exit{git_reset_app}
+IRT::Directives.irt_at_exit {git_reset_app}
 
 def invoke(*args)
   Rails::Generators.invoke *args
@@ -20,7 +20,7 @@ end
 def file_content(path, action, *strings)
   f = File.read(path)
   wrong = strings.send(action) do |s|
-            re = s.is_a?(Regexp) ? s : /#{Regexp.escape(s)}/
+            re = s.is_a?(Regexp) ? s : /#{Regexp.escape(s)}/m
             !(f =~ re)
           end
   wrong.empty? || wrong

data/test/irt/generators/model.irt

@@ -1,6 +1,3 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
 invoke 'hobo:model', %w(house alpha:string -q)
 
 eval_file '../partials/_house_model_tests.rb'
@@ -9,10 +6,7 @@ invoke 'hobo:model', %w(nest/ed alpha:string -q)
 
 desc "Nested files exist"
 files_exist? %w[ app/models/nest/ed.rb
-        app/models/nest.rb
-        test/unit/nest/ed_test.rb
-        test/fixtures/nest/eds.yml
-        app/viewhints/nest/ed_hints.rb ]
+        app/models/nest.rb ]
 test_value_eql? true
 
 desc "Nested injection matches"
@@ -21,8 +15,3 @@ file_include? 'app/models/nest/ed.rb',
               'fields do',
               /alpha\s+\:string/
 test_value_eql? true
-
-desc "Nested hint content matches"
-file_include? 'app/viewhints/nest/ed_hints.rb',
-              'class Nest::EdHints'
-test_value_eql? true

data/test/irt/generators/partials/_account_user_model_tests.rb

@@ -1,9 +1,6 @@
 desc "Account Model files exist"
 files_exist? %w[ app/models/account.rb
                  app/models/account.rb
-                 test/unit/account_test.rb
-                 test/fixtures/accounts.yml
-                 app/viewhints/account_hints.rb
 ]
 test_value_eql? true
 
@@ -14,8 +11,3 @@ file_include? 'app/models/account.rb',
               /name\s+\:string/ ,
               /email_address\s+\:email_address/
 test_value_eql? true
-
-desc "Nested hint content matches"
-file_include? 'app/viewhints/account_hints.rb',
-              'class AccountHints'
-test_value_eql? true

data/test/irt/generators/partials/_accounts_users_controller_tests.rb

@@ -1,8 +1,6 @@
 desc "All controller files exists"
 files_exist? %w[ app/controllers/accounts_controller.rb
                  app/helpers/accounts_helper.rb
-                 test/unit/helpers/accounts_helper_test.rb
-                 test/functional/accounts_controller_test.rb
 ]
 test_value_eql? true
 

data/test/irt/generators/partials/_default_user_model_tests.rb

@@ -1,9 +1,6 @@
 desc "All files exists"
 files_exist? %w[ app/models/user.rb
                  app/models/user.rb
-                 test/unit/user_test.rb
-                 test/fixtures/users.yml
-                 app/viewhints/user_hints.rb
 ]
 test_value_eql? true
 
@@ -14,8 +11,3 @@ file_include? 'app/models/user.rb',
               /name\s+:string/,
               /email_address\s+:email_address/
 test_value_eql? true
-
-desc "Hint content matches"
-file_include? 'app/viewhints/user_hints.rb',
-            'class UserHints'
-test_value_eql? true

data/test/irt/generators/partials/_default_users_controller_tests.rb

@@ -1,8 +1,6 @@
 desc "All user controller files exists"
 files_exist? %w[ app/controllers/users_controller.rb
                  app/helpers/users_helper.rb
-                 test/unit/helpers/users_helper_test.rb
-                 test/functional/users_controller_test.rb
 ]
 test_value_eql? true
 

data/test/irt/generators/partials/_house_controller_tests.rb

@@ -1,8 +1,6 @@
 desc "All controller files exists"
 files_exist? %w[ app/controllers/houses_controller.rb
                  app/helpers/houses_helper.rb
-                 test/unit/helpers/houses_helper_test.rb
-                 test/functional/houses_controller_test.rb
 ]
 
 test_value_eql? true

data/test/irt/generators/partials/_house_model_tests.rb

@@ -1,8 +1,5 @@
 desc "All Model files exists"
-files_exist? %w[ app/models/house.rb
-   test/unit/house_test.rb
-   test/fixtures/houses.yml
-   app/viewhints/house_hints.rb ]
+files_exist? %w[ app/models/house.rb ]
 test_value_eql? true
 
 desc "Model injection matches"
@@ -11,8 +8,3 @@ file_include? 'app/models/house.rb',
               'fields do',
               /alpha\s+\:string/
 test_value_eql? true
-
-desc "Hint content matches"
-file_include? 'app/viewhints/house_hints.rb',
-              'class HouseHints'
-test_value_eql? true

data/test/irt/generators/partials/_subsite_taglib_admin.rb

@@ -1,4 +1,7 @@
-desc "Taglib admin file matches"
-file_include?( "app/views/taglibs/subs_site.dryml", tags, admin_tag ) &&
+desc "Taglib admin file matches inclusions"
+file_include?( "app/views/taglibs/subs_site.dryml", tags )
+test_value_eql? true
+
+desc "Taglib admin file matches exclusions"
 file_exclude?("app/views/taglibs/subs_site.dryml", invite_only)
 test_value_eql? true

data/test/irt/generators/partials/_subsite_taglib_admin_invite_only.rb

@@ -1,3 +1,3 @@
 desc "Taglib admin invite-only file matches with #{user_resource_name}"
-file_include?("app/views/taglibs/subs_site.dryml", tags, admin_tag, invite_only)
+file_include?("app/views/taglibs/subs_site.dryml", tags, invite_only)
 test_value_eql? true

data/test/irt/generators/partials/_subsite_taglib_noopt.rb

@@ -1,4 +1,4 @@
 desc "Taglib file matches"
-file_include?("app/views/taglibs/subs_site.dryml", tags) &&
-file_exclude?("app/views/taglibs/subs_site.dryml", admin_tag, invite_only)
+file_include?("app/views/taglibs/subs_site.dryml", tags) === true &&
+file_exclude?("app/views/taglibs/subs_site.dryml", invite_only)
 test_value_eql? true

data/test/irt/generators/partials/_subsite_taglib_variables.rb

@@ -1,25 +1,10 @@
 tags = %(<!-- Tag definitions for the subs subsite -->
 
-<include src="rapid" gem="hobo"/>
-
 <include src="taglibs/auto/subs/rapid/cards"/>
 <include src="taglibs/auto/subs/rapid/pages"/>
 <include src="taglibs/auto/subs/rapid/forms"/>
-
-<set-theme name="clean"/>
 )
 
-admin_tag = '<extend tag="page">
-  <old-page merge>
-    <append-stylesheets:>
-      <stylesheet name="subs"/>
-    </append-stylesheets:>
-    <footer:>
-      <a href="#{base_url}/">View Site</a> |
-    </footer:>
-  </old-page>
-</extend>'
-
 invite_only = %(<extend tag="card" for="#{user_resource_name}">
   <old-card merge>
     <append-header:><%= h this.state.titleize %></append-header:>

data/test/irt/generators/partials/_user_mailer_tests.rb

@@ -2,14 +2,12 @@
 desc "User Mailer files exist"
 files_exist? %w[ app/mailers/user_mailer.rb
                  app/views/user_mailer/forgot_password.erb
-                 test/functional/user_mailer_test.rb
 ]
 test_value_eql? true
 
 desc "user_mailer.rb file content"
 file_include? 'app/mailers/user_mailer.rb',
-              'class UserMailer',
-              'def set_variables'
+              'class UserMailer'
 test_value_eql? true
 
 desc "forgot_password.erb file content"

data/test/irt/generators/resource.irt

@@ -1,6 +1,3 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
 invoke 'hobo:resource' , %w(house alpha:string -q)
 
 eval_file '../partials/_house_controller_tests.rb'

data/test/irt/generators/subsite.irt

@@ -1,10 +1,6 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
-invoke 'hobo:subsite', %w[ subs -q]
+invoke 'hobo:subsite', %w[ subs --make-front-site=false -q]
 desc "Subsite files exist"
 files_exist? %w[ app/controllers/subs/subs_site_controller.rb
-                 test/functional/subs_site_controller_test.rb
                  app/views/taglibs/subs_site.dryml ]
 test_value_eql? true
 
@@ -22,31 +18,19 @@ eval_file '../partials/_subsite_taglib_noopt.rb'
 git_reset_app
 
 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
-                 app/views/taglibs/application.dryml
-                 app/controllers/subs/subs_site_controller.rb
-                 test/functional/subs_site_controller_test.rb
-                 app/views/taglibs/subs_site.dryml ]
-test_value_eql? true
-
-
-git_reset_app
-invoke 'hobo:subsite', %w[ subs -q --admin]
+invoke 'hobo:admin_subsite', %w[ subs -q --make-front-site=false]
 eval_file '../partials/_subsite_taglib_admin.rb'
 
 git_reset_app
-invoke 'hobo:subsite', %w[ subs -q --admin --invite-only]
+invoke 'hobo:assets', %w[ -q ]
+invoke 'hobo:admin_subsite', %w[ subs --make-front-site=false -q --invite-only]
 eval_file '../partials/_subsite_taglib_admin_invite_only.rb'
 
 git_reset_app
-invoke 'hobo:subsite', %w[ subs --user-resource-name=account -q --admin --invite-only]
+invoke 'hobo:assets', %w[ -q ]
+invoke 'hobo:admin_subsite', %w[ subs --make-front-site=false --user-resource-name=account -q --invite-only]
 user_resource_name = 'Account'
 eval_file '../partials/_subsite_taglib_variables.rb'
 eval_file '../partials/_subsite_taglib_admin_invite_only.rb'
 
 
-
-
-

data/test/irt/generators/subsite_taglib.irt

@@ -1,23 +1,5 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
 user_resource_name = 'User'
 eval_file '../partials/_subsite_taglib_variables.rb'
 
 invoke 'hobo:subsite_taglib', %w[ subs -q]
 eval_file '../partials/_subsite_taglib_noopt.rb'
-
-git_reset_app
-invoke 'hobo:subsite_taglib', %w[ subs -q --admin]
-eval_file '../partials/_subsite_taglib_admin.rb'
-
-git_reset_app
-invoke 'hobo:subsite_taglib', %w[ subs -q --admin --invite-only]
-eval_file '../partials/_subsite_taglib_admin_invite_only.rb'
-
-git_reset_app
-invoke 'hobo:subsite_taglib', %w[ subs --user-resource-name=account -q --admin --invite-only]
-user_resource_name = 'Account'
-eval_file '../partials/_subsite_taglib_variables.rb'
-eval_file '../partials/_subsite_taglib_admin_invite_only.rb'
-

data/test/irt/generators/test_framework.irt

@@ -1,6 +1,3 @@
-require File.expand_path('../helper.rb', __FILE__)
-
-
 desc "test_unit: default no-changes'"
 invoke 'hobo:test_framework', %w(test_unit)
 file_exclude? 'config/application.rb',
@@ -41,7 +38,7 @@ file_include? 'config/application.rb',
 test_value_eql? true
 
 desc "rspec Gemfile injection"
-file_include? 'Gemfile',  %(gem "rspec-rails", ">= 2.0.0.beta.10", :group => :test)
+file_include? 'Gemfile',  %(gem "rspec-rails", ">= 2.5.0", :group => [:test, :development])
 test_value_eql? true
 
 git_reset_app
@@ -55,7 +52,7 @@ file_include? 'config/application.rb',
 test_value_eql? true
 
 desc "rspec_with_shoulda Gemfile injection"
-file_include? 'Gemfile', %(gem "rspec-rails", ">= 2.0.0.beta.10", :group => :test),
+file_include? 'Gemfile', %(gem "rspec-rails", ">= 2.5.0", :group => [:test, :development]),
                        %(gem "shoulda", :group => :test)
 test_value_eql? true