ish_models 0.0.33.301 → 0.0.33.303

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4efc52be97806ddfc99cbb6fa6cc0c183e51a0f32384d789906a98793906616d
-  data.tar.gz: '084169118e8a9e6c4ef65f07ab3c5cfbc79c77136f6d3974adc1f29b1a0157f0'
+  metadata.gz: 8b412037faff703b47b7fa0233f65fdba3a6c1172323c19fbc60ec719c180fa9
+  data.tar.gz: 0c68af161d244280a3cd3a109f5b880dc778c5e2ca03338222a4a1262b1461f8
 SHA512:
-  metadata.gz: 0bd8bf92613eb20ab1518dc9fabe62dba096000845dc691b39946cff8a4b4578905e0ee5f57121394fede7539326d0c1df56ff783356614dbdde250f0ab07c84
-  data.tar.gz: a3aa5e12b8ada259599b578f67dabfab9c0e2e283fa00d03f03e5cefc9e3f2e7fcfae14a912cfabdcba0cd7f786b1442a9b7851fe4400f52ce9015dff2b33934
+  metadata.gz: 7199e68751b9367d9b6ca3a6c9967d8ae0aea6515869f820e34b8c7283b80939e004622f666fdf08ddc13418d7a6b2480af2dea9a399f7171d8933d3911bbd20
+  data.tar.gz: 1a1518f3581dd67a240cb4e333f35ba405523777f048b21e5e91bb432c84d1ed11cf4ca5832234abd213300f99eb8eaec6f81ce2900f604b56eb17f81a66322a

data/lib/gameui/asset3d.rb

@@ -8,6 +8,8 @@ class ::Gameui::Asset3d
   include Mongoid::Paperclip
   include Ish::Utils
 
+  field :filename
+
   belongs_to :marker,        class_name: 'Gameui::Marker', optional: true
   belongs_to :invoice,       class_name: 'Ish::Invoice',   optional: true
   belongs_to :email_message, class_name: 'Office::EmailMessage', optional: true, inverse_of: :asset3ds

data/lib/iro/{option_watch.rb → alert.rb-bk}

@@ -2,7 +2,7 @@
 ##
 ## for alerting
 ##
-class Iro::OptionWatch
+class Iro::Alert
   include Mongoid::Document
   include Mongoid::Timestamps
   store_in collection: 'iro_option_watches'

data/lib/ish_models.rb

@@ -40,7 +40,7 @@ require 'gameui/asset3d'
 require 'gameui/map'
 require 'gameui/marker'
 
-require 'iro/option_watch'
+# require 'iro/alert'
 
 require 'ish/cache_key'
 require 'ish/crawler'

data/lib/office/email_message.rb

@@ -100,6 +100,7 @@ class Office::EmailMessage
 
   ## From: https://stackoverflow.com/questions/24672834/how-do-i-remove-emoji-from-string/24673322
   def self.strip_emoji(text)
+    text = '' if text.blank?
     text = text.force_encoding('utf-8').encode
     clean = ""
 
@@ -134,23 +135,13 @@ class Office::EmailMessage
   # "text/calendar; charset=utf-8; method=REQUEST"
   def churn_subpart part
     if part.content_disposition&.include?('attachment')
-      ## @TODO: attachments !
-      ;
+      save_attachment( part, filename: "subpart-attachment" )
     else
-      if part.content_type.include?("multipart/related") ||
-        part.content_type.include?("multipart/alternative")
-
+      if part.content_type.include?("multipart")
         part.parts.each do |subpart|
           churn_subpart( subpart )
         end
       else
-        # attachment = Office::EmailAttachment.new({
-        #   content:       part.decoded,
-        #   content_type:  part.content_type,
-        #   email_message: self,
-        # })
-        # attachment.save
-
         if part.content_type.include?('text/html')
           self.part_html = part.decoded
 
@@ -158,15 +149,19 @@ class Office::EmailMessage
           self.part_txt = part.decoded
 
         elsif part.content_type.include?("text/calendar")
-          ;
+          save_attachment( part, filename: 'subpart-calendar.ics' )
+
         elsif part.content_type.include?("application/pdf")
-          ;
+          save_attachment( part, filename: 'subpart.pdf' )
+
         elsif part.content_type.include?("image/jpeg")
-          ;
+          save_attachment( part, filename: 'subpart.jpg' )
+
         elsif part.content_type.include?("image/png")
-          ;
+          save_attachment( part, filename: 'subpart.png' )
 
         else
+          save_attachment( part, filename: 'subpart-unspecified' )
           self.logs.push "444 No action for a part with content_type #{part.content_type}"
 
         end
@@ -174,6 +169,49 @@ class Office::EmailMessage
     end
   end
 
+  def save_attachment att, filename: "no-filename-specified"
+    content_type = att.content_type.split(';')[0]
+    if content_type.include? 'image'
+      photo = Photo.new({
+        content_type:      content_type,
+        email_message_id:  @message.id,
+        image_data:        att.body.encoded,
+        original_filename: att.content_type_parameters[:name],
+      })
+      photo.decode_base64_image
+      photo.save
+    else
+
+      filename   = CGI.escape( att.filename || filename )
+      attachment = Office::EmailAttachment.new({
+        content:       att.body.decoded,
+        content_type:  att.content_type,
+        email_message: @message,
+        filename:      filename,
+      })
+      begin
+        attachment.save
+      rescue Encoding::UndefinedConversionError
+        @message.logs.push "Could not save an attachment"
+        @message.save
+      end
+
+      sio = StringIO.new att.body.decoded
+      File.open("/tmp/#{filename}", 'w:UTF-8:ASCII-8BIT') do |f|
+        f.puts(sio.read)
+      end
+      asset3d = ::Gameui::Asset3d.new({
+        email_message: @message,
+        filename:      filename,
+        object:        File.open("/tmp/#{filename}"),
+      })
+      if !asset3d.save
+        @message.logs.push "Could not save an asset3d"
+        @message.save
+      end
+
+    end
+  end
 
   def body_sanitized
     ActionView::Base.full_sanitizer.sanitize( part_html||'' ).squish

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.301
+  version: 0.0.33.303
 platform: ruby
 authors:
 - piousbox
@@ -191,7 +191,7 @@ files:
 - lib/gameui/map.rb
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
-- lib/iro/option_watch.rb
+- lib/iro/alert.rb-bk
 - lib/ish/cache_key.rb
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb