@@ -17,7 +17,7 @@ module ScaffoldingExtensions meth = "scaffold_#{action}_#{m}" if respond_to?(meth, true) Proc.new{send(meth)} - elsif instance_variables.include?(meth = "@#{meth}") + elsif instance_variable_defined?(meth = "@#{meth}") Proc.new{instance_variable_get(meth)} end end lib/scaffolding_extensions/overridable.rb @@ -8,6 +8,7 @@ spec = Gem::Specification.new do |s| s.files = %w'LICENSE README' + Dir['{lib,doc,contrib,scaffolds}/**/*'] s.require_paths = ["lib"] s.has_rdoc = true + s.required_ruby_version = ">= 1.8.6" s.rdoc_options = %w'--inline-source --line-numbers README LICENSE lib' + Dir['doc/*.txt'] s.rubyforge_project = 'scaffolding-ext' s.homepage = 'http://scaffolding-ext.rubyforge.org/' scaffolding_extensions.gemspec 09adeb306d4d7aa9071ba21eda5e99292412dc97 Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/scaffolding_extensions/commit/16bf607001f6e542ae055ed2154681a68dca660e 16bf607001f6e542ae055ed2154681a68dca660e 2009-06-16T14:16:57-07:00 2009-06-16T10:26:09-07:00 Use instance_variable_defined? in Overridable so SE works on 1.8 and 1.9 I was on the fence about using instance_variable_defined?, since it was added in 1.8.6, and there are a lot of systems still using 1.8.5 (CentOS/RHEL 5). However, I bumped the required ruby version of the gem to 1.8.6, so people using 1.8.5 shouldn't be able to install it. If there is anyone using 1.8.5 that wants to use future SE versions, I don't have a problem modifying things. f9cfebd850ad4e2e124ff25fd721349346763b1e Jeremy Evans code@jeremyevans.net