Deprecate to_hash/to_hsh in favor of to_h or attrs

sferik · Jan 13, 2014 · 63e2cdd · 63e2cdd
1 parent ac24671
commit 63e2cdd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/lib/twitter/base.rb b/lib/twitter/base.rb
@@ -2,15 +2,17 @@
 require 'forwardable'
 require 'memoizable'
 require 'twitter/null_object'
+require 'twitter/utils'
 
 module Twitter
   class Base
     extend Forwardable
     include Memoizable
+    include Twitter::Utils
     attr_reader :attrs
     alias_method :to_h, :attrs
-    alias_method :to_hash, :attrs
-    alias_method :to_hsh, :attrs
+    deprecate_alias :to_hash, :to_h
+    deprecate_alias :to_hsh, :to_h
 
     class << self
       # Construct an object from a response hash

diff --git a/lib/twitter/cursor.rb b/lib/twitter/cursor.rb
@@ -1,12 +1,14 @@
 require 'twitter/enumerable'
+require 'twitter/utils'
 
 module Twitter
   class Cursor
     include Twitter::Enumerable
+    include Twitter::Utils
     attr_reader :attrs
     alias_method :to_h, :attrs
-    alias_method :to_hash, :attrs
-    alias_method :to_hsh, :attrs
+    deprecate_alias :to_hash, :to_h
+    deprecate_alias :to_hsh, :to_h
 
     class << self
       # Construct a new Cursor object from a response hash

diff --git a/lib/twitter/geo_results.rb b/lib/twitter/geo_results.rb
@@ -1,12 +1,14 @@
 require 'twitter/enumerable'
+require 'twitter/utils'
 
 module Twitter
   class GeoResults
     include Twitter::Enumerable
+    include Twitter::Utils
     attr_reader :attrs
     alias_method :to_h, :attrs
-    alias_method :to_hash, :attrs
-    alias_method :to_hsh, :attrs
+    deprecate_alias :to_hash, :to_h
+    deprecate_alias :to_hsh, :to_h
 
     class << self
       # Construct a new GeoResults object from a response hash

diff --git a/lib/twitter/search_results.rb b/lib/twitter/search_results.rb
@@ -1,12 +1,14 @@
 require 'twitter/enumerable'
+require 'twitter/utils'
 
 module Twitter
   class SearchResults
     include Twitter::Enumerable
+    include Twitter::Utils
     attr_reader :attrs
     alias_method :to_h, :attrs
-    alias_method :to_hash, :attrs
-    alias_method :to_hsh, :attrs
+    deprecate_alias :to_hash, :to_h
+    deprecate_alias :to_hsh, :to_h
 
     class << self
       # Construct a new SearchResults object from a response hash

diff --git a/lib/twitter/trend_results.rb b/lib/twitter/trend_results.rb
@@ -1,17 +1,19 @@
+require 'memoizable'
 require 'twitter/creatable'
 require 'twitter/enumerable'
-require 'memoizable'
 require 'twitter/null_object'
+require 'twitter/utils'
 
 module Twitter
   class TrendResults
     include Twitter::Creatable
     include Twitter::Enumerable
+    include Twitter::Utils
     include Memoizable
     attr_reader :attrs
     alias_method :to_h, :attrs
-    alias_method :to_hash, :attrs
-    alias_method :to_hsh, :attrs
+    deprecate_alias :to_hash, :to_h
+    deprecate_alias :to_hsh, :to_h
 
     class << self
       # Construct a new TrendResults object from a response hash