myrando 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 342b4b10703690ed8fef14bfa4cacbde22fc63b5
-  data.tar.gz: b0ba567316d220050090178010398c4e91732e86
+  metadata.gz: aec93bf83dd5b45641e4e960702fe6db107ebce1
+  data.tar.gz: b9af4f76673353de8ab2d6172ce2693ade57f8eb
 SHA512:
-  metadata.gz: 28aaa1a0a44fa80c34ed17d8882fafa85465de1e6e16c6a9744bd3eda9ff9d8d32c1e19c9b6e9a51e477cd33a56e5f9cab49e7e1adfffd4afe28c06aee540750
-  data.tar.gz: 337a3e1e2e201f34c6985586b1181511bb9559539115392c78751d1dbcf716121b7d17a4f6922a26850c191fe65385f6825250b5d80a07fcad2ed4dae3cf063e
+  metadata.gz: 7f35ebf916baa714adbcd9596a765672c6586397c3fe6d86f962a8428e8e23ccdca1f180471b105f1bc9d793f2a33f7a694d4fb9553f8d3e348232602b37c1d5
+  data.tar.gz: ae01d3b534bcf28912a9f986bc68092222fc955ef9e1f4254edd573e1dfc37aa7ac877c1de1888a20aef30ee8a216dfe0c86df5866106c8a82d1f0f1e73c5987

data/lib/myrando.rb

@@ -6,10 +6,28 @@ require "uri-handler"
 module Myrando
   RANDO_API_URL = "http://rando.ustwo.se"
 
+  class RandoConnection
+    include HTTParty
+
+    def initialize()
+    end
+
+    def get(path)
+      opts = { :headers => { 'User-Agent' => "myrando/#{Myrando::VERSION}" } }
+      return self.class.get(path, opts)
+    end
+
+    def post(path, body)
+      opts = { :body => body, :headers => { 'User-Agent' => "myrando/#{Myrando::VERSION}" } }
+      return self.class.post(path, opts)
+    end
+  end
+
   class MyRando
     include HTTParty
     class InvalidParameterError < StandardError; end
     class ApiError < StandardError; end
+    
     attr_accessor :user_info
 
     def initialize(options = {})
@@ -17,11 +35,12 @@ module Myrando
       password = options[:password].to_uri if options [:password].kind_of?(String)
       raise InvalidParameterError, "MyRando must :username attribute" if username.nil?
       raise InvalidParameterError, "MyRando must :password attribute" if password.nil?
+      @connection = RandoConnection.new()
       @user_info = login(username, password)
     end
 
     def get_photos(page=1)
-      resp = self.class.get("#{RANDO_API_URL}/users/#{@user_info[:user_id]}/deliveries/received.json?page=#{page}&auth_token=#{@user_info[:token]}")
+      resp = @connection.get("#{RANDO_API_URL}/users/#{@user_info[:user_id]}/deliveries/received.json?page=#{page}&auth_token=#{@user_info[:token]}")
       if resp.code == 200
         begin
           json = MultiJson.decode(resp.body)
@@ -40,7 +59,7 @@ module Myrando
     end
     
     def get_account_status()
-      resp = self.class.get("#{RANDO_API_URL}/account.json?auth_token=#{@user_info[:token]}")
+      resp = @connection.get("#{RANDO_API_URL}/account.json?auth_token=#{@user_info[:token]}")
       if resp.code == 200
         begin
           json = MultiJson.decode(resp.body)
@@ -57,15 +76,17 @@ module Myrando
     private
     def login(username, password)
       body = "user[email]=#{username}&user[password]=#{password}"
-      resp = self.class.post("#{RANDO_API_URL}/users/sign_in.json", :body => body)
+      resp = @connection.post("#{RANDO_API_URL}/users/sign_in.json", body)
       if resp.code == 200
         begin
           json = MultiJson.decode(resp.body)
           raise ApiError, "Rando returned an error: #{json['error']}" if json.has_key?('error')
           {:token => json['authentication_token'], :user_id => json['id']}
         rescue MultiJson::DecodeError
-          raise ApiError, "Rando returned an error:\nStatus: #{resp.code}\nBody: #{resp.body}"
+          raise ApiError, "Error decoding Rando answer"
         end
+      else
+        raise ApiError, "Rando return an error: \nStatus: #{resp.code}\n"
       end
     end
 

data/lib/myrando/version.rb

@@ -1,3 +1,3 @@
 module Myrando
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myrando
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ómar Kjartan Yasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Interact with the Rando API