omniauth-teamsnap 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83fbc211023278b4432be966d30137e5ee689a85
-  data.tar.gz: ab9dbbe8ef3649b70bfc5ef0b29890215bb8b085
+  metadata.gz: 540222c492e87a75c182d19da9c20381ed6e3e42
+  data.tar.gz: 897951250e344e8e184fe662bfdb45fb9424d490
 SHA512:
-  metadata.gz: ad5c18eb61a4ba8c5735546057f34e98ca163ca3ccaa80070b76deac33d9cc6c7461ce4223283606f35d788cbc744a8491df17b0f3a9cfae7e14920453d96e5f
-  data.tar.gz: 88a5f6c24383b86b0d9cf61c9444e65f402f48ed675adb32443e00f77398243405e91e30f6475162a02758da33a1d0060b729cb35abbaec05f618d736065f327
+  metadata.gz: c6aa2b1c59e2531735ce8d96ef18021bcd2d9deff98b8e4eea70ce8544e2e838a53c7848756646269f869c05dfceb4576e45257e6632544947e89e7718f361ca
+  data.tar.gz: 668000b20b4c305d9410a3e7876971ef1d4b8b0b90348b54bef6d01da47b9131ae1141e6ed04a356c77fd27f3496071ba5a3ee29d69105f3cad0d5fada3ea4c3

data/README.md

@@ -18,3 +18,21 @@ TeamSnap API v3 lets you set scopes to provide granular access to different type
       provider :teamsnap, ENV['TEAMSNAP_KEY'], ENV['TEAMSNAP_SECRET'], scope: "read write"
     end
 
+## Authentication Hash
+An example auth hash available in `request.env['omniauth.auth']`:
+
+```
+{
+  :provider => "teamsnap",
+  :uid => "123456",
+  :info => {
+    :email => "player@example.com",
+    :first_name => "John",
+    :last_name => "Player",
+  },
+  :credentials => {
+    :token => "a1b2c3d4...", # The OAuth 2.0 access token
+  },
+  :extra = {}
+}
+```

data/lib/omniauth-teamsnap/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Teamsnap
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/omniauth/strategies/teamsnap.rb

@@ -12,13 +12,13 @@ module OmniAuth
         :token_method => :post
       }
 
-      uid { raw_info.find { |d| d.name == "id"}.value }
+      uid { parse_datum("id") }
 
       info do
         {
-          :email => raw_info.find { |d| d.name == "email"}.value,
-          :first_name => raw_info.find { |d| d.name == "first_name"}.value,
-          :last_name => raw_info.find { |d| d.name == "last_name"}.value
+          :email => parse_datum("email"),
+          :first_name => parse_datum("first_name"),
+          :last_name => parse_datum("last_name")
         }
       end
 
@@ -32,12 +32,16 @@ module OmniAuth
           req.url "https://api.teamsnap.com/v3/me"
           req.headers["Authorization"] = "Bearer #{access_token.token}"
         end
-        deserializer = Conglomerate::TreeDeserializer.new(JSON.parse(response.body))
-        collection_json = deserializer.deserialize
+        collection_json = JSON.parse(response.body)
 
-        @raw_info = collection_json.items.first.data
+        @raw_info = collection_json["collection"]["items"].first.fetch("data")
       end
 
+      private
+
+      def parse_datum(property)
+        raw_info.find { |d| d["name"] == property }.fetch("value")
+      end
     end
   end
 end

data/omniauth-teamsnap.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "omniauth", "~> 1.2"
-  spec.add_dependency "omniauth-oauth2", "~> 1.2"
-  spec.add_dependency "faraday", "~> 0.9"
-  spec.add_dependency "conglomerate", "~> 0.15"
+  spec.add_dependency "omniauth-oauth2", "~> 1.3.1"
+  spec.add_dependency "faraday", "~> 0.9.2"
   spec.add_development_dependency "rspec", "~> 2.7"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-teamsnap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -30,42 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: conglomerate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Official OmniAuth strategy for TeamSnap