lib/twitter/user.rb in twitter-4.3.0 vs lib/twitter/user.rb in twitter-4.4.0

@@ -1,49 +1,39 @@
 require 'twitter/basic_user'
-require 'twitter/core_ext/hash'
 require 'twitter/creatable'
+require 'twitter/exceptable'
 require 'twitter/tweet'
 
 module Twitter
   class User < Twitter::BasicUser
     PROFILE_IMAGE_SUFFIX_REGEX = /_normal(\.gif|\.jpe?g|\.png)$/
     include Twitter::Creatable
+    include Twitter::Exceptable
     attr_reader :connections, :contributors_enabled, :default_profile,
       :default_profile_image, :description, :favourites_count,
       :follow_request_sent, :followers_count, :friends_count, :geo_enabled,
       :is_translator, :lang, :listed_count, :location, :name, :notifications,
       :profile_background_color, :profile_background_image_url,
       :profile_background_image_url_https, :profile_background_tile,
       :profile_link_color, :profile_sidebar_border_color,
       :profile_sidebar_fill_color, :profile_text_color,
       :profile_use_background_image, :protected, :statuses_count, :time_zone,
       :url, :utc_offset, :verified
-    alias contributors_enabled? contributors_enabled
-    alias default_profile? default_profile
-    alias default_profile_image? default_profile_image
-    alias follow_request_sent? follow_request_sent
     alias favorite_count favourites_count
     alias favoriters_count favourites_count
     alias favorites_count favourites_count
     alias favourite_count favourites_count
     alias favouriters_count favourites_count
     alias follower_count followers_count
     alias friend_count friends_count
-    alias geo_enabled? geo_enabled
-    alias is_translator? is_translator
-    alias notifications? notifications
-    alias profile_background_tile? profile_background_tile
-    alias profile_use_background_image? profile_use_background_image
-    alias protected? protected
     alias status_count statuses_count
     alias translator is_translator
-    alias translator? is_translator
+    alias translator? is_translator?
     alias tweet_count statuses_count
     alias tweets_count statuses_count
     alias update_count statuses_count
     alias updates_count statuses_count
-    alias verified? verified
 
     # Return the URL to the user's profile banner image
     #
     # @param size [String, Symbol] The size of the image. Must be one of: 'mobile', 'mobile_retina', 'web', 'web_retina', 'ipad', or 'ipad_retina'
     # @return [String]
@@ -91,10 +81,10 @@
     end
     alias profile_image_url_https? profile_image_url?
 
     # @return [Twitter::Tweet]
     def status
-      @status ||= Twitter::Tweet.fetch_or_new(@attrs.dup[:status].merge(:user => @attrs.except(:status))) if status?
+      @status ||= fetch_or_new_without_self(Twitter::Tweet, @attrs, :status, :user)
     end
 
     def status?
       !@attrs[:status].nil?
     end