Remove String core extensions

sferik · Nov 21, 2012 · 5a9144c · 5a9144c
1 parent 0a8591e
commit 5a9144c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/lib/twitter/core_ext/string.rb b/lib/twitter/core_ext/string.rb
diff --git a/lib/twitter/factory.rb b/lib/twitter/factory.rb
@@ -1,5 +1,3 @@
-require 'twitter/core_ext/string'
-
 module Twitter
   class Factory
 
@@ -10,8 +8,10 @@ class Factory
     # @return [Twitter::Action::Favorite, Twitter::Action::Follow, Twitter::Action::ListMemberAdded, Twitter::Action::Mention, Twitter::Action::Reply, Twitter::Action::Retweet]
     def self.fetch_or_new(method, klass, attrs={})
       return unless attrs
-      if type = attrs.delete(method.to_sym)
-        klass.const_get(type.camelize.to_sym).fetch_or_new(attrs)
+      type = attrs.delete(method.to_sym)
+      if type
+        const_name = type.gsub(/\/(.?)/){"::#{$1.upcase}"}.gsub(/(?:^|_)(.)/){$1.upcase}
+        klass.const_get(const_name.to_sym).fetch_or_new(attrs)
       else
         raise ArgumentError, "argument must have :#{method} key"
       end