ish_models 0.0.33.241 → 0.0.33.243

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272ee9358917dbef42235373fb57c5c795461ea3686b9af93109d038aa67108c
-  data.tar.gz: 14b29f6d63f6954c5068811989e8753b952dbc6406b7b1d03b25e96cd36130f9
+  metadata.gz: 3cb9bfd0b2e4267bdafbdc6e0e07d9064dfcb7c5bcc4d767ccf14e12ee0f81fb
+  data.tar.gz: b17871e045a9983e191457ad8ec843c03ce4cb515b0846ba1c5b23457a0ade34
 SHA512:
-  metadata.gz: 29ff547eeffbf6efb6d1954726702907b2805bacf60f0b60e0a8b6560a78c1336ee51e051de39e70f8e351e1fb1e25224d923dcbed97f2ea4bcb75f4db7547c5
-  data.tar.gz: 48fb17551e98e47216766dbfecc47b5c0d901dddbff16399889993a5a98819e1781e3b3cdd58c361acf871c707162a7b4c4c9a4323a1ebbea0cfd998bcf6aec4
+  metadata.gz: f1c4d9279bc85b0c051a705e18bc0404a03880e04a69d0e73056e306f6aac13f789b8afebdb73dab6e3b5b8c6fd9fde0bf10dc4f33a5f9520784109500221ed6
+  data.tar.gz: 45207a395aab807bdaf12b33b277e4d342267fdd5eb7ae00672e231cc93153671fc42e68fb284300068976d3f0b557cec4dd8502918a95dec76bf540c849e198

data/lib/address.rb

@@ -4,7 +4,9 @@ class Address
   include Mongoid::Timestamps
 
   belongs_to :profile, :class_name => '::Ish::UserProfile'
-  validates :profile, :presence => true
+  # validates :profile, :presence => true
+
+  field :lead_id, type: :integer
 
   field :name
   field :address_1

data/lib/gallery.rb

@@ -9,6 +9,8 @@ class Gallery
 
   field :name
   validates :name, :uniqueness => true
+  index({ :name => -1 }, { :unique => true })
+
   field :subhead
   field :descr,   :as => :description
 

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/email_template.rb

@@ -17,6 +17,7 @@ class ::Ish::EmailTemplate
     marketing_wordpres_1 marketing_wordpress_2
     piousbox_roundborders
     plain
+    tracking_footer
     wasyaco_roundborders |
 
   field :subject

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.241
+  version: 0.0.33.243
 platform: ruby
 authors:
 - piousbox