mail2cb 0.0.10 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b543b885ac95a03294916bf21153e2e24c10f03e
-  data.tar.gz: cf6c04c3f0d66a1b101d24fad3805600386304a1
+  metadata.gz: 7d2cba71197126aa98852f1e336207c4135ffb5e
+  data.tar.gz: ea8bc136dd810fcf720091dfc05ed0ea0118a72f
 SHA512:
-  metadata.gz: 9b4cf23a8af24d680583c029ac6c3012bd12ab7bbef1173aa542a5c03a55dcca8cde5df2a77f579d5f164cb9029486260826296ba0fe2867c00db355684820b1
-  data.tar.gz: afae4ac1dc2e2611bbd262892260b20f1958f87fbb2218d0bfc9eb471e3d78311e1a9fbdfea372800ca58a60af33ece2baa3a7608e925d40a4a1c86de7b30d1d
+  metadata.gz: 401608a23939fb8fda0fade16549d771e170502a61873e213fb9d737030a0b822f1bb414e1f7acd8463854db134ffae995cfe0feea64bff84d9ac1d30a22d38c
+  data.tar.gz: 1fc92b60cc5a1057670c73cbc5e56cd58869e295154113fe5da545365aebdac7fb024b349a9b161d7571d66de307f9006649fee33812b03c9fba134e7999f1ac

data/Dockerfile

@@ -34,4 +34,4 @@ RUN cd /var/www/mail2cb
 RUN bundle install
 
 EXPOSE 8016
-CMD bin/run
+CMD bin/mail2cb

data/bin/mail2cb

@@ -30,6 +30,8 @@ puts "Connecting to Redis: #{ENV["REDIS_URL"]}"
 ENV["FAYE_HOST"] = "http://localhost"
 ENV["FAYE_PORT"] = "9292"
 
+ENV["CRYPT_API_ENDPOINT"] = "http://localhost:8888/case_blocks/crypt" if ENV["CRYPT_API_ENDPOINT"].nil?
+
 ENV["DEBUG"] = "false"
 
 oh = Mail2cb::Handler.new

data/lib/mail2cb.rb

@@ -23,6 +23,7 @@ module Mail2cb
       my_app = Sinatra.new do
         set :logging, false
         set :run, false
+        set :bind, '0.0.0.0'
 
         get('/reload') do
           @@watcher.restart

data/lib/mail2cb/email_handler.rb

@@ -58,6 +58,9 @@ module Mail2cb
         "in_reply_to" => @email.in_reply_to,
         "message_id" => @email.message_id,
         "account_code" => @options[:mailbox][:account_code],
+        "mailbox_id" => @options[:mailbox][:mailbox_id],
+        "mailbox_name" => @options[:mailbox][:mailbox_name],
+        "mailbox_default" => @options[:mailbox][:mailbox_default],
         "references" => id_parser.references
       }.merge(id_parser.hash)
     end

data/lib/mail2cb/email_watcher.rb

@@ -69,7 +69,9 @@ module Mail2cb
           case_blocks_email_accounts.imap_search_command,
           case_blocks_email_accounts.imap_messages_processed,
           case_blocks_email_accounts.imap_last_processed_at,
-          u.authentication_token
+          u.authentication_token,
+          case_blocks_email_accounts.id as mailbox_id,
+          case_blocks_email_accounts.name as mailbox_name
         FROM case_blocks_email_accounts
         JOIN case_blocks_accounts
         ON case_blocks_email_accounts.account_id = case_blocks_accounts.id
@@ -87,7 +89,23 @@ EOS
           auth_token = row["authentication_token"]
           decrypted_password = Encryption.new(auth_token).decrypt(row["imap_encrypted_password"])
           puts "decrypted password: #{decrypted_password}"
-          mailboxes << {:id => row["id"], :account_code => row["nickname"], :account_id => row["account_id"], :username => row["imap_username"], :host => row["imap_host"], :port => row["imap_port"], :password => decrypted_password, :ssl_options => ssl_options, :start_tls => row["imap_start_tls"]==1, :name => row["imap_folder_nam"], :search_command => row["imap_search_command"], :message_count => row["imap_messages_processed"], :last_delivered_at => row["imap_last_processed_at"]}
+          mailboxes << {:id => row["id"],
+                          :account_code => row["nickname"],
+                          :account_id => row["account_id"],
+                          :username => row["imap_username"],
+                          :host => row["imap_host"],
+                          :port => row["imap_port"],
+                          :password => decrypted_password,
+                          :ssl_options => ssl_options,
+                          :start_tls => row["imap_start_tls"]==1,
+                          :name => row["imap_folder_nam"],
+                          :search_command => row["imap_search_command"],
+                          :message_count => row["imap_messages_processed"],
+                          :last_delivered_at => row["imap_last_processed_at"],
+                          :mailbox_id => row["mailbox_id"],
+                          :mailbox_name => row["mailbox_name"],
+                          :mailbox_default => row['smtp_is_default']==1
+                        }
         end
       end
       mailboxes

data/lib/mail2cb/version.rb

@@ -1,3 +1,3 @@
 module Mail2cb
-  VERSION = "0.0.10"
+  VERSION = "0.0.13"
 end

data/mail2cb.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'mysql2'
   spec.add_dependency 'mail'
-  spec.add_dependency 'mail_daemon', "~> 0.0.8"
+  spec.add_dependency 'mail_daemon', "~> 0.0.10"
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'sinatra'
   spec.add_dependency 'sanitize'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail2cb
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.13
 platform: ruby
 authors:
 - EmergeAdapt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement