ish_models 0.0.33.240 → 0.0.33.242

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a019b6d79afed69337d3cb41d08427cae941c52865a68ac5cf08ab3513072f4d
-  data.tar.gz: 1b38c157a54506f181f940218a3190455f5e790c69fb1c9a5083451043c51724
+  metadata.gz: 947ab34b57772b91d9fb1b1334c035debd3a0935f5fc1d06fccd102d49742ff0
+  data.tar.gz: c1c390a81049197dd06af734b0018f8697c21f9fec0d5b5c8f54d286ec2bdb38
 SHA512:
-  metadata.gz: efaa2cc5056b4b2ce1061a20d64a851eeace5ee617b917ea8de1fa23a95936f390309e06580300d31ee382f545d2cb103fb2ce3959d51ca0cbd15bf974ad9fa7
-  data.tar.gz: 848da5f2623372fd0936086efeb3044f36bde484b8bf1e92e3899a484fbd0568eb3cdf3133dc5aa6bb769300fe47cd1b68d33df2f3ab6ba50247f63db7419865
+  metadata.gz: b5824c65663990c2d9ad914fdec672f952d258a85ef77f682fe086ec49204f65c3d8b5e7ba5a99aa7ca20f613d2cd8c902fae49c0aec2fc50433d1f1c4522259
+  data.tar.gz: c92e76f7d0c5ee56898354e1a648581a0979cf3690ebf8a9672e61250d433e3d51cea1a50bd5a4d52ebcca7720ac20aaa1d0a65614be888af7edae53c99af111

data/lib/gameui/map.rb

@@ -35,6 +35,7 @@ class ::Gameui::Map
 
   # shareable, nonpublic
   field :is_public, type: Boolean, default: true
+  scope :public, ->{ where( is_public: true ) }
   has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_locations
 
   field :version, type: String, default: '0.0.0'

data/lib/ish/user_profile.rb

@@ -108,6 +108,8 @@ class Ish::UserProfile
     end
   end
 
+  field :per_page, type: Integer, default: 100
+
 end
 
 Profile = Ish::UserProfile

data/lib/office/email_message.rb

@@ -23,18 +23,21 @@ class Office::EmailMessage
   field :subject
   field :part_txt
   field :part_html
-  # attachments ?
+  field :preamble
+  field :epilogue
+
+  has_many :attachments, class_name: 'Photo'
 
   def lead
     Lead.find_by email: from
   end
 
-  field :from,  type: :string
-  field :froms, type: Array, default: []
-  field :to,    type: :string
-  field :tos,   type: Array, default: []
-  field :ccs,   type: Array, default: []
-  field :bccs,  type: Array, default: []
+  field :from,   type: :string
+  field :froms,  type: Array, default: []
+  field :to,     type: :string
+  field :tos,    type: Array, default: []
+  field :ccs,    type: Array, default: []
+  field :bccs,   type: Array, default: []
 
   field :date, type: DateTime
   def received_at

data/lib/photo.rb

@@ -8,15 +8,12 @@ class Photo
   include Mongoid::Paperclip
   include Ish::Utils
 
-  belongs_to :user_profile,  :class_name => 'Ish::UserProfile',               :optional => true
-  def user
-    user_profile
-  end
-  belongs_to :user_profile,  :class_name => 'Ish::UserProfile',  :inverse_of => :profile_photo, :optional => true
-
-  belongs_to :report,   :optional => true
-  belongs_to :gallery,  :optional => true
-  belongs_to :newsitem, :optional => true
+  belongs_to :user_profile,  :optional => true, :class_name => 'Ish::UserProfile'
+  belongs_to :user_profile,  :optional => true, :class_name => 'Ish::UserProfile',     :inverse_of => :profile_photo
+  belongs_to :email_message, :optional => true, :class_name => 'Office::EmailMessage'
+  belongs_to :report,        :optional => true
+  belongs_to :gallery,       :optional => true
+  belongs_to :newsitem,      :optional => true
 
   # photo.photo.to_s.split('/').last.split('?').first
   field :name,   :type => String
@@ -52,6 +49,7 @@ class Photo
                             :s3_protocol => 'https',
                             :validate_media_type => false,
                             s3_region: ::S3_CREDENTIALS[:region]
+  validates_attachment_content_type :photo, :content_type => ["image/webp", "image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
   def self.n_per_manager_gallery
     25
@@ -66,7 +64,23 @@ class Photo
     |
   end
 
-  validates_attachment_content_type :photo, :content_type => ["image/webp", "image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
+  ## From: https://gist.github.com/WizardOfOgz/1012107?permalink_comment_id=1442486
+  attr_accessor :content_type, :image_data, :original_filename
+  def decode_base64_image
+    if image_data && content_type && original_filename
+      decoded_data = Base64.decode64(image_data)
+
+      data = StringIO.new(decoded_data)
+      data.class_eval do
+        attr_accessor :content_type, :original_filename
+      end
+
+      data.content_type = content_type
+      data.original_filename = File.basename(original_filename)
+
+      self.photo = data
+    end
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.240
+  version: 0.0.33.242
 platform: ruby
 authors:
 - piousbox