teamsnap_rb 2.0.0.beta4 → 2.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db56d6d4ca6e055cf80fe479fca02c9b4b8074f
-  data.tar.gz: 5cdfb06bbf191203c5a223dac95e49a589e68c66
+  metadata.gz: f52464e6a2e0dcb607c8cb48f44da22fcb99088c
+  data.tar.gz: e7a00559a594e50b8e2681cae0ca9f17f37d68fe
 SHA512:
-  metadata.gz: 54372ade0ae182ab80db00f56662d8997294ddb429ea01173cd1c9f53c1176220735af1c562011b2b0a4594b1aebbd6c30aab0ea68e5f9fc82619533b13b88cf
-  data.tar.gz: b7bda322d789e638491fded6272a554eee314a235e31b28aef241b1b3e989932478d1b500bd9fda51a2b7558a503992fde21c593c148f8b5a1197318af1a3d99
+  metadata.gz: fdd9bd671fea6da070c628d12d2423b6a9bd88c2990e357755f2e23e87dd2a4a63bddd11c6b309739803505207396a5a2ae4a770dcc2d181a8b9800e1eed49cf
+  data.tar.gz: 7e1d60b58f8ea299f5a16284ad90f51095c333b3602d9a61ad9a974beeabde7bcb11ce12ed96c1408098c2ca42ebf5fc3f27039d81734ffba3a2900784978971

data/CHANGELOG.md

@@ -20,3 +20,8 @@ v2.0.0.beta
 
 - Full CRUD actions available along with TeamSnap::Response option for better
   control-flow statements.
+
+v2.0.0.beta6
+------
+
+- Handle errors when response body is an empty string

data/lib/teamsnap.rb

@@ -15,6 +15,7 @@ module TeamSnap
   DEFAULT_URL = "https://apiv3.teamsnap.com"
   Error = Class.new(StandardError)
   NotFound = Class.new(TeamSnap::Error)
+  InitializationError = Class.new(TeamSnap::Error)
 
   class << self
     attr_accessor :client_id, :client_secret, :root_client, :token, :url
@@ -34,7 +35,10 @@ module TeamSnap
       self.root_client = TeamSnap::Client.new(:token => token)
 
       ##   Make the apiv3 root call. collection is parsed JSON
-      collection = TeamSnap.run(root_client, :get, self.url, {})
+      collection = TeamSnap.run(root_client, :get, self.url, {}) do
+        self.root_client = nil
+        raise TeamSnap::InitializationError
+      end
 
       ##   Setup Dynamic Classes from the collection
       TeamSnap::Structure.init(root_client, collection)
@@ -43,12 +47,19 @@ module TeamSnap
       TeamSnap::Collection.apply_endpoints(self, collection) && true
     end
 
-    def run(client, via, href, args = {})
+    def run(client, via, href, args = {}, &block)
+      timeout_error = block || default_timeout_error
       resp = client_send(client, via, href, args)
       return TeamSnap::Response.load_collection(resp)
     rescue Faraday::TimeoutError
-      warn("Connection to API failed with TimeoutError")
-      {:links => []}
+      timeout_error.call
+    end
+
+    def default_timeout_error
+      -> {
+        warn("Connection to API failed with TimeoutError")
+        {:links => []}
+      }
     end
 
     def client_send(client, via, href, args)

data/lib/teamsnap/api.rb

@@ -73,6 +73,8 @@ module TeamSnap
 
     def self.parse_error(resp)
       return "Object Not Found (404)" if resp.status == 404
+      return "Forbidden (403)" if resp.status == 403 && resp.body == ""
+
       begin
         Oj.load(resp.body)
           .fetch(:collection)

data/lib/teamsnap/item.rb

@@ -6,7 +6,9 @@ module TeamSnap
         collection
           .fetch(:items) { [] }
           .map { |item|
-            data = parse_data(item).merge(:href => item[:href])
+            data = parse_data(item)
+              .merge(:href => item[:href])
+              .merge(url_attributes(item))
             type = type_of(item)
             cls = load_class(type, data)
 
@@ -53,12 +55,18 @@ module TeamSnap
         }
       end
 
