totter 0.3.1 → 0.3.2

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 bundler_args: --without development
 rvm:
+  - 1.8.7
   - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Gem dependencies
 gemspec
 
-gem 'rake', group: [:development, :test]
+gem 'rake', :group => [:development, :test]
 
 # Development dependencies
 group :development do
@@ -14,9 +14,9 @@ end
 # Testing dependencies
 group :test do
   gem 'minitest'
-  gem 'minitest-wscolor'
-  gem 'webmock', require: 'webmock/minitest'
+  gem 'turn'
+  gem 'webmock', :require => 'webmock/minitest'
   gem 'vcr'
-  gem 'mocha', require: 'mocha/setup'
-  gem 'simplecov', require: false
+  gem 'mocha', :require => 'mocha/setup'
+  gem 'simplecov', :require => false
 end

data/Rakefile

@@ -6,7 +6,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
 end
-task default: :test
+task :default => :test
 
 begin
   require 'yard'

data/lib/totter/client.rb

@@ -29,7 +29,7 @@ module Totter
     #
     # @param options [Hash] optionally specify `:access_token`, `:api_scheme`, `:api_host`, `:api_version`, `:client_token`, or `:transport`.
     def initialize(options = {})
-      options = { access_token: options } if options.is_a? String
+      options = { :access_token => options } if options.is_a? String
 
       @access_token = options[:access_token] if options[:access_token]
       @api_scheme = (options[:api_scheme] or 'https')
@@ -65,14 +65,17 @@ module Totter
       @api_scheme == 'https'
     end
 
+    # Turns on stubbing. When called, all HTTP API calls will return an empty response
     def self.stub!
       @@stubbed = true
     end
 
+    # Turns off stubing. Once called, HTTP requests will be sent as normal
     def self.unstub!
       @@stubbed = false
     end
 
+    # Returns the current status of HTTP stubbing
     def self.stubbed?
       @@stubbed
     end

data/lib/totter/client/choices.rb

