wco_models 3.1.0.154 → 3.1.0.155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8214f97a78a923e7696ac257e51c35e82735e5f49ee72fb5323897c263494eed
-  data.tar.gz: 50a95c9ae5bc39baf0f5ed8c959b537219e6646accffd52f46577941c393835e
+  metadata.gz: 7087d1bed892c6923940fc6d1c8ba234ad9e9773e490e4bce6d92808625ad211
+  data.tar.gz: f88b3cb63acf8f2253156ec1fd45b53d1ff6e9d14886a19233142e7e026efc0d
 SHA512:
-  metadata.gz: 2ee8c67d727e601dbf625f4309651d56611f147852e50091bb0f8144b4b25aa382a88268fce8475a975157a9fd01e97d8bc7bdc06c980dd02084fe47eb6683c9
-  data.tar.gz: 7356863e168fc520d0dd7ba14a9a4e02bd4b77b97b92a00df164569f0136162446a843189495fde59eac51d804cae0a93adccfc99b2a292aca8c6af579cb3bc1
+  metadata.gz: da0b670caac9e737d49dbbf02633554617cd18c9abdc8def6dc8b65ad20e62038aa984e01f010bed84a2efa1b06b9e31db609acb418d9587b7681d071026813b
+  data.tar.gz: a828cddbe1e4662d249167c24ec8e5c0abf29beb1811deb3c780c10e013b148004884ea9a5fa30ac4756d823ab8bb26b712ea5ec64cc97587b95cb165fb94339

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

@@ -167,7 +167,7 @@ textarea.monospace {
 /* M */
 
 .maxwidth {
-  width: 1000px;
+  max-width: 1000px; /* @TODO: this would be responsive by-breakpoint _vp_ 2024-04-23 */
   margin: auto;
 }
 

data/app/controllers/wco/sites_controller.rb

@@ -1,6 +1,13 @@
 
 class Wco::SitesController < Wco::ApplicationController
 
+  def check_sitemap
+    @site = Wco::Site.find params[:id]
+    authorize! :check_sitemap, @site
+    @site.check_sitemap
+    redirect_to request.referrer
+  end
+
   def create
     @site = Wco::Site.new params[:site].permit!
     authorize! :create, @site
@@ -41,6 +48,8 @@ class Wco::SitesController < Wco::ApplicationController
   def show
     @site = Wco::Site.find params[:id]
     authorize! :show, @site
+
+    @new_sitemap_path = Wco::SitemapPath.new( site_id: @site.id )
   end
 
   def update

data/app/models/wco/office_action_template.rb

@@ -29,13 +29,13 @@ class Wco::OfficeActionTemplate
   has_many :prev_ties, class_name: 'OfficeActionTemplateTie', inverse_of: :next_office_action_template
   accepts_nested_attributes_for :ties
 
+  has_and_belongs_to_many :email_filters, class_name: WcoEmail::EmailFilter
+
   def to_s
     "#{slug}"
   end
-
   def self.list
     [[nil,nil]] + all.map { |ttt| [ ttt.slug, ttt.id ] }
   end
-
 end
-OAT ||= Wco::OfficeActionTemplate
+# OAT ||= Wco::OfficeActionTemplate

data/app/models/wco/site.rb

@@ -14,8 +14,11 @@ class Wco::Site
     [nil] + KINDS
   end
 
-  has_many :publishers # , class_name: 'Wco::Publisher'
+
   has_many :headlines # , class_name: 'Wco::Newstitle'
+  has_many :logs, inverse_of: :obj
+  has_many :publishers # , class_name: 'Wco::Publisher'
+  has_many :sitemap_paths, class_name: 'Wco::SitemapPath'
   has_many :tags, class_name: 'Wco::Tag'
 
   field :slug
@@ -101,4 +104,112 @@ class Wco::Site
     puts "ok"
   end
 
+  def check_sitemap
+    results = []
+    total_count = 0
+    error_count = 0
+
+    sitemap_paths.each do |check|
+      total_count += 1
+
+      # puts "Checking #{check[:path]}:"
+      if check[:selector]
+        begin
+          body = HTTParty.get( "#{origin}#{check[:path]}" ).body
+        rescue OpenSSL::SSL::SSLError => err
+          results.push "NOT OK [ssl-exception] #{check[:path]}".red
+          logg "NOT OK [ssl-exception] #{check[:path]}"
+          check.update status: 'NOT OK'
+
+          next
+        end
+        doc = Nokogiri::HTML( body )
+        out = doc.search check[:selector]
+        if out.present?
+          results.push "OK #{check[:path]}"
+          logg "OK #{check[:path]}"
+          check.update status: 'OK'
+        else
+          results.push "NOT OK [selector-missing] #{check[:path]}".red
+          logg "NOT OK [selector-missing] #{check[:path]}"
+          check.update status: 'NOT OK'
+          error_count += 1
+        end
+
+        if check[:meta_description]
+          out = doc.search( 'head meta[name="description"]' )[0]['content']
+          if check[:meta_description] == out
+            results.push "OK #{check[:path]} meta_description"
+            logg "OK #{check[:path]} meta_description"
+            check.update status: 'OK'
+          else
+            results.push "NOT OK [meta-description-missing] #{check[:path]}".red
+            logg "NOT OK [meta-description-missing] #{check[:path]}"
+            check.update status: 'NOT OK'
+            error_count += 1
+          end
+        end
+
+      elsif check[:redirect_to]
+        out = HTTParty.get( "#{origin}#{check[:path]}", follow_redirects: false )
+        if( out.headers[:location] == check[:redirect_to] ||
+            out.headers[:location] == "#{origin}#{check[:redirect_to]}" )
+          results.push "OK #{check[:path]}"
+          logg "OK #{check[:path]}"
+          check.update status: 'OK'
+        else
+          results.push "NOT OK [redirect-missing] #{check[:path]}".red
+          logg "NOT OK [redirect-missing] #{check[:path]}"
+          check.update status: 'NOT OK'
+
+          puts!( out.response, 'response' ) if DEBUG
+          # puts!( out.body, 'body' ) if DEBUG
+
+          error_count += 1
+
+          puts "NOT OK #{check[:path]}".red
+          puts out.headers[:location]
+          puts check[:redirect_to]
+        end
+      else
+        results.push "SKIP #{check[:path]}"
+        logg "SKIP #{check[:path]}"
+        check.update status: 'SKIP'
+      end
+
+      if check[:selectors]
+        check[:selectors].each do |selector|
+          body = HTTParty.get( "#{origin}#{check[:path]}" ).body
+          doc = Nokogiri::HTML( body )
+          out = doc.search selector
+          if out.present?
+            results.push "OK #{check[:path]} selectors:#{selector}"
+            logg "OK #{check[:path]} selectors:#{selector}"
+            check.update status: 'OK'
+          else
+            results.push "NOT OK [selectors-missing:#{selector}] #{check[:path]}".red
+            logg "NOT OK [selectors-missing:#{selector}] #{check[:path]}"
+            check.update status: 'NOT OK'
+            error_count += 1
+          end
+        end
+      end
+
+    end
+
+    puts "Results:".green
+    results.each do |r|
+      puts r
+    end
+    puts "Total count: #{total_count}"
+    puts "Error count: #{error_count}"
+  end
+
+  def logg msg
+    Wco::Log.create!({
+      message: msg,
+      obj: self,
+    })
+  end
+
 end

data/app/models/wco/sitemap_path.rb

@@ -0,0 +1,20 @@
+
+class Wco::SitemapPath
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_sitemap_paths'
+
+  belongs_to :site, class_name: 'Wco::Site'
+
+  field :path,        type: String
+  validates :path, presence: true, uniqueness: { scope: :site }
+
+  field :redirect_to, type: String
+  field :selector,    type: String
+  field :selectors,   type: Array, default: []
+
+  field :status,      type: String
+
+end
+

data/app/models/wco_email/email_filter.rb

@@ -10,6 +10,9 @@ class WcoEmail::EmailFilter
 
   PAGE_PARAM_NAME = :filters_page
 
+  FIELD_OPTS     = [ :subject, :from, :to, :to_and_cc, :body, ]
+  MATCHTYPE_OPTS = [ :regex, :exact_insensitive, ]
+
   field :from_regex
   field :from_exact
   field :subject_regex
@@ -20,6 +23,10 @@ class WcoEmail::EmailFilter
   field :skip_from_regex
   field :skip_to_exact
 
+  has_many :email_filter_conditions
+  has_many :email_filter_skip_conditions, class_name: 'WcoEmail::EmailFilterCondition'
+  has_and_belongs_to_many :action_tmpls, class_name: 'Wco::OfficeActionTemplate'
+
   belongs_to :tag, class_name: 'Wco::Tag', inverse_of: :email_filters, optional: true
 
   KIND_AUTORESPOND_TMPL = 'autorespond-template'
@@ -36,6 +43,7 @@ class WcoEmail::EmailFilter
   KINDS = [ nil, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS]
   field :kind
 
+
   belongs_to :email_template,        class_name: 'WcoEmail::EmailTemplate',         optional: true
   belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate',   optional: true
 

data/app/models/wco_email/email_filter_condition.rb

@@ -0,0 +1,17 @@
+
+class WcoEmail::EmailFilterCondition
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'office_email_filter_conditions'
+
+  belongs_to :email_filter,      inverse_of: :email_filter_conditions
+  belongs_to :email_filter_skip, inverse_of: :email_filter_skip_conditions
+
+  field :field
+  field :matchtype
+  field :value
+
+
+end
+

data/app/models/wco_email/message.rb

@@ -29,7 +29,10 @@ class WcoEmail::Message
 
   field :read_at, type: DateTime
   index({ read_at: -1 })
-  scope :unread, ->{ where( read_at: nil ) }
+  def self.unread
+    where( read_at: nil )
+  end
+  # scope :unread, ->() { where( read_at: nil ) }
 
   def part_html_sanitized
     doc = Nokogiri::HTML part_html

data/app/views/layouts/wco/application.haml

@@ -1,6 +1,9 @@
 !!!
 %html
   %head
+    %title #{@page_title} | Wco Core
+    %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
+    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2' }
     %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}
     %title Wco Models
 

