omniauth-mailchimp 1.0.1 → 1.0.2

data/.gitignore

@@ -1 +1,17 @@
-omniauth-mailchimp-1.0.gem
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/examples/config.ru

@@ -19,7 +19,7 @@ end
 
 get '/auth/:provider/callback' do
   content_type 'text/plain'
-  token = request.env['omniauth.auth']['credentials']['token']
+	token = request.env['omniauth.auth']['credentials']['token']
   dc = request.env['omniauth.auth']['extra']['user_hash']['dc']
   "Standard API key is #{token}-#{dc}".inspect rescue "No data"
 end

data/lib/omniauth/mailchimp/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Mailchimp
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/omniauth/strategies/mailchimp.rb

@@ -12,16 +12,33 @@ module OmniAuth
         :authorize_url => '/oauth2/authorize',
         :token_url => '/oauth2/token'
       }
+
+      uid {
+        raw_info["user_id"]
+      }
+
+      info do
+        { 
+          :first_name => raw_info["contact"]["fname"],
+          :last_name => raw_info["contact"]["lname"],
+          :email => raw_info["contact"]["email"] 
+        }
+      end
       
-      def auth_hash
-        data = user_data
-        OmniAuth::Utils.deep_merge(
-          super, {
-            'extra'=> {
-              'user_hash' => data
-            }
-          }
-        )
+      extra do 
+        { 
+          :metadata => user_data,
+          :raw_info => raw_info
+        }
+      end
+
+      def raw_info
+        @raw_info ||= begin
+          data = user_data
+          endpoint = data["api_endpoint"]
+          apikey = "#{@access_token.token}-#{data['dc']}"
+          @access_token.get("#{endpoint}/1.3/?method=getAccountDetails&apikey=#{apikey}").parsed
+        end
       end
 
       def user_data
@@ -35,4 +52,4 @@ module OmniAuth
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mailchimp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000Z
+date: 2012-01-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70341852345780 !ruby/object:Gem::Requirement
+  requirement: &70224140065360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341852345780
+  version_requirements: *70224140065360
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70341852343840 !ruby/object:Gem::Requirement
+  requirement: &70224140063440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341852343840
+  version_requirements: *70224140063440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70341852343320 !ruby/object:Gem::Requirement
+  requirement: &70224140062920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70341852343320
+  version_requirements: *70224140062920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70341852342900 !ruby/object:Gem::Requirement
+  requirement: &70224140062500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341852342900
+  version_requirements: *70224140062500
 description: MailChimp OAuth2 strategy for OmniAuth 1.0
 email:
 - florian.mhun@gmail.com
@@ -64,7 +64,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    omniauth-mailchimp (1.0)
-      omniauth (~> 1.0)
-      omniauth-oauth2
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.6)
-    diff-lcs (1.1.3)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
-    hashie (1.2.0)
-    multi_json (1.0.4)
-    multipart-post (1.1.4)
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
-    omniauth (1.0.1)
-      hashie (~> 1.2)
-      rack
-    omniauth-oauth2 (1.0.0)
-      oauth2 (~> 0.5.0)
-      omniauth (~> 1.0)
-    rack (1.3.5)
-    rack-protection (1.1.4)
-      rack
-    rake (0.9.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  omniauth-mailchimp!
-  rake
-  rspec (~> 2.6.0)
-  sinatra