polyhoraire 1.0.1 → 1.1

data/Readme.rdoc

@@ -1,3 +1,7 @@
+= Installation
+
+ gem install polyhoraire
+
 = Setup
 
  rake setup

data/lib/google_exporter.rb

@@ -3,17 +3,61 @@ require 'google/api_client'
 require 'nokogiri'
 require 'yaml'
 require 'tzinfo'
+require 'data_mapper'
+
+require 'polyhoraire'
+
+
+# Set up our token store
+DataMapper.setup(:default, 'sqlite::memory:')
+class TokenPair
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :refresh_token, String, :length => 255
+  property :access_token, String, :length => 255
+  property :expires_in, Integer
+  property :issued_at, Integer
+
+
+  def update_token!(object)
+    self.refresh_token = object.refresh_token
+    self.access_token = object.access_token
+    self.expires_in = object.expires_in
+    self.issued_at = object.issued_at
+  end
+
+  def to_hash
+    return {
+      :refresh_token => refresh_token,
+      :access_token => access_token,
+      :expires_in => expires_in,
+      :issued_at => Time.at(issued_at)
+    }
+  end
+end
+TokenPair.auto_migrate!
+
 
 class GoogleExporter
+  attr_reader :sentEvents
   
   def initialize
-    auth
     @tz = TZInfo::Timezone.get('America/Montreal')
     @sentEvents = Array.new
   end
+  
+  def self.from_client(client)
+    exporter = self.new
+    exporter.client = client
+    exporter.service = client.service
+  end
+  
+  
 
   def send(schedule,toCalID)
     @sentEvents = Array.new
+    events = Array.new
     @sentCalendarID = toCalID
     
     schedule.courses.each do |course|
@@ -38,13 +82,20 @@ class GoogleExporter
             ]
         }
 
-        result = @client.execute(:api_method => @service.events.insert,
+        result = @client.execute!(:api_method => @service.events.insert,
                         :parameters => {'calendarId' => toCalID},
                         :body_object => event,
                         :headers => {'Content-Type' => 'application/json'})
         @sentEvents.push(result)
+        rEvent = {
+          :id => result.data.id,
+          :summary => result.data.summary,
+          :htmlLink => result.data.htmlLink
+        }
+        events.push(rEvent)
       end
     end
+    return events
   end
   
   def deleteEvent(eventID,calendarID)
@@ -57,17 +108,14 @@ class GoogleExporter
       deleteEvent(event.data.id,@sentCalendarID)
     end  
   end
-  
-  def selectCalendar(idUrl)
-    
-  end
+ 
   
   # return : hash[:calendarID => :calendarName]
   def calendarList
     list = Hash.new
     
     page_token = nil
-    result = client.execute(:api_method => service.calendar_list.list)
+    result = @client.execute(:api_method => @service.calendar_list.list)
     while true
       entries = result.data.items
       entries.each do |e|
@@ -76,12 +124,60 @@ class GoogleExporter
       if !(page_token = result.data.next_page_token)
         break
       end
-      result = client.execute(:api_method => service.calendar_list.list,
+      result = @client.execute(:api_method => @service.calendar_list.list,
                               :parameters => {'pageToken' => page_token})
     end
+    
+    list
+  end
+  
+  # Returns access token
+  def authWeb(code,tokenID,callBackURI)
+    oauth_yaml = YAML.load_file(Poly::userConfDir + '/google-api.yaml')
+    
+    @client = Google::APIClient.new
+    @client.authorization.client_id = oauth_yaml["client_id"]
+    @client.authorization.client_secret = oauth_yaml["client_secret"]
+    @client.authorization.scope = oauth_yaml["scope"]
+    @client.authorization.redirect_uri = callBackURI
+    @client.authorization.code = code if code
+    
+    if tokenID
+      # Load the access token here if it's available
+      token_pair = TokenPair.get(tokenID)
+      @client.authorization.update_token!(token_pair.to_hash)
+    end
+    
+    if @client.authorization.refresh_token && @client.authorization.expired?
+      @client.authorization.fetch_access_token!
+    end
+    
+    @service = @client.discovered_api('calendar', 'v3')
+    
+    return @client.authorization.access_token
+  end
+  
+  # Returns the session token
+  def authWebCallback(tokenID)
+    @client.authorization.fetch_access_token!
+    # Persist the token here
+    token_pair = if tokenID
+      TokenPair.get(tokenID)
+    else
+      TokenPair.new
+    end
+    TokenPair.auto_migrate!
+    token_pair.update_token!(@client.authorization)
+    token_pair.save
+    
+    return token_pair.id
+  end
+  
+  def authURI
+    @client.authorization.authorization_uri.to_s
   end
   
-  def auth
+  def auth_cli
     oauth_yaml = YAML.load_file(Poly::userConfDir + '/google-api.yaml')
     client = Google::APIClient.new
     client.authorization.client_id = oauth_yaml["client_id"]

data/lib/polyhoraire.rb

@@ -6,6 +6,8 @@ require 'nokogiri'
 
 
 module Poly
+  require 'polyhoraire/auth'
+  require 'polyhoraire/schedule'
   
   URL = {
     :connection => "https://www4.polymtl.ca/servlet/ValidationServlet",

data/lib/polyhoraire/auth.rb

@@ -1,3 +1,4 @@
+#encoding: UTF-8
 require 'polyhoraire'
 
 class Poly::Auth
@@ -78,7 +79,13 @@ class Poly::Auth
   
   
   def setStatus(response)
+    @connected = false
+    
     doc = Nokogiri::HTML(response.body.to_s)  
+    
+    node = doc.xpath("//font[contains(string(.),'Le système est temporairement hors d')]")
+    raise 'Maintenance du dossier etudiant' unless node.empty?
+    
     nodes = doc.xpath("//center/font[@color = '#FF0000']")
     if nodes.empty?
       @connected = true

data/test/test_google_exporter.rb

@@ -26,4 +26,9 @@ class TestGoogleExporter < Test::Unit::TestCase
     STDIN.gets.chomp
     @exporter.deleteSentEvents()
   end
+  
+  def test_calendarList
+    list = @exporter.calendarList
+    assert(list.has_key?('charlesbriere.flatzo@gmail.com'))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyhoraire
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &10452780 !ruby/object:Gem::Requirement
+  requirement: &16402240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10452780
+  version_requirements: *16402240
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &10452340 !ruby/object:Gem::Requirement
+  requirement: &16401800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10452340
+  version_requirements: *16401800
 - !ruby/object:Gem::Dependency
   name: google-api-client
-  requirement: &10451920 !ruby/object:Gem::Requirement
+  requirement: &16401380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10451920
+  version_requirements: *16401380
 description: Retrieve schedule from Polytechnique de Montreal and exports it to different
   formats(only google calendar is suported at this time)
 email: charles.briere@polymtl.ca