hobo 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12fc9a9fb6626d3e125ab54d4357c98f4ffec9b6
-  data.tar.gz: bd705d3d658a46e93373599305f85476616911cb
+  metadata.gz: a47131d7bc70b7def777c284c85589c4157315ae
+  data.tar.gz: 7c36ca7f61f274d6cdf1b3e50eab85d32344d3c3
 SHA512:
-  metadata.gz: f43ce9b0b3b8f70fa5f702de7b7ad11d0e5b1e347fd49718582ffdd63a23bfe6e1821ca36fd046b43f86850046d17448146fdd62b49bdcb0a376cfcc958172f9
-  data.tar.gz: 61186300408c90cc1dbc6c24a0257fd027fd299a424e0ba3a59237d924b6ea282431ae78222be644fec1af91402e60ad73d6f647922e9ea0be0f430166f853a1
+  metadata.gz: 91991f1e78d2bd243125fbaddb4d43622aad3f176b07a4e8e5f3e33e8ff7f8a5d86f9a6f3f8135ae97525de3b591bdb4a01f793c995ec3ccc648812d4ca52a25
+  data.tar.gz: 64a86d4866dbe794894f078300b869c5518b3746aa57e334d7d63061be94a4bb77b54b114c0824a001f6f3fe8d87f14ccc22687dd75dd2619bf2ce4b1b53cccb

data/Gemfile

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
 gem 'rubydoctest', :git => 'git://github.com/bryanlarsen/rubydoctest.git'
-gem 'rails', '4.0.8'
+gem 'rails', '4.2.4'
+gem 'responders', '~> 2.0'
 gem 'protected_attributes'
 gemspec :path => "../dryml"
 gemspec :path => "../hobo_support"

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.2.0

data/app/helpers/hobo_route_helper.rb

@@ -56,7 +56,8 @@ module HoboRouteHelper
           owner_name = refl.name.to_s
           owner_name = owner_name.singularize if refl.macro == :has_many
           poly = [owner_name, obj.member_class]
-          params[:"#{owner_name}_id"] = obj.origin
+          params[:"#{owner_name}_id"] = obj.origin.id
+          params = params.symbolize_keys
           action = "#{action}_for_#{owner_name}"
         else
           poly = [obj.member_class]
@@ -85,6 +86,9 @@ module HoboRouteHelper
       rescue ActionController::RoutingError => e  # raised if recognize_path fails
         logger.info("recognize_path has failed: #{e.message}")
         nil
+      rescue ActionController::UrlGenerationError => e # error that inherits from ActionController::RoutingError
+        logger.info("UrlGenerationError: #{e.message}")
+        nil
       end
 
     end

data/lib/generators/hobo/controller.rb

@@ -29,10 +29,6 @@ module Generators
         invoke 'helper', [name], options
       end
 
-      hook_for :test_framework, :as => :controller do | instance, controller_test |
-        instance.invoke controller_test, [ instance.name ]
-      end
-
     end
   end
 end

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

@@ -102,8 +102,8 @@ module Generators
             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
-            owner = owner.to_s.singularize if model.reflections[owner].macro == :has_many
+            owner_class        = model.reflections[owner.to_s].klass.name.underscore
+            owner = owner.to_s.singularize if model.reflections[owner.to_s].macro == :has_many
             collection_path = "#{owner_class.pluralize}/:#{owner}_id/#{collection}"
 
             routes = []
@@ -167,8 +167,8 @@ module Generators
             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
-            owner = owner.to_s.singularize if model.reflections[owner].macro == :has_many
+            owner_class        = model.reflections[owner.to_s].klass.name.underscore
+            owner = owner.to_s.singularize if model.reflections[owner.to_s].macro == :has_many
             collection_path = "#{owner_class.pluralize}/:#{owner}_id/#{collection}"
 
             actions.each do |action|

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

@@ -150,28 +150,6 @@ EOI
       gem_with_comments('hobo_will_paginate', :comments => "\n# Hobo's version of will_paginate is required.")
     end
 
