omniauth-artsy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72a0934cb2f200b475f98786ff00b6f6e941e0ea
-  data.tar.gz: 94efa9e5725f75610d36174e15770ed27582c7fe
+  metadata.gz: 360b4024520d1f3647d0feba0f33c40094851ce6
+  data.tar.gz: 16328ef3f26ff9c2fb9f9f28d00ce706d65bf674
 SHA512:
-  metadata.gz: e3291407926b8f67989fd079e52e201f0c3d59f94a817a8631788dfc906dfe9ae0b2ed982ed7c1af757e5b4f2bcd1d1909dc5acd146d389d4ef440785109ea58
-  data.tar.gz: baf43adc69c2258fff4a456c9ab27ec25606c283a4f26fc1fa200bccfdba2c310223a6330e8d5f9f0c713dd26b4d5da2d47ad8d6636942b5482ed2557ed5d3b2
+  metadata.gz: f533ad7818486e00ae4fe4e51ad0523d9164a9260bec46916600e44481cc90119e66f4e736b6e4ec95718552b6928b980240f52a08efe27ac46dc77d5002b2ec
+  data.tar.gz: b9cf21862d613d73aa2f4d5a7f0bbbcfeeddd79e5feb568b45b6eaa52ae90c7e0939fe7fef29a38010bace81472d2a393aece0a0182264b4c81d5bc5f4f420ab

data/.rubocop_todo.yml

@@ -9,7 +9,7 @@
 # Offense count: 2
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 64
+  Max: 67
 
 # Offense count: 8
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.

data/CHANGELOG.md

@@ -1,8 +1,13 @@
-0.2.2 (Next)
+0.2.3 (Next)
 ============
 
 * Your contribution here.
 
+0.2.2
+============
+
+* [#7](https://github.com/artsy/omniauth-artsy/pull/7): Fix issue in configuring Artsy's strategy when using new config - [@ashkan18](https://github.com/ashkan18).
+
 0.2.1
 ============
 

data/lib/omniauth-artsy/config.rb

@@ -14,7 +14,15 @@ module OmniAuth
 
     class << self
       def configure
-        block_given? ? yield(Config) : Config
+        if block_given?
+          yield(Config)
+          reconfigure_strategy
+        end
+        Config
+      end
+
+      def reconfigure_strategy
+        Strategies::Artsy.configure
       end
 
       def config

data/lib/omniauth-artsy/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Artsy
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

data/lib/omniauth/strategies/artsy.rb

@@ -3,10 +3,14 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class Artsy < OmniAuth::Strategies::OAuth2
-      option :client_options,
-             site: OmniAuth::Artsy.config.artsy_api_url || ENV['ARTSY_API_URL'] || ENV['gravity_url'],
-             authorize_url: '/oauth2/authorize?scope=offline_access&response_type=code',
-             token_url: '/oauth2/access_token?scope=offline_access&response_type=code&grant_type=authorization_code'
+      def self.configure
+        option :client_options,
+               site: OmniAuth::Artsy.config.artsy_api_url || ENV['ARTSY_API_URL'] || ENV['gravity_url'],
+               authorize_url: '/oauth2/authorize?scope=offline_access&response_type=code',
+               token_url: '/oauth2/access_token?scope=offline_access&response_type=code&grant_type=authorization_code'
+      end
+
+      configure
 
       def request_phase
         super

data/spec/lib/config_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe OmniAuth::Artsy::Config do
   describe '#configure' do
     before do
+      expect(OmniAuth::Artsy).to receive(:reconfigure_strategy).once
       OmniAuth::Artsy.configure do |config|
         config.artsy_api_url = 'http://localhost:3000/api'
       end

data/spec/omniauth/strategies/artsy_spec.rb

@@ -22,8 +22,11 @@ describe OmniAuth::Strategies::Artsy do
   end
 
   describe '#client_options' do
-    it 'returns nil for Artsy API URL without setting' do
-      expect(subject.options.client_options.site).to be_nil
+    it 'returns correct url for Artsy API URL when it was set' do
+      OmniAuth::Artsy.configure do |config|
+        config.artsy_api_url = 'http://api.test.url'
+      end
+      expect(subject.options.client_options.site).to eq 'http://api.test.url'
     end
 
     it 'has correct authorize url' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-artsy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Omniauth plugin for Artsy authentication.