Fix "loading in progress, circular require considered harmful" warning

sferik · Dec 2, 2012 · 0b7e9cc · 0b7e9cc
1 parent 182e7f6
commit 0b7e9cc
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 31 deletions.
diff --git a/lib/twitter.rb b/lib/twitter.rb
@@ -1,5 +1,34 @@
+require 'twitter/action_factory'
 require 'twitter/client'
 require 'twitter/configurable'
+require 'twitter/configuration'
+require 'twitter/cursor'
+require 'twitter/default'
+require 'twitter/direct_message'
+require 'twitter/entity'
+require 'twitter/entity/hashtag'
+require 'twitter/entity/url'
+require 'twitter/entity/user_mention'
+require 'twitter/geo_factory'
+require 'twitter/language'
+require 'twitter/list'
+require 'twitter/media_factory'
+require 'twitter/metadata'
+require 'twitter/oembed'
+require 'twitter/place'
+require 'twitter/profile_banner'
+require 'twitter/rate_limit'
+require 'twitter/relationship'
+require 'twitter/saved_search'
+require 'twitter/search_results'
+require 'twitter/settings'
+require 'twitter/size'
+require 'twitter/source_user'
+require 'twitter/suggestion'
+require 'twitter/target_user'
+require 'twitter/trend'
+require 'twitter/tweet'
+require 'twitter/user'
 
 module Twitter
   class << self

diff --git a/lib/twitter/action/follow.rb b/lib/twitter/action/follow.rb
@@ -1,6 +1,5 @@
 require 'twitter/base'
 require 'twitter/creatable'
-require 'twitter/user'
 
 module Twitter
   module Action

diff --git a/lib/twitter/action/list_member_added.rb b/lib/twitter/action/list_member_added.rb
@@ -1,7 +1,5 @@
 require 'twitter/base'
 require 'twitter/creatable'
-require 'twitter/list'
-require 'twitter/user'
 
 module Twitter
   module Action

diff --git a/lib/twitter/action/mention.rb b/lib/twitter/action/mention.rb
@@ -1,7 +1,5 @@
 require 'twitter/base'
 require 'twitter/creatable'
-require 'twitter/tweet'
-require 'twitter/user'
 
 module Twitter
   module Action

diff --git a/lib/twitter/action/tweet.rb b/lib/twitter/action/tweet.rb
@@ -1,7 +1,5 @@
 require 'twitter/base'
 require 'twitter/creatable'
-require 'twitter/tweet'
-require 'twitter/user'
 
 module Twitter
   module Action

diff --git a/lib/twitter/configurable.rb b/lib/twitter/configurable.rb
@@ -1,5 +1,3 @@
-require 'twitter/default'
-
 module Twitter
   module Configurable
     attr_writer :consumer_key, :consumer_secret, :oauth_token, :oauth_token_secret

diff --git a/lib/twitter/configuration.rb b/lib/twitter/configuration.rb
@@ -1,5 +1,4 @@
 require 'twitter/base'
-require 'twitter/size'
 
 module Twitter
   class Configuration < Twitter::Base

diff --git a/lib/twitter/direct_message.rb b/lib/twitter/direct_message.rb
@@ -1,6 +1,5 @@
 require 'twitter/creatable'
 require 'twitter/identity'
-require 'twitter/user'
 
 module Twitter
   class DirectMessage < Twitter::Identity

diff --git a/lib/twitter/error.rb b/lib/twitter/error.rb
@@ -1,5 +1,3 @@
-require 'twitter/rate_limit'
-
 module Twitter
   # Custom error class for rescuing from all Twitter errors
   class Error < StandardError

diff --git a/lib/twitter/list.rb b/lib/twitter/list.rb
@@ -1,6 +1,5 @@
 require 'twitter/creatable'
 require 'twitter/identity'
-require 'twitter/user'
 
 module Twitter
   class List < Twitter::Identity

diff --git a/lib/twitter/media/photo.rb b/lib/twitter/media/photo.rb
@@ -1,5 +1,4 @@
 require 'twitter/identity'
-require 'twitter/size'
 
 module Twitter
   module Media

diff --git a/lib/twitter/place.rb b/lib/twitter/place.rb
@@ -1,4 +1,3 @@
-require 'twitter/geo_factory'
 require 'twitter/identity'
 
 module Twitter

diff --git a/lib/twitter/profile_banner.rb b/lib/twitter/profile_banner.rb
@@ -1,5 +1,4 @@
 require 'twitter/base'
-require 'twitter/size'
 
 module Twitter
   class ProfileBanner < Twitter::Base

diff --git a/lib/twitter/relationship.rb b/lib/twitter/relationship.rb
@@ -1,6 +1,4 @@
 require 'twitter/base'
-require 'twitter/source_user'
-require 'twitter/target_user'
 
 module Twitter
   class Relationship < Twitter::Base

diff --git a/lib/twitter/search_results.rb b/lib/twitter/search_results.rb
@@ -1,5 +1,4 @@
 require 'twitter/base'
-require 'twitter/tweet'
 
 module Twitter
   class SearchResults < Twitter::Base

diff --git a/lib/twitter/settings.rb b/lib/twitter/settings.rb
@@ -1,5 +1,4 @@
 require 'twitter/base'
-require 'twitter/place'
 
 module Twitter
   class Settings < Twitter::Base

diff --git a/lib/twitter/suggestion.rb b/lib/twitter/suggestion.rb
@@ -1,5 +1,4 @@
 require 'twitter/base'
-require 'twitter/user'
 
 module Twitter
   class Suggestion < Twitter::Base

diff --git a/lib/twitter/tweet.rb b/lib/twitter/tweet.rb
@@ -1,14 +1,6 @@
 require 'twitter/creatable'
-require 'twitter/entity/hashtag'
-require 'twitter/entity/url'
-require 'twitter/entity/user_mention'
 require 'twitter/exceptable'
-require 'twitter/geo_factory'
 require 'twitter/identity'
-require 'twitter/media_factory'
-require 'twitter/metadata'
-require 'twitter/place'
-require 'twitter/user'
 
 module Twitter
   class Tweet < Twitter::Identity

diff --git a/lib/twitter/user.rb b/lib/twitter/user.rb
@@ -1,7 +1,6 @@
 require 'twitter/basic_user'
 require 'twitter/creatable'
 require 'twitter/exceptable'
-require 'twitter/tweet'
 
 module Twitter
   class User < Twitter::BasicUser