wco_models 3.1.0.275 → 3.1.0.276

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5df9cb4bcb4f460b4cc64878583e88e60d82079b8bc0215a017eed561f7bd41
-  data.tar.gz: 8104ce3a762d78d9d11d15790feb8949ed5d5cec9c08515cc0f8eabca99412c1
+  metadata.gz: 0d2d2fd07a9f97269d04402ecbe29c6e258f33d07a5e68c3cf4fc3e11066f146
+  data.tar.gz: 445ab09e9ac094715bcedcc994f3d70f97b3afdf4460513e1471912e6b960de9
 SHA512:
-  metadata.gz: 57173b9190a08c917608dd776ad1295bb3e191ec7ceb1f7db060e020860c08e8594fd6fd1c367dd433f9ef91730f4b6d835ded25d11667e1740da2c54d44eea0
-  data.tar.gz: 81b65826be767a52cf854d9abf484e16165bfac7ac3259a1d0ae40cbe88f870d50ab0b80fcc88687e5da509deaf7a7515db71288a4aec8a6825e75144de75a31
+  metadata.gz: b90e415933235fbc0a12e406da6ec7bc113b1e2119da06085812c50bcad796b956aca162ca518ec5592f3da90c62a85794d131f8331599760ee427b7bdb71c72
+  data.tar.gz: d67a830c270ac218edffaee49100c7ac94da66db961bd3957bf60acae2b6990338f0ace9cb0e3889a35d34876834b586b37cac13e48e04d0db51382afb29b909

data/app/models/wco/asset.rb

@@ -1,5 +1,4 @@
 
-# require 'aws-sdk'
 require 'mongoid_paperclip'
 
 class Wco::Asset
@@ -9,6 +8,8 @@ class Wco::Asset
   include Mongoid::Paranoia
   include Wco::Utils
 
+  store_in collection: 'wco_assets'
+
   field :filename
 
   belongs_to :email_message, class_name: 'WcoEmail::Message', optional: true

data/app/models/wco_email/conversation.rb

@@ -32,8 +32,7 @@ class WcoEmail::Conversation
   has_and_belongs_to_many :tags,     class_name: 'Wco::Tag',     index: true
   has_and_belongs_to_many :leadsets, class_name: 'Wco::Leadset', index: true
   has_and_belongs_to_many :leads,    class_name: 'Wco::Lead',    index: true
-
-  belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
+  has_and_belongs_to_many :filters,  class_name: 'WcoEmail::EmailFilter', index: true
 
 =begin
   current_profile = OpenStruct.new per_page: 25

data/app/models/wco_email/email_filter.rb

@@ -77,8 +77,7 @@ class WcoEmail::EmailFilter
   belongs_to :office_action_template, class_name: '::Wco::OfficeActionTemplate', optional: true
   belongs_to :tag,                    class_name: '::Wco::Tag',                  optional: true, inverse_of: :email_filters
 
-  ## @TODO: change to has_and_belongs_to_many, test-driven.
-  has_many :conversations, class_name: '::WcoEmail::Conversation', inverse_of: :filter
+  has_and_belongs_to_many :conversations, class_name: '::WcoEmail::Conversation'
 
   def to_s
     "EmailFilter: #{from_regex} #{from_exact} #{conditions.map { |c| c.to_s }.join }"
@@ -87,8 +86,14 @@ class WcoEmail::EmailFilter
     # inn = ""
     # inn = "#{inn}#{conditions.map { |c| c.to_s_full }.join }" if conditions.present?
     # inn = "#{inn}#{skip_conditions.map { |c| c.to_s_full }.join }" if skip_conditions.present?
+
+    attrs = ''
+    if from_regex || from_exact
+      attrs = "#{attrs} from=#{from_regex}#{from_exact}"
+    end
+
     out =<<-AOL
-<EmailFilter >
+<EmailFilter#{attrs} >
 #{conditions.map { |c| c.to_s_full( indent: 2) }.join }
 #{skip_conditions.map { |c| c.to_s_full( indent: 2) }.join }
 #{actions.map { |c| c.to_s_full( indent: 2) }.join }

data/app/models/wco_email/message_stub.rb

@@ -170,7 +170,7 @@ class WcoEmail::MessageStub
         if skip_reason
           puts! "NOT Applying filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
         else
-          @conv.filter = filter; @conv.save
+          @conv.filters << filter; @conv.save
           filter.actions.each do |action|
             @message.apply_filter_action( action )
           end
@@ -186,16 +186,7 @@ class WcoEmail::MessageStub
 
 
   def do_process
-    ## _TODO: remove this fork, be consistent across environments. _vp_ 2026-06-22
-    if Rails.env.production?
-      @client ||= Aws::S3::Client.new({
-        region:            ::S3_CREDENTIALS[:region_ses],
-        access_key_id:     ::S3_CREDENTIALS[:access_key_id_ses],
-        secret_access_key: ::S3_CREDENTIALS[:secret_access_key_ses],
-      })
-    else
-      @client ||= Aws::S3::Client.new(::SES_S3_CREDENTIALS)
-    end
+    @client ||= Aws::S3::Client.new(::SES_S3_CREDENTIALS)
 
     stub = self
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.275
+  version: 3.1.0.276
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-29 00:00:00.000000000 Z
+date: 2026-07-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ahoy_matey
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -484,9 +470,6 @@ files:
 - app/mailers/iro/alert_mailer.rb
 - app/mailers/wco_email/application_mailer.rb
 - app/models/ability.rb
-- app/models/ahoy/event.rb
-- app/models/ahoy/visit.rb
-- app/models/do/dns_record.rb-txt
 - app/models/iro/alert.rb
 - app/models/iro/datapoint.rb
 - app/models/iro/date.rb
@@ -543,10 +526,8 @@ files:
 - app/models/wco_email/email_template.rb
 - app/models/wco_email/message.rb
 - app/models/wco_email/message_stub.rb
-- app/models/wco_email/obfuscated_redirect.rb
+- app/models/wco_email/obfuscated_redirect.rb-trash
 - app/models/wco_email/unsubscribe.rb
-- app/models/wco_game/location.rb
-- app/models/wco_game/marker.rb
 - app/models/wco_hosting/appliance.rb
 - app/models/wco_hosting/appliance_tmpl.rb
 - app/models/wco_hosting/domain.rb
@@ -789,7 +770,7 @@ files:
 - config/initializers/00_s3.rb-example
 - config/initializers/08_integrations.rb
 - config/initializers/08_integrations.rb-example
-- config/initializers/ahoy.rb
+- config/initializers/ahoy.rb-trash
 - config/initializers/assets.rb
 - config/routes.rb
 - lib/20260402_tmp.rb

data/app/models/ahoy/event.rb

@@ -1,15 +0,0 @@
-
-class Ahoy::Event
-  include Mongoid::Document
-
-  # associations
-  belongs_to :visit, class_name: "Ahoy::Visit", index: true
-  belongs_to :user, index: true, optional: true
-
-  # fields
-  field :name, type: String
-  field :properties, type: Hash
-  field :time, type: Time
-
-  index({name: 1, time: 1})
-end

data/app/models/ahoy/visit.rb

@@ -1,50 +0,0 @@
-
-class Ahoy::Visit
-  include Mongoid::Document
-
-  # associations
-  has_many :events, class_name: "Ahoy::Event"
-  belongs_to :user, index: true, optional: true
-
-  # required
-  field :visit_token, type: String
-  field :visitor_token, type: String
-
-  # the rest are recommended but optional
-  # simply remove the columns you don't want
-
-  # standard
-  field :ip, type: String
-  field :user_agent, type: String
-  field :referrer, type: String
-  field :referring_domain, type: String
-  field :landing_page, type: String
-
-  # technology
-  field :browser, type: String
-  field :os, type: String
-  field :device_type, type: String
-
-  # location
-  field :country, type: String
-  field :region, type: String
-  field :city, type: String
-  field :latitude, type: Float
-  field :longitude, type: Float
-
-  # utm parameters
-  field :utm_source, type: String
-  field :utm_medium, type: String
-  field :utm_term, type: String
-  field :utm_content, type: String
-  field :utm_campaign, type: String
-
-  # native apps
-  field :app_version, type: String
-  field :os_version, type: String
-  field :platform, type: String
-
-  field :started_at, type: Time
-
-  index({visit_token: 1}, {unique: true})
-end

data/app/models/do/dns_record.rb-txt

@@ -1,15 +0,0 @@
-
-From: https://docs.digitalocean.com/reference/api/digitalocean/#tag/Domain-Records/operation/domains_list_records
-
-new:
-
-POST /v2/domains/$DOMAIN_NAME/records
-
-{
-  type: 'A',
-  name: 'subdomain',
-  data: '127.0.0.1',
-  ttl: 3600,
-}
-
-DELETE /v2/domains/$DOMAIN_NAME/records/$DOMAIN_RECORD_ID

data/app/models/wco_game/location.rb

@@ -1,257 +0,0 @@
-
-# require 'ish/premium_item'
-# require 'ish/utils'
-
-class WcoGame::Location
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  # include Ish::PremiumItem
-  include Mongoid::Paranoia
-  include Wco::Utils
-  store_in collection: 'gameui_maps'
-
-  field :name
-
-  field :newsitems_page_size, default: 25
-
-  field :slug
-  validates :slug, uniqueness: true, presence: true
-
-  field :description
-
-  has_many :markers,      :class_name => '::Gameui::Marker', inverse_of: :map
-  has_many :from_markers, :class_name => '::Gameui::Marker', inverse_of: :destination
-
-  has_many :newsitems, inverse_of: :map, order: :created_at.desc
-
-  # @TODO: remove field, replace with relation. _vp_ 2022-09-13
-  field :parent_slug
-  belongs_to :parent, class_name: '::Gameui::Map', inverse_of: :childs, optional: true
-  has_many :childs, class_name: '::Gameui::Map', inverse_of: :parent
-
-  has_one :image, class_name: '::Ish::ImageAsset', inverse_of: :location
-  belongs_to :creator_profile, class_name: '::Ish::UserProfile', inverse_of: :my_maps
-
-  has_and_belongs_to_many :bookmarked_profiles, class_name: '::Ish::UserProfile', inverse_of: :bookmarked_location
-
-  # 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'
-
-  ## @TODO: or self, right? and refactor this, seems N+1. _vp_ 2022-09-13
-  field :map_slug
-  def map
-    ::Gameui::Map.where( slug: map_slug ).first
-  end
-
-  RATED_OPTIONS = [ 'pg-13', 'r', 'nc-17' ]
-  field :rated, default: 'pg-13' # 'r', 'nc-17'
-
-  ## Possible keys: description, map, markers, newsitems,
-  field :labels, type: Object, default: <<~AOL
-    { "description":"Description", "map":"Map", "markers":"Markers", "newsitems":"Newsitems"
-    }
-  AOL
-
-  ## Possible keys:
-  ## config.description.collapsible
-  field :config, type: Object, default: <<~AOL
-    { "map_panel_type": "ThreePanelV1",
-      "studio": { "hasFloor": true, "studioLength": 2500, "studioWidth": 2500 }
-    }
-  AOL
-
-  # @deprecated, dont use!
-  field :img_path
-
-  ## Not used! See config.map_panel_type instead.
-  # MAP_TYPES = [ :map_2d, :map_3d, :map_geospatial, :map_gallery, :map_toc ] ## Mostly not implemented. _vp_ 2022-09-06
-  # field :map_type, default: :map_2d
-
-  ## Make sure to use x,y,z and w,h as appropriate.
-  ## @TODO: abstract this into a module
-  field :x, type: Float
-  field :y, type: Float
-  field :z, type: Float
-
-  ## Make sure to use x,y,z and w,h as appropriate.
-  field :w, type: Integer
-  validates :w, presence: true
-  field :h, type: Integer
-  validates :h, presence: true
-  # @TODO: this is shared between map and marker, move to a concern.
-  before_validation :compute_w_h
-  def compute_w_h
-    return if !image ## @TODO: test this
-
-    begin
-      geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
-      self.w = geo.width
-      self.h = geo.height
-    rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
-      puts! e, 'Could not #compute_w_h'
-      # @TODO: do something with this
-    end
-  end
-
-  ORDERING_TYPE_ALPHABETIC = 'alphabetic'
-  ORDERING_TYPE_CUSTOM     = 'custom'
-  ORDERING_TYPE_TIMESTAMP  = 'timestamp'
-  ORDERING_TYPES = [ ORDERING_TYPE_ALPHABETIC, ORDERING_TYPE_CUSTOM, ORDERING_TYPE_TIMESTAMP ]
-  field :ordering_type, type: String, default: 'custom' # timestamp, alphabetic, custom
-  validates :ordering_type, presence: true
-
-  def self.list conditions = { is_trash: false }
-    out = self.order_by( created_at: :desc )
-    [[nil, nil]] + out.map { |item| [ item.name, item.id.to_s ] }
-  end
-
-  def breadcrumbs
-    out = [{ name: self.name, slug: self.slug, link: false }]
-    p = self.parent
-    while p
-      out.push({ name: p.name, slug: p.slug })
-      p = p.parent
-    end
-    out.reverse
-  end
-
-  ##
-  ## @TODO: move the export func, below, to a module. _vp_ 2022-09-20
-  ##
-
-  def empty_export
-    return {
-      galleries: {},
-      image_assets: {},
-      maps: {}, markers: {},
-      newsitems: {},
-      photos: {}, profiles: {},
-      reports: {},
-      videos: {},
-    }
-  end
-  def self.empty_export; Gameui::Map.new.empty_export; end
-
-  def empty_export_arr
-    return {
-      galleries: [],
-      image_assets: [],
-      maps: [], markers: [],
-      newsitems: [],
-      photos: [], profiles: [],
-      reports: [],
-      videos: [],
-    }
-  end
-
-  def export_key_to_class
-    return {
-      galleries: 'Gallery',
-      image_assets: 'Ish::ImageAsset',
-      maps: 'Gameui::Map',
-      markers: 'Gameui::Marker',
-      newsitems: 'Newsitem',
-      photos: 'Photo',
-      profiles: 'Ish::UserProfile',
-      reports: 'Report',
-      videos: 'Video',
-      # 'galleries' => 'Gallery',
-      # 'image_assets' => 'Ish::ImageAsset',
-      # 'maps' => 'Gameui::Map',
-      # 'markers' => 'Gameui::Marker',
-      # 'newsitems' => 'Newsitem',
-      # 'photos' => 'Photo',
-      # 'profiles' => 'Ish::UserProfile',
-      # 'reports' => 'Report',
-      # 'videos' => 'Video',
-    }.with_indifferent_access
-  end
-  def self.export_key_to_class
-    Map.new.export_key_to_class
-  end
-
-  def export_fields
-    %w|
-      creator_profile_id config
-      deleted_at description
-      h
-      is_public
-      labels
-      map_slug
-      name
-      ordering_type
-      parent_slug
-      rated
-      slug
-      version
-      w
-    |
-  end
-
-  ## This is the starting point _vp_ 2022-03-12
-  ##
-  def export_subtree
-    collected = collect(empty_export)
-    exportable = empty_export_arr
-    collected.map do |k, v|
-      if v.present?
-        v.map do |id|
-          id = id[0]
-          item = export_key_to_class[k].constantize.unscoped.find id
-          export = item.export
-          exportable[k].push( export )
-        end
-      end
-    end
-    JSON.pretty_generate exportable
-  end
-
-  def collect export_object
-    map = self
-    export_object[:maps][map.id.to_s] = map.id.to_s
-
-    if map.markers.present?
-      map.markers.map do |marker|
-        id = marker.id.to_s
-        if !export_object[:markers][id]
-          marker.collect( export_object )
-        end
-        export_object[:markers][id] = id
-      end
-    end
-
-    if map.newsitems.present?
-      map.newsitems.map do |newsitem|
-        id = newsitem.id.to_s
-        export_object[:newsitems][id] = id
-        newsitem.collect export_object
-      end
-    end
-
-    ## @TODO: maybe implement this later, maybe not. _vp_ 2022-03-12
-    # if map.childs.present?
-    #   export_object[:maps].push( map.childs.map &:id )
-    #   map.childs.map do |child|
-    #     child.collect export_object
-    #   end
-    # end
-
-    if map.creator_profile.present?
-      export_object[:profiles][map.creator_profile.id.to_s] = map.creator_profile.id.to_s
-    end
-
-    if map.image.present?
-      export_object[:image_assets][map.image.id.to_s] = map.image.id.to_s
-    end
-
-    export_object
-  end
-
-  ## endExport
-
-
-end

data/app/models/wco_game/marker.rb

@@ -1,9 +0,0 @@
-
-class WcoGame::Marker
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Paranoia
-  include Wco::Utils
-  store_in collection: 'gameui_markers'
-
-end