redbooth-ruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6dd0b91631fad3635e4e0fc83d44f87a15760cb
-  data.tar.gz: a88346e81a79e57af855446b69af90d011ed0140
+  metadata.gz: df3cb643a0b5277bd0811041afd475eee458fbc6
+  data.tar.gz: 3c3bcb50e38e37f3c3daa8f4e4725e11829c5532
 SHA512:
-  metadata.gz: 9ccde9979fff86dcc2c47c6f705d49c86770f16b6706f66dcc74a679dfde637cda88d077422c693e7fe232d46315542e8d1ede5729a2fd37868e6fd8e97cc674
-  data.tar.gz: c274f5514b38eb104dc5b6f0921d6051e6843b82b044b9a9f40e5165e13b21ce41d40083e6e62ac4702ed964aa7e0f93d03e6123b21421b071435c8157042dae
+  metadata.gz: 82f2aa1ccaf85f45a6c33c6da9c73999cff96e118fa5fb1b415ce10bcc40e0719bea46416ae826591b91d1e51143a5e8ba288e4429ef5ebbaa496ffc72c44173
+  data.tar.gz: ebc579951c1754a24cdef20f53fab98cd1c62ee48e84b13108ab812886157f65df4995a5da1affb21504c93f90ca7802b302ef5d7546286b75580d2fadbb5d9e

data/lib/redbooth-ruby/session.rb

@@ -7,12 +7,7 @@ module RedboothRuby
     attr_accessor :refresh_token, :expires_in, :auto_refresh_token, :on_token_refresh
     attr_accessor :consumer_key, :consumer_secret
     attr_accessor :oauth_verifier, :oauth_token
-
-    OAUTH_URLS =  {
-      site: 'https://redbooth.com/api/3',
-      authorize_url: 'https://redbooth.com/oauth2/authorize',
-      token_url: 'https://redbooth.com/oauth2/token'
-    }
+    attr_accessor :oauth_urls
 
     def initialize(opts = {})
       @token = opts[:token]
@@ -24,6 +19,13 @@ module RedboothRuby
       @consumer_secret = opts[:consumer_secret] || RedboothRuby.configuration[:consumer_secret]
       @oauth_verifier = opts[:oauth_verifier]
       @oauth_token = opts[:oauth_token]
+      oauth2_base = opts[:oauth2_base] || RedboothRuby.configuration[:oauth2_base] || 'redbooth.com'
+      oauth_site = "https://#{oauth2_base}/api/3"
+      @oauth_urls = {
+        site: "https://#{oauth2_base}/api/3",
+        authorize_url: "https://#{oauth2_base}/oauth2/authorize",
+        token_url: "https://#{oauth2_base}/oauth2/token"
+      }
     end
 
     def valid?
@@ -32,11 +34,11 @@ module RedboothRuby
     end
 
     def client
-      @client ||= OAuth2::Client.new(consumer_key, consumer_secret, OAUTH_URLS)
+      @client ||= OAuth2::Client.new(consumer_key, consumer_secret, @oauth_urls)
     end
 
     def get_access_token_url
-      uri = URI.parse(OAUTH_URLS[:token_url])
+      uri = URI.parse(@oauth_urls[:token_url])
       params = URI.decode_www_form(uri.query.to_s)
       params << ['oauth_verifier', oauth_verifier] if oauth_verifier
       params << ['oauth_token', oauth_token] if oauth_token
@@ -69,4 +71,4 @@ module RedboothRuby
       end
     end
   end
-end
+end

data/lib/redbooth-ruby/version.rb

@@ -1,3 +1,3 @@
 module RedboothRuby
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/redbooth-ruby.gemspec

@@ -6,7 +6,7 @@ require 'redbooth-ruby/version'
 Gem::Specification.new do |s|
   s.name        = 'redbooth-ruby'
   s.version     = RedboothRuby::VERSION
-  s.authors     = ['Andres Bravo', 'Carlos Saura', 'Bruno Pedro']
+  s.authors     = ['Andres Bravo', 'Carlos Saura', 'Bruno Pedro', 'Oscar Ferrer']
   s.email       = ['support@redbooth.com']
   s.homepage    = 'https://github.com/teambox/redbooth-ruby'
   s.summary     = %q{API wrapper for Redbooth.}

data/spec/redbooth-ruby/session_spec.rb

@@ -7,21 +7,36 @@ describe RedboothRuby::Session, vcr: 'session' do
   let(:auto_refresh_token) { true }
   let(:consumer_key) { '_your_consumer_key_' }
   let(:consumer_secret) { '_your_consumer_secret_' }
