oa-recruitmilitary 0.1.0 → 0.2.0

data/lib/omniauth/recruitmilitary/version.rb

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

data/lib/omniauth/recruitmilitary.rb

@@ -1,5 +1,3 @@
-require 'omniauth/strategies/recruitmilitary'
-
 module OmniAuth
   module RecruitMilitary
 

data/lib/omniauth/strategies/recruitmilitary.rb

@@ -1,49 +1,52 @@
-require 'omniauth/oauth'
-require 'multi_json'
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
-    class Recruitmilitary < OAuth2
-
-      def initialize(app, api_key = nil, secret_key = nil, options = {}, &block)
-        client_options = options.fetch(:client_options, {}).merge(
-          :site             => RecruitMilitary.configuration.site,
-          :authorize_url    => RecruitMilitary.configuration.authorize_url,
-          :access_token_url => RecruitMilitary.configuration.access_token_url)
-
-        super(app, :recruitmilitary, api_key, secret_key, client_options, &block)
+    class Recruitmilitary < ::OmniAuth::Strategies::OAuth2
+      option :name, "recruitmilitary"
+
+      option :client_options, {
+        :site => ::OmniAuth::RecruitMilitary.configuration.site,
+        :authorize_url => ::OmniAuth::RecruitMilitary.configuration.authorize_url,
+        :token_url => ::OmniAuth::RecruitMilitary.configuration.access_token_url,
+      }
+
+      uid{ user_hash['id'] }
+
+      info do
+        {
+          :name => user_name,
+          :email => user_hash['email'],
+        }
       end
 
-      protected
-
-      def user_data
-        @data ||= MultiJson.decode(@access_token.get(RecruitMilitary.configuration.user_data_url))
+      extra do
+        {
+          'email' => user_hash['email'],
+          'roles' => user_hash['roles'],
+          'first_name' => user_hash['first_name'],
+          'last_name' => user_hash['last_name'],
+          'military_branch_id' => user_hash['military_branch_id'],
+          'military_status_id' => user_hash['military_status_id'],
+          'gender_id' => user_hash['gender_id'],
+        }
       end
 
-      def request_phase
-        options[:scope] ||= "read"
-        super
+      def raw_info
+        @raw_info ||= @access_token.get(RecruitMilitary.configuration.user_data_url).parsed
       end
 
       def user_hash
-        user_data['user']
+        raw_info['user']
       end
 
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-            'uid' => user_hash["id"],
-            'user_info' => user_hash['user_info'],
-            'extra' => {
-              'email' => user_hash['email'],
-              'roles' => user_hash['roles'],
-              'first_name' => user_hash['first_name'],
-              'last_name' => user_hash['last_name'],
-              'military_branch_id' => user_hash['military_branch_id'],
-              'military_status_id' => user_hash['military_status_id'],
-              'gender_id' => user_hash['gender_id'],
-            }
-          })
+      def user_name
+        [
+         user_hash['first_name'],
+         user_hash['last_name'],
+        ].join(' ')
       end
+
     end
   end
 end

data/oa-recruitmilitary.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'omniauth', '~> 0.2.6'
+  s.add_dependency 'omniauth-oauth2', '~> 1.0.0'
 
   s.add_development_dependency 'rspec', '~> 2.6'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-recruitmilitary
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Guterl
@@ -15,22 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-26 00:00:00 Z
+date: 2012-01-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: omniauth
+  name: omniauth-oauth2
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 2
-        - 6
-        version: 0.2.6
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency