polyhoraire 1.1 → 1.2

data/Readme.rdoc

@@ -1,8 +1,10 @@
-= Installation
+= Installation from gem
 
  gem install polyhoraire
 
-= Setup
+= Using source code
+
+== Setup
 
  rake setup
  

data/lib/google_exporter.rb

@@ -3,40 +3,42 @@ 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 initialize(hash)
+    if hash != nil
+      @access_token = hash[:access_token]
+      @expires_in   = hash[:expires_in]
+      @issued_at    = hash[:issued_at]
+      @refresh_token= hash[:refresh_token]
+    end
+  end
 
   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
+    @refresh_token  = object.refresh_token
+    @access_token   = object.access_token
+    @expires_in     = object.expires_in
+    @issued_at      = object.issued_at
+  end
+  
+  def set?
+    @refresh_token != nil
   end
 
   def to_hash
     return {
-      :refresh_token => refresh_token,
-      :access_token => access_token,
-      :expires_in => expires_in,
-      :issued_at => Time.at(issued_at)
+      :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
@@ -67,6 +69,7 @@ class GoogleExporter
         courseBeginsOn += 7 if period.week == 2
         event = {
           'summary' => course.acronym + '(' + period.group + ') ' + (period.isLab ? '[Lab]' : '') ,
+          'description' => course.description ,
           'location' => period.location,
           'timeZone' => 'America/Montreal',
           'start' => {
@@ -132,7 +135,7 @@ class GoogleExporter
   end
   
   # Returns access token
-  def authWeb(code,tokenID,callBackURI)
+  def authWeb(code,callBackURI,tokenPair = nil)
     oauth_yaml = YAML.load_file(Poly::userConfDir + '/google-api.yaml')
     
     @client = Google::APIClient.new
@@ -142,10 +145,8 @@ class GoogleExporter
     @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)
+    if tokenPair.set?
+      @client.authorization.update_token!(tokenPair.to_hash)
     end
     
     if @client.authorization.refresh_token && @client.authorization.expired?
@@ -156,22 +157,7 @@ class GoogleExporter
     
     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
@@ -195,6 +181,13 @@ class GoogleExporter
     @client = client
   end
   
+  def newTokenPair 
+    @client.authorization.fetch_access_token!
+    token = TokenPair.new(nil)
+    token.update_token!(@client.authorization)
+    return token
+  end
+  
   private 
   
   def dateTime(date, time)

data/test/test_google_exporter.rb

@@ -7,6 +7,7 @@ require 'nokogiri'
 class TestGoogleExporter < Test::Unit::TestCase
   def setup
     @exporter = GoogleExporter.new
+    @exporter.auth_cli
     
     auth = Poly::Auth.new
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyhoraire
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &16402240 !ruby/object:Gem::Requirement
+  requirement: &19897620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16402240
+  version_requirements: *19897620
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &16401800 !ruby/object:Gem::Requirement
+  requirement: &19897180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16401800
+  version_requirements: *19897180
 - !ruby/object:Gem::Dependency
   name: google-api-client
-  requirement: &16401380 !ruby/object:Gem::Requirement
+  requirement: &19896760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16401380
+  version_requirements: *19896760
 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