teamsnap_rb 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c81581a206de0d99dea75777830a764ba63b965
-  data.tar.gz: 284dc197b286c7bfa8041b5810332fe5717ccfc0
+  metadata.gz: f5c247d6f1854cf336cecb619650aeee8874707f
+  data.tar.gz: 3a025c42980dad4d3da35f8795360042e157388a
 SHA512:
-  metadata.gz: cf8b9e6b81e6fc05ffaa5270d9a5bc6b0ae32cd98106abe1e4af8029e9327111f59588acc007967343636c19e8d5636624058e4f39cf016101e8f31bed3e68dd
-  data.tar.gz: 9bd33d443efa7a176dda48c92227f3a8cf60c71292e9d54b7c0a1347f3e93348f7decb54ccf4f5f9d628524ea7b24838fc2598ff21e4538255195e535beea3e1
+  metadata.gz: 4053c6f511dd48f576400bf8283cca14a01ff46b3677341392dc772724142e126b81bb1a5c0eb0dbbb255415aac1d47e8d2d5b28891474738598fa44b68e4ef5
+  data.tar.gz: 86e36409184178ef0c1397c4e5cc10bf34ac31232bfdaca7b362d19a538a283d8a491b704d77ed65be7f8c4be8e490c3f685b5ca8d4d86d9001593b3cff07cfc

data/README.md

@@ -15,7 +15,7 @@ _Note: You'll need an OAuth2 Token from TeamSnap. Checkout our API docs
 ```
 λ gem install teamsnap_rb
 λ irb
-> TeamSnap.init(:token => "abc123...", :url => "https://apiv3.teamsnap.com")
+> TeamSnap.init(:token => "abc123...")
 > t = TeamSnap::Team.find(1)
 => #<TeamSnap::Team::...>
 > t.name

data/lib/teamsnap/version.rb

@@ -1,3 +1,3 @@
 module TeamSnap
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/teamsnap.rb

@@ -32,7 +32,7 @@ end
 
 module TeamSnap
   EXCLUDED_RELS = %w(me apiv2_root root self dude sweet random xyzzy)
-  DEFAULT_URL = "http://apiv3.teamsnap.com"
+  DEFAULT_URL = "https://apiv3.teamsnap.com"
   Error = Class.new(StandardError)
   NotFound = Class.new(TeamSnap::Error)
 
@@ -43,10 +43,6 @@ module TeamSnap
     end
 
     def call(env)
-      token = @options[:token]
-      client_id = @options[:client_id]
-      client_secret = @options[:client_secret]
-
       if token
         env[:request_headers].merge!({"Authorization" => "Bearer #{token}"})
       elsif client_id && client_secret
@@ -58,22 +54,43 @@ module TeamSnap
           })
         env.url.query = URI.encode_www_form(query_params)
 
-        body = if env.body.is_a?(Hash)
-                 Faraday::Utils::ParamsHash.new.merge(env.body).to_query
-               else
-                 env.body
-               end
-        message = "/?" + env.url.query.to_s + (body || "")
-        digest = OpenSSL::Digest.new("sha256")
-        message_hash = digest.hexdigest(message)
-
         env.request_headers["X-Teamsnap-Hmac"] = OpenSSL::HMAC.hexdigest(
-          digest, client_secret, message_hash
+          digest, client_secret, message_hash(env)
         )
       end
 
       @app.call(env)
     end
+
+    def token
+      @token ||= @options[:token]
+    end
+
+    def client_id
+      @client_id ||= @options[:client_id]
+    end
+
+    def client_secret
+      @client_secret ||= @options[:client_secret]
+    end
+
+    def digest
+      OpenSSL::Digest.new("sha256")
+    end
+
+    def message_hash(env)
+      digest.hexdigest(
+        query_string(env) + message(env)
+      )
+    end
+
+    def query_string(env)
+      "/?" + env.url.query.to_s
+    end
+
+    def message(env)
+      env.body || ""
+    end
   end
 
   class << self
@@ -104,11 +121,6 @@ module TeamSnap
         )
       end
 
-      opts[:backup_cache] = opts.fetch(:backup_cache) { true }
-      if opts[:backup_cache]
-        opts[:backup_cache_file] = TeamSnap.backup_file_for(opts[:backup_cache])
-      end
-
       self.client = Faraday.new(
         :url => opts.fetch(:url),
         :parallel_manager => Typhoeus::Hydra.new
@@ -121,7 +133,7 @@ module TeamSnap
         c.adapter :typhoeus
       end
 
-      collection = TeamSnap.run(:get, "/", {}, opts)
+      collection = TeamSnap.run_init(:get, "/", {})
 
       classes = []
       client.in_parallel do
@@ -136,17 +148,15 @@ module TeamSnap
       apply_endpoints(self, collection) && true
     end
 
-    def run(via, href, args = {}, opts = {})
-      resp = client.send(via, href, args)
-
-      if resp.status == 200
-        collection = Oj.load(resp.body).fetch(:collection)
-        TeamSnap.write_backup_file(opts[:backup_cache_file], collection)
-        collection
+    def run_init(via, href, args = {}, opts = {})
+      begin
+        resp = client_send(via, href, args)
+      rescue Faraday::TimeoutError
+        warn("Connection to API failed. Initializing with empty class structure")
+        {:links => []}
       else
-        if TeamSnap.backup_file_exists?(opts[:backup_cache_file])
-          warn("Connection to API failed.. using backup cache file to initialize endpoints")
-          Oj.load(IO.read(opts[:backup_cache_file]))
+        if resp.success?
+          Oj.load(resp.body).fetch(:collection)
         else
           error_message = parse_error(resp)
           raise TeamSnap::Error.new(error_message)
@@ -154,25 +164,33 @@ module TeamSnap
       end
     end
 
-    def backup_file_for(backup_cache)
-      backup_cache == true ? "./tmp/.teamsnap_rb" : backup_cache
-    end
-
-    def write_backup_file(file_location, collection)
-      return unless file_location
-      dir_location = File.dirname(file_location)
-      if Dir.exist?(dir_location)
-        File.open(file_location, "w+") { |f| f.write Oj.dump(collection) }
+    def run(via, href, args = {})
+      resp = client_send(via, href, args)
+      if resp.success?
+        Oj.load(resp.body).fetch(:collection)
       else
-        warn(
-          "WARNING: Directory '#{dir_location}' does not exist. " +
-          "Backup cache functionality will not work until this is resolved."
-        )
+        if resp.headers["content-type"].match("json")
+          error_message = parse_error(resp)
+          raise TeamSnap::Error.new(error_message)
+        else
+          raise TeamSnap::Error.new("`#{via}` call was unsuccessful. " +
+            "Unexpected response content-type. " +
+            "Check TeamSnap APIv3 connection")
+        end
       end
     end
 
-    def backup_file_exists?(backup_cache_file)
-      !!backup_cache_file && File.exist?(backup_cache_file)
+    def client_send(via, href, args)
+      case via
+      when :get
+        client.send(via, href, args)
+      when :post
+        client.send(via, href) do |req|
+          req.body = Oj.dump(args)
+        end
+      else
+        raise TeamSnap::Error.new("Don't know how to run `#{via}`")
+      end
     end
 
     def parse_error(resp)