omniauth-draugiem 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d02ed02020c52e2ea3b3c72d4da019fb376e80c
-  data.tar.gz: e1cd42b6b53304e7f1bef69868e36271d16ef85f
+  metadata.gz: b3522a225714401cb6d46a60a90cb3d80d1144cc
+  data.tar.gz: d65d9883674c351bca10a0be45d1b04e66d528ac
 SHA512:
-  metadata.gz: cd4dece0b7d1639a749038b7ee97268483ceba61ce7bfce56c6270d23c027e571fc11c35cc98c3b9a5b43415089a4e395a43d67efc3f8004bd222c8b35ae2d8f
-  data.tar.gz: 7a3a07f2e66543e63df8c7af00ea0cf9bae66a55d33066208b6d67d3925be9c54c5dfb05c2ce07ccb596586fcb1236fff28c7337fca3c96c4a39f02d8efeb08f
+  metadata.gz: 910ee5d048cd445c3f70bee5ef6a16b77a62d155befe6687d0940df6753f2a78fe020fa3140a3ae26ca75b2dd4732bd0f7801875ccb823383a801eb265bb1ad9
+  data.tar.gz: de66d56525721d824558d2c8811901cd98fc3e62e48484087c234b4406f0443bbaf45d27326cd1cda319105f17a732aaa5c3741332202c2c1eb196d71970df6f

data/.travis.yml

@@ -6,6 +6,8 @@ rvm:
   - 2.1.0
   - 2.2.4
   - 2.3.3
+  - 2.4.1
+  - 2.5.0
   - ruby-head
 
-before_install: gem install bundler -v 1.14.6
+before_install: gem install bundler -v 1.16.1

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
-
 gemspec
+gem 'pry-rails'

data/lib/omniauth-draugiem/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Draugiem
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/lib/omniauth/strategies/draugiem.rb

@@ -55,23 +55,24 @@ module OmniAuth
         fail!(:invalid_response, e)
       end
 
-      uid { @auth_data['uid'] }
+      uid { @auth_data['uid'].to_s }
 
       credentials do
         { 'apikey' => @auth_data['apikey'] }
       end
 
       info do
-        if @auth_data['users'] && @auth_data['users'][@auth_data['uid']]
-          user = @auth_data['users'][@auth_data['uid']]
+        if @auth_data['users'] && @auth_data['users'][@auth_data['uid'].to_s]
+          user = @auth_data['users'][@auth_data['uid'].to_s]
           {
             'name' => "#{user['name']} #{user['surname']}",
             'nickname' => user['nick'],
+            'email' => user['email'],
             'first_name' => user['name'],
             'last_name' => user['surname'],
             'location' => user['place'],
-            'age' => user['age'] =~ /^0-9$/ ? user['age'] : nil,
-            'adult' => user['adult'] == '1' ? true : false,
+            'age' => user['age'] ? user['age'] : nil,
+            'adult' => (user['adult'] == 1),
             'image' => user['img'],
             'sex' => user['sex']
           }

data/omniauth-draugiem.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "omniauth", "~> 1.0"
-  s.add_runtime_dependency "rest-client", "~> 1.6"
+  s.add_runtime_dependency "rest-client", "~> 2.0.1"
   s.add_runtime_dependency "multi_json", "~> 1.0"
 
   s.add_development_dependency "bundler", "~> 1.5"

data/spec/omniauth/strategies/draugiem_spec.rb

@@ -24,28 +24,52 @@ describe 'OmniAuth::Strategies::Draugiem', :type => :strategy do
       stub_request(:get, "https://api.draugiem.lv/json/?action=authorize&app=abc&code=123456").
         to_return(:body => MultiJson.encode({
           'apikey'=>"123456789",
-          'uid'=>"100",
+          'uid'=>100,
           'language'=>"lv",
           'users'=>{
             '100'=>{
-              'uid'=>"100",
+              'uid'=>100,
               'name'=>"John",
               'surname'=>"Lenon",
               'nick'=>"johnybravo",
               'place'=>"Durbe",
-              'age'=>"false",
-              'adult'=>"1",
+              'age'=>false,
+              'adult'=> 1,
               'img'=>"https://4.bp.blogspot.com/_ZmXOoYjxXog/Sg2jby1RFSI/AAAAAAAAE_Q/1LpfjimAz50/s400/JohnnyBravo3.gif",
               'sex'=>"M"
             }
           }
         }))
         get '/auth/draugiem/callback?dr_auth_status=ok&dr_auth_code=123456'
-
         expect(last_request.env['omniauth.auth']['credentials']['apikey']).to eq "123456789"
         expect(last_request.env['omniauth.auth']['info']['location']).to eq "Durbe"
         expect(last_request.env['omniauth.auth']['info']['age']).to be nil
         expect(last_request.env['omniauth.auth']['info']['adult']).to be true
     end
+
+    it 'should gather user data after success authorization when age is 8 and not adult' do
+      stub_request(:get, "https://api.draugiem.lv/json/?action=authorize&app=abc&code=123456").
+        to_return(:body => MultiJson.encode({
+          'apikey'=>"123456789",
+          'uid'=>100,
+          'language'=>"lv",
+          'users'=>{
+            '100'=>{
+              'uid'=>100,
+              'name'=>"John",
+              'surname'=>"Lenon",
+              'nick'=>"johnybravo",
+              'place'=>"Durbe",
+              'age'=>8,
+              'adult'=> 0,
+              'img'=>"https://4.bp.blogspot.com/_ZmXOoYjxXog/Sg2jby1RFSI/AAAAAAAAE_Q/1LpfjimAz50/s400/JohnnyBravo3.gif",
+              'sex'=>"M"
+            }
+          }
+        }))
+        get '/auth/draugiem/callback?dr_auth_status=ok&dr_auth_code=123456'
+        expect(last_request.env['omniauth.auth']['info']['age']).to be 8
+        expect(last_request.env['omniauth.auth']['info']['adult']).to be false
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-draugiem
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Edgars Beigarts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement