badgeville 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+* 0.0.5
+
+* set default timeout to 3s
+* add timeout paramater
+
 * 0.0.4
 
 * count activities

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/badgeville.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{badgeville}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gilad Buchman"]
-  s.date = %q{2011-09-18}
+  s.date = %q{2011-10-07}
   s.description = %q{Client for Badgeville's Core API v2. http://rules.badgeville.com}
   s.extra_rdoc_files = [
     "README.md"

data/lib/badgeville.rb

@@ -5,7 +5,7 @@ require 'badgeville/activity'
 require 'badgeville/reward'
 
 module Badgeville
-  TIMEOUT = 1000
+  TIMEOUT_SECS = 3
   HOST = "sandbox.v2.badgeville.com"
   PROTOCOL = "http"
 
@@ -14,18 +14,24 @@ module Badgeville
 
     def initialize (err_code=nil, error_msg="")
       super error_msg
+      @message = error_msg
       @code = err_code
     end
+
+    def to_s
+      "ERROR #{@code} : #{@message}"
+    end
   end
 
   class Client
-    attr_accessor :user, :site, :player_id, :site_id
+    attr_accessor :user, :site, :player_id, :site_id, :timeout
 
     def initialize (email, opts={})
       # Required Parameters
       @site = opts['site']
       @private_key = opts['private_key']
       @public_key = opts['public_key']
+      @timeout = opts['timeout'] || TIMEOUT_SECS
       @host = opts['host'] || HOST
       @protocol = opts['protocol'] || PROTOCOL
       @user = email
@@ -91,9 +97,10 @@ module Badgeville
     end
 
     def set_player
-      end_point = "#{@site}/players/#{@user}.json"
+      end_point = "#{@site}/players/info.json"
       begin
-        response = session[end_point].get
+        response = session[end_point].get(:params =>
+                                          {:user => @user, :site => @site})
         data = response.body
         json = JSON.parse(data)
         json = json["data"]
@@ -109,6 +116,10 @@ module Badgeville
       end
     end
 
+    def timeout
+      @timeout
+    end
+
     def site_id
       unless @site_id
         set_player
@@ -132,7 +143,7 @@ module Badgeville
     def session
       if @session.nil?
         base_url = "#{@protocol}://#{@host}/api/berlin/#{@private_key}"
-        @session = RestClient::Resource.new base_url
+        @session = RestClient::Resource.new base_url, :timeout => @timeout
       end
       @session
     end
@@ -155,9 +166,9 @@ module Badgeville
         if e.respond_to? :response
           begin
             data = JSON.parse(e.response)
-            raise BadgevilleError.new(e.http_code, data["error"])
-          rescue TypeError
             raise BadgevilleError.new(e.http_code, data)
+          rescue TypeError, JSON::ParserError
+            raise BadgevilleError.new(e.http_code, e.message)
           end
         else
           raise e

data/spec/badgeville_spec.rb

@@ -63,7 +63,7 @@ describe Badgeville do
   describe "#get_activities" do
     before do
       @url = /http:\/\/#{Badgeville::HOST}.*activities.json.*user=#{@user}.*/
-      mock_activities = { 
+      mock_activities = {
         "data" => [
                    {
                      "verb" => "join_team",
@@ -125,11 +125,22 @@ describe Badgeville do
 
   describe "#set_player" do
     before do
-      @url = /http:\/\/#{Badgeville::HOST}.*example.com\/players\/#{@user}\.json.*/
+      @url = /http:\/\/#{Badgeville::HOST}.*example.com\/players\/info\.json.*user=#{@user}.*/
       stub_http_request(:get, @url).to_return(:body => {"data" => {"id" => "1", "site_id" => "site"}}.to_json)
     end
 
     it {@badgeville.player_id.should == "1"}
     it {@badgeville.site_id.should == "site"}
   end
+
+  describe "verify default timeout is 3" do
+    it {@badgeville.timeout.should == 3}
+  end
+
+  describe "verify timeout parameter is set" do
+    new_badgeville = Badgeville::Client.new @user, 'private_key' => "api_key",
+      'site' => 'example.com', 'timeout' => 10
+    it {new_badgeville.timeout.should == 10}
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badgeville
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000 -07:00
+date: 2011-10-10 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157019100 !ruby/object:Gem::Requirement
+  requirement: &2160449300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157019100
+  version_requirements: *2160449300
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157018180 !ruby/object:Gem::Requirement
+  requirement: &2160448300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157018180
+  version_requirements: *2160448300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157017140 !ruby/object:Gem::Requirement
+  requirement: &2160447640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2157017140
+  version_requirements: *2160447640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157016440 !ruby/object:Gem::Requirement
+  requirement: &2160447000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157016440
+  version_requirements: *2160447000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157015620 !ruby/object:Gem::Requirement
+  requirement: &2160446280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2157015620
+  version_requirements: *2160446280
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2157014620 !ruby/object:Gem::Requirement
+  requirement: &2160445520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157014620
+  version_requirements: *2160445520
 description: Client for Badgeville's Core API v2. http://rules.badgeville.com
 email: 
 executables: []
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1038648532873041495
+      hash: 832478503767646954
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: