wco_models 3.1.0.51 → 3.1.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2aedb50a30f432370f7a3d8dce814677b95ec4373a64594aae4b142fa7d31fa
-  data.tar.gz: 6b56ff81d8003170a2d7f2035de0b5708ece56d3bf2576c5f4f2575b8d4e5a84
+  metadata.gz: 7e600845398a0cd10bcd4683dfd01a7f3793ba4b1dc9e086df508d1845fc8127
+  data.tar.gz: a8f500decf7e7f67716cdcf3e53231239bedb36e3ee8098a0a27063ef80068f9
 SHA512:
-  metadata.gz: a1887e0d49d5d016b0e672118428bc71809375a1989ee89fa1976eafb8edf4976c27f5733550fd8b82921b49e819c14d3f158a7c56d469660de33fe6c36c3b01
-  data.tar.gz: d2330182a059ad9699441c11e40fd81b7867ec7650cad664a4f8848b56f7f8c2bbf8f712a4104f72b9950ed1c7f0483524921de999def7410a3935a319e0a727
+  metadata.gz: a5649ea010caf2ecba1b71bfdd800f4674320a5c36ac95c7aab2f0b9266d19eedfbb37ed3a91785c9e4bc8a80c4aeccc848e3709018d81c3bc427ddee740dbde
+  data.tar.gz: 8a7e153a876fe7f28c411c056e838f08e204f1d4647add4a72c68718474b8dc971af71105d7cd455bb4934b43a62560f752e29da1ac4d8f1f12475718f074cf0

data/app/assets/stylesheets/wco/pagination.scss

@@ -11,8 +11,9 @@
   border-left-width: 0;
 }
 
-.pagination {
+ul.pagination {
   border-left: 1px solid #ddd;
+  margin: 1em 0;
 
   li.active {
     padding: 0 14px;

data/app/assets/stylesheets/wco/utils.scss

@@ -26,6 +26,13 @@ textarea {
   border-right: 1px solid red !important;
 }
 
+.bordered {
+  border: 1px solid gray;
+  border-radius: 5px;
+
+  padding: 0.5em;
+}
+
 table.bordered {
   table-layout:fixed;
   width: 100%;
@@ -94,6 +101,7 @@ textarea.monospace {
 .gray,
 .grey {
   color: grey;
+  display: inline-block;
 }
 
 .green {

data/app/models/wco/gallery.rb

@@ -7,23 +7,24 @@ class Wco::Gallery
   include Wco::Utils
   store_in collection: 'galleries'
 
-  PER_PAGE = 6
 
   field :name
   validates :name, :uniqueness => true
   index({ :name => -1 }) ## 2023-09-23 removed uniqueness
 
+  field :slug
+  index({ :slug => -1 }, { :unique => true })
+  validates :slug, presence: true, uniqueness: true
+  before_validation :set_slug, :on => :create
+
   field :subhead
   field :descr,   :as => :description
 
   field :is_public, type: Boolean, default: false
   # has_and_belongs_to_many :shared_profiles, :class_name => 'Wco::Profile', :inverse_of => :shared_galleries
 
-  field :is_trash,   type: Boolean, default: false
-  field :is_done,    type: Boolean, default: false
-
   def published
-    where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc })
+    where({ :is_public => true }).order_by({ :created_at => :desc })
   end
 
   field :x,       :type => Float
@@ -31,15 +32,9 @@ class Wco::Gallery
   field :z,       :type => Float
 
   field :lang,    :default => 'en'
-  # field :username
-  # field :lead_id, type: :integer
 
-  field :slug
-  index({ :slug => -1 }, { :unique => true })
-  validates :slug, presence: true, uniqueness: true
-  before_validation :set_slug, :on => :create
 
-  def self.list conditions = { :is_trash => false }
+  def self.list conditions = {}
     out = self.unscoped.where( conditions ).order_by( :created_at => :desc )
     [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end

data/app/models/wco/photo.rb

@@ -51,14 +51,10 @@ class Wco::Photo
                             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
-  end
-
   def export_fields
     %w|
       gallery_id
-      name descr weight is_public is_trash
+      name descr weight
 
       photo_file_name photo_content_type photo_file_size photo_updated_at photo_fingerprint
     |

data/app/models/wco/tag.rb

@@ -20,7 +20,14 @@ class Wco::Tag
   has_and_belongs_to_many :logs
 
   INBOX = 'inbox'
+  def self.inbox
+    find_or_create_by({ slug: INBOX })
+  end
+
   TRASH = 'trash'
+  def self.trash
+    find_or_create_by({ slug: TRASH })
+  end
 
   def self.list
     [[nil,nil]] + all.map { |p| [ p.slug, p.id ] }

data/app/models/wco_email/message.rb

@@ -17,7 +17,9 @@ class WcoEmail::Message
 
   field :in_reply_to_id, type: :string
 
-  field :object_key,  type: :string ## aka 'filename', use with bucket name + prefix. I need this!
+  field     :bucket, default: 'ish-ses'
+
+  field     :object_key ## aka 'filename', use with bucket name + prefix. I need this!
   validates :object_key, presence: true, uniqueness: true
   index({ object_key: 1 }, { unique: true, name: "object_key_idx" })
 

data/app/models/wco_email/message_stub.rb

@@ -17,6 +17,8 @@ class WcoEmail::MessageStub
   field :status, default: STATUS_PENDING
   scope :pending, ->{ where( status: 'status_pending' ) }
 
+  field     :bucket # 'ish-ses', 'ish-ses-2024'
+
   field     :object_key
   validates :object_key, presence: true, uniqueness: true
   index({ object_key: 1 }, { unique: true, name: "object_key_idx" })
@@ -35,14 +37,16 @@ class WcoEmail::MessageStub
     key      = the_mail.message_id || "no-key-#{Time.now.to_i}.#{rand(1000)}"
 
     @stub = WcoEmail::MessageStub.create({
+      bucket:      ::S3_CREDENTIALS[:bucket_ses],
       object_key:  key,
       status:      WcoEmail::MessageStub::STATUS_PENDING,
       tags:        [ @tag ],
     })
     if @stub.persisted?
-      @client.put_object({ bucket: ::S3_CREDENTIALS[:bucket_ses],
-        key: key,
+      @client.put_object({
         body: message,
+        bucket: ::S3_CREDENTIALS[:bucket_ses],
+        key: key,
       })
     else
       msg = @stub.errors.full_messages.join(", ")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.51
+  version: 3.1.0.53
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3