myrando 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c560dd94f8e95acb9c5a40e2afb3606b9a5e536a
-  data.tar.gz: fd9ad2c5bcd8efe14c13fbcb8e9a4714d44db1b1
+  metadata.gz: 342b4b10703690ed8fef14bfa4cacbde22fc63b5
+  data.tar.gz: b0ba567316d220050090178010398c4e91732e86
 SHA512:
-  metadata.gz: 1119a887c59fe6642e720f71f79a51e9019ef36cdd809febed1ecd31c0de0df14ecea1c5decb93c089b9804b7e8000ecd5650df62dd7499f9f804272f49acf54
-  data.tar.gz: fb8b7118cbd064c2878d1d0eae44567c45f8168675ec6f08142dee2dbd7e2c42da81ff307532848320afbc527d69b1d46b7db4f73fdf2a651414922ff5bee714
+  metadata.gz: 28aaa1a0a44fa80c34ed17d8882fafa85465de1e6e16c6a9744bd3eda9ff9d8d32c1e19c9b6e9a51e477cd33a56e5f9cab49e7e1adfffd4afe28c06aee540750
+  data.tar.gz: 337a3e1e2e201f34c6985586b1181511bb9559539115392c78751d1dbcf716121b7d17a4f6922a26850c191fe65385f6825250b5d80a07fcad2ed4dae3cf063e

data/README.md

@@ -26,6 +26,14 @@ rando = Myrando::MyRando.new(:username => "your email", :password => "your passw
 rando.get_photos()
 ```
 
+### Get your account status
+
+``` ruby
+require 'myrando'
+rando = Myrando::MyRando.new(:username => "your email", :password => "your password")
+rando.get_account_status()
+```
+
 ## Contributing
 
 1. Fork it

data/lib/myrando/version.rb

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

data/lib/myrando.rb

@@ -23,12 +23,34 @@ module Myrando
     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]}")
       if resp.code == 200
-        json = MultiJson.decode(resp.body)
-        randos = []
-        json.each do |r|
-          randos << r
+        begin
+          json = MultiJson.decode(resp.body)
+          raise ApiError, "Rando returned an error: #{json['error']}" if not json.kind_of?(Array) and json.has_key?('error')
+          randos = []
+          json.each do |r|
+            randos << r
+          end
+          randos
+        rescue MultiJson::DecodeError
+          raise ApiError, "Rando returned an error:\nStatus: #{resp.code}\nBody: #{resp.body}"
+        end
+      else
+        raise ApiError, "Rando returned an error:\nStatus: #{resp.code}\nBody: #{resp.body}"
+      end
+    end
+    
+    def get_account_status()
+      resp = self.class.get("#{RANDO_API_URL}/account.json?auth_token=#{@user_info[:token]}")
+      if resp.code == 200
+        begin
+          json = MultiJson.decode(resp.body)
+          raise ApiError, "Rando returned an error: #{json['error']}" if json.has_key?('error')
+          return json
+        rescue MultiJson::DecodeError
+          raise ApiError, "Rando returned an error:\nStatus: #{resp.code}\nBody: #{resp.body}"
         end
-        randos
+      else
+        raise ApiError, "Rando returned an error:\nStatus: #{resp.code}\nBody: #{resp.body}"
       end
     end
 
@@ -39,7 +61,7 @@ module Myrando
       if resp.code == 200
         begin
           json = MultiJson.decode(resp.body)
-          raise ApiError, "Rando returned an error: #{json['error']}" if json['error']
+          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}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myrando
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ómar Kjartan Yasin