blabla_client 0.0.2 → 0.0.3

data/lib/blabla_client/version.rb

@@ -1,3 +1,3 @@
 module BlablaClient
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/blabla_client.rb

@@ -4,8 +4,9 @@ require 'blabla_client/trip'
 
 module BlablaClient
 
-  # Note : token expiration is ignored for now (current token expires on 15/03/2015)
-  CURRENT_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0MjY0MjY5NTUsImNsaWVudCI6ImE3NzM3ODdhNmI2YjM0NzlhMjk5NTg0MDUwMmUwNDZkNGE0NDNjYmE2MDFjMDk2Y2U1NGI4OTcyYjRkZTdjNzkiLCJzY29wZSI6IiIsInVzZXIiOm51bGx9.dOZF0wbZtW6_Vfa5dU6_X831yGCJlsSZE7gkdp2lldg'
+  # Note : token expiration is ignored for now (current token expires on 15/04/2015)
+  # PREVIOUS_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0MjY0MjY5NTUsImNsaWVudCI6ImE3NzM3ODdhNmI2YjM0NzlhMjk5NTg0MDUwMmUwNDZkNGE0NDNjYmE2MDFjMDk2Y2U1NGI4OTcyYjRkZTdjNzkiLCJzY29wZSI6IiIsInVzZXIiOm51bGx9.dOZF0wbZtW6_Vfa5dU6_X831yGCJlsSZE7gkdp2lldg'
+  CURRENT_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0MjkxMzIwMDUsImNsaWVudCI6ImE3NzM3ODdhNmI2YjM0NzlhMjk5NTg0MDUwMmUwNDZkNGE0NDNjYmE2MDFjMDk2Y2U1NGI4OTcyYjRkZTdjNzkiLCJzY29wZSI6IiIsInVzZXIiOm51bGx9.HKdhHE8XilgrK9cfK6GYUWFbaaQDg_fOWdc0Ze06qIA'
 
   # token "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0MjY0MjY5NTUsImNsaWVudCI6ImE3NzM3ODdhNmI2YjM0NzlhMjk5NTg0MDUwMmUwNDZkNGE0NDNjYmE2MDFjMDk2Y2U1NGI4OTcyYjRkZTdjNzkiLCJzY29wZSI6IiIsInVzZXIiOm51bGx9.dOZF0wbZtW6_Vfa5dU6_X831yGCJlsSZE7gkdp2lldg"
   # expires_at : 1426426958
@@ -41,10 +42,16 @@ module BlablaClient
       trips = Trip.parse_response(response.body)
       @logger.info("Retrieved #{trips[:trips].length} trips for page #{page} of request #{departure}-#{arrival} from #{range_start} to #{range_end}")
     rescue OAuth2::Error => e
+      http_code = e.response.status
       @logger.error("An error occurred while calling the API on #{@config[:api_url]}")
       @logger.error("Response : #{e.response}")
       @logger.error("Code : #{e.code}")
+      @logger.error("HTTP status code : #{http_code}")
       @logger.error("Description : #{e.description}")
+      if http_code == 403
+        @logger.info('Token seems to have expired - Retrying with a new one')
+        trips = renew_and_get_trips(departure, arrival, range_start, range_end, page)
+      end
     end
     trips
   end
@@ -60,10 +67,26 @@ module BlablaClient
 
   private
 
-  def self.get_response(departure, arrival, date_range_start, date_range_end, page)
+  def self.renew_and_get_trips(departure, arrival, date_range_start, date_range_end, page)
+    trips = []
+    begin
+      response = get_response(departure, arrival, date_range_start, date_range_end, page, true)
+      trips = Trip.parse_response(response.body)
+      @logger.info("Retrieved #{trips[:trips].length} trips for page #{page} of request #{departure}-#{arrival} from #{date_range_start} to #{date_range_start}")
+    rescue OAuth2::Error => e
+      http_code = e.response.status
+      @logger.error("An error occurred while calling the API on #{@config[:api_url]} after attempting to renew the token")
+      @logger.error("Response : #{e.response}")
+      @logger.error("Code : #{e.code}")
+      @logger.error("HTTP status code : #{http_code}")
+      @logger.error("Description : #{e.description}")
+    end
+    trips
+  end
+
+  def self.get_response(departure, arrival, date_range_start, date_range_end, page, renew_token = false)
     client = OAuth2::Client.new(@config[:client_id], @config[:client_secret], :site => @config[:auth_site], :token_url => @config[:token_path])
-    # token = client.client_credentials.get_token
-    token = OAuth2::AccessToken.new(client, CURRENT_TOKEN, :mode => :query)
+    token = renew_token ? client.client_credentials.get_token : OAuth2::AccessToken.new(client, CURRENT_TOKEN, :mode => :query)
     token.get(@config[:api_url],
               :params => {
                              :_format => 'json',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blabla_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler