homeschool 0.0.1.34 → 0.0.1.38

data/lib/form_buildr.rb

@@ -37,7 +37,6 @@
 #     <input id="person_name" name="person[name]" size="30" type="text" />
 #
 module Homeschool::FormBuildr
-  module ClassMethods; end
   module InstanceMethods
     def label_for(method, options={})
       options = {:label => options} if options.is_a? String

data/lib/homeschool.rb

@@ -86,8 +86,8 @@ class Module
   alias_method :append_features, :append_features_with_pattern_methods
   
   def add_extension(extension)
-    self.extend extension::ClassMethods
-    self.send(:include, extension::InstanceMethods)
+    self.extend extension::ClassMethods unless !defined?(extension::ClassMethods)
+    self.send(:include, extension::InstanceMethods) unless !defined?(extension::InstanceMethods)
   end
 end
 
@@ -153,5 +153,5 @@ class Hash
   end
 end
 
-require 'standardized_test' if defined?(RAILS_ENV) && RAILS_ENV  == 'test'
+require 'standardized_test' if defined?(RAILS_ENV) && RAILS_ENV  == 'test' || defined?(TEST_ENV)
 require 'tame_rails' if defined?(RAILS_ENV)

data/lib/standardized_test.rb

@@ -1,41 +1,50 @@
 require 'test/unit'
-module Test::Unit::Assertions
-  def diff(one, two)
-    prefix = 0
-    (0...[one, two].min_by(&:length).length).each do |i|
-      if one[i] == two[i]
-        prefix = i + 1
+module Homeschool::StandardizedTest; end
+module Homeschool::StandardizedTest::Assertions
+  module InstanceMethods
+    def assert_fails
+      yield
+      passed = true
+    rescue
+    ensure
+      assert !passed
+    end
+    
+    def diff(one, two)
+      prefix = 0
+      (0...[one, two].min_by(&:length).length).each do |i|
+        if one[i] == two[i]
+          prefix = i + 1
+        else
+          break
+        end
+      end
+      "Expected <#{diff_format(one, prefix)}> but was <#{diff_format(two, prefix)}>"
+    end
+
+    def diff_format(string, prefix)
+      prefix > 0 ? "...#{string[prefix..-1]}" : string
+    end
+
+    def assert_equal_with_diffing(expected, actual, message=nil)
+      if message == :diff
+        assert_block(diff(expected, actual)) {expected == actual}
       else
-        break
+        assert_equal_without_diffing(expected, actual, message)
       end
     end
-    "Expected <#{diff_format(one, prefix)}> but was <#{diff_format(two, prefix)}>"
-  end
-  def diff_format(string, prefix)
-    prefix > 0 ? "...#{string[prefix..-1]}" : string
-  end
-  def assert_equal_with_diffing(expected, actual, message=nil)
-    if message == :diff
-      assert_block(diff(expected, actual)) {expected == actual}
-    else
-      assert_equal_without_diffing(expected, actual, message)
+    def self.included(klass)
+      klass.send :alias_method, :assert_equal_without_diffing, :assert_equal
+      klass.send :alias_method, :assert_equal, :assert_equal_with_diffing
     end
   end
-  alias_method :assert_equal_without_diffing, :assert_equal
-  alias_method :assert_equal, :assert_equal_with_diffing
 end
+Test::Unit::TestCase.add_extension(Homeschool::StandardizedTest::Assertions)
 
 module HomeschoolTestHelper
   def assert_json(expected, actual)
     assert_equal JSON.parse(expected), JSON.parse(actual)
   end
-  def assert_fails
-    yield
-    passed = true
-  rescue
-  ensure
-    assert !passed
-  end
 
   def HomeschoolTestHelper.included(klass)
     klass.rdef(/last_(.*)/) do |match|

data/test/homeschool_test.rb