data/app/views/wco/_main_header.haml

@@ -7,36 +7,39 @@
 
     %i.fa.fa-compress.collapse-expand#collapseHeaderModels
       Wco Suite
-    .flex-row
-      %ul
-        %li= link_to 'ROOT', '/'
-        - if defined? wco_email
-          %li= link_to '/email',   '/email'
-        - if defined? wco_hosting
-          %li= link_to '/hosting', '/hosting'
-        - if defined? iro
-          %li= link_to '/trading', '/trading'
-
-      %ul
-        %li= render '/wco/invoices/header'
-        %li= render '/wco/products/header'
-        %li= render '/wco/tags/header'
-        %li= render '/wco/logs/header'
-
-      %ul
-        %li= render '/wco/leadsets/header'
-        %li= render '/wco/leads/header'
-        %li= render '/wco/office_action_templates/header'
-        %li= render '/wco/office_actions/header'
-        %li= render '/wco/profiles/header'
-
-      %ul
-        %li= render '/wco/sites/header'
-        %li= render '/wco/headlines/header'
-        %li= render '/wco/publishers/header'
-        %li= render '/wco/galleries/header_mini'
-        %li= render '/wco/reports/header'
-        %li= render '/wco/videos/header'
+    .W
+
+      .d-flex.flex-wrap
+
+        %ul
+          %li= link_to 'ROOT', '/'
+          - if defined? wco_email
+            %li= link_to '/email',   '/email'
+          - if defined? wco_hosting
+            %li= link_to '/hosting', '/hosting'
+          - if defined? iro
+            %li= link_to '/trading', '/trading'
+
+        %ul
+          %li= render '/wco/invoices/header'
+          %li= render '/wco/products/header'
+          %li= render '/wco/tags/menuitem'
+          %li= render '/wco/logs/header'
+
+        %ul
+          %li= render '/wco/leadsets/header'
+          %li= render '/wco/leads/header'
+          %li= render '/wco/office_action_templates/header'
+          %li= render '/wco/office_actions/header'
+          %li= render '/wco/profiles/header'
+
+        %ul
+          %li= render '/wco/sites/header'
+          %li= render '/wco/headlines/header'
+          %li= render '/wco/publishers/header'
+          %li= render '/wco/galleries/header_mini'
+          %li= render '/wco/reports/header'
+          %li= render '/wco/videos/header'
 
 
     .c

data/app/views/wco/sitemap_paths/_form.haml

@@ -0,0 +1,18 @@
+
+.sitemap-paths--form
+  = form_for spath do |f|
+    = hidden_field_tag :site_id, spath[:site_id] || params[:site_id]
+
+    .d-flex
+      .field
+        %label Path
+        = f.text_field :path
+      .field
+        %label redirect_to
+        = f.text_field :redirect_to
+      .field
+        %label selector
+        = f.text_field :selector
+
+      .actions
+        = f.submit 'Go'

data/app/views/wco/sitemap_paths/_index.haml

@@ -0,0 +1,15 @@
+
+.sitemap-paths--index
+  %table.bordered.data-table
+    %thead
+      %td Path
+      %td Redirect To
+      %td Selector
+      %td Status
+    %tbody
+      - spaths.each do |spath|
+        %tr
+          %td= spath.path
+          %td= spath.redirect_to
+          %td= spath.selector
+          %td= spath.status

data/app/views/wco/sites/show.haml

@@ -1,8 +1,18 @@
 
-.sites-show.maxwidth
-  .header
-    %h5.title
-      = @site
+.sites-show.padded
+  .maxwidth
+    .header
+      %h5.title
+        = @site
 
-  = render '/wco/tags/header'
-  = render '/wco/tags/index', tags: @site.tags
+    = render '/wco/tags/header'
+    = render '/wco/tags/index', tags: @site.tags
+
+  %h5.d-flex
+    Sitemap Paths 
+    = link_to '[+]', new_sitemap_path_path( site_id: @site.id )
+     
+    = button_to 'check', check_sitemap_path( site: @site ), data: { confirm: 'Are you sure?' }
+  = render '/wco/sitemap_paths/form', spath: @new_sitemap_path
+  -# %hr
+  = render '/wco/sitemap_paths/index', spaths: @site.sitemap_paths

data/app/views/wco/tags/_header.haml

@@ -1,7 +1,5 @@
 
-.d-flex
-  = link_to "Tags (#{Wco::Tag.all.length})", wco.tags_path
-  .inline-search
-    = form_tag wco.tags_path, method: :get do
-      = text_field_tag :q
-  = link_to '[+]', wco.new_tag_path
+.header
+  %h5.title
+    Tags (#{Wco::Tag.all.length}) 
+    = link_to '[+]', wco.new_tag_path

data/app/views/wco/tags/_menuitem.haml

@@ -0,0 +1,9 @@
+
+.d-flex
+  = link_to "Tags (#{Wco::Tag.all.length})", wco.tags_path
+   
+  .inline-search
+    = form_tag wco.tags_path, method: :get do
+      = text_field_tag :q
+   
+  = link_to '[+]', wco.new_tag_path

data/config/routes.rb

@@ -54,7 +54,9 @@ Wco::Engine.routes.draw do
   get 'reports/deleted', to: 'reports#index', as: :deleted_reports, defaults: { deleted: true }
   resources :reports
 
+  post 'sites/:id/check_sitemap', to: 'sites#check_sitemap', as: :check_sitemap
   resources :sites
+  resources :sitemap_paths
   resources :subscriptions
 
   delete 'tags/remove/:id/from/:resource/:resource_id', to: 'tags#remove_from', as: :remove_tag_from

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.154
+  version: 3.1.0.155
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -455,6 +455,7 @@ files:
 - app/models/wco/publisher.rb
 - app/models/wco/report.rb
 - app/models/wco/site.rb
+- app/models/wco/sitemap_path.rb
 - app/models/wco/subscription.rb
 - app/models/wco/tag.rb
 - app/models/wco/utils.rb
@@ -466,6 +467,7 @@ files:
 - app/models/wco_email/email_action_template.rb
 - app/models/wco_email/email_action_template_tie.rb
 - app/models/wco_email/email_filter.rb
+- app/models/wco_email/email_filter_condition.rb
 - app/models/wco_email/email_template.rb
 - app/models/wco_email/message.rb
 - app/models/wco_email/message_stub.rb
@@ -597,6 +599,8 @@ files:
 - app/views/wco/reports/index_table.haml
 - app/views/wco/reports/new.haml
 - app/views/wco/reports/show.haml
+- app/views/wco/sitemap_paths/_form.haml
+- app/views/wco/sitemap_paths/_index.haml
 - app/views/wco/sites/_form.haml
 - app/views/wco/sites/_header.haml
 - app/views/wco/sites/edit.haml
@@ -608,6 +612,7 @@ files:
 - app/views/wco/tags/_index.haml
 - app/views/wco/tags/_index_chips.haml
 - app/views/wco/tags/_list_chips.haml
+- app/views/wco/tags/_menuitem.haml
 - app/views/wco/tags/edit.haml
 - app/views/wco/tags/index.haml
 - app/views/wco/tags/new.haml