update constantize to latest.

Taken from Rails master at 991cf78584

Author: steveklabnik

lib/resque/helpers.rb

@@ -21,44 +21,48 @@ def classify(dashed_word)
       dashed_word.split('-').each { |part| part[0] = part[0].chr.upcase }.join
     end
 
-    # Tries to find a constant with the name specified in the argument string:
+    # Tries to find a constant with the name specified in the argument string.
     #
-    # constantize("Module") # => Module
-    # constantize("Test::Unit") # => Test::Unit
+    #   'Module'.constantize     # => Module
+    #   'Test::Unit'.constantize # => Test::Unit
     #
     # The name is assumed to be the one of a top-level constant, no matter
     # whether it starts with "::" or not. No lexical context is taken into
     # account:
     #
-    # C = 'outside'
-    # module M
-    #   C = 'inside'
-    #   C # => 'inside'
-    #   constantize("C") # => 'outside', same as ::C
-    # end
+    #   C = 'outside'
+    #   module M
+    #     C = 'inside'
+    #     C               # => 'inside'
+    #     'C'.constantize # => 'outside', same as ::C
+    #   end
     #
-    # NameError is raised when the constant is unknown.
+    # NameError is raised when the name is not in CamelCase or the constant is
+    # unknown.
     def constantize(camel_cased_word)
-      camel_cased_word = camel_cased_word.to_s
-
-      if camel_cased_word.include?('-')
-        camel_cased_word = classify(camel_cased_word)
-      end
-
-      names = camel_cased_word.split('::')
+      names = camel_cased_word.to_s.split('::')
       names.shift if names.empty? || names.first.empty?
 
-      constant = Object
-      names.each do |name|
-        args = Module.method(:const_get).arity != 1 ? [false] : []
-
-        if constant.const_defined?(name, *args)
-          constant = constant.const_get(name)
+      names.inject(Object) do |constant, name|
+        if constant == Object
+          constant.const_get(name)
         else
-          constant = constant.const_missing(name)
+          candidate = constant.const_get(name)
+          next candidate if constant.const_defined?(name, false)
+          next candidate unless Object.const_defined?(name)
+
+          # Go down the ancestors to check it it's owned
+          # directly before we reach Object or the end of ancestors.
+          constant = constant.ancestors.inject do |const, ancestor|
+            break const    if ancestor == Object
+            break ancestor if ancestor.const_defined?(name, false)
+            const
+          end
+
+          # owner is in Object, so raise
+          constant.const_get(name, false)
         end
       end
-      constant
     end
   end
 end

test/resque_test.rb

@@ -36,7 +36,7 @@
   end
 
   it "can grab jobs off a queue" do
-    Resque::Job.create(:jobs, 'some-job', 20, '/tmp')
+    Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
 
     job = Resque.reserve(:jobs)
 
@@ -47,7 +47,7 @@
   end
 
   it "can re-queue jobs" do
-    Resque::Job.create(:jobs, 'some-job', 20, '/tmp')
+    Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
 
     job = Resque.reserve(:jobs)
     job.recreate
@@ -108,7 +108,7 @@
 
   it "jobs can it for equality" do
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
-    assert Resque::Job.create(:jobs, 'some-job', 20, '/tmp')
+    assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
     assert_equal Resque.reserve(:jobs), Resque.reserve(:jobs)
 
     assert Resque::Job.create(:jobs, 'SomeMethodJob', 20, '/tmp')