ish_models 0.0.33.302 → 0.0.33.304

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2466c302497d9d68bbea639194f985dd4b34d8bbd8ef5aaecebbef7f1e3650ed
-  data.tar.gz: '087e0d9cd4469555e510cb4b1da335b77a8f44a1dd59be0fbf9edf2cfcb790be'
+  metadata.gz: '069e59f9305d7133032ef2b6776d9cefd59f376d40774828a21b5b95c5acd7b9'
+  data.tar.gz: a556f13344b589b0add0b7c0f81408f0c9c55a89f902cfa855b7b29171182769
 SHA512:
-  metadata.gz: 65078192596ea0469d46fa671c0e373c6c7628f01a6ed9da023a0c82dfce4c417f387bcdc1768b148093dbb231b806acf4220db497263db7b64cd1f6b18ebc6b
-  data.tar.gz: bc05a572fb9b7da56d41a1103b67b51af8bcf9cff27b0c82d0324081efc65c1c85fc7b0478635d3314d1097dbdc9bb0c0cd0ca117622a8d19cba8a40ec4cee2e
+  metadata.gz: a9ab4766a82cd464fef564632d3fade497a5bb4542d0c472c2089fcf99cd657462d68b0c463b5800486d47a51613c2952d290b78fba7adcc080d713a508d119e
+  data.tar.gz: d21d6f7d92307efd7338bd86dd3b1fc1f0f3c9bc254c7b2ee00da15c5cf8193c1ac4aa5ea46d47d21f02fae2c1283b69553ac37f84f38ce1ae5d9615e1b0ff17

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

@@ -135,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
 
@@ -159,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
@@ -175,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:  self.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: self,
+        filename:      filename,
+      })
+      begin
+        attachment.save
+      rescue Encoding::UndefinedConversionError
+        self.logs.push "Could not save an attachment"
+        self.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: self,
+        filename:      filename,
+        object:        File.open("/tmp/#{filename}"),
+      })
+      if !asset3d.save
+        self.logs.push "Could not save an asset3d"
+        self.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.302
+  version: 0.0.33.304
 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