gmail-api-ruby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f721a46ac6615f3e1fb812174992b8a10bce73b
-  data.tar.gz: 6d1ae38e0a720d3fa4e644f50b6b12ef9a5d4e21
+  metadata.gz: 50da12b58316258876e0a9c5a67aecc25b9c23df
+  data.tar.gz: 939731da0a5f2f3b5ace2a0ebd5f202d7ef5058f
 SHA512:
-  metadata.gz: 6325c873f3f7495a5be90837a3b787f1b34ad61e86817b184d01d624beee3701e2d756dd04ec29cdb13a5b78012e13b2bd67129c4173397121b937d2be64efe2
-  data.tar.gz: d471f984ec9a7878730efa8e5ba9e1b53e9fa6e4b84e732444e627c6681cf3664004364b396b23bf04fcf182b0a6d5aaf5dcb61a7470a5d7e7cdb7ef586f7b30
+  metadata.gz: 07cfb690f0db78ba1156bef9c78b1b0ca21d5b45c2636eb691591a23479b4aaadb65c5bba4b185ff1998d120397a86455d3c7c7f0493031c92e2070e559d2d40
+  data.tar.gz: fc60b494bf49812736249210d4cf22db71fb84c690c8762b409b8769aa2fd5cf947a50405345644fc713a20a08f06faad951a182a27b85b6f814b03cde82fa29

data/.bundle/config

@@ -0,0 +1 @@
+--- {}

data/CHANGELOG.md

@@ -35,3 +35,6 @@
 
 * Fixed email parsing in forward and reply method when contact names contain ,
 
+## 0.0.11 / 2015-06-22
+
+* Forked to Carpela. Changed auth to work with Service Account

data/README.md

@@ -29,15 +29,21 @@ If for your usecase, the gem is too limited there are two solutions for you:
 ## Initialization
 
 ```ruby
-    Gmail.client_id = "...Your app client id..."
-    Gmail.client_secret = "...Your app Secret..."
-    Gmail.refresh_token = "...the refresh token of the Gmail account you want to use..."
+    Gmail.client_id = "...Your app client id..." or the email from your service account credentials
+    Gmail.client_secret = "...Your app Secret..." or the pem version of hte api key for service account
+    Gmail.refresh_token = "...the refresh token of the Gmail account you want to use..." or the account email address for service account auth
+    # Or for service Accounts
+    Gmail.auth_method = "service_account"
+    Gmail.client_id = "... or the email from your service account credentials..."
+    Gmail.client_secret = "...pem version of the api key ..."
+    Gmail.email_account = "...the email account you're going to use"
+    Gmail.auth_scopes = ['http://mail.google.com'] # an array of the permissions required.
 ```
 
 ## Usage
 
 ```ruby
-    require "Gmail"
+    require "gmail"
 ```
 
 ### Common methods

data/account.yml.example

@@ -1,5 +1,17 @@
-client_id: example
-client_secret: example
-refresh_token: example
-application_name: example
-application_version: 1.0.0
+# Auth Method
+google_api_auth_method: ENV['GOOGLE_API_AUTH_METHOD']
+
+#App Info
+application_name: ENV['APP_NAME']
+application_version: ENV['APP_VERSION']
+
+# Web Application Auth
+client_id: ENV['GOOGLE_API_CLIENT_ID']
+client_secret: ENV['GOOGLE_API_CLIENT_SECRET']
+refresh_token: ENV['GOOGLE_API_REFRESH_TOKEN']
+
+# Service Account Auth
+google_api_key: ENV['GOOGLE_API_KEY']
+google_api_email: ENV['GOOGLE_API_EMAIL']
+email_account: ENV['GOOGLE_ACCOUNT']
+auth_scopes: ENV['GOOGLE_AUTH_SCOPES']

data/gmail.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   "
   s.version = Gmail::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Julien Hobeika"]
+  s.authors = ["Julien Hobeika","Keiran Betteley"]
   s.homepage = "http://github.com/jhk753/gmail-ruby-api"
   s.licenses = ['MIT']
 

data/lib/gmail.rb

@@ -20,15 +20,14 @@ require 'gmail/draft'
 require 'gmail/thread'
 require 'gmail/label'
 
-
-
 module Gmail
 
   class << self
-    attr_accessor :client_id, :client_secret, :refresh_token, :application_name, :application_version
+    attr_accessor :auth_method, :client_id, :client_secret, 
+      :refresh_token, :auth_scopes, :email_account, :application_name, :application_version
     attr_reader :service, :client, :mailbox_email
     def new hash
-      [:client_id, :client_secret, :refresh_token, :application_name, :application_version].each do |accessor|
+      [:auth_method, :client_id, :client_secret, :refresh_token, :auth_scopes, :email_account, :application_name, :application_version].each do |accessor|
         Gmail.send("#{accessor}=", hash[accessor.to_s])
       end
     end
@@ -44,11 +43,23 @@ module Gmail
 
   end
 
-  def self.request(method, params={}, body={})
+  def self.request(method, params={}, body={}, auth_method=@auth_method)
+    
     params[:userId] ||= "me"
