@@ -1,5 +1,9 @@ == master +== 0.1.1 / 2008-07-06 + +* Remove dependency on active_support for non-ActiveRecord predicates + == 0.1.0 / 2008-07-03 * Rename to attribute_predicates CHANGELOG.rdoc @@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher' spec = Gem::Specification.new do |s| s.name = 'attribute_predicates' - s.version = '0.1.0' + s.version = '0.1.1' s.platform = Gem::Platform::RUBY s.summary = 'Adds automatic generation of predicate methods for attributes.' Rakefile @@ -29,8 +29,9 @@ module PluginAWeek #:nodoc: module Module def self.included(base) #:nodoc: base.class_eval do - [:attr, :attr_reader, :attr_writer, :attr_accessor].each do |method| - alias_method_chain method, :predicates + %w(attr attr_reader attr_writer attr_accessor).each do |method| + alias_method "#{method}_without_predicates", method + alias_method method, "#{method}_with_predicates" end end end @@ -59,7 +60,15 @@ module PluginAWeek #:nodoc: # Returns true if the specified variable is not blank, otherwise false def attr_predicate(symbol) define_method("#{symbol}?") do - !instance_variable_get("@#{symbol}").blank? + value = instance_variable_get("@#{symbol}") + if value.respond_to?(:blank?) + # Use ActiveSupport's implementation + !value.blank? + elsif value.respond_to?(:empty?) + !value.empty? + else + !!value + end end end end lib/attribute_predicates/extensions/module.rb @@ -15,18 +15,18 @@ class ModuleAttrTest < Test::Unit::TestCase def test_should_create_predicate_for_readonly_attr @module.attr(:foo) - ['foo', 'foo?'].each do |method| + %w(foo foo?).each do |method| assert @module.instance_methods.include?(method), "#{method} does not exist" end - ['foo='].each do |method| + %w(foo=).each do |method| assert !@module.instance_methods.include?(method), "#{method} exists" end end def test_should_create_predicate_for_readwrite_attr @module.attr(:foo, true) - ['foo', 'foo=', 'foo?'].each do |method| + %w(foo foo= foo?).each do |method| assert @module.instance_methods.include?(method), "#{method} does not exist" end end @@ -39,22 +39,22 @@ class ModuleAttrReaderTest < Test::Unit::TestCase def test_should_create_predicate @module.attr_reader(:foo) - ['foo', 'foo?'].each do |method| + %w(foo foo?).each do |method| assert @module.instance_methods.include?(method), "#{method} does not exist" end - ['foo='].each do |method| + %w(foo=).each do |method| assert !@module.instance_methods.include?(method), "#{method} exists" end end def test_should_create_predicate_for_multiple_attributes @module.attr_reader(:foo, :bar) - ['foo', 'foo?', 'bar', 'bar?'].each do |method| + %w(foo foo? bar bar?).each do |method| assert @module.instance_methods.include?(method), "#{method} does not exist" end - ['foo=', 'bar='].each do |method| + %w(foo= bar=).each do |method| assert !@module.instance_methods.include?(method), "#{method} exists" end end @@ -67,14 +67,14 @@ class ModuleAttrAccessorTest < Test::Unit::TestCase def test_should_create_predicate @module.attr_accessor(:foo) - ['foo', 'foo=', 'foo?'].each do |method| + %w(foo foo= foo?).each do |method| assert @module.instance_methods.include?(method), "#{method} does not exist" end end def test_should_create_predicate_for_multiple_attributes @module.attr_accessor(:foo, :bar) - ['foo', 'foo=', 'foo?', 'bar', 'bar=', 'bar?'].each do |method| + %w(foo foo= foo? bar bar= bar?).each do |method| assert @module.instance_methods.include?(method), "#{method} does not exist" end end @@ -87,22 +87,22 @@ class ModuleAttrWriterTest < Test::Unit::TestCase def test_should_create_predicate @module.attr_writer(:foo) - ['foo=', 'foo?'].each do |method| + %w(foo= foo?).each do |method| assert @module.instance_methods.include?(method), "#{method} does not exist" end - ['foo'].each do |method| + %w(foo).each do |method| assert !@module.instance_methods.include?(method), "#{method} exists" end end def test_should_create_predicate_for_multiple_attributes @module.attr_writer(:foo, :bar) - ['foo=', 'foo?', 'bar=', 'bar?'].each do |method| + %w(foo= foo? bar= bar?).each do |method| assert @module.instance_methods.include?(method), "#{method} does not exist" end - ['foo', 'bar'].each do |method| + %w(foo bar).each do |method| assert !@module.instance_methods.include?(method), "#{method} exists" end end @@ -131,6 +131,7 @@ class ModuleTest < Test::Unit::TestCase def test_should_evaluate_false_values_for_predicate @klass.attr_accessor(:foo) + # *Note* ' ' is only false when ActiveSupport is being used [nil, '', ' ', {}, []].each do |value| assert_equal false, @klass.new(value).foo?, "#{value.inspect} is true" end test/module_test.rb @@ -1,4 +1,6 @@ # Load the plugin testing framework $:.unshift("#{File.dirname(__FILE__)}/../../plugin_test_helper/lib") + +# Use the test helper for testing ActiveRecord require 'rubygems' require 'plugin_test_helper' test/test_helper.rb 03cdb00980a1401f2fae880b623ed3ccf5c09668 Aaron Pfeifer aaron.pfeifer@gmail.com http://github.com/pluginaweek/attribute_predicates/commit/a5245091b05c5cfccce6132accb2456985a1d52d a5245091b05c5cfccce6132accb2456985a1d52d 2008-07-06T20:42:58-07:00 2008-07-06T20:42:58-07:00 Remove dependency on active_support for non-ActiveRecord predicates Tag 0.1.1 release 47359fbbc4dd32e948220a2c9ac121786bad0891 Aaron Pfeifer aaron.pfeifer@gmail.com