totter 0.3.4 → 0.3.5

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .ruby-version
+.DS_Store

data/lib/totter/client.rb

@@ -5,6 +5,7 @@ module Totter
   class Client
     Dir[File.expand_path('../client/*.rb', __FILE__)].each { |f| require f }
 
+    include Activities
     include Avatars
     include Choices
     include Comments
@@ -21,24 +22,28 @@ module Totter
     attr_reader :api_host
     attr_reader :api_version
     attr_reader :transport
+    attr_reader :result_format
 
-    @@stubbed = false
-
+    # Default parameters for the client
     DEFAULTS = {
       :api_scheme => 'https',
       :api_host => 'api.seesaw.co',
       :api_version => '1',
+      :result_format => :mashie,
       :transport => :http
     }
 
+    # The current configuration parameters for all clients
     def self.options
       @options ||= Hashie::Mash.new(DEFAULTS.dup)
     end
 
+    # Sets the current configuration parameters for all clients
     def self.options=(val)
       @options = val
     end
 
+    # Allows the setting of configuration parameters in a configure block.
     def self.configure
       yield options
     end
@@ -56,6 +61,7 @@ module Totter
       @api_version = options[:api_version]
       @client_token = options[:client_token] if options[:client_token]
       @transport = options[:transport]
+      @result_format = options[:result_format]
 
       # Include transport
       transport_module = Totter::Transport::TRANSPORT_MAP[@transport]
@@ -84,16 +90,6 @@ 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

data/lib/totter/client/activities.rb

@@ -0,0 +1,46 @@
+module Totter
+  class Client
+    # Client methods for working with activities in the application.
+    module Activities
+      # Default query parameters for retrieving activities
+      DEFAULT_ACTIVITY_OPTIONS = {
+        :limit => 50,
+        :offset => 0
+      }
+
+      # Returns a user's activities
+      #
+      # @param user_id [Numeric] The user's id
+      # @param options [Hash] Parameters for returning selected activities
+      # @return [Hashie::Mash]
+      # @example
+      #   Totter.activity(1)
+      def activities(user_id, options = DEFAULT_ACTIVITY_OPTIONS)
+        get("users/#{user_id}/activities").body
+      end
+
+      # Returns activities performed on a given user
+      #
+      # @param user_id [Numeric] The user's id
+      # @param options [Hash] Parameters for returning selected activities
+      # @return [Hashie::Mash]
+      # @example
+      #   Totter.activity(1)
+      def my_activities(user_id, options = DEFAULT_ACTIVITY_OPTIONS)
+        get("users/#{user_id}/activities/me").body
+      end
+
+      # Returns activities performed by a user's friends
+      #
+      # @param user_id [Numeric] The user's id
+      # @param options [Hash] Parameters for returning selected activities
+      # @return [Hashie::Mash]
+      # @example
+      #   Totter.activity(1)
+      def friends_activities(user_id, options = DEFAULT_ACTIVITY_OPTIONS)
+        get("users/#{user_id}/activities/friends").body
+      end
+
+    end
+  end
+end

data/lib/totter/client/timelines.rb

@@ -121,7 +121,13 @@ module Totter
     private
 
       def format_timeline_result(http_result)
-        Hashie::Mash.new(:items => http_result.body, :pusher_channel => http_result.headers['x-pusher-channel'])
+        hash = {:items => http_result.body, :pusher_channel => http_result.headers['x-pusher-channel']}
+        case @result_format
+        when :mashie
+          Hashie::Mash.new(hash)
+        else
+          hash
+        end
       end
     end
   end

data/lib/totter/transport/http.rb

@@ -100,10 +100,8 @@ module Totter
       end
 
       def json_request(*args)
-        return Response.new(Hashie::Mash.new(:body => '{}', :headers => [])) if Totter::Client.stubbed?
-
-        # Perform request
-        Response.new(request(*args))
+        # Perform request, pass result format
+        Response.new(request(*args), result_format)
       end
 
       def boolean_from_response(*args)
@@ -130,7 +128,8 @@ module Totter
         # Initializes a new result
         #
         # @param http_response [Net::HTTPResponse] the raw response to parse
-        def initialize(http_response)
+        def initialize(http_response, result_format = :mashie)
+          @result_format = result_format
           @headers = parse_headers(http_response.to_hash)
           @body = parse_body(http_response.body)
         end
@@ -151,16 +150,18 @@ module Totter
           # 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
+          case @result_format
+          when :mashie
+            # 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. Fall through.
+            end
           end
-          # Fallback incase it's not a hash or array
+
           object
         end
       end

data/lib/totter/version.rb

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

data/test/cassettes/client_http/configuration.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.seesaw.co/v1/configuration
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Content-Type:
+      - application/json; charset=utf-8
+      Date:
+      - Thu, 04 Apr 2013 22:27:48 GMT
+      Etag:
+      - ! '"0d93d141645a3ac8841c317bd949da58"'
+      Server:
+      - thin 1.5.0 codename Knife
+      Strict-Transport-Security:
+      - max-age=31536000
+      X-Rack-Cache:
+      - miss
+      X-Request-Id:
+      - 801bd0cb264f4c1dfc19a74f208981e5
+      X-Runtime:
+      - '0.004561'
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"api_version":"v1","view_url":"https://seesaw.co","max_invitiees":0,"socket":{"auth_url":"https://api.seesaw.co/pusher/auth","app_id":27149,"app_key":"9f186e47577d6fa195b4"},"avatar_sizes":[35,70,80,160,320,640],"image_choice_sizes":[100,200,157,307,314,320,624,640],"preferences":{"notifications":[{"key":"notification_friends","text":{"en":"People
+        I follow share a decision"}},{"key":"notification_invitee_votes","text":{"en":"People
+        I''ve invited vote on my decisions"}},{"key":"notification_following_votes","text":{"en":"People
+        I follow vote on my decisions"}},{"key":"notification_other_votes","text":{"en":"People
+        I''m not following vote on my decisions"}},{"key":"notification_after_votes","text":{"en":"Others
+        vote on a decision I''ve been invited to"}},{"key":"notification_comments","text":{"en":"People
+        comment on my decisions"}},{"key":"notification_following","text":{"en":"Someone
+        follows me"}},{"key":"notification_mentions","text":{"en":"Someone mentions
+        me"}},{"key":"notification_announcements","text":{"en":"System Announcements"}}]},"updated_at":"2013-03-22T11:26:50Z"}'
+    http_version: 
+  recorded_at: Thu, 04 Apr 2013 22:27:48 GMT
+recorded_with: VCR 2.4.0

data/test/test_helper.rb

@@ -3,7 +3,9 @@ require 'bundler'
 Bundler.require :test
 
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_filter "/test/"
+end
 
 require 'minitest/autorun'
 require 'totter'

data/test/totter/client/activities_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class ActivitiesTest < Totter::TestCase
+  def test_activity
+    stub_request(:get, 'http://localhost:5000/v1/users/4/activities').to_return(:status => 200, :body => "[]")
+    result = local_client.activities(4)
+    assert_equal 0, result.length
+  end
+
+  def test_my_activity
+    stub_request(:get, 'http://localhost:5000/v1/users/4/activities/me').to_return(:status => 200, :body => "[]")
+    result = local_client.my_activities(4)
+    assert_equal 0, result.length
+  end
+
+  def test_friends_activity
+    stub_request(:get, 'http://localhost:5000/v1/users/4/activities/friends').to_return(:status => 200, :body => "[]")
+    result = local_client.friends_activities(4)
+    assert_equal 0, result.length
+  end
+end

data/test/totter/client/configuration_test.rb

@@ -7,7 +7,7 @@ class ConfigurationTest < Totter::TestCase
     end
   end
 
-  def test_configuration
+  def test_explore
     VCR.use_cassette 'configuration/explore' do
       assert_equal 2, Totter.explore.timelines.length
     end

data/test/totter/client_test.rb

@@ -29,27 +29,19 @@ class ClientTest < Totter::TestCase
     refute client.ssl?
   end
 
-  def test_stub!
-    client = Totter::Client.new
-    Totter::Client.stub!
-
-    assert Totter::Client.stubbed?
-    expected = {}
-    assert_equal expected, client.create_decision(1)
-
-    Totter::Client.unstub!
-  end
-
   def test_configuration
     Totter::Client.configure do |client|
       client.api_host = 'blah'
       client.api_scheme = 'gopher'
+      client.result_format = :hash
     end
 
     assert_equal 'blah', Totter::Client.new.api_host
     assert_equal 'gopher', Totter::Client.new.api_scheme
+    Totter::Client.new.result_format
 
     # forcibly reset the configuration
     Totter::Client.options = nil
   end
+
 end

data/test/totter/transport/http_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class HttpTest < Totter::TestCase
+  def test_default_mashie_format
+    VCR.use_cassette 'client_http/configuration' do
+      assert_equal Hashie::Mash, Totter.configuration.class
+    end
+  end
+
+  def test_default_mashie_format
+    VCR.use_cassette 'client_http/configuration' do
+      assert_equal Hash, Totter.new(result_format: :hash).configuration.class
+    end
+  end
+
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: totter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
+  prerelease: 
 platform: ruby
 authors:
 - Sam Soffes
@@ -10,11 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,6 +24,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -29,6 +32,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -36,6 +40,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,6 +63,7 @@ files:
 - Readme.markdown
 - lib/totter.rb
 - lib/totter/client.rb
+- lib/totter/client/activities.rb
 - lib/totter/client/avatars.rb
 - lib/totter/client/choices.rb
 - lib/totter/client/comments.rb
@@ -81,6 +87,7 @@ files:
 - test/cassettes/choices/create_for_image.yml
 - test/cassettes/choices/destroy.yml
 - test/cassettes/choices/show.yml
+- test/cassettes/client_http/configuration.yml
 - test/cassettes/comments/create.yml
 - test/cassettes/comments/destroy.yml
 - test/cassettes/comments/index.yml
@@ -114,6 +121,7 @@ files:
 - test/cassettes/votes/create.yml
 - test/support/client_macros.rb
 - test/test_helper.rb
+- test/totter/client/activities_test.rb
 - test/totter/client/avatars_test.rb
 - test/totter/client/choices_test.rb
 - test/totter/client/comments_test.rb
@@ -125,31 +133,33 @@ files:
 - test/totter/client/users_test.rb
 - test/totter/client/votes_test.rb
 - test/totter/client_test.rb
+- test/totter/transport/http_test.rb
 - test/totter_test.rb
 - totter.gemspec
 homepage: https://github.com/seesawco/totter-rb
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby gem for working with the Seesaw API.
 test_files:
 - test/cassettes/avatars/create.yml
@@ -160,6 +170,7 @@ test_files:
 - test/cassettes/choices/create_for_image.yml
 - test/cassettes/choices/destroy.yml
 - test/cassettes/choices/show.yml
+- test/cassettes/client_http/configuration.yml
 - test/cassettes/comments/create.yml
 - test/cassettes/comments/destroy.yml
 - test/cassettes/comments/index.yml
@@ -193,6 +204,7 @@ test_files:
 - test/cassettes/votes/create.yml
 - test/support/client_macros.rb
 - test/test_helper.rb
+- test/totter/client/activities_test.rb
 - test/totter/client/avatars_test.rb
 - test/totter/client/choices_test.rb
 - test/totter/client/comments_test.rb
@@ -204,5 +216,6 @@ test_files:
 - test/totter/client/users_test.rb
 - test/totter/client/votes_test.rb
 - test/totter/client_test.rb
+- test/totter/transport/http_test.rb
 - test/totter_test.rb
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 03da894c649ab5b6964fa4706ced06e1e9611267
-  data.tar.gz: b0122b38cb1d56a61736d0035218e81f1048428f
-SHA512:
-  metadata.gz: 06e327a8188d254058933565df74521ab9ba9e1a2e5f83efef9e77edc2d37aceb727856e1c5ccc8227515bd6f1dbaa741112c7b468b665bd8fab80b10f25d720
-  data.tar.gz: 93ac291640eee5a6eebd9ef52c1edad0fd944a66c07054f4fc29cac5ecd63cb93480a386fd7f988bfc677e0afc2c2ab0812a0576637abf6a3cd0a851207f4aed