wco_models 3.1.0.167 → 3.1.0.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05367b8f0f5fd71ec10163a5b9015ee30e8d7ab8d9b44dfc85532e92b084e2be
-  data.tar.gz: cd907b758d6867b0f414afa1d5f9c95b2893b4419f5480fd72039ac4b9cb1191
+  metadata.gz: 55d9ac4131e23711ece162eeb0d966ad0a0a1d674eeaff4914e9a8f8a04d8854
+  data.tar.gz: dd2312d66791bc3bb0bf644632acc6f9d37513a5331a226ea911ad2f7fa1f5e8
 SHA512:
-  metadata.gz: ab4d63e88b4ebbf1167d8eae84603ac23a367d83e6f8f04e5624a8809dd3d31daaa8e138b3887be6d8d4b8988090b479c7de24c7cb5e8876170558677d85df68
-  data.tar.gz: ae176db912dcd3a51c9da77564bba7ab2e3146e46b5b62b68e2ffb42b2b74bad9958e4a95df78c7df441e69c11451dd8bea3b975f77c61704b16a3a99be32386
+  metadata.gz: e886165a18d09abcc2798f081803c2fb645d0c664e152e5511b496a534b58b8c9ae8977aa64c2c728c2bda233546bb3a82418cdf25b731768060f2d6e87b9dc5
+  data.tar.gz: 88921f8da539770fd3698a7a98be6eff4f8043b8d4513d495f1a55a9b44763124221e939c98f8583a36a51d4b40541b7c71aaa090c626dc2a62e44ef96852d92

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

@@ -0,0 +1,4 @@
+
+.Sitemaps {
+  border: 1px solid red;
+}

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

@@ -74,7 +74,6 @@ textarea.monospace {
   padding: 0.6em;
 }
 
-
 /* D */
 
 .descr {

data/app/controllers/wco/sitemap_paths_controller.rb

@@ -1,11 +1,36 @@
 
 class Wco::SitemapPathsController < Wco::ApplicationController
 
+  def check
+    @spath = Wco::SitemapPath.find params[:id]
+    authorize! :check, @spath
+    @spath.check
+  end
+
+  def create
+    authorize! :create, Wco::SitemapPath
+    @spath = Wco::SitemapPath.new params[:spath].permit!
+    if @spath.save
+      flash_notice 'Success.'
+      redirect_to wco.site_path(params[:spath][:site_id])
+    else
+      flash_alert "Could not save spath: #{@spath.errors.full_messages}"
+      render 'new'
+    end
+  end
+
   def edit
     @spath = Wco::SitemapPath.find params[:id]
+    @site = @spath.site
     authorize! :edit, @spath
   end
 
+  def new
+    @site = Wco::Site.find( params[:site_id] )
+    @spath = Wco::SitemapPath.new site: @site
+    authorize! :new, @spath
+  end
+
   def update
     @spath = Wco::SitemapPath.find params[:id]
     authorize! :update, @spath

data/app/mailers/wco_email/application_mailer.rb

@@ -77,7 +77,8 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     mail( from:    @ctx.from_email,
           to:      @ctx.to_email,
           cc:      @ctx.cc,
-          bcc:     "poxlovibb1@gmail.com",
+          ## 2024-07-30 I'm no longer sending these to google.
+          # bcc:     "poxlovibb1@gmail.com",
           subject: rendered_subject,
           body:    rendered_str,
           content_type: "text/html" )

data/app/models/wco/site.rb

@@ -31,8 +31,11 @@ class Wco::Site
   field :username
   field :password
 
+  default_scope ->{ order_by( slug: :asc ) }
+
   def to_s
-    origin
+    slug
+    # origin
   end
 
   def self.list

data/app/models/wco/sitemap_path.rb

@@ -10,11 +10,78 @@ class Wco::SitemapPath
   field :path,        type: String
   validates :path, presence: true, uniqueness: { scope: :site }
 
+  field :meta_description, type: String
   field :redirect_to, type: String
   field :selector,    type: String
   field :selectors,   type: Array, default: []
 
-  field :status,      type: String
+  field :results, type: Array, default: []
+  field :status,  type: String
+
+  def check
+    self.status = 'NOT_OK'
+    if self[:selector]
+      begin
+        body = HTTParty.get( "#{site.origin}#{self[:path]}" ).body
+      rescue OpenSSL::SSL::SSLError => err
+        results.push "NOT OK [ssl-exception] #{self[:path]}".red
+        return
+      end
+      doc = Nokogiri::HTML( body )
+      out = doc.search self[:selector]
+      if out.present?
+        results.push "OK #{self[:path]}"
+        self.status = 'OK'
+      else
+        results.push "NOT OK [selector-missing] #{self[:path]}".red
+      end
+
+      if self[:meta_description]
+        out = doc.search( 'head meta[name="description"]' )[0]['content']
+        if self[:meta_description] == out
+          results.push "OK #{self[:path]} meta_description"
+          self.status = 'OK'
+        else
+          results.push "NOT OK [meta-description-missing] #{self[:path]}".red
+        end
+      end
+
+    elsif self[:redirect_to]
+      out = HTTParty.get( "#{origin}#{self[:path]}", follow_redirects: false )
+      if( out.headers[:location] == self[:redirect_to] ||
+          out.headers[:location] == "#{origin}#{self[:redirect_to]}" )
+        results.push "OK #{self[:path]}"
+        self.status = 'OK'
+      else
+        results.push "NOT OK [redirect-missing] #{self[:path]}".red
+
+        puts!( out.response, 'response' ) if DEBUG
+        # puts!( out.body, 'body' ) if DEBUG
+
+        puts "NOT OK #{self[:path]}".red
+        puts out.headers[:location]
+        puts self[:redirect_to]
+      end
+    else
+      results.push "SKIP #{self[:path]}"
+      self.status = 'OK'
+    end
+
+    if self[:selectors].present?
+      self[:selectors].each do |selector|
+        body = HTTParty.get( "#{origin}#{self[:path]}" ).body
+        doc = Nokogiri::HTML( body )
+        out = doc.search selector
+        if out.present?
+          results.push "OK #{self[:path]} selectors:#{selector}"
+          self.status = 'OK'
+        else
+          results.push "NOT OK [selectors-missing:#{selector}] #{self[:path]}".red
+        end
+      end
+    end
+    self.save
+  end
 
 end
 

data/app/models/wco_email/message_stub.rb

@@ -221,11 +221,12 @@ class WcoEmail::MessageStub
     if config['skip_notification']
       ;
     else
-      conv = WcoEmail::Conversation.find( conv.id )
-      if conv.tags.include? Wco::Tag.inbox
-        out = WcoEmail::ApplicationMailer.forwarder_notify( @message.id.to_s )
-        Rails.env.production? ? out.deliver_later : out.deliver_now
-      end
+      ## 2024-07-30 I'm no longer sending these to google.
+      # conv = WcoEmail::Conversation.find( conv.id )
+      # if conv.tags.include? Wco::Tag.inbox
+      #   out = WcoEmail::ApplicationMailer.forwarder_notify( @message.id.to_s )
+      #   Rails.env.production? ? out.deliver_later : out.deliver_now
+      # end
     end
 
     puts 'ok'

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

@@ -5,8 +5,8 @@
   - url = spath_path(spath)
 
 .sitemap-paths--form
-  = form_for spath, url: url do |f|
-    = hidden_field_tag :site_id, spath[:site_id] || params[:site_id]
+  = form_for spath, url: url, as: :spath do |f|
+    = hidden_field_tag 'spath[site_id]', spath[:site_id] || params[:site_id]
 
     .d-flex
       .field

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

@@ -11,7 +11,8 @@
         %tr
           %td
             = link_to '[~]', edit_spath_path(spath)
-            = spath.path
+            .d-inline-block= button_to 'check', check_spath_path(spath), method: :get
+            = link_to "#{@site.origin}#{spath.path}","#{@site.origin}#{spath.path}", target: :_blank
             - if spath.redirect_to
               %div
                 \->  

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

@@ -0,0 +1,3 @@
+
+.spaths-check
+  = @spath.results.inspect

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

@@ -1,5 +1,6 @@
 
 .sitemap-paths-edit.maxwidth
   .header
-    %h3.title Edit spath
+    %h3.title
+      Edit Spath for `#{link_to @site, site_path(@site)}`
   = render 'form', spath: @spath

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

@@ -0,0 +1,7 @@
+
+.spaths-new.maxwidth
+  .header
+    %h3.title
+      New Spath for `#{link_to @site, site_path(@site)}`
+
+  = render 'form', spath: @spath

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

@@ -5,14 +5,18 @@
       %h5.title
         = @site
 
-    = render '/wco/tags/header'
-    = render '/wco/tags/index', tags: @site.tags
+  .row
+    .Sitemaps.col-md-9
 
-  %h5.d-flex
-    Sitemap Paths  
-    = link_to '[+]', new_spath_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
+      %h5.d-flex
+        Sitemap Paths  
+        = link_to '[+]', new_spath_path( site_id: @site.id )
+         
+        = button_to 'check', check_sitemap_path( site: @site ), data: { confirm: 'Are you sure?' }
+
+      -# %hr
+      = render '/wco/sitemap_paths/index', spaths: @site.sitemap_paths
+
+    .col-md-3
+      = render '/wco/tags/header'
+      = render '/wco/tags/index', tags: @site.tags

data/config/routes.rb

@@ -62,6 +62,7 @@ Wco::Engine.routes.draw do
 
   post 'sites/:id/check_sitemap', to: 'sites#check_sitemap', as: :check_sitemap
   resources :sites
+  get 'sitemap_paths/:id/check', to: 'sitemap_paths#check', as: :check_spath
   resources :sitemap_paths, as: :spaths
   resources :subscriptions
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.167
+  version: 3.1.0.169
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -424,6 +424,7 @@ files:
 - app/assets/stylesheets/wco/office_action_templates.scss
 - app/assets/stylesheets/wco/pagination.scss
 - app/assets/stylesheets/wco/photos.scss
+- app/assets/stylesheets/wco/sitemaps.scss
 - app/assets/stylesheets/wco/utils.scss
 - app/assets/stylesheets/wco/videos.scss
 - app/controllers/wco/api/leads_controller.rb
@@ -454,7 +455,6 @@ files:
 - app/helpers/wco/application_helper.rb
 - app/jobs/wco_hosting/certbot_job.rb
 - app/mailers/wco_email/application_mailer.rb
-- app/mailers/wco_email/application_mailer.rb-trash
 - app/models/ability.rb
 - app/models/ahoy/event.rb
 - app/models/ahoy/visit.rb
@@ -635,7 +635,9 @@ files:
 - app/views/wco/reports/show.haml
 - app/views/wco/sitemap_paths/_form.haml
 - app/views/wco/sitemap_paths/_index.haml
+- app/views/wco/sitemap_paths/check.haml
 - app/views/wco/sitemap_paths/edit.haml
+- app/views/wco/sitemap_paths/new.haml
 - app/views/wco/sites/_form.haml
 - app/views/wco/sites/_header.haml
 - app/views/wco/sites/check_sitemap.haml

data/app/mailers/wco_email/application_mailer.rb-trash

@@ -1,18 +0,0 @@
-      ## From: https://www.fileformat.info/info/unicode/char/a.htm
-      ## From: https://stackoverflow.com/questions/7019034/utf-8-encoding-in-ruby-using-a-variable
-      ## From: https://stackoverflow.com/questions/52654509/random-generate-a-valid-unicode-character-in-ruby
-      ## latin
-      # n1 = 0x192
-      # n2 = 0x687
-      ##
-      ## weird punctuation
-      # n1 = 0x133
-      # n2 = 0x255
-
-      # random_utf8 = Enumerator.new do |yielder|
-      #   loop do
-      #     yielder << ( rand(n2-n1)+n1 ).chr('UTF-8')
-      #   rescue RangeError
-      #   end
-      # end
-      # rendered_subject = "#{rendered_subject} #{ random_utf8.next }#{ random_utf8.next }"