@@ -0,0 +1,107 @@
+TEST_ENV = true
+#RAILS_ENV = ENV["RAILS_ENV"] = "test"
+require 'test/unit'
+require 'rubygems'
+require 'active_support'
+require 'json'
+require File.dirname(__FILE__) + "/../lib/homeschool"
+
+class Chicken
+  attr_accessor :feet
+  def initialize(properties)
+    @feet = properties[:feet]
+  end
+  def self.find(*args)
+    [2]
+  end
+end
+
+module RdefHelper
+  rdef /mod_(.*)/ do |match|
+    match[1]
+  end
+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
+  end
+  
+  def test_dom_id
+    object = {:id => 3}.to_obj
+    assert_equal 'object_3', object.dom_id
+    assert_equal 'object_3_tr', object.dom_id(:tr)
+    assert_equal 'object_3_one_two', object.dom_id('one', 'two')
+    assert_json '{"element": "object_3", "tr": "object_3_tr", "one_two": "object_3_one_two"}', object.dom_ids.to_json
+  end
+  
+  def test_assert_json
+    assert_json '{"one": 1, "two": 2}', '{"two": 2, "one": 1}'
+  end
+  
+  def test_symbol_patterns
+    assert :lala!.bang?
+    assert_equal :lala!, :lala.bang
+  end
+  
+  def test_to_obj
+    obj = {:one => 1, :two => 2}.to_obj
+    assert_equal 1, obj.one
+    assert_equal 2, obj.two
+    assert_equal Object, obj.class
+  end
+  
+  def test_hash_list
+    obj = {:one => 1, :two => 2, :three => 3, :four => 4}
+    assert [4,2,3] == obj.list(:four, :two, :three)
+  end
+  
+  def test_iv_cache
+    iv_cache(:one) {Object.new}
+    assert @one
+    assert_equal @one, iv_cache(:one) {Object.new}
+    assert_not_equal @one, iv_cache(:two) {Object.new}
+  end
+  
+  rdef(/in_(.*)_between/) do |match|
+    return match[1]
+  end
+  
+  def test_rdef
+    assert_equal "expected", in_expected_between
+    assert_fails {in_expected_between_lala}
+  end
+  
+  def test_module_rdef
+    assert_equal 'worked', mod_worked
+  end
+  
+  def test_filter
+    assert_equal({:one => 1, :two => 2}, {:one => 1, :two => 2, :three => 3}.filter(:one, :two))
+  end
+  
+  def test_assert_fails
+    assert_fails {lala}
+    begin
+      assert_fails {one = 1}
+      passed = true
+    rescue
+    end
+    assert !passed
+  end
+  
+  def test_assert_equal
+    assert_equal 'this string is the same until you get here.', 'this string is the same until you get somewhere else.', :diff
+  rescue
+    assert_equal 'Expected <...here.> but was <...somewhere else.>', $!.message
+  end
+end

data/test/module_tests.rb

@@ -1,26 +1,31 @@
+TEST_ENV = true
 require 'test/unit'
 require File.dirname(__FILE__) + "/../lib/homeschool"
 
 class ModuleTests < Test::Unit::TestCase
+  
   def test_add_extension
-    assert !MyTestClass.methods.include?(:my_class_method)
-    assert !MyTestClass.new.respond_to?(:my_instance_method)
-    MyTestClass.add_extension(MyTestModule)
-    assert MyTestClass.methods.include?('my_class_method')
-    assert MyTestClass.new.respond_to?(:my_instance_method)
-  end
-end
-
-class MyTestClass
-end
-
-module MyTestModule
-  module ClassMethods
-    def my_class_method
+    new_class do |klass|
+      klass.add_extension(new_module(:class_methods, :instance_methods))
+      assert klass.methods.include?('c_method') && klass.new.respond_to?(:i_method)
     end
-  end
-  module InstanceMethods
-    def my_instance_method
+    new_class do |klass|
+      klass.add_extension(new_module(:class_methods))
+      assert klass.methods.include?('c_method') && !klass.new.respond_to?(:i_method)
+      klass.add_extension(new_module(:instance_methods))
+      assert klass.new.respond_to?(:i_method)
     end
   end
-end
+  
+  private
+    def new_class(&block)
+      yield Class.new
+    end
+    
+    def new_module(*methods)
+      Module.new do |m|
+        m.module_eval("module ClassMethods; def c_method; end; end") if methods.include?(:class_methods)
+        m.module_eval("module InstanceMethods; def i_method; end; end")  if methods.include?(:instance_methods)
+      end
+    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.34
-date: 2007-10-06 00:00:00 -04:00
+  version: 0.0.1.38
+date: 2007-10-07 00:00:00 -04:00
 summary: The homeschool gem
 require_paths: 
 - lib
@@ -36,6 +36,7 @@ files:
 - bin/gfight
 - bin/homeschool
 - bin/svm
+- test/homeschool_test.rb
 - test/module_tests.rb
 - test/the_test.rb
 - lib/fight.rb