-    if @client.nil?
-      self.connect
-    end
+    case auth_method
+      when "web_application" 
+        if @client.nil?
+          self.connect
+        end
+      when "service_account"
+        if @client.nil?
+          self.service_account_connect
+        elsif self.client.authorization.principal != @email_account
+          self.service_account_connect
+        end
+
+      end
+  
     if body.empty?
       response = @client.execute(
           :api_method => method,
@@ -71,6 +82,8 @@ module Gmail
     @mailbox_email ||= self.request(@service.users.to_h['gmail.users.getProfile'])[:emailAddress]
   end
 
+
+
   def self.connect(client_id=@client_id, client_secret=@client_secret, refresh_token=@refresh_token)
     unless client_id
       raise 'No client_id specified'
@@ -99,6 +112,30 @@ module Gmail
 
   end
 
+  def self.service_account_connect(
+    client_id=@client_id, client_secret=@client_secret,
+    email_account=@email_account, auth_scopes=@auth_scopes, 
+    application_name=@application_name, application_version=@application_version
+    )
+    puts "Authenticating service account - #{email_account}"
+    
+
+    @client = Google::APIClient.new(application_name: application_name, application_version: application_version)
+      
+      
+    
+    key = Google::APIClient::KeyUtils.load_from_pem(
+        client_secret,
+        'notasecret')
+    asserter = Google::APIClient::JWTAsserter.new(
+        client_id,
+        auth_scopes, 
+        key
+    )
+    @client.authorization = asserter.authorize(email_account)
+    
+  end
+
   def self.parse(response)
     begin
 

data/lib/gmail/message.rb

@@ -108,16 +108,31 @@ module Gmail
         msg.header['X-Bcc'] = bcc unless bcc.nil?#because Mail gem doesn't allow bcc headers...
         msg.in_reply_to = in_reply_to  unless in_reply_to.nil?
         msg.references = references unless references.nil?
-        if text
-          msg.text_part = Mail::Part.new do |p|
-            content_type 'text/plain; charset=UTF-8'
-            p.body s.text
+        if text || html
+          bodypart = Mail::Part.new
+          if text
+            bodypart.text_part = Mail::Part.new do |p|
+              content_type 'text/plain; charset=UTF-8'
+              p.body s.text
+            end
           end
+          if html
+            bodypart.html_part = Mail::Part.new do |p|
+              content_type 'text/html; charset=UTF-8'
+              p.body s.html
+            end
+          end
+          msg.add_part bodypart
         end
-        if html
-          msg.html_part = Mail::Part.new do |p|
-            content_type 'text/html; charset=UTF-8'
-            p.body s.html
+        if attachments
+          if attachments.is_a?(Hash)
+            attachments.each do |name, attachment|
+              msg.add_file filename: name, content: attachment
+            end
+          elsif attachments.is_a?(Array)
+            attachments.each do |attachment|
+              msg.add_file(attachment)
+            end
           end
         end
         Base64.urlsafe_encode64 msg.to_s.sub("X-Bcc", "Bcc") #because Mail gem doesn't allow bcc headers...
@@ -137,13 +152,17 @@ module Gmail
       msg
     end
 
+    def self.find_addresses str
+      Mail::AddressList.new("#{str}".to_ascii.gsub(/<(<(.)*@(.)*>)(.)*>/, '\1'))
+    end
+
     def set_headers_for_reply msg
       #to_ar = []
       #split_regexp = Regexp.new("\s*,\s*")
       own_email = delivered_to || Gmail.mailbox_email
 
 
-      to_ar = (Mail::AddressList.new("#{to}".to_ascii).addresses + Mail::AddressList.new("#{cc}".to_ascii).addresses).map(&:to_s)
+      to_ar = (Message.find_addresses(to).addresses + Message.find_addresses(cc).addresses).map(&:to_s)
       #to_ar = (to || "").split(split_regexp) + (cc || "").split(split_regexp)
       result = to_ar.grep(Regexp.new(own_email, "i"))
       to_ar = to_ar - result
@@ -186,11 +205,13 @@ module Gmail
         end
 
         if payload.parts
-          text_part=@values.payload.find_all_object_containing("mimeType", "text/plain").first
+          content_payload = @values.payload.find_all_object_containing("mimeType", "multipart/alternative").first
+          content_payload ||= @values.payload
+          text_part=content_payload.find_all_object_containing("mimeType", "text/plain").first
           if text_part
             @values.text = urlsafe_decode64(text_part.body.data)
           end
-          html_part=@values.payload.find_all_object_containing("mimeType", "text/html").first
+          html_part=content_payload.find_all_object_containing("mimeType", "text/html").first
           if html_part
             @values.html = urlsafe_decode64(html_part.body.data)
           end

data/lib/gmail/version.rb

@@ -1,3 +1,3 @@
 module Gmail
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end # Gmail

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gmail-api-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Julien Hobeika
+- Keiran Betteley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime
@@ -173,6 +174,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -181,7 +183,6 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- account.yml
 - account.yml.example
 - gmail.gemspec
 - lib/gmail.rb