@@ -32,13 +32,13 @@ module Totter
         raise ArgumentError.new('image_url option is required') unless options[:image_url]
 
         data = {
-          choice: {
-            type: 'image',
-            image_url: options[:image_url],
-            subject: options[:subject],
-            meta: {
-              link_url: options[:link_url],
-              link_title: options[:link_title]
+          :choice => {
+            :type => 'image',
+            :image_url => options[:image_url],
+            :subject => options[:subject],
+            :meta => {
+              :link_url => options[:link_url],
+              :link_title => options[:link_title]
             }
           }
         }

data/lib/totter/client/comments.rb

@@ -23,8 +23,8 @@ module Totter
       #   Totter.create_comment(1, 1, 'I love boots!')
       def create_comment(user_id, decision_id, message)
         options = {
-          comment: {
-            message: message
+          :comment => {
+            :message => message
           }
         }
         post("users/#{user_id}/decisions/#{decision_id}/comments", options).body

data/lib/totter/client/decisions.rb

@@ -37,7 +37,7 @@ module Totter
       #   Totter.publish_decision(1, 1, question: 'Why is the sky blue?')
       def publish_decision(user_id, decision_id, options = {})
         decision_options = {
-          decision: options
+          :decision => options
         }
 
         post("users/#{user_id}/decisions/#{decision_id}/publish", decision_options).body

data/lib/totter/client/timelines.rb

@@ -4,7 +4,7 @@ module Totter
     module Timelines
       # Default options sent with every timeline request unless otherwise specified.
       DEFAULT_TIMELINE_OPTIONS = {
-        limit: 20
+        :limit => 20
       }
 
       # Get recent decisions from the global timeline.
@@ -31,7 +31,7 @@ module Totter
       # @example
       #   Totter.global_timeline(limit: 20, since: '1,15')
       def hashtag_timeline(hashtag, options = DEFAULT_TIMELINE_OPTIONS)
-        format_timeline_result 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)
-        format_timeline_result 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)
-        format_timeline_result 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
@@ -106,10 +106,10 @@ module Totter
         format_timeline_result get("users/#{user_id}/timelines/friends", options)
       end
 
-      private
+    private
 
       def format_timeline_result(http_result)
-        Hashie::Mash.new(items: http_result.body, pusher_channel: http_result.headers['x-pusher-channel'])
+        Hashie::Mash.new(:items => http_result.body, :pusher_channel => http_result.headers['x-pusher-channel'])
       end
     end
   end

data/lib/totter/client/users.rb

@@ -41,7 +41,7 @@ module Totter
       # @option preferences [Boolean] :notification_following Notify when other_user starts follwing user
       def update_me(options = {}, preferences = {})
         data = {
-          user: options.merge({preferences: preferences})
+          :user => options.merge({:preferences => preferences})
         }
         put("me", data).body
       end

data/lib/totter/client/votes.rb

@@ -13,10 +13,10 @@ module Totter
         raise UniqueIDRequired unless unique_id or self.authenticated?
 
         path = "users/#{decision_user_id}/decisions/#{decision_id}/votes"
-        params = { choice_id: choice_id, unique_id: unique_id }
+        params = { :choice_id => choice_id, :unique_id => unique_id }
 
         slug = options[:invitation_slug]
-        params[:invitation] = { slug: slug } if slug
+        params[:invitation] = { :slug => slug } if slug
 
         post(path, params).body
       end

data/lib/totter/transport.rb

@@ -5,7 +5,7 @@ module Totter
 
     # Transport adapter map
     TRANSPORT_MAP = {
-      http: Totter::Transport::HTTP
+      :http => Totter::Transport::HTTP
     }
   end
 end

data/lib/totter/transport/http.rb

@@ -1,3 +1,4 @@
+
 module Totter
   module Transport
     # Default HTTP API transport adapter
@@ -25,7 +26,7 @@ module Totter
         # if the request requires parameters in the query string, merge them in
         if params and !can_post_data?(method)
           query_values = uri.query ? URI.decode_www_form(uri.query).inject({}) {|h,(k,v)| h[k]=v; h} : {}
-          uri.query = URI.encode_www_form (query_values || {}).merge(params)
+          uri.query = to_url_params((query_values || {}).merge(params))
         end
 
         # Build request
@@ -62,6 +63,27 @@ module Totter
         end
       end
 
+      def to_url_params(hash)
+        params = []
+        hash.each_pair do |key, value|
+          params << param_for(key, value).flatten
+        end
+        params.sort.join('&')
+      end
+
+      def param_for(key, value, parent = nil)
+        if value.is_a?(Hash)
+          params = []
+          value.each_pair do |value_key, value_value|
+            value_parent = parent ? parent + "[#{key}]" : key.to_s
+            params << param_for(value_key, value_value, value_parent)
+          end
+          params
+        else
+          ["#{parent ? parent + "[#{key}]" : key.to_s}=#{CGI::escape(value.to_s)}"]
+        end
+      end
+
       def handle_error(response)
         # Find error or return
         return unless error = Totter::ERROR_MAP[response.code.to_i]
@@ -78,7 +100,7 @@ module Totter
       end
 
       def json_request(*args)
-        return Response.new(Hashie::Mash.new(body: {}.to_json, headers: [])) if Totter::Client.stubbed?
+        return Response.new(Hashie::Mash.new(:body => '{}', :headers => [])) if Totter::Client.stubbed?
 
         # Perform request
         Response.new(request(*args))
@@ -99,9 +121,15 @@ module Totter
         end
       end
 
+      # Response class responsible for deserializing API calls
+      # @attr [Object] body The parsed response
+      # @attr [Hash] headers HTTP headers returned as part of the response
       class Response
         attr_accessor :body, :headers
 
+        # Initializes a new result
+        #
+        # @param http_response [Net::HTTPResponse] the raw response to parse
         def initialize(http_response)
           @headers = parse_headers(http_response.to_hash)
           @body = parse_body(http_response.body)
@@ -109,13 +137,16 @@ module Totter
 
         private
 
+        # Parses raw headers in to a reasonable hash
         def parse_headers(raw_headers)
+          # raw headers from net_http have an array for each result. Flatten them out.
           raw_headers.inject({}) do |remainder, (k, v)|
             remainder[k] = [v].flatten.first
             remainder
           end
         end
 
+        # Parses the raw body in to a Hashie::Mash object, an array of Hashie::Mashes, or, if all else fails, returns a hash.
         def parse_body(body)
           # Parse JSON
           object = MultiJson.load(body)

data/lib/totter/version.rb

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

data/test/support/client_macros.rb

@@ -1,5 +1,5 @@
 module ClientMacros
   def local_client
-    client = Totter::Client.new(access_token: '9774e653f7b3c1de5f21b61adc08ba24', api_host: 'localhost:5000', api_scheme: 'http')
+    client = Totter::Client.new(:access_token => '9774e653f7b3c1de5f21b61adc08ba24', :api_host => 'localhost:5000', :api_scheme => 'http')
   end
 end

data/test/totter/client/choices_test.rb

@@ -12,11 +12,11 @@ class ChoicesTest < Totter::TestCase
   def test_create_choice_for_image
     VCR.use_cassette 'choices/create_for_image' do
       client = local_client
-        data = {
-        image_url: 'http://recess.s3.amazonaws.com/default_avatars/v1/photo_1.png',
-        subject: 'Test Image',
-        link_url: 'http://seesaw.co',
-        link_title: 'Seesaw'
+      data = {
+        :image_url => 'http://recess.s3.amazonaws.com/default_avatars/v1/photo_1.png',
+        :subject => 'Test Image',
+        :link_url => 'http://seesaw.co',
+        :link_title => 'Seesaw'
       }
       decision = client.create_decision(1)
       choice = client.create_choice_for_image(decision.user_id, decision.id, data)

data/test/totter/client/decisions_test.rb

@@ -23,7 +23,7 @@ class DecisionsTest < Totter::TestCase
       client = local_client
       decision = client.create_decision(1)
       choice = create_test_choice(client, decision.user_id, decision.id)
-      result = client.publish_decision(decision.user_id, decision.id, question: 'Why is the sky blue?')
+      result = client.publish_decision(decision.user_id, decision.id, :question => 'Why is the sky blue?')
       assert result.published_at
       assert 1, result.choices.length
     end
@@ -67,10 +67,10 @@ class DecisionsTest < Totter::TestCase
 
   def create_test_choice(client, user_id, decision_id)
     data = {
-      image_url: 'http://recess.s3.amazonaws.com/default_avatars/v1/photo_1.png',
-      subject: 'Test Image',
-      link_url: 'http://seesaw.co',
-      link_title: 'Seesaw'
+      :image_url => 'http://recess.s3.amazonaws.com/default_avatars/v1/photo_1.png',
+      :subject => 'Test Image',
+      :link_url => 'http://seesaw.co',
+      :link_title => 'Seesaw'
     }
     client.create_choice_for_image(user_id, decision_id, data)
   end

data/test/totter/client/timelines_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class TimelinesTest < Totter::TestCase
   def test_global
     VCR.use_cassette 'timelines/global' do
-      response = Totter.global_timeline(limit: 15)
+      response = Totter.global_timeline(:limit => 15)
       assert_equal 15, response.items.length
       assert_equal 'timeline-global', response.pusher_channel
     end

data/test/totter/client/users_test.rb

@@ -20,11 +20,11 @@ class UsersTest < Totter::TestCase
     VCR.use_cassette 'users/update' do
       client = local_client
       options = {
-        given_name: "Aaron",
-        family_name: 'Gotwalt'
+        :given_name => "Aaron",
+        :family_name => 'Gotwalt'
       }
       preferences = {
-        notification_comments: false
+        :notification_comments => false
       }
 
       result = client.update_me(options, preferences)

data/test/totter/client/votes_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 class VotesTest < Totter::TestCase
   def test_create_vote
     VCR.use_cassette 'votes/create' do
-      vote = Totter.create_vote(5, 3276, 5381, unique_id: '021a997')
+      vote = Totter.create_vote(5, 3276, 5381, :unique_id => '021a997')
       assert_equal 5381, vote.choice_id
 
       # Prevent duplicates
       assert_raises Totter::BadRequest do
-        Totter.create_vote(5, 3276, 5381, unique_id: '021a997')
+        Totter.create_vote(5, 3276, 5381, :unique_id => '021a997')
       end
     end
   end

data/test/totter/client_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ClientTest < Totter::TestCase
   def test_initialization
-    client = Totter::Client.new(access_token: 'asdf1234')
+    client = Totter::Client.new(:access_token => 'asdf1234')
     assert_equal 'asdf1234', client.access_token
     assert client.authenticated?
 
@@ -17,7 +17,7 @@ class ClientTest < Totter::TestCase
     client = Totter::Client.new
     assert_equal 'https://api.seesaw.co/v1/', client.base_url
 
-    client = Totter::Client.new(api_scheme: 'http', api_host: 'example.com', api_version: 42)
+    client = Totter::Client.new(:api_scheme => 'http', :api_host => 'example.com', :api_version => 42)
     assert_equal 'http://example.com/v42/', client.base_url
   end
 
@@ -25,7 +25,7 @@ class ClientTest < Totter::TestCase
     client = Totter::Client.new
     assert client.ssl?
 
-    client = Totter::Client.new(api_scheme: 'http')
+    client = Totter::Client.new(:api_scheme => 'http')
     refute client.ssl?
   end
 

data/totter.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.required_ruby_version = '>= 1.9.2'
+  gem.required_ruby_version = '>= 1.8.7'
   gem.add_dependency 'multi_json', '~> 1.5.0'
   gem.add_dependency 'hashie', '~> 1.2.0'
 end

metadata

@@ -1,59 +1,69 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: totter
-version: !ruby/object:Gem::Version
-  version: 0.3.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
-authors:
+authors: 
 - Sam Soffes
 - Aaron Gotwalt
 - Adam Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-25 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hashie
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
+  type: :runtime
+  version_requirements: *id002
 description: Ruby gem for working with the Seesaw API.
-email:
+email: 
 - sam@soff.es
 - gotwalt@gmail.com
 - adam.g.ryan@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Contributing.markdown
@@ -129,32 +139,43 @@ files:
 - test/totter/client_test.rb
 - test/totter_test.rb
 - totter.gemspec
+has_rdoc: true
 homepage: https://github.com/seesawco/totter-rb
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby gem for working with the Seesaw API.
-test_files:
+test_files: 
 - test/cassettes/avatars/create.yml
 - test/cassettes/avatars/destroy.yml
 - test/cassettes/avatars/index.yml
@@ -205,4 +226,3 @@ test_files:
 - test/totter/client/votes_test.rb
 - test/totter/client_test.rb
 - test/totter_test.rb
-has_rdoc: