oa-recruitmilitary 0.0.5 → 0.0.6

data/lib/omniauth/recruitmilitary/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Recruitmilitary
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/omniauth/recruitmilitary.rb

@@ -15,27 +15,46 @@ module OmniAuth
 
     class Configuration
 
-      DEFAULT_SITE             = 'http://connect.recruitmilitary.com'
-      DEFAULT_AUTHORIZE_URL    = '/auth/authorize'
-      DEFAULT_ACCESS_TOKEN_URL = '/auth/access_token'
-      DEFAULT_USER_DATA_URL    = '/auth/user.json'
+      DEFAULT_SITE              = 'http://connect.recruitmilitary.com'
+      DEFAULT_AUTHORIZE_PATH    = '/auth/authorize'
+      DEFAULT_ACCESS_TOKEN_PATH = '/auth/access_token'
+      DEFAULT_USER_DATA_PATH    = '/auth/user.json'
 
       attr_accessor :site, :authorize_url, :access_token_url, :user_data_url
+      attr_accessor :authorize_path, :access_token_path, :user_data_path
 
       def initialize(options = {})
-        @site = DEFAULT_SITE
+        @site = options.fetch(:site, DEFAULT_SITE)
+        @authorize_path = options.fetch(:authorize_path, DEFAULT_AUTHORIZE_PATH)
+        @access_token_path = options.fetch(:access_token_path, DEFAULT_ACCESS_TOKEN_PATH)
+        @user_data_path = options.fetch(:user_data_path, DEFAULT_USER_DATA_PATH)
+      end
+
+      def authorize_path=(authorize_path)
+        @authorize_path = authorize_path
+        @authorize_url  = nil
+      end
+
+      def access_token_path=(access_token_path)
+        @access_token_path = access_token_path
+        @access_token_url  = nil
+      end
+
+      def user_data_path(user_data_path)
+        @user_data_path = user_data_path
+        @user_data_url  = nil
       end
 
       def authorize_url
-        @site + DEFAULT_AUTHORIZE_URL
+        @authorize_url || @site + @authorize_path
       end
 
       def access_token_url
-        @site + DEFAULT_ACCESS_TOKEN_URL
+        @access_token_url || @site + @access_token_path
       end
 
       def user_data_url
-        @site + DEFAULT_USER_DATA_URL
+        @user_data_url || @site + @user_data_path
       end
     end
 

data/spec/recruitmilitary_spec.rb

@@ -4,17 +4,25 @@ require 'oa-recruitmilitary'
 describe OmniAuth::RecruitMilitary do
 
   describe OmniAuth::RecruitMilitary::Configuration do
+    let(:config) { OmniAuth::RecruitMilitary::Configuration.new }
+
+    it 'sets properties from the initializer' do
+      config = OmniAuth::RecruitMilitary::Configuration.new(
+        :site => 'http://localhost:3000',
+        :authorize_path => '/oauth/authorize')
+
+      config.site.should == 'http://localhost:3000'
+      config.authorize_url.should == 'http://localhost:3000/oauth/authorize'
+    end
+
     context 'without modification' do
       it 'has sane values' do
-        config = OmniAuth::RecruitMilitary::Configuration.new
-
         config.authorize_url.should == 'http://connect.recruitmilitary.com/auth/authorize'
       end
     end
 
     context 'when modifying the site url' do
       it 'updates all related urls' do
-        config = OmniAuth::RecruitMilitary::Configuration.new
         config.site = 'http://localhost:3000'
 
         config.authorize_url.should == 'http://localhost:3000/auth/authorize'
@@ -22,6 +30,30 @@ describe OmniAuth::RecruitMilitary do
         config.user_data_url.should == 'http://localhost:3000/auth/user.json'
       end
     end
+
+    context 'when modifying a path' do
+      it 'preserves the original site' do
+        config.authorize_path = '/oauth/authorize'
+
+        config.authorize_url = config.site + '/oauth/authorize'
+      end
+    end
+
+    it 'allows the url to be modified directly' do
+      config.authorize_url = 'http://google.com'
+
+      config.authorize_url.should == 'http://google.com'
+    end
+
+    context 'when the url has been modified' do
+      it 'is modifiable by changing path' do
+        config.authorize_url = 'http://google.com'
+
+        config.authorize_path = '/blah/blah'
+
+        config.authorize_url.should == config.site + '/blah/blah'
+      end
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-recruitmilitary
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michael Guterl