totter 0.3.0 → 0.3.1

data/lib/totter/client/timelines.rb

@@ -17,7 +17,7 @@ module Totter
       # @example
       #   Totter.global_timeline(limit: 20, since: '1,15')
       def global_timeline(options = DEFAULT_TIMELINE_OPTIONS)
-        get('timelines/global', options)
+        format_timeline_result get('timelines/global', options)
       end
 
       # Get recent decisions from a hashtag timeline
@@ -31,7 +31,7 @@ module Totter
       # @example
       #   Totter.global_timeline(limit: 20, since: '1,15')
       def hashtag_timeline(hashtag, options = DEFAULT_TIMELINE_OPTIONS)
-        get('timelines/global', options.merge({hashtag: hashtag}))
+        format_timeline_result get('timelines/global', options.merge({hashtag: hashtag}))
       end
 
       # Get recent decisions from a sticker timeline
@@ -45,7 +45,7 @@ module Totter
       # @example
       #   Totter.global_timeline(limit: 20, since: '1,15')
       def sticker_timeline(sticker, options = DEFAULT_TIMELINE_OPTIONS)
-        get('timelines/global', options.merge({sticker: sticker}))
+        format_timeline_result get('timelines/global', options.merge({sticker: sticker}))
       end
 
       # Search for published items
@@ -59,7 +59,7 @@ module Totter
       # @example
       #   Totter.global_timeline(limit: 20, since: '1,15')
       def search_timeline(query, options = DEFAULT_TIMELINE_OPTIONS)
-        get('timelines/search', options.merge({query: query}))
+        format_timeline_result get('timelines/search', options.merge({query: query}))
       end
 
       # Get recent decisions from the flagged-for-review timeline
@@ -72,7 +72,7 @@ module Totter
       # @example
       #   Totter.global_timeline(limit: 20, since: '1,15')
       def flagged_timeline(options = DEFAULT_TIMELINE_OPTIONS)
-        get('timelines/flagged', options)
+        format_timeline_result get('timelines/flagged', options)
       end
 
       # Get recent decisions from a given user.
@@ -86,7 +86,7 @@ module Totter
       # @example
       #   Totter.user_timeline(4, limit: 20, since: '1,15')
       def user_timeline(user_id, options = DEFAULT_TIMELINE_OPTIONS)
-        get("users/#{user_id}/timelines/user", options)
+        format_timeline_result get("users/#{user_id}/timelines/user", options)
       end
 
       # Get the friends timeline (also known as "feed" or "home") for a given user.
@@ -103,7 +103,13 @@ module Totter
       # @example
       #   Totter.friends_timeline(4, limit: 20, since: '1,15')
       def friends_timeline(user_id, options = DEFAULT_TIMELINE_OPTIONS)
-        get("users/#{user_id}/timelines/friends", options)
+        format_timeline_result get("users/#{user_id}/timelines/friends", options)
+      end
+
+      private
+
+      def format_timeline_result(http_result)
+        Hashie::Mash.new(items: http_result.body, pusher_channel: http_result.headers['x-pusher-channel'])
       end
     end
   end

data/lib/totter/version.rb

@@ -1,4 +1,4 @@
 module Totter
   # Verion of the Totter gem
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/test/totter/client/timelines_test.rb

@@ -4,8 +4,8 @@ class TimelinesTest < Totter::TestCase
   def test_global
     VCR.use_cassette 'timelines/global' do
       response = Totter.global_timeline(limit: 15)
-      assert_equal 15, response.body.length
-      assert_equal 'timeline-global', response.headers['x-pusher-channel']
+      assert_equal 15, response.items.length
+      assert_equal 'timeline-global', response.pusher_channel
     end
   end
 
@@ -13,8 +13,8 @@ class TimelinesTest < Totter::TestCase
     VCR.use_cassette 'timelines/hashtags' do
       client = local_client
       response = local_client.hashtag_timeline('test')
-      assert_equal 1, response.body.length
-      assert_equal 'timeline-hashtag-test', response.headers['x-pusher-channel']
+      assert_equal 1, response.items.length
+      assert_equal 'timeline-hashtag-test', response.pusher_channel
     end
   end
 
@@ -22,8 +22,8 @@ class TimelinesTest < Totter::TestCase
     VCR.use_cassette 'timelines/stickers' do
       client = local_client
       response = local_client.sticker_timeline('test')
-      assert_equal 1, response.body.length
-      assert_equal 'timeline-sticker-test', response.headers['x-pusher-channel']
+      assert_equal 1, response.items.length
+      assert_equal 'timeline-sticker-test', response.pusher_channel
     end
   end
 
@@ -31,7 +31,7 @@ class TimelinesTest < Totter::TestCase
     VCR.use_cassette 'timelines/search' do
       client = local_client
       response = local_client.search_timeline('bacon')
-      assert_equal 2, response.body.length
+      assert_equal 2, response.items.length
     end
   end
 
@@ -39,8 +39,8 @@ class TimelinesTest < Totter::TestCase
     VCR.use_cassette 'timelines/flagged' do
       client = local_client
       response = local_client.flagged_timeline
-      assert_equal 1, response.body.length
-      assert_equal 'timeline-flagged', response.headers['x-pusher-channel']
+      assert_equal 1, response.items.length
+      assert_equal 'timeline-flagged', response.pusher_channel
     end
   end
 
@@ -48,8 +48,8 @@ class TimelinesTest < Totter::TestCase
     VCR.use_cassette 'timelines/user' do
       client = local_client
       response = local_client.user_timeline(4)
-      assert_equal 0, response.body.length
-      assert_equal 'timeline-user-4', response.headers['x-pusher-channel']
+      assert_equal 0, response.items.length
+      assert_equal 'timeline-user-4', response.pusher_channel
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: totter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: