@@ -1,5 +1,10 @@ == master +== 0.1.0 / 2008-07-06 + +* Add support for specifying the parent class/module in the name of the class/module being created +* Don't depend on active_support + == 0.0.4 / 2008-05-05 * Updated documentation CHANGELOG.rdoc @@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher' spec = Gem::Specification.new do |s| s.name = 'module_creation_helper' - s.version = '0.0.4' + s.version = '0.1.0' s.platform = Gem::Platform::RUBY s.summary = 'Adds a helper method for creating new modules and classes at runtime.' Rakefile @@ -27,16 +27,14 @@ module PluginAWeek #:nodoc: # Class.create('Woddle', :superclass => Waddle::Widdle, :parent => Waddle) # => Waddle::Woddle # Waddle::Woddle.superclass # => Waddle::Widdle def create(name, options = {}, &block) - options.assert_valid_keys( - :superclass, - :parent - ) + # Validate the provided options + invalid_options = options.keys - [:superclass, :parent] + raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty? + + # Validate usage of :superclass option raise ArgumentError, 'Modules cannot have superclasses' if options[:superclass] && self.to_s == 'Module' - options.reverse_merge!( - :superclass => Object, - :parent => Object - ) + options = {:superclass => Object, :parent => Object}.merge(options) parent = options[:parent] superclass = options[:superclass] @@ -46,12 +44,12 @@ module PluginAWeek #:nodoc: superclass = '' end - parent.class_eval <<-end_eval + mod = parent.class_eval <<-end_eval #{self.to_s.downcase} #{name}#{superclass} + self end end_eval - mod = parent.const_get(name) mod.class_eval(&block) if block_given? mod end lib/module_creation_helper/extensions/module.rb @@ -4,9 +4,11 @@ module Ford end class Vehicle - cattr_accessor :test_name - cattr_accessor :test_inspect - cattr_accessor :test_to_s + class << self + attr_accessor :test_name + attr_accessor :test_inspect + attr_accessor :test_to_s + end def self.inherited(base) self.test_name = base.name @@ -21,7 +23,7 @@ class ModuleCreationHelperTest < Test::Unit::TestCase end end -class ModuleCreationHelperForClassTest < Test::Unit::TestCase +class ClassTest < Test::Unit::TestCase def setup @car = Class.create('Car') end @@ -31,7 +33,6 @@ class ModuleCreationHelperForClassTest < Test::Unit::TestCase end def test_should_have_object_as_parent - assert_equal Object, @car.parent assert Object.const_defined?('Car') end @@ -40,7 +41,7 @@ class ModuleCreationHelperForClassTest < Test::Unit::TestCase end end -class ModuleCreationHelperForClassWithSuperclassTest < Test::Unit::TestCase +class ClassWithSuperclassTest < Test::Unit::TestCase def setup @car = Class.create('Car', :superclass => Vehicle) end @@ -50,7 +51,6 @@ class ModuleCreationHelperForClassWithSuperclassTest < Test::Unit::TestCase end def test_should_have_object_as_parent - assert_equal Object, @car.parent assert Object.const_defined?('Car') end @@ -71,7 +71,7 @@ class ModuleCreationHelperForClassWithSuperclassTest < Test::Unit::TestCase end end -class ModuleCreationHelperForClassWithParentTest < Test::Unit::TestCase +class ClassWithParentTest < Test::Unit::TestCase def setup @car = Class.create('Car', :parent => Ford) end @@ -81,7 +81,6 @@ class ModuleCreationHelperForClassWithParentTest < Test::Unit::TestCase end def test_should_be_nested_within_parent - assert_equal Ford, @car.parent assert Ford.const_defined?('Car') end @@ -90,7 +89,45 @@ class ModuleCreationHelperForClassWithParentTest < Test::Unit::TestCase end end -class ModuleCreationHelperForClassWithSuperclassAndParentTest < Test::Unit::TestCase +class ClassWithInferredParentTest < Test::Unit::TestCase + def setup + @car = Class.create('Ford::Car') + end + + def test_should_have_object_as_superclass + assert_equal Object, @car.superclass + end + + def test_should_be_nested_within_parent + assert Ford.const_defined?('Car') + end + + def teardown + Ford.send(:remove_const, 'Car') + end +end + +class ClassWithInferredParentAndConfiguredParenTest < Test::Unit::TestCase + def setup + Module.create('Car', :parent => Ford) + @part = Class.create('Car::Part', :parent => Ford) + end + + def test_should_have_object_as_superclass + assert_equal Object, @part.superclass + end + + def test_should_be_nested_within_parent + assert Ford::Car.const_defined?('Part') + end + + def teardown + Ford::Car.send(:remove_const, 'Part') + Ford.send(:remove_const, 'Car') + end +end + +class ClassWithSuperclassAndParentTest < Test::Unit::TestCase def setup Vehicle.test_name = nil Vehicle.test_inspect = nil @@ -104,7 +141,6 @@ class ModuleCreationHelperForClassWithSuperclassAndParentTest < Test::Unit::Test end def test_should_be_nested_within_parent - assert_equal Ford, @car.parent assert Ford.const_defined?('Car') end @@ -125,7 +161,7 @@ class ModuleCreationHelperForClassWithSuperclassAndParentTest < Test::Unit::Test end end -class ModuleCreationHelperForClassWithDynamicSuperclassTest < Test::Unit::TestCase +class ClassWithDynamicSuperclassTest < Test::Unit::TestCase def setup @car = Class.create('Car') @convertible = Class.create('Convertible', :superclass => @car) @@ -141,7 +177,7 @@ class ModuleCreationHelperForClassWithDynamicSuperclassTest < Test::Unit::TestCa end end -class ModuleCreationHelperForClassWithCustomMethods < Test::Unit::TestCase +class ClassWithCustomMethodsTest < Test::Unit::TestCase def setup @car = Class.create('Car', :superclass => Vehicle) do def self.color @@ -159,13 +195,12 @@ class ModuleCreationHelperForClassWithCustomMethods < Test::Unit::TestCase end end -class ModuleCreationHelperForModuleTest < Test::Unit::TestCase +class ModuleTest < Test::Unit::TestCase def setup @autopilot = Module.create('Autopilot') end def test_should_have_object_as_parent - assert_equal Object, @autopilot.parent assert Object.const_defined?('Autopilot') end @@ -174,19 +209,18 @@ class ModuleCreationHelperForModuleTest < Test::Unit::TestCase end end -class ModuleCreationHelperForModuleWithSuperclassTest < Test::Unit::TestCase +class ModuleWithSuperclassTest < Test::Unit::TestCase def test_should_raise_an_exception assert_raise(ArgumentError) {Module.create(nil, :superclass => Object)} end end -class ModuleCreationHelperForModuleWithParentTest < Test::Unit::TestCase +class ModuleWithParentTest < Test::Unit::TestCase def setup @autopilot = Module.create('Autopilot', :parent => Ford) end def test_should_be_nested_within_parent - assert_equal Ford, @autopilot.parent assert Ford.const_defined?('Autopilot') end test/module_creation_helper_test.rb @@ -1,6 +1,4 @@ require 'test/unit' -require 'rubygems' -require 'active_support' $:.unshift(File.dirname(__FILE__) + '/../lib') -require File.dirname(__FILE__) + '/../init' \ No newline at end of file +require File.dirname(__FILE__) + '/../init' test/test_helper.rb 42ee1210fc75b76adbb8aa0a077db36b6aafdb3b Aaron Pfeifer aaron.pfeifer@gmail.com http://github.com/pluginaweek/module_creation_helper/commit/16c3c7dbf6198654080ed251d4644110757f25d7 16c3c7dbf6198654080ed251d4644110757f25d7 2008-07-06T19:20:35-07:00 2008-07-06T19:20:35-07:00 Don't depend on active_support Add support for specifying the parent class/module in the name of the class/module being created Tag 0.1.0 release e01f5b2fb3b9dd0202dd77d5e113c5758265522d Aaron Pfeifer aaron.pfeifer@gmail.com