+  let(:oauth2_base) { nil }
   let(:session) do
     RedboothRuby::Session.new(token: token, refresh_token: refresh_token,
       expires_in: expires_in, auto_refresh_token: auto_refresh_token,
-      consumer_key: consumer_key, consumer_secret: consumer_secret)
+      consumer_key: consumer_key, consumer_secret: consumer_secret, oauth2_base: oauth2_base)
   end
 
   describe '#initialize' do
     subject { session }
-
     it { expect(session.token).to eql token }
     it { expect(session.refresh_token).to eql refresh_token }
     it { expect(session.expires_in).to eql expires_in }
     it { expect(session.auto_refresh_token).to eql auto_refresh_token }
     it { expect(session.consumer_key).to eql consumer_key }
     it { expect(session.consumer_secret).to eql consumer_secret }
+
+    context 'with default values' do
+      let(:oauth2_base) { nil }
+      it { expect(session.oauth_urls[:site]).to eql "https://redbooth.com/api/3" }
+      it { expect(session.oauth_urls[:authorize_url]).to eql "https://redbooth.com/oauth2/authorize" }
+      it { expect(session.oauth_urls[:token_url]).to eql "https://redbooth.com/oauth2/token"}
+    end
+
+    context 'with configurable values'  do
+      let(:oauth2_base) { 'foo.bar' }
+      it { expect(session.oauth_urls[:site]).to eql "https://#{oauth2_base}/api/3" }
+      it { expect(session.oauth_urls[:authorize_url]).to eql "https://#{oauth2_base}/oauth2/authorize" }
+      it { expect(session.oauth_urls[:token_url]).to eql "https://#{oauth2_base}/oauth2/token"}
+    end
+
   end
 
   describe '#valid?' do
@@ -43,25 +58,35 @@ describe RedboothRuby::Session, vcr: 'session' do
 
   describe '#get_access_token_url' do
     subject { session.get_access_token_url }
-    it { should eql 'https://redbooth.com/oauth2/token' }
+    let(:oauth2_base) { 'foo.bar' }
 
-    context 'when oauth_verifier is present' do
+    context 'when oauth2_base is default' do
+      let(:oauth2_base) { nil }
+      it { should eql 'https://redbooth.com/oauth2/token' }
+    end
+
+    context 'when  oauth2_base is custom' do
+      it { should eql "https://#{oauth2_base}/oauth2/token" }
+    end
+
+    context 'when oauth_verifier is present and default oauth endpoint' do
       before { session.oauth_verifier = '_your_user_oauth_verifier_token_' }
-      it { should eql 'https://redbooth.com/oauth2/token?oauth_verifier=_your_user_oauth_verifier_token_' }
+      it { should eql "https://#{oauth2_base}/oauth2/token?oauth_verifier=_your_user_oauth_verifier_token_" }
     end
 
-    context 'when oauth_token is present' do
+    context 'when oauth_token is present and default oauth endpoint' do
       before { session.oauth_token = '_your_user_oauth_token_' }
-      it { should eql 'https://redbooth.com/oauth2/token?oauth_token=_your_user_oauth_token_' }
+      it { should eql "https://#{oauth2_base}/oauth2/token?oauth_token=_your_user_oauth_token_" }
     end
 
-    context 'when oauth_verifier and oauth_token are present' do
+    context 'when oauth_verifier and oauth_token are present and default oauth endpoint' do
       before do
         session.oauth_verifier = '_your_user_oauth_verifier_token_'
         session.oauth_token = '_your_user_oauth_token_'
       end
-      it { should eql 'https://redbooth.com/oauth2/token?oauth_verifier=_your_user_oauth_verifier_token_&oauth_token=_your_user_oauth_token_' }
+      it { should eql "https://#{oauth2_base}/oauth2/token?oauth_verifier=_your_user_oauth_verifier_token_&oauth_token=_your_user_oauth_token_" }
     end
+
   end
 
   describe '#access_token' do
@@ -102,4 +127,4 @@ describe RedboothRuby::Session, vcr: 'session' do
       session.refresh_access_token!
     end
   end
-end
+end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: redbooth-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andres Bravo
 - Carlos Saura
 - Bruno Pedro
+- Oscar Ferrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -393,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: API wrapper for Redbooth.
@@ -596,4 +597,3 @@ test_files:
 - spec/redbooth_spec.rb
 - spec/shared/authentication_context.rb
 - spec/spec_helper.rb
-has_rdoc: