Specify development dependencies and ensure correct loading of test libraries

annotate.gemspec

@@ -45,6 +45,9 @@ Gem::Specification.new do |s|
      "spec/annotate_spec.rb",
      "spec/spec_helper.rb"
   ]
+  s.add_development_dependency('jeweler')
+  s.add_development_dependency('rspec', '~> 1.3.2')
+  s.add_development_dependency('activesupport', '>= 2.1.0')
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

lib/annotate.rb

 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'yaml'
+
 module Annotate
   def self.version
     version_file = File.dirname(__FILE__) + "/../VERSION.yml"

lib/annotate/annotate_models.rb

@@ -229,7 +229,7 @@ module AnnotateModels
     # in subdirectories without namespacing.
     def get_model_class(file)
       require File.expand_path("#{model_dir}/#{file}") # this is for non-rails projects, which don't get Rails auto-require magic
-      model = file.gsub(/\.rb$/, '').camelize
+      model = ActiveSupport::Inflector.camelize(file.gsub(/\.rb$/, ''))
       parts = model.split('::')
       begin
         parts.inject(Object) {|klass, part| klass.const_get(part) }

spec/annotate/annotate_models_spec.rb

 require File.dirname(__FILE__) + '/../spec_helper.rb'
 require 'annotate/annotate_models'
 require 'rubygems'
-require 'activesupport'
+require 'active_support'
 
 describe AnnotateModels do