omniauth-draugiem 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be3b7eb114c496930595e2fb4840a13633fde8b3
-  data.tar.gz: 1cf0b1bedfccec6c192e77d8e61cab3edf10ed3f
+  metadata.gz: 9d02ed02020c52e2ea3b3c72d4da019fb376e80c
+  data.tar.gz: e1cd42b6b53304e7f1bef69868e36271d16ef85f
 SHA512:
-  metadata.gz: 0c4e85ad7699f5ae228a282fc79799d138fba55175060c5f0a80d0910c95887a6007f4aaeb1e93f02dcff32e823d487e8a12fdd0d99f9c1b394617f8926b317f
-  data.tar.gz: 49438ac6f4d96de1be1df729a8fd39c1be5a4d97e9388cb4bb11d86e9c3a189a2dafa2b8118ad0fb0cc94031156849d7aa44d226441584354508363eb1d5c65c
+  metadata.gz: cd4dece0b7d1639a749038b7ee97268483ceba61ce7bfce56c6270d23c027e571fc11c35cc98c3b9a5b43415089a4e395a43d67efc3f8004bd222c8b35ae2d8f
+  data.tar.gz: 7a3a07f2e66543e63df8c7af00ea0cf9bae66a55d33066208b6d67d3925be9c54c5dfb05c2ce07ccb596586fcb1236fff28c7337fca3c96c4a39f02d8efeb08f

data/.travis.yml

@@ -1,5 +1,11 @@
+sudo: false
+language: ruby
+cache: bundler
+
 rvm:
-  - 2.0.0
   - 2.1.0
-  - rbx
+  - 2.2.4
+  - 2.3.3
   - ruby-head
+
+before_install: gem install bundler -v 1.14.6

data/README.md

@@ -1,6 +1,6 @@
-# Omniauth::Draugiem
+# OmniAuth Draugiem
 
-[![Continuous Integration status](https://secure.travis-ci.org/mak-it/omniauth-draugiem.png)](http://travis-ci.org/mak-it/omniauth-draugiem)
+[![Continuous Integration status](https://secure.travis-ci.org/mak-it/omniauth-draugiem.svg)](http://travis-ci.org/mak-it/omniauth-draugiem)
 
 OmniAuth strategy for authenticating to draugiem.lv
 

data/lib/omniauth-draugiem/version.rb

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

data/lib/omniauth/strategies/draugiem.rb

@@ -35,12 +35,12 @@ module OmniAuth
           :hash => Digest::MD5.hexdigest("#{options.api_key}#{callback_url}")
         }
         query_string = params.collect{ |key,value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
-        redirect "http://api.draugiem.lv/authorize/?#{query_string}"
+        redirect "https://api.draugiem.lv/authorize/?#{query_string}"
       end
 
       def callback_phase
         if request.params['dr_auth_status'] == 'ok' && request.params['dr_auth_code']
-          response = RestClient.get('http://api.draugiem.lv/json/', { :params => draugiem_authorize_params(request.params['dr_auth_code']) })
+          response = RestClient.get('https://api.draugiem.lv/json/', { :params => draugiem_authorize_params(request.params['dr_auth_code']) })
           auth = MultiJson.decode(response.to_s)
           unless auth['error']
             @auth_data = auth

data/omniauth-draugiem.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "omniauth", "~> 1.0"
   s.add_runtime_dependency "rest-client", "~> 1.6"
+  s.add_runtime_dependency "multi_json", "~> 1.0"
 
   s.add_development_dependency "bundler", "~> 1.5"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rack-test"
   s.add_development_dependency 'webmock'

data/spec/omniauth/strategies/draugiem_spec.rb

@@ -9,19 +9,19 @@ describe 'OmniAuth::Strategies::Draugiem', :type => :strategy do
   end
 
   it 'should initialize with api key and app id' do
-    lambda{OmniAuth::Strategies::Draugiem.new({},'123','abc')}.should_not raise_error
+    expect { OmniAuth::Strategies::Draugiem.new({},'123','abc') }.to_not raise_error
   end
 
   describe '/auth/draugiem' do
 
     it 'should redirect to api.draugiem.lv' do
       get '/auth/draugiem'
-      last_response.should be_redirect
-      last_response.headers['Location'].should match %r{http://api\.draugiem\.lv/authorize/}
+      expect(last_response).to be_redirect
+      expect(last_response.headers['Location']).to match %r{https://api\.draugiem\.lv/authorize/}
     end
 
     it 'should gather user data after success authorization' do
-      stub_request(:get, "http://api.draugiem.lv/json/?action=authorize&app=abc&code=123456").
+      stub_request(:get, "https://api.draugiem.lv/json/?action=authorize&app=abc&code=123456").
         to_return(:body => MultiJson.encode({
           'apikey'=>"123456789",
           'uid'=>"100",
@@ -35,17 +35,17 @@ describe 'OmniAuth::Strategies::Draugiem', :type => :strategy do
               'place'=>"Durbe",
               'age'=>"false",
               'adult'=>"1",
-              'img'=>"http://4.bp.blogspot.com/_ZmXOoYjxXog/Sg2jby1RFSI/AAAAAAAAE_Q/1LpfjimAz50/s400/JohnnyBravo3.gif",
+              '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'
 
-        last_request.env['omniauth.auth']['credentials']['apikey'].should == "123456789"
-        last_request.env['omniauth.auth']['info']['location'].should == "Durbe"
-        last_request.env['omniauth.auth']['info']['age'].should be_nil
-        last_request.env['omniauth.auth']['info']['adult'].should be_true
+        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
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_filter '/vendor/bundle/'
+end
+
 require 'rspec'
 require 'rack/test'
 require 'webmock/rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-draugiem
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Edgars Beigarts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +85,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Draugiem.lv authentication strategy for OmniAuth