+      def url_attributes(item)
+        links = item
+          .fetch(:links) { [] }
+          .map { |link| ["#{link.fetch(:rel)}_url", link.fetch(:href)] }
+        hashify(links)
+      end
+
       def hashify(arr)
         Hash[*arr.flatten]
       rescue NoMethodError
         arr.inject({}) { |hash, (key, value)| hash[key] = value; hash }
       end
-
     end
 
     private
@@ -71,7 +79,6 @@ module TeamSnap
         href = link.fetch(:href)
         is_singular = rel == Inflecto.singularize(rel)
 
-        define_singleton_method("#{rel}_url") { href }
         define_singleton_method(rel) {
           instance_variable_get("@#{rel}") || instance_variable_set(
             "@#{rel}", -> {

data/lib/teamsnap/response.rb

@@ -84,7 +84,7 @@ module TeamSnap
 
     def process_error
       if @resp.headers["content-type"].match("json")
-        body = Oj.load(@resp.body)
+        body = Oj.load(@resp.body) || {}
         @collection = body.fetch(:collection) { {} }
         @message = TeamSnap::Api.parse_error(@resp)
         @objects = TeamSnap::Item.load_items(@client, @collection)

data/lib/teamsnap/version.rb

@@ -1,3 +1,3 @@
 module TeamSnap
-  VERSION = "2.0.0.beta4"
+  VERSION = "2.0.0.beta6"
 end

data/spec/teamsnap/apiv_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+require "teamsnap"
+
+RSpec.describe "teamsnap__api", :vcr => true do
+  context ".parse_error" do
+    it "returns error message on a 403 and an empty body" do
+      response = Faraday::Response.new(
+        :status => 403,
+        :body => ""
+      )
+      expect(TeamSnap::Api.parse_error(response)).to eq("Forbidden (403)")
+    end
+
+    it "returns error message on a 404" do
+      response = Faraday::Response.new(
+        :status => 404,
+        :body => ""
+      )
+      expect(TeamSnap::Api.parse_error(response)).to eq("Object Not Found (404)")
+    end
+
+    it "returns a proper error message" do
+      response = Faraday::Response.new(
+        :status => 403,
+        :body => Oj.dump("collection" => { :error => { :message => "Error Message"}})
+      )
+      expect(TeamSnap::Api.parse_error(response)).to eq("Error Message")
+    end
+  end
+end

data/spec/teamsnap/item_spec.rb

@@ -142,14 +142,22 @@ RSpec.describe "teamsnap__item", :vcr => true do
                 :name => "humanized_media_storage_used",
                 :value => "0 B"
               }
+            ],
+            :links => [
+              {
+                :rel => "logo",
+                :href => "http://example.com/logo.png"
+              }
             ]
           }
         ]
       }
 
-      expect(
-        TeamSnap::Item.load_items(TeamSnap.root_client, collection)[0].class
-      ).to eq(TeamSnap::Team)
+      item = TeamSnap::Item.load_items(TeamSnap.root_client, collection)[0]
+
+      expect(item.class).to eq(TeamSnap::Team)
+      expect(item.logo_url).to eq("http://example.com/logo.png")
+      expect(item.attributes[:logo_url]).to eq("http://example.com/logo.png")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamsnap_rb
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0.beta6
 platform: ruby
 authors:
 - Shane Emmons
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -193,6 +193,7 @@ files:
 - spec/cassettes/teamsnap_rb/_run/processes_the_response.yml
 - spec/cassettes/teamsnap_rb/_server_error/Specifies_call_and_endpoint_that_was_unsuccessful.yml
 - spec/spec_helper.rb
+- spec/teamsnap/apiv_spec.rb
 - spec/teamsnap/client_spec.rb
 - spec/teamsnap/collection_spec.rb
 - spec/teamsnap/item_spec.rb
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A gem to interact with TeamSnap's API
@@ -256,6 +257,7 @@ test_files:
 - spec/cassettes/teamsnap_rb/_run/processes_the_response.yml
 - spec/cassettes/teamsnap_rb/_server_error/Specifies_call_and_endpoint_that_was_unsuccessful.yml
 - spec/spec_helper.rb
+- spec/teamsnap/apiv_spec.rb
 - spec/teamsnap/client_spec.rb
 - spec/teamsnap/collection_spec.rb
 - spec/teamsnap/item_spec.rb