geoloqi 0.9.8 → 0.9.9

data/lib/geoloqi/config.rb

@@ -15,4 +15,4 @@ module Geoloqi
       !client_secret.nil? && !client_secret.empty?
     end
   end
-end
+end

data/lib/geoloqi/session.rb

@@ -78,7 +78,7 @@ module Geoloqi
 
       # expires_at is likely incorrect. I'm chopping 5 seconds
       # off to allow for a more graceful failover.
-      auth['expires_at'] = ((Time.now + auth['expires_in'].to_i)-5).rfc2822
+      auth['expires_at'] = auth_expires_at auth['expires_in']
       self.auth = auth
       self.auth
     end
@@ -93,13 +93,19 @@ module Geoloqi
 
       # expires_at is likely incorrect. I'm chopping 5 seconds
       # off to allow for a more graceful failover.
-      auth['expires_at'] = ((Time.now + auth['expires_in'].to_i)-5).rfc2822
+      auth['expires_at'] = auth_expires_at auth['expires_in']
       self.auth = auth
       self.auth
     end
 
     private
 
+    def auth_expires_at(expires_in=nil)
+      # expires_at is likely incorrect. I'm chopping 5 seconds
+      # off to allow for a more graceful failover.
+      expires_in.to_i.zero? ? nil : ((Time.now + expires_in.to_i)-5).rfc2822
+    end
+
     def headers
       headers = {'Content-Type' => 'application/json', 'User-Agent' => "geoloqi-ruby #{Geoloqi.version}", 'Accept' => 'application/json'}
       headers['Authorization'] = "OAuth #{access_token}" if access_token

data/lib/geoloqi/version.rb

@@ -1,5 +1,5 @@
 module Geoloqi
   def self.version
-    '0.9.8'
+    '0.9.9'
   end
 end

data/spec/geoloqi_spec.rb

@@ -195,6 +195,27 @@ describe Geoloqi::Session do
 
       expect { (5..10).include? (Time.rfc2822(response[:expires_at]) - (Time.now+86400)).abs }
     end
+
+    it 'does not refresh when never expires' do    
+      WebMock.disable_net_connect!
+      begin
+        response = @session.get_auth '1234', 'http://neverexpires.example.com/'
+      ensure
+        WebMock.allow_net_connect!
+      end
+      
+      expect { @session.auth[:expires_in] == '0' }
+      expect { @session.auth[:expires_at].nil? }
+      
+      WebMock.disable_net_connect!
+      begin
+        response = @session.get 'account/username'
+      ensure
+        WebMock.allow_net_connect!
+      end
+      expect { @session.auth[:access_token] == 'access_token1234' }
+      expect { response['username'] == 'bulbasaurrulzok' }
+    end
   end
 
   describe 'with config and expired auth' do
@@ -221,6 +242,18 @@ end
 
 include WebMock::API
 
+stub_request(:post, "https://api.geoloqi.com/1/oauth/token").
+  with(:body => {:client_id => ARGV[0],
+                 :client_secret => ARGV[1],
+                 :code => "1234",
+                 :grant_type => "authorization_code",
+                 :redirect_uri => "http://neverexpires.example.com/"}.to_json).
+  to_return(:status => 200,
+            :body => {:access_token => 'access_token1234',
+                      :scope => nil,
+                      :expires_in => '0',
+                      :refresh_token => 'never_expires'}.to_json)
+
 stub_request(:post, "https://api.geoloqi.com/1/oauth/token").
   with(:body => {:client_id => ARGV[0],
                  :client_secret => ARGV[1],
@@ -244,6 +277,11 @@ stub_request(:post, "https://api.geoloqi.com/1/oauth/token").
                       :expires_in => '5000',
                       :refresh_token => 'refresh_token4567'}.to_json)
 
+stub_request(:get, "https://api.geoloqi.com/1/account/username").
+  with(:headers => {'Authorization'=>'OAuth access_token1234'}).
+  to_return(:status => 200,
+            :body => {'username' => 'bulbasaurrulzok'}.to_json)
+
 stub_request(:get, "https://api.geoloqi.com/1/account/username").
   with(:headers => {'Authorization'=>'OAuth access_token4567'}).
   to_return(:status => 200,

metadata

@@ -2,7 +2,7 @@
 name: geoloqi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Kyle Drake
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 -07:00
+date: 2011-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency