totter 0.2.14 → 0.3.0

data/lib/totter/client/avatars.rb

@@ -10,7 +10,7 @@ module Totter
       # @example
       #   Totter.avatar(1, 1)
       def avatar(user_id, avatar_id)
-        get "users/#{user_id}/avatars/#{avatar_id}"
+        get("users/#{user_id}/avatars/#{avatar_id}").body
       end
 
       # Get all known avatars for a given user
@@ -20,7 +20,7 @@ module Totter
       # @example
       #   Totter.avatar(1)
       def avatars(user_id)
-        get "users/#{user_id}/avatars"
+        get("users/#{user_id}/avatars").body
       end
 
       # Creates a new avatar on the server, allowing for a signed S3 upload
@@ -33,7 +33,7 @@ module Totter
       def create_avatar(user_id, redirect_url = nil)
         data = {}
         data[:redirect_url] = redirect_url if redirect_url
-        post "users/#{user_id}/avatars", data
+        post("users/#{user_id}/avatars", data).body
       end
 
       # Destroy an avatar
@@ -44,7 +44,7 @@ module Totter
       # @example
       #   Totter.destroy_avatar(1, 1)
       def destroy_avatar(user_id, avatar_id)
-        boolean_from_response :delete, "users/#{user_id}/avatars/#{avatar_id}"
+        boolean_from_response(:delete, "users/#{user_id}/avatars/#{avatar_id}")
       end
     end
   end

data/lib/totter/client/choices.rb

@@ -11,7 +11,7 @@ module Totter
       # @example
       #   Totter.choice(1, 1, 1)
       def choice(user_id, decision_id, choice_id)
-        get "users/#{user_id}/decisions/#{decision_id}/choices/#{choice_id}"
+        get("users/#{user_id}/decisions/#{decision_id}/choices/#{choice_id}").body
       end
 
 
@@ -43,7 +43,7 @@ module Totter
           }
         }
 
-        post "users/#{user_id}/decisions/#{decision_id}/choices", data
+        post("users/#{user_id}/decisions/#{decision_id}/choices", data).body
       end
 
       # Create a new choice upload. Resulting hash contains an #upload parameter
@@ -55,7 +55,7 @@ module Totter
       # @example
       #   Totter.create_choice_upload(1, 1)
       def create_choice_upload(user_id, decision_id)
-        post "users/#{user_id}/decisions/#{decision_id}/choices"
+        post("users/#{user_id}/decisions/#{decision_id}/choices").body
       end
 
       # Destroy a choice
@@ -67,7 +67,7 @@ module Totter
       # @example
       #   Totter.destroy_choice(1, 1)
       def destroy_choice(user_id, decision_id, choice_id)
-        boolean_from_response :delete, "users/#{user_id}/decisions/#{decision_id}/choices/#{choice_id}"
+        boolean_from_response(:delete, "users/#{user_id}/decisions/#{decision_id}/choices/#{choice_id}")
       end
     end
   end

data/lib/totter/client/comments.rb

@@ -10,7 +10,7 @@ module Totter
       # @example
       #   Totter.comments(1, 1)
       def comments(user_id, decision_id)
-        get "users/#{user_id}/decisions/#{decision_id}/comments"
+        get("users/#{user_id}/decisions/#{decision_id}/comments").body
       end
 
       # Creates a new comment
@@ -27,7 +27,7 @@ module Totter
             message: message
           }
         }
-        post "users/#{user_id}/decisions/#{decision_id}/comments", options
+        post("users/#{user_id}/decisions/#{decision_id}/comments", options).body
       end
 
       # Destroys a comment
@@ -39,7 +39,7 @@ module Totter
       # @example
       #   Totter.destroy_comment(1, 1, 15)
       def destroy_comment(user_id, decision_id, comment_id)
-        boolean_from_response :delete, "users/#{user_id}/decisions/#{decision_id}/comments/#{comment_id}"
+        boolean_from_response(:delete, "users/#{user_id}/decisions/#{decision_id}/comments/#{comment_id}")
       end
 
     end

data/lib/totter/client/configuration.rb

@@ -8,7 +8,7 @@ module Totter
       # @example
       #   Totter.configuration
       def configuration
-        get 'configuration'
+        get('configuration').body
       end
 
       # Get the featured timelines and users for Explore.
@@ -17,7 +17,7 @@ module Totter
       # @example
       #   Totter.explore
       def explore
-        get 'explore'
+        get('explore').body
       end
     end
   end

data/lib/totter/client/decisions.rb

@@ -10,7 +10,7 @@ module Totter
       # @example
       #   Totter.decision(1, 1)
       def decision(user_id, decision_id)
-        get "users/#{user_id}/decisions/#{decision_id}"
+        get("users/#{user_id}/decisions/#{decision_id}").body
       end
 
       # Create a decision
@@ -20,7 +20,7 @@ module Totter
       # @example
       #   Totter.create_decision(1)
       def create_decision(user_id)
-        post "users/#{user_id}/decisions"
+        post("users/#{user_id}/decisions").body
       end
 
       # Publish a decision
@@ -40,7 +40,7 @@ module Totter
           decision: options
         }
 
-        post "users/#{user_id}/decisions/#{decision_id}/publish", decision_options
+        post("users/#{user_id}/decisions/#{decision_id}/publish", decision_options).body
       end
 
       # Destroy a decision
@@ -51,7 +51,7 @@ module Totter
       # @example
       #   Totter.destroy_decision(1, 1)
       def destroy_decision(user_id, decision_id)
-        boolean_from_response :delete, "users/#{user_id}/decisions/#{decision_id}"
+        boolean_from_response(:delete, "users/#{user_id}/decisions/#{decision_id}")
       end
 
       # Get decision analytics
@@ -62,7 +62,7 @@ module Totter
       # @example
       #   Totter.decision_analytics(1, 1)
       def decision_analytics(user_id, decision_id)
-        get "users/#{user_id}/decisions/#{decision_id}/analytics"
+        get("users/#{user_id}/decisions/#{decision_id}/analytics").body
       end
 
       # Flag a decision for content review
@@ -73,7 +73,7 @@ module Totter
       # @example
       #   Totter.flag_decision(1, 1)
       def flag_decision(user_id, decision_id)
-        boolean_from_response :post, "users/#{user_id}/decisions/#{decision_id}/flag"
+        boolean_from_response(:post, "users/#{user_id}/decisions/#{decision_id}/flag")
       end
 
       # Unflag a decision for content review
@@ -84,7 +84,7 @@ module Totter
       # @example
       #   Totter.unflag_decision(1, 1)
       def unflag_decision(user_id, decision_id)
-        boolean_from_response :post, "users/#{user_id}/decisions/#{decision_id}/unflag"
+        boolean_from_response(:post, "users/#{user_id}/decisions/#{decision_id}/unflag")
       end
     end
   end

data/lib/totter/client/slugs.rb

@@ -12,7 +12,7 @@ module Totter
       def slug(id, unique_id = nil)
         path =  "slugs/#{id}"
         path += "?unique_id=#{unique_id}" if unique_id
-        get path
+        get(path).body
       end
     end
   end

data/lib/totter/client/stickers.rb

@@ -9,7 +9,7 @@ module Totter
       # @example
       #   Totter.sticker('staff')
       def sticker(sticker_name)
-        get "stickers/#{sticker_name}"
+        get("stickers/#{sticker_name}").body
       end
     end
   end

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
+        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})
+        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})
+        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})
+        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
+        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
+        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,7 @@ 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
+        get("users/#{user_id}/timelines/friends", options)
       end
     end
   end

data/lib/totter/client/users.rb

@@ -11,7 +11,7 @@ module Totter
       # @example
       #   client.me
       def me
-        get 'me'
+        get('me').body
       end
 
       # Get a single user
@@ -21,7 +21,7 @@ module Totter
       # @example
       #   Totter.user('soffes')
       def user(user)
-        get "users/#{user}"
+        get("users/#{user}").body
       end
 
       # Updates the authenticating user
@@ -43,7 +43,7 @@ module Totter
         data = {
           user: options.merge({preferences: preferences})
         }
-        put "me", data
+        put("me", data).body
       end
 
       # Follow a user.
@@ -56,7 +56,7 @@ module Totter
       # @example
       #   client.follow('gotwalt')
       def follow(user)
-        boolean_from_response :post, "users/#{user}/follow"
+        boolean_from_response(:post, "users/#{user}/follow")
       end
 
       # Unfollow a user.
@@ -69,7 +69,7 @@ module Totter
       # @example
       #   client.unfollow('kyle')
       def unfollow(user)
-        boolean_from_response :post, "users/#{user}/unfollow"
+        boolean_from_response(:post, "users/#{user}/unfollow")
       end
 
       # @return Array of [Hashie::Mash]
@@ -77,7 +77,7 @@ module Totter
       # @example
       #   client.followers('5')
       def followers(user_id)
-        get "users/#{user_id}/followers"
+        get("users/#{user_id}/followers").body
       end
 
       # @return Array of [Hashie::Mash]
@@ -85,7 +85,7 @@ module Totter
       # @example
       #   client.following('5')
       def following(user_id)
-        get "users/#{user_id}/following"
+        get("users/#{user_id}/following").body
       end
 
       # @return Array of [Hashie::Mash]
@@ -93,7 +93,7 @@ module Totter
       # @example
       #   client.user_votes('5')
       def votes(user_id)
-        get "users/#{user_id}/votes"
+        get("users/#{user_id}/votes").body
       end
 
     end

data/lib/totter/client/votes.rb

@@ -18,7 +18,7 @@ module Totter
         slug = options[:invitation_slug]
         params[:invitation] = { slug: slug } if slug
 
-        post path, params
+        post(path, params).body
       end
     end
   end

data/lib/totter/response.rb

@@ -0,0 +1,3 @@
+module Totter
+
+end

data/lib/totter/transport/http.rb

@@ -78,25 +78,10 @@ module Totter
       end
 
       def json_request(*args)
-        return Hashie::Mash.new({}) if Totter::Client.stubbed?
+        return Response.new(Hashie::Mash.new(body: {}.to_json, headers: [])) if Totter::Client.stubbed?
 
         # Perform request
-        response = request(*args)
-
-        # Parse JSON
-        object = MultiJson.load(response.body)
-
-        # Hash
-        return Hashie::Mash.new(object) if object.is_a? Hash
-
-        # Array
-        begin
-          return object.map { |h| Hashie::Mash.new(h) } if object.is_a? Array
-        rescue
-          # sometimes, for things like string arrays, we'll end up with an error
-        end
-        # Fallback incase it's not a hash or array
-        object
+        Response.new(request(*args))
       end
 
       def boolean_from_response(*args)
@@ -113,6 +98,42 @@ module Totter
           json_request(method, *args)
         end
       end
+
+      class Response
+        attr_accessor :body, :headers
+
+        def initialize(http_response)
+          @headers = parse_headers(http_response.to_hash)
+          @body = parse_body(http_response.body)
+        end
+
+        private
+
+        def parse_headers(raw_headers)
+          raw_headers.inject({}) do |remainder, (k, v)|
+            remainder[k] = [v].flatten.first
+            remainder
+          end
+        end
+
+        def parse_body(body)
+          # Parse JSON
+          object = MultiJson.load(body)
+
+          # Hash
+          return Hashie::Mash.new(object) if object.is_a? Hash
+
+          # Array
+          begin
+            return object.map { |h| Hashie::Mash.new(h) } if object.is_a? Array
+          rescue
+            # sometimes, for things like string arrays, we'll end up with an error
+          end
+          # Fallback incase it's not a hash or array
+          object
+        end
+      end
+
     end
   end
 end

data/lib/totter/version.rb

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

data/test/cassettes/timelines/stickers.yml

@@ -21,7 +21,7 @@ http_interactions:
       message: OK
     headers:
       X-Pusher-Channel:
-      - timeline-hashtag-test
+      - timeline-sticker-test
       Content-Type:
       - application/json; charset=utf-8
       X-Ua-Compatible:

data/test/totter/client/timelines_test.rb

@@ -3,42 +3,53 @@ require 'test_helper'
 class TimelinesTest < Totter::TestCase
   def test_global
     VCR.use_cassette 'timelines/global' do
-      assert_equal 15, Totter.global_timeline(limit: 15).length
+      response = Totter.global_timeline(limit: 15)
+      assert_equal 15, response.body.length
+      assert_equal 'timeline-global', response.headers['x-pusher-channel']
     end
   end
 
   def test_hashtags
     VCR.use_cassette 'timelines/hashtags' do
       client = local_client
-      assert_equal 1, local_client.hashtag_timeline('test').length
+      response = local_client.hashtag_timeline('test')
+      assert_equal 1, response.body.length
+      assert_equal 'timeline-hashtag-test', response.headers['x-pusher-channel']
     end
   end
 
   def test_stickers
     VCR.use_cassette 'timelines/stickers' do
       client = local_client
-      assert_equal 1, local_client.sticker_timeline('test').length
+      response = local_client.sticker_timeline('test')
+      assert_equal 1, response.body.length
+      assert_equal 'timeline-sticker-test', response.headers['x-pusher-channel']
     end
   end
 
   def test_search
     VCR.use_cassette 'timelines/search' do
       client = local_client
-      assert_equal 2, local_client.search_timeline('bacon').length
+      response = local_client.search_timeline('bacon')
+      assert_equal 2, response.body.length
     end
   end
 
   def test_flagged
     VCR.use_cassette 'timelines/flagged' do
       client = local_client
-      assert_equal 1, local_client.flagged_timeline.length
+      response = local_client.flagged_timeline
+      assert_equal 1, response.body.length
+      assert_equal 'timeline-flagged', response.headers['x-pusher-channel']
     end
   end
 
   def test_user
     VCR.use_cassette 'timelines/user' do
       client = local_client
-      assert_equal 0, local_client.user_timeline(4).length
+      response = local_client.user_timeline(4)
+      assert_equal 0, response.body.length
+      assert_equal 'timeline-user-4', response.headers['x-pusher-channel']
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: totter
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -74,6 +74,7 @@ files:
 - lib/totter/client/users.rb
 - lib/totter/client/votes.rb
 - lib/totter/error.rb
+- lib/totter/response.rb
 - lib/totter/transport.rb
 - lib/totter/transport/http.rb
 - lib/totter/version.rb