songdrop 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92532eb8b2390ee5d6d0b851710c68ee0ee99a63
-  data.tar.gz: 3993966de74f124dae889714e14b7785bcad94c1
+  metadata.gz: ad1635e165e3d9d321d7c04590e52d06ad9786fb
+  data.tar.gz: a2254f352f6d67f51a6f21d0b97ad466a8d28af6
 SHA512:
-  metadata.gz: dbaa754abc921c3af9241fdcec39da114a4c4f6db7a36d2d44d638c5dc3e4fa611c84a67e3720e9859e9f883330fbf9f5692fe0f6630fb4ca226fcedad173a1b
-  data.tar.gz: 7fc463fb2032cfb4d0cf58cbb80ee32588cb1b4db89b77ce59286e9c607a8c93dd7fd925bb559336653f755c8bfc145dc56d43a14e92fda88d3d625aa2b0a956
+  metadata.gz: 3fdf8914e9901929622dc9a41986f74e1ab9421dd0f7ff11c17abfe3a185e5d68bcc3b686575d9c39d2d89ee19cdd68087044ddf3e574c7b3ff58eae87a106d9
+  data.tar.gz: 73ab81fcc7f07d05bddbb28617280296d353b20b757e2ca3b9c6f4951013d37c67f0822805d1438c1510f52dd4b597bac7ddb2bac52e32cebe9084820dadade4

data/lib/songdrop.rb

@@ -24,6 +24,7 @@ else
   require_relative './songdrop/objects/song'
   require_relative './songdrop/objects/mix'
   require_relative './songdrop/objects/artist'
+  require_relative './songdrop/objects/error'
   require_relative './songdrop/http/rest-client'
   require_relative './songdrop/json/json'
 end

data/lib/songdrop/client.rb

@@ -50,7 +50,7 @@ module Songdrop
         JSON.parse(target) do |obj|
           res = Parser.parse(obj)
           res = res.first if res.is_a? Array and res.size == 1
-          block.call res if block_given?
+          block.call res if block
           res
         end
       end

data/lib/songdrop/client/methods.rb

@@ -4,7 +4,7 @@ module Songdrop
     def login(params, &block)
       post('/session', params) do |user|
         @auth_token = user.auth_token
-        block.call user if block_given?
+        block.call user if block
         user
       end
     end

data/lib/songdrop/http/bubblewrap.rb

@@ -25,14 +25,9 @@ module Songdrop
 
       BubbleWrap::HTTP.send(method, url, bw_options) do |response|
         if response.ok?
-          begin #in case we don't receive JSON back, we don't want the app to crash:
-            json = BubbleWrap::JSON.parse(response.body.to_str)
-            block.call response, json
-          rescue
-            block.call response, nil
-          end
+          block.call response.body.to_str, nil
         else
-          block.call response, nil
+          block.call nil, response.body.to_str
         end
       end
     end

data/lib/songdrop/json/bubblewrap.rb

@@ -1,8 +1,10 @@
 module Songdrop
   class JSON
 
-    def self.parse(response, &block)
-      block.call ::BubbleWrap::JSON.parse(response.body.to_str)
+    def self.parse(json, &block)
+      result = ::BubbleWrap::JSON.parse(json)
+      block.call result if block
+      result
     end
 
   end

data/lib/songdrop/json/json.rb

@@ -2,7 +2,9 @@ module Songdrop
   class JSON
 
     def self.parse(json, &block)
-      block.call ::JSON.parse(json)
+      result = ::JSON.parse(json)
+      block.call result if block
+      result
     end
 
   end

data/lib/songdrop/parser.rb

@@ -60,6 +60,7 @@ module Songdrop
         when :song then Song.new(properties)
         when :mix then Mix.new(properties)
         when :artist then Artist.new(properties)
+        when :error then Error.new(properties)
         else "[Songdrop::Parser] Don't know how to objectize #{type}"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: songdrop
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Richard Taylor