Merge remote branch 'adamico/master' into restart

annotate.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cuong Tran", "Alex Chaffee", "Marcos Piccinini"]
-  s.date = %q{2009-12-14}
+  s.date = %q{2010-03-11}
   s.default_executable = %q{annotate}
   s.description = %q{Annotates Rails Models, routes, fixtures, and others based on the database schema.}
   s.email = ["alex@stinky.com", "ctran@pragmaquest.com", "x@nofxx.com"]

spec/annotate/annotate_models_spec.rb

+#encoding: utf-8
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 require 'annotate/annotate_models'
 require 'rubygems'
-require 'activesupport'
+require 'active_support'
 
 describe AnnotateModels do
   
@@ -124,6 +125,12 @@ EOF
           acts_as_awesome :yah
         end
       EOS
+      create('foo_with_utf8.rb', <<-EOS)
+        #encoding: utf-8
+        class FooWithUtf8 < ActiveRecord::Base
+          UTF8STRINGS = %w[résumé façon âge]
+        end
+      EOS
     end
     
     it "should work" do
@@ -136,6 +143,10 @@ EOF
       klass.name.should == "FooWithMacro"
     end
     
+    it "should not complain of invalid multibyte char (USASCII)" do
+      klass = AnnotateModels.get_model_class("foo_with_utf8.rb")
+      klass.name.should == "FooWithUtf8"      
+    end
   end
 
 end

spec/spec.opts

+--format=specdoc
 --colour
\ No newline at end of file