-    def choose_test_framework
-      if wizard?
-        say_title 'Test Framework'
-        return unless yes_no? "Do you want to customize the test_framework?"
-        require 'generators/hobo/test_framework/test_framework_generator'
-        f = Hobo::TestFrameworkGenerator::FRAMEWORKS * '|'
-        test_framework = choose("Choose your preferred test framework: [<enter>=#{f}]:", /^(#{f})$/, 'test_unit')
-        fixtures = yes_no?("Do you want the test framework to generate the fixtures?")
-        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?)
-        test_framework = options[:test_framework]
-        fixtures = options[:fixtures]
-        fixture_replacement = options[:fixture_replacement]
-      end
-      invoke 'hobo:test_framework', [test_framework],
-                                    :fixture_replacement => fixture_replacement,
-                                    :fixtures => fixtures,
-                                    :update => true
-    end
-
     def front_controller
       if wizard?
         say_title 'Front Controller'

data/lib/generators/hobo/subsite.rb

@@ -31,10 +31,6 @@ module Generators
         application "# Hobo: the #{file_name} subsite loads #{file_name}.css & #{file_name}.js"
       end
 
-      hook_for :test_framework, :as => :controller do | instance, controller_test |
-        instance.invoke controller_test, ["#{instance.name}_site"]
-      end
-
       private
 
       def subsite_name

data/lib/generators/hobo/user_mailer/user_mailer_generator.rb

@@ -25,9 +25,5 @@ module Hobo
       template( 'activation.erb', File.join(mailer_dir, "activation.erb")) if options[:activation_email]
     end
 
-    hook_for :test_framework, :as => :mailer do | instance, mailer |
-      instance.invoke mailer, ["#{instance.name}_mailer"]
-    end
-
   end
 end

data/lib/generators/hobo/user_model/templates/model_injection.rb.erb

@@ -44,7 +44,7 @@
            :params => [:name, :email_address],
            :new_key => true,
            :become => :invited do
-       <%= class_name %>Mailer.invite(self, lifecycle.key).deliver
+       <%= class_name %>Mailer.invite(self, lifecycle.key).deliver_now
     end
 
     transition :accept_invitation, { :invited => :active }, :available_to => :key_holder,
@@ -57,13 +57,13 @@
     create :signup, :available_to => "Guest",
       :params => [:name, :email_address, :password, :password_confirmation],
       :become => :inactive, :new_key => true  do
-      <%= class_name %>Mailer.activation(self, lifecycle.key).deliver
+      <%= class_name %>Mailer.activation(self, lifecycle.key).deliver_now
     end
 
     transition :activate, { :inactive => :active }, :available_to => :key_holder
 
     transition :request_password_reset, { :inactive => :inactive }, :new_key => true do
-      <%= class_name %>Mailer.activation(self, lifecycle.key).deliver
+      <%= class_name %>Mailer.activation(self, lifecycle.key).deliver_now
     end
 
 <% else -%>
@@ -75,7 +75,7 @@
 
 <% end -%>
     transition :request_password_reset, { :active => :active }, :new_key => true do
-      <%= class_name %>Mailer.forgot_password(self, lifecycle.key).deliver
+      <%= class_name %>Mailer.forgot_password(self, lifecycle.key).deliver_now
     end
 
     transition :reset_password, { :active => :active }, :available_to => :key_holder,

data/lib/hobo/controller/model.rb

@@ -269,7 +269,7 @@ module Hobo
 
 
       def auto_actions_for(owner, actions)
-        name = model.reflections[owner].macro == :has_many ? owner.to_s.singularize : owner
+        name = model.reflections[owner.to_s].macro == :has_many ? owner.to_s.singularize : owner
 
         owner_actions[owner] ||= []
         Array(actions).each do |action|
@@ -358,7 +358,7 @@ module Hobo
 
 
     def find_instance(options={})
-      model.user_find(current_user, params[:id], options) do |record|
+      model.user_find(current_user, params[:id]) do |record|
         yield record if block_given?
       end
     end
@@ -466,7 +466,7 @@ module Hobo
 
     def find_owner_and_association(owner_association)
       owner_name = name_of_auto_action_for(owner_association)
-      refl = model.reflections[owner_association]
+      refl = model.reflections[owner_association.to_s]
       id = params["#{owner_name}_id"]
       owner = refl.klass.find(id)
       instance_variable_set("@#{owner_association}", owner)
@@ -474,7 +474,7 @@ module Hobo
     end
 
     def name_of_auto_action_for(owner_association)
-      model.reflections[owner_association].macro == :has_many ? owner_association.to_s.singularize : owner_association
+      model.reflections[owner_association.to_s].macro == :has_many ? owner_association.to_s.singularize : owner_association
     end
 
     # --- Action implementations --- #

data/lib/hobo/model.rb

@@ -155,7 +155,7 @@ module Hobo
             options = args[1]
         end
         belongs_to_without_test_methods(name, *args, &block)
-        refl = reflections[name]
+        refl = reflections[name.to_s]
         id_method = refl.options[:primary_key] || refl.klass.primary_key
         if options[:polymorphic]
           # TODO: the class lookup in _is? below is incomplete; a polymorphic association to an STI base class
@@ -259,7 +259,7 @@ module Hobo
 
 
       def reverse_reflection(association_name)
-        refl = reflections[association_name.to_sym] or raise "No reverse reflection for #{name}.#{association_name}"
+        refl = reflections[association_name.to_s] or raise "No reverse reflection for #{name}.#{association_name}"
         return nil if refl.options[:conditions] || refl.options[:polymorphic]
 
         if refl.macro == :has_many && (self_to_join = refl.through_reflection)

data/lib/hobo/model/accessible_associations.rb

@@ -54,7 +54,7 @@ module Hobo
               record.send(method, owner) if record.respond_to? method
             end
           else
-            owner.include_in_save(association_name, record) unless owner.class.reflections[association_name].options[:through]
+            owner.include_in_save(association_name, record) unless owner.class.reflections[association_name.to_s].options[:through]
           end
         else
           # It's already a record
@@ -90,7 +90,7 @@ module Hobo
       end
 
       def finder_for_belongs_to(record, name)
-        refl = record.class.reflections[name]
+        refl = record.class.reflections[name.to_s]
         #conditions = ActiveRecord::Associations::BelongsToAssociation.new(record, refl).reflection.send(:conditions)
         conditions = [[]]
         conditions == [[]] || conditions == [[],[]] ? refl.klass : refl.klass.scoped(:conditions => conditions)

data/lib/hobo/model/find_for.rb

@@ -13,10 +13,10 @@ module Hobo
 
         collection_name = $1.to_sym
         anchor_association_name = $2.to_sym
-        if (refl = self.class.reflections[collection_name]) && refl.macro == :has_many
+        if (refl = self.class.reflections[collection_name.to_s]) && refl.macro == :has_many
           # the association name matches (e.g. comment_for_...)
 
-          if (anchor_refl = refl.klass.reflections[anchor_association_name]) && anchor_refl.macro == :belongs_to
+          if (anchor_refl = refl.klass.reflections[anchor_association_name.to_s]) && anchor_refl.macro == :belongs_to
             # the whole thing matches (e.g. comment_for_user)
 
 
@@ -52,7 +52,7 @@ module Hobo
 
       def initialize(owner, name, collection, anchor_association)
         @association = owner.send(collection)
-        @anchor_reflection = @association.member_class.reflections[anchor_association]
+        @anchor_reflection = @association.member_class.reflections[anchor_association.to_s]
         @name = name
       end
 

data/lib/hobo/model/include_in_save.rb

@@ -16,7 +16,7 @@ module Hobo
       def validate_included_in_save
         if included_in_save
           included_in_save._?.each_pair do |association, records|
-            next if self.class.reflections[association].options[:validate]==false
+            next if self.class.reflections[association.to_s].options[:validate]==false
             added = false
             records.each do |record|
               # we want to call valid? on each one, but only add the error to self once

data/lib/hobo/model/lifecycles/actions.rb

@@ -31,7 +31,7 @@ module Hobo
             who.detect { |w| publishable_by(user, w, record) }
 
           else
-            refl = record.class.reflections[who]
+            refl = record.class.reflections[who.to_s]
             if refl && refl.macro == :has_many
               record.send(who).include?(user)
             elsif refl && refl.macro == :belongs_to

data/lib/hobo/model/lifecycles/creator.rb

@@ -31,7 +31,7 @@ module Hobo
           params = options.fetch(:params, [])
           allowed = params.dup
           params.each do |p|
-            if (refl = model.reflections[p]) && refl.macro == :belongs_to
+            if (refl = model.reflections[p.to_s]) && refl.macro == :belongs_to
               allowed << refl.foreign_key.to_s
               allowed << refl.options[:foreign_type] if refl.options[:polymorphic]
             end

data/lib/hobo/model/lifecycles/transition.rb

@@ -24,7 +24,7 @@ module Hobo
           params = options.fetch(:params, [])
           allowed = params.dup
           params.each do |p|
-            if (refl = model.reflections[p]) && refl.macro == :belongs_to
+            if (refl = model.reflections[p.to_s]) && refl.macro == :belongs_to
               allowed << refl.foreign_key.to_s
               allowed << refl.options[:foreign_type] if refl.options[:polymorphic]
             end

data/lib/hobo/model/permissions.rb

@@ -81,7 +81,7 @@ module Hobo
 
         def has_many_with_hobo_permission_check(association_id, *args, &extension)
           has_many_without_hobo_permission_check(association_id, *args, &extension)
-          reflection = reflections[association_id]
+          reflection = reflections[association_id.to_s]
           if reflection.options[:dependent]==:destroy
             #overriding dynamic method created in ActiveRecord::Associations#configure_dependency_for_has_many
             method_name =  "has_many_dependent_destroy_for_#{reflection.name}".to_sym
@@ -93,7 +93,7 @@ module Hobo
 
         def has_one_with_hobo_permission_check(association_id, *args, &extension)
           has_one_without_hobo_permission_check(association_id, *args, &extension)
-          reflection = reflections[association_id]
+          reflection = reflections[association_id.to_s]
           if reflection.options[:dependent]==:destroy
             #overriding dynamic method created in ActiveRecord::Associations#configure_dependency_for_has_one
             method_name =  "has_one_dependent_destroy_for_#{reflection.name}".to_sym
@@ -108,7 +108,7 @@ module Hobo
 
         def belongs_to_with_hobo_permission_check(association_id, *args, &extension)
           belongs_to_without_hobo_permission_check(association_id, *args, &extension)
-          reflection = reflections[association_id]
+          reflection = reflections[association_id.to_s]
           if reflection.options[:dependent]==:destroy
             #overriding dynamic method created in ActiveRecord::Associations#configure_dependency_for_belongs_to
             method_name =  "belongs_to_dependent_destroy_for_#{reflection.name}".to_sym
@@ -244,7 +244,7 @@ module Hobo
           # No setter = no edit permission
           return false if !respond_to?("#{attribute}=")
 
-          refl = self.class.reflections[attribute.to_sym]
+          refl = self.class.reflections[attribute.to_s]
           if refl && refl.macro != :belongs_to # a belongs_to is handled the same as a regular attribute
             return association_editable_by?(user, refl)
           end
@@ -338,7 +338,7 @@ module Hobo
       end
 
       def with_attribute_or_belongs_to_keys(attribute)
-        if (refl = self.class.reflections[attribute.to_sym]) && refl.macro == :belongs_to
+        if (refl = self.class.reflections[attribute.to_s]) && refl.macro == :belongs_to
           if refl.options[:polymorphic]
             yield refl.foreign_key, refl.options[:foreign_type]
           else
@@ -386,7 +386,7 @@ module Hobo
           end
         end
 
-        if (refl = self.class.reflections[attr.to_sym]) && refl.macro == :belongs_to
+        if (refl = self.class.reflections[attr.to_s]) && refl.macro == :belongs_to
           # A belongs_to -- also unknownify the underlying fields
           unknownify_attribute refl.foreign_key
           unknownify_attribute refl.options[:foreign_type] if refl.options[:polymorphic]
@@ -429,7 +429,7 @@ module Hobo
 
         metaclass.send :remove_method, attr
 
-        if (refl = self.class.reflections[attr]) && refl.macro == :belongs_to
+        if (refl = self.class.reflections[attr.to_s]) && refl.macro == :belongs_to
           # A belongs_to -- restore the underlying fields
           deunknownify_attribute refl.foreign_key
           deunknownify_attribute(refl.options[:foreign_type], false) if refl.options[:polymorphic]

data/lib/hobo/model/scopes/automatic_scopes.rb

@@ -404,7 +404,7 @@ module Hobo
 
 
         def reflection(name)
-          @klass.reflections[name.to_sym]
+          @klass.reflections[name.to_s]
         end
 
 

data/lib/hobo/rapid/generators/rapid/cards.dryml.erb

@@ -14,7 +14,7 @@ creator_attribute     = model.creator_attribute
 primary_collection    = model.view_hints.primary_children
 
 if creator_attribute
-  creator_refl = model.reflections[creator_attribute]
+  creator_refl = model.reflections[creator_attribute.to_s]
   creator_link = creator_refl && linkable?(creator_refl.klass, :show)
 end
 

data/lib/hobo/rapid/generators/rapid/pages.dryml.erb

@@ -105,11 +105,11 @@ model_key = model.to_s.underscore
 
 <%
 back_link      = model.view_hints.parent
-back_link_human_name = model.reflections[back_link] && model.reflections[back_link].klass unless back_link.blank?
+back_link_human_name = model.reflections[back_link.to_s] && model.reflections[back_link.to_s].klass unless back_link.blank?
 back_link_human_name = back_link_human_name && back_link_human_name.model_name.human
 boolean_fields = model.table_exists? ? (model.columns.select { |c| c.type == :boolean }.*.name - model.view_hints.inline_booleans) : []
 creator        = model.creator_attribute
-creator_link   = creator && model.reflections[creator] && linkable?(model.reflections[creator].klass, :show)
+creator_link   = creator && model.reflections[creator.to_s] && linkable?(model.reflections[creator.to_s].klass, :show)
 edit_link      = linkable?(model, :edit)
 main_content   = model.primary_content_attribute
 show_fields    = standard_fields(:belongs_to).*.to_s - [model.name_attribute, main_content, creator, back_link, *boolean_fields].*.to_s
@@ -118,7 +118,7 @@ is_user_model = model < Hobo::Model::UserBase
 
 collection     = model.view_hints.primary_children
 if collection
-  collection_class = model.reflections[collection].klass
+  collection_class = model.reflections[collection.to_s].klass
   owner            = model.reverse_reflection(collection)._?.name
   if owner
     add_link = collection && linkable?(collection_class, :"new_for_#{owner}")
@@ -127,7 +127,7 @@ if collection
 end
 
 unless model.view_hints.secondary_children.empty?
-  aside_collections = model.view_hints.secondary_children.map { |c| [model.reflections[c], model.reverse_reflection(c)] }
+  aside_collections = model.view_hints.secondary_children.map { |c| [model.reflections[c.to_s], model.reverse_reflection(c)] }
 end
 -%>
 <def tag="show-page" for="<%= model.name %>">
@@ -261,14 +261,14 @@ name_attribute = model.name_attribute
 
 <% controller.owner_actions.each_pair do |owner, actions| -%>
 <%
-collection_name = model.reverse_reflection(owner).name.to_s
-owner_model     = model.reflections[owner].klass
+collection_name = model.reverse_reflection(owner.to_s).name.to_s
+owner_model     = model.reflections[owner.to_s].klass
 linkable_owner  = linkable?(owner_model, :show)
 owner_tag       = linkable_owner ? "a" : "name"
 
 owner_is_user = owner_model < Hobo::Model::UserBase
 
-owner = model.reflections[owner].macro == :has_many ? owner.to_s.singularize : owner.to_s
+owner = model.reflections[owner.to_s].macro == :has_many ? owner.to_s.singularize : owner.to_s
 -%>
 <% if :index.in? actions -%>
 <%

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Tom Locke
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: hobo_fields
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: dryml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: hobo_will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -231,9 +231,6 @@ files:
 - lib/generators/hobo/subsite_taglib/subsite_taglib_generator.rb
 - lib/generators/hobo/subsite_taglib/templates/taglib.dryml.erb
 - lib/generators/hobo/taglib.rb
-- lib/generators/hobo/test_framework/USAGE
-- lib/generators/hobo/test_framework/test_framework_generator.rb
-- lib/generators/hobo/test_options.rb
 - lib/generators/hobo/user_controller/USAGE
 - lib/generators/hobo/user_controller/templates/accept_invitation.dryml
 - lib/generators/hobo/user_controller/templates/controller.rb.erb
@@ -322,7 +319,6 @@ files:
 - test/irt/generators/resource.irt
 - test/irt/generators/subsite.irt
 - test/irt/generators/subsite_taglib.irt
-- test/irt/generators/test_framework.irt
 - test/irt/generators/user_controller.irt
 - test/irt/generators/user_mailer.irt
 - test/irt/generators/user_model.irt

data/lib/generators/hobo/test_framework/USAGE

@@ -1,2 +0,0 @@
-Description:
-    This generator is used by the setup_wizard generator to set up the test framework.

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

@@ -1,72 +0,0 @@
-require 'bundler/cli'
-module Hobo
-  class TestFrameworkGenerator < Rails::Generators::NamedBase
-
-    include Generators::Hobo::TestOptions
-
-    FRAMEWORKS = %w[test_unit rspec shoulda rspec_with_shoulda]
-
-    def self.banner
-      "rails generate hobo:test_framework NAME [options]"
-    end
-
-    def initialize(*)
-      super
-      @finalize_hooks = []
-    end
-
-    def setup_framework
-      if FRAMEWORKS.include?(name)
-        eval 'setup_' + name
-      else
-        say "'#{name}' is not supported. You should configure it manually."
-        exit 1
-      end
-    end
-
-    def fixture_replacement_installation
-      return if options[:fixture_replacement].blank?
-      gem options[:fixture_replacement], :group => :test
-    end
-
-    def finalize_installation
-      # add the block only if it's not the default
-      add_generators_block unless (name == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
-      invoke(Bundler::CLI, :update, [], {}) if options[:update] && @should_update
-      @finalize_hooks.each {|h| h.call }
-    end
-
-private
-
-    def setup_test_unit
-    end
-
-    def setup_rspec
-      gem 'rspec-rails', '>= 2.5.0', :group => [:test, :development]
-      @should_update = true
-      return unless options[:update]
-      @finalize_hooks << lambda {say "Finalizing rspec installation..."; system 'rails g rspec:install'}
-    end
-
-    def setup_shoulda
-      gem 'shoulda', :group => :test
-      @should_update = true
-    end
-
-    def setup_rspec_with_shoulda
-      setup_rspec
-      setup_shoulda
-    end
-
-    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"
-      environment block
-    end
-
-  end
-end

data/lib/generators/hobo/test_options.rb

@@ -1,19 +0,0 @@
-module Generators
-  module Hobo
-    TestOptions = classy_module do
-
-      class_option :test_framework, :type => :string,
-      :desc => "Use a specific test framework"
-
-      class_option :fixtures, :type => :boolean,
-      :desc => "Add the fixture option to the test framework", :default => true
-
-      class_option :fixture_replacement, :type => :string,
-      :desc => "Use a specific fixture replacement"
-
-      class_option :update, :type => :boolean,
-      :desc => "Run bundle update to install the missing gems"
-
-    end
-  end
-end

data/test/irt/generators/test_framework.irt

@@ -1,59 +0,0 @@
-desc "test_unit: default no-changes'"
-invoke 'hobo:test_framework', %w(test_unit)
-file_exclude? 'config/application.rb',
-              'config.generators do' ,
-              'test_framework :test_unit'
-test_value_eql? true
-
-git_reset_app
-
-desc "test_unit: don't generate fixtures'"
-invoke 'hobo:test_framework', %w(test_unit --no-fixtures)
-file_include? 'config/application.rb',
-              'config.generators do' ,
-              'test_framework :test_unit, :fixtures => false'
-test_value_eql? true
-
-git_reset_app
-
-desc "shoulda application.rb injection"
-invoke 'hobo:test_framework', %w(shoulda --no-update -q)
-file_include? 'config/application.rb',
-              'config.generators do' ,
-              'test_framework :shoulda, :fixtures => true'
-test_value_eql? true
-
-desc "shoulda Gemfile injection"
-file_include? 'Gemfile', %(gem "shoulda", group: :test)
-test_value_eql? true
-
-git_reset_app
-
-desc "rspec application.rb injection"
-invoke 'hobo:test_framework', %w(rspec --no-update -q)
-file_include? 'config/application.rb',
-              'config.generators do' ,
-              'test_framework :rspec, :fixtures => true',
-              'fallbacks[:rspec] = :test_unit'
-test_value_eql? true
-
-desc "rspec Gemfile injection"
-file_include? 'Gemfile',  %(gem "rspec-rails", ">= 2.5.0", group: [:test, :development])
-test_value_eql? true
-
-git_reset_app
-
-desc "rspec_with_shoulda application.rb injection"
-invoke 'hobo:test_framework', %w(rspec_with_shoulda --no-update -q)
-file_include? 'config/application.rb',
-              'config.generators do' ,
-              'test_framework :rspec, :fixtures => true',
-              'fallbacks[:rspec] = :test_unit'
-test_value_eql? true
-
-desc "rspec_with_shoulda Gemfile injection"
-file_include? 'Gemfile', %(gem "rspec-rails", ">= 2.5.0", group: [:test, :development]),
-                       %(gem "shoulda", group: :test)
-test_value_eql? true
-
-