homeschool 0.0.1.38 → 0.0.1.41

data/lib/controller_extensions.rb

@@ -0,0 +1,24 @@
+module Homeschool::ControllerExtensions
+  # Add find_object, model_name
+  module ClassMethods
+    def find_object(options={})
+      find_by_id(model_name, {:only => [:update, :edit, :show, :destroy]}.merge(options))
+    end
+
+    def find_by_id(klass, options={})
+      options = {:name => klass.name.underscore, :param => :id}.merge(options)
+      before_filter options.filter(:only, :except) do |controller|
+        controller.send(:instance_variable_set, options[:name].to_sym.iv, klass.find(controller.params[options[:param]]))
+      end
+    end
+
+    def model_name
+      name.sub(/Controller$/, '').singularize.underscore
+    end
+
+    def model_class
+      model_name.classify.constantize
+    end
+  end
+end
+ActionController::Base.add_extension(Homeschool::ControllerExtensions)

data/lib/standardized_test.rb

@@ -2,12 +2,12 @@ require 'test/unit'
 module Homeschool::StandardizedTest; end
 module Homeschool::StandardizedTest::Assertions
   module InstanceMethods
-    def assert_fails
+    def assert_fails(message="")
       yield
       passed = true
     rescue
     ensure
-      assert !passed
+      assert !passed, message
     end
     
     def diff(one, two)
@@ -33,6 +33,7 @@ module Homeschool::StandardizedTest::Assertions
         assert_equal_without_diffing(expected, actual, message)
       end
     end
+    
     def self.included(klass)
       klass.send :alias_method, :assert_equal_without_diffing, :assert_equal
       klass.send :alias_method, :assert_equal, :assert_equal_with_diffing
@@ -50,21 +51,39 @@ module HomeschoolTestHelper
     klass.rdef(/last_(.*)/) do |match|
       match[1].classify.constantize.find(:all).last
     end
-    class << klass
-      def homeschool_fixtures(*fixtures)
-        fixtures.each do |fixture|
-          fixture_class = fixture.to_s.classify.constantize
-          rdef(/.*#{fixture_class.name.underscore}.*/) do |match, *options|
-            iv_cache(match[0]) do
-              options = {:save => true}.merge(options[0] || {})
-              save = options.delete(:save)
-              instance = fixture_class.new(options)
-              instance.save if save && instance.respond_to?(:save)
-              instance
-            end
+  end
+end
+
+module Homeschool::StandardizedTest::RailsExtentions
+  def self.included(klass)
+    klass.add_extension(self)
+  end
+  
+  def self.extended(klass)
+    (klass.class == Class ? klass : klass.class).add_extension(self)
+  end
+  
+  module ClassMethods
+    def homeschool_fixtures(*fixtures)
+      fixtures.each do |fixture|
+        fixture_class = fixture.to_s.classify.constantize
+        rdef(/.*#{fixture_class.name.underscore}.*/) do |match, *options|
+          iv_cache(match[0]) do
+            options = {:save => true}.merge(options[0] || {})
+            save = options.delete(:save)
+            instance = fixture_class.new(options)
+            instance.save if save && instance.respond_to?(:save)
+            instance
           end
         end
       end
     end
   end
-end
+  module InstanceMethods
+    # last(:person)
+    def last(sym)
+      sym.to_s.classify.constantize.find(:first, :order => 'id DESC')
+    end      
+  end
+end
+Test::Unit::TestCase.add_extension(Homeschool::StandardizedTest::RailsExtentions) if defined?(RAILS_ENV) && RAILS_ENV  == 'test'

data/lib/tame_rails.rb

@@ -1,24 +1,3 @@
 require 'form_buildr'
 require 'model_extensions'
-
-# Add find_object, model_name
-class ActionController::Base
-  def self.find_object(options={})
-    find_by_id(model_name, {:only => [:update, :edit, :show, :destroy]}.merge(options))
-  end
-
-  def self.find_by_id(klass, options={})
-    options = {:name => klass.name.underscore, :param => :id}.merge(options)
-    before_filter options.filter(:only, :except) do |controller|
-      controller.send(:instance_variable_set, options[:name].to_sym.iv, klass.find(controller.params[options[:param]]))
-    end
-  end
-
-  def self.model_name
-    name.sub(/Controller$/, '').singularize.underscore
-  end
-  
-  def self.model_class
-    model_name.classify.constantize
-  end
-end
+require 'controller_extensions'

data/test/homeschool_test.rb

@@ -24,13 +24,6 @@ end
 class HomeschoolTest < Test::Unit::TestCase
   include HomeschoolTestHelper
   include RdefHelper
-  homeschool_fixtures :chickens
-  
-  def test_fixtures
-    assert_equal red_chicken, red_chicken
-    assert_not_equal red_chicken, blue_chicken
-    assert_equal 3, chicken_experiment(:feet => 3).feet
-  end
   
   def test_last
     assert_equal 2, last_chicken

data/test/standardized_test_test.rb

@@ -0,0 +1,27 @@
+TEST_ENV = true
+require 'test/unit'
+require File.dirname(__FILE__) + "/../lib/homeschool"
+Test::Unit::TestCase.add_extension(Homeschool::StandardizedTest::RailsExtentions)
+
+class Chicken
+  attr_accessor :feet
+  def initialize(properties)
+    @feet = properties[:feet]
+  end
+  def self.find(*args)
+    args[0] == :first && args[1][:order].include?('DESC') || [2]
+  end
+end
+
+class StandardizedTestTest < Test::Unit::TestCase
+  homeschool_fixtures :chickens
+  def test_last
+    assert last(:chicken)
+  end
+  
+  def test_fixtures
+    assert_equal red_chicken, red_chicken
+    assert_not_equal red_chicken, blue_chicken
+    assert_equal 3, chicken_experiment(:feet => 3).feet
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: homeschool
 version: !ruby/object:Gem::Version 
-  version: 0.0.1.38
-date: 2007-10-07 00:00:00 -04:00
+  version: 0.0.1.41
+date: 2007-10-08 00:00:00 -04:00
 summary: The homeschool gem
 require_paths: 
 - lib
@@ -38,7 +38,9 @@ files:
 - bin/svm
 - test/homeschool_test.rb
 - test/module_tests.rb
+- test/standardized_test_test.rb
 - test/the_test.rb
+- lib/controller_extensions.rb
 - lib/fight.rb
 - lib/form_buildr.rb
 - lib/homeschool.rb