oa-cadun 3.1.2 → 3.1.3

data/lib/oa-cadun/version.rb

@@ -2,7 +2,7 @@ module OACadun
   module VERSION
     MAJOR = 3
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
     
     STRING = [MAJOR, MINOR, TINY] * '.'
   end

data/lib/omni_auth/strategies/cadun.rb

@@ -19,31 +19,14 @@ module OmniAuth
       end
       
       def auth_hash
-        { 
-          :provider => "cadun",
-          :uid => user.id,
-          :user_info => {
-            :id => user.id,
-            :GLBID => request.params['GLBID'],
-            :url => request.params['url'],
-            :email => user.email,
-            :status => user.status,
-            :nickname => user.login,
-            :name => user.name,
-            :address => user.address,
-            :neighborhood => user.neighborhood,
-            :city => user.city,
-            :state => user.state,
-            :country => user.country,
-            :gender => user.gender,
-            :birthday =>  user.birthday.strftime('%d/%m/%Y'),
-            :mobile => user.mobile,
-            :phone => user.phone,
-            :cpf => user.cpf,
-            :user_type => user.user_type,
-            :zipcode => user.zipcode
-          }
-        }
+        self.class.build_auth_hash(user, request)
+      end
+      
+      def self.build_auth_hash(user, request = nil)
+        hash = { :provider => "cadun", :uid => user.id, :user_info => user.to_hash.merge(:birthday =>  user.birthday.strftime('%d/%m/%Y')) }
+        hash[:user_info].merge!(:GLBID => request.params['GLBID'], :url => request.params['url']) if request
+        
+        hash
       end
       
       protected

data/spec/omni_auth/strategies/cadun_spec.rb

@@ -69,11 +69,11 @@ describe OmniAuth::Strategies::Cadun do
       specify { subject[:user_info].should include(:email => "fab1@spam.la") }
       specify { subject[:user_info].should include(:gender => "MASCULINO") }
       specify { subject[:user_info].should include(:GLBID => "GLBID") }
-      specify { subject[:user_info].should include(:id => "21737810") }
+      specify { subject[:user_info].should include(:user_id => "21737810") }
       specify { subject[:user_info].should include(:mobile => "21 99999999") }
       specify { subject[:user_info].should include(:name => "Fabricio Rodrigo Lopes") }
       specify { subject[:user_info].should include(:neighborhood => "Andaraí") }
-      specify { subject[:user_info].should include(:nickname => "fabricio_fab1") }
+      specify { subject[:user_info].should include(:login => "fabricio_fab1") }
       specify { subject[:user_info].should include(:phone => "21 22881060") }
       specify { subject[:user_info].should include(:state => "RJ") }
       specify { subject[:user_info].should include(:status => "ATIVO") }

metadata

@@ -2,7 +2,7 @@
 name: oa-cadun
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors: 
 - Bruno