omniauth-mapmyfitness-oauth2 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1adbe1b10480660f1d3479ef8cbab69db46ac8f8
-  data.tar.gz: f597ab491059907662168fdbe0ea71d27044c323
+  metadata.gz: 8de76e8c2a4bb7fe06395671b98ee6017053e746
+  data.tar.gz: b02172c1983e95418e3cbee0608c3f663837afbd
 SHA512:
-  metadata.gz: f43a10c9e81922e3da89ddf95c098dceb7f42c0229ebedff1f830c6a511e92f3d0c78e0e7412f05369b84966d4d0d90138fe53a1a500156f99a8bbe9cc57bfff
-  data.tar.gz: 2172a69c60a3078b6f2120943cec59fb970441309f089b65d1f9f54969caa9351ece77adac0e20507f1af36ae632c89e5f67fb907d57ce1a0d03b8d5f62922f3
+  metadata.gz: ad10cacc9128012b5505df663d395dd9f679336ecd07d59c7abf019c738ae6c41f7a40039e430bd532247ed74eafb083287e23b52afc8aae787360f4fc4f155a
+  data.tar.gz: 80b016b9cd1ae2573782704c7eaaec546d39429f6a4a16fe34d51ba1b6d25f19d56d6e51b591187d0e3a820911422e85b13e51bf696ff7c4728d9e8a91f5ae32

data/lib/omniauth-mapmyfitness-oauth2/user.rb

@@ -0,0 +1,30 @@
+module OmniAuth
+  module MapMyFitness
+    class User
+      def self.data_attributes
+        ["username", "first_name", "last_name", "display_name", "last_initial", 
+         "weight", "communication", "display_measurement_system", "time_zone", 
+         "birthdate", "height", "email", "sharing", "last_login", "location", 
+         "gender", "_links", "id", "date_joined"]
+      end
+
+      attr_reader :data, :token_expires_at, :token_refresh, :token
+      attr_reader *data_attributes
+
+      def initialize(auth_info)
+        @data = auth_info
+        parse_attributes
+      end
+
+      def parse_attributes
+        User.data_attributes.each do |attribute|
+          instance_variable_set("@#{attribute}", data["info"][attribute])
+        end
+        @token_expires = data["credentials"]["expires"]
+        @token_expires_at = data["credentials"]["expires_at"]
+        @token_refresh = data["credentials"]["refresh_token"]
+        @token = data["credentials"]["token"]
+      end
+    end
+  end
+end

data/lib/omniauth-mapmyfitness-oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module MapMyFitness
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/omniauth/strategies/mapmyfitness.rb

@@ -1,5 +1,5 @@
 require 'omniauth-oauth2'
-require 'pry'
+require 'omniauth-mapmyfitness-oauth2/user'
 
 module OmniAuth
   module Strategies
@@ -15,35 +15,14 @@ module OmniAuth
         }
       }
 
-      option :token_options, {
-        :grant_type => 'authorization_code',
-      }
+      option :token_options, { :grant_type => 'authorization_code' }
 
-      uid {
-        raw_info['user_id']
-      }
+      uid{ raw_info['user_id'] }
 
-      info do
-        {
-          :name => "#{raw_info['first_name']} #{raw_info['last_name']}",
-          :email => raw_info['email'],
-          :nickname => raw_info['username'],
-          :first_name => raw_info['first_name'],
-          :last_name => raw_info['last_name'],
-          :location => [raw_info['start_city'], raw_info['start_state'], raw_info['start_country']].join(', '),
-          #:image => "http://api.mapmyfitness.com/3.1/users/get_avatar?uid=#{raw_info['user_id']}",
-          :urls => {:mapmyfitness => "http://www.mapmyfitness.com/profile/#{raw_info['username']}"}
-        }
-      end
-
-      extra do
-        {
-          'raw_info' => raw_info
-        }
-      end
+      info{ raw_info }
 
       def raw_info
-        @raw_info = JSON.parse(access_token.get("/v7.0/user/self").body)
+        @raw_info ||= JSON.parse(access_token.get("/v7.0/user/self").body)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mapmyfitness-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeff Casimir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - Rakefile
 - VERSION
 - lib/omniauth-mapmyfitness-oauth2.rb
+- lib/omniauth-mapmyfitness-oauth2/user.rb
 - lib/omniauth-mapmyfitness-oauth2/version.rb
 - lib/omniauth/strategies/mapmyfitness.rb
 - omniauth-mapmyfitness-oauth2.gemspec