lib/gnip_api/gnip/activity.rb in gnip_api-1.0.1 vs lib/gnip_api/gnip/activity.rb in gnip_api-1.0.2

@@ -1,12 +1,13 @@
 module Gnip
   class Activity < Gnip::Message
     attr_reader :id, :object_type, :actor, :verb, :posted_time, :generator, :provider, :link,
     :body, :object, :favorites_count, :twitter_entities, :twitter_filter_level, :twitter_lang,
-    :retweet_count, :gnip
+    :retweet_count, :gnip, :raw
 
     def initialize params = {}
+      @raw = params
       @id = params['id']
       @object_type = params['objectType']
       @actor = Gnip::Actor.new params['actor']
       @verb = params['verb']
       @posted_time = params['postedTime']
@@ -21,28 +22,28 @@
       @twitter_lang = params['twitter_lang']
       @retweet_count = params['retweetCount']
       @gnip = Gnip::GnipData.new(params['gnip']) if params['gnip']
     end
 
-    def original_attributes
+    def to_h
       {
         :id => @id,
         :objectType => @object_type,
-        :actor => @actor.original_attributes,
+        :actor => @actor.to_h,
         :verb => @verb,
         :postedTime => @posted_time,
         :generator => @generator,
         :provider => @provider,
         :link => @link,
         :body => @body,
-        :object => @object.kind_of?(Gnip::Activity) ? @object.original_attributes : @object,
+        :object => @object.kind_of?(Gnip::Activity) ? @object.to_h : @object,
         :favoritesCount => @favorites_count,
         :twitter_entities => @twitter_entities,
         :twitter_filter_level => @twitter_filter_level,
         :twitter_lang => @twitter_lang,
         :retweetCount => @retweet_count,
-        :gnip => @gnip ? @gnip.original_attributes : nil
+        :gnip => @gnip ? @gnip.to_h : nil
       }
     end
 
     def posted_time
       DateTime.parse(@posted_time)
@@ -55,10 +56,10 @@
     def tweet_id
       @id.split(':').last
     end
 
     def to_json
-      generate_json(original_attributes)
+      @raw.to_json
     end
 
     def author
       actor.display_name
     end