wco_models 3.1.0.173 → 3.1.0.175

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd705af408f7a2df9270b4fb75723b1c657a2df5c38437468a59a490028c249e
-  data.tar.gz: d9fbba6082924957cbc409c08a87dc60042890e2b70d538885a83f52ed3a40ab
+  metadata.gz: a05466d095355ec09936c5f72861b3292b272866d603196be5ace081f657c978
+  data.tar.gz: 00af6f41df7a96e17cab793b68b2fb5f4cedf6f84582c956ea1924ee3c0a42d6
 SHA512:
-  metadata.gz: 4ab8a576afb201f905788bd567a828bb8a7f4f347079fa292b9a93d00dcac16dc8ec72a7625370ea11579f9d99c4597903d60809855ecf27488269c2c158b074
-  data.tar.gz: 92decb4e332e25045a29ca87b90f7da3eabac5eaba969efdb2818b5d48e02bce135b6243b05414a9f02d2b6ad99f013b531890d27783cae2ce4ba33f399d600c
+  metadata.gz: b5d501169a2186a206ce0ff1cad4875bf6fd0bf1bb3cd90aa1ee93c6f33f55e30f974c63a6a268c19f5237d464385098e18aa6c9adbd3b950d32551960c22403
+  data.tar.gz: e3095c492065d542c85b29c93e54bce2bd0b7d6d653c6adbed89e9f230a57254c8155f39a7daefcfc2bb594c2a3fab4fb5b65cb1cd705332ba35b2d9c26eb797

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

@@ -90,7 +90,9 @@ textarea.monospace {
 
 /* F */
 
-
+.flex-grow {
+  flex-grow: 1;
+}
 .flex-row {
   display: flex;
 }

data/app/controllers/wco/sitemap_paths_controller.rb

@@ -1,15 +1,25 @@
 
 class Wco::SitemapPathsController < Wco::ApplicationController
 
+  before_action :fix_params, only: [ :create, :update ]
+
   def check
     @spath = Wco::SitemapPath.find params[:id]
     authorize! :check, @spath
     @spath.check
   end
 
+  def clear
+    @spath = Wco::SitemapPath.find params[:id]
+    authorize! :clear, @spath
+    @spath.update_attributes({ results: [] })
+    redirect_to request.referrer || sites_path(@spath.site)
+  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])
@@ -31,6 +41,14 @@ class Wco::SitemapPathsController < Wco::ApplicationController
     authorize! :new, @spath
   end
 
+  def show
+    @spath = Wco::SitemapPath.find params[:id]
+    @site = @spath.site
+    authorize! :show, @spath
+    render 'check'
+  end
+
+
   def update
     @spath = Wco::SitemapPath.find params[:id]
     authorize! :update, @spath
@@ -45,6 +63,19 @@ class Wco::SitemapPathsController < Wco::ApplicationController
 
   end
 
+  ##
+  ## private
+  ##
+  private
+
+  def fix_params
+    if params[:spath][:selectors].present?
+      params[:spath][:selectors] =  params[:spath][:selectors].split(',').strip
+    else
+      params[:spath][:selectors] = []
+    end
+  end
+
 
 end
 

data/app/models/wco/sitemap_path.rb

@@ -14,17 +14,20 @@ class Wco::SitemapPath
   field :redirect_to, type: String
   field :selector,    type: String
   field :selectors,   type: Array, default: []
+  field :title,       type: String
 
   field :results, type: Array, default: []
   field :status,  type: String
 
   def check
     self.status = 'NOT_OK'
+    skip_rest = false
+
     if self[:selector].present?
       begin
         body = HTTParty.get( "#{site.origin}#{self[:path]}" ).body
       rescue OpenSSL::SSL::SSLError => err
-        results.push "NOT OK [ssl-exception] #{self[:path]}".red
+        results.push "NOT OK [ssl-exception] #{self[:path]}" # .red
         return
       end
       doc = Nokogiri::HTML( body )
@@ -33,17 +36,7 @@ class Wco::SitemapPath
         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
+        results.push "NOT OK [selector-missing] #{self[:path]}" # .red
       end
 
     elsif self[:redirect_to].present?
@@ -53,33 +46,58 @@ class Wco::SitemapPath
         results.push "OK #{self[:path]}"
         self.status = 'OK'
       else
-        results.push "NOT OK [redirect-missing] #{self[:path]}".red
+        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 "NOT OK #{self[:path]}" # .red
         puts out.headers[:location]
         puts self[:redirect_to]
       end
+      skip_rest = true
     else
       results.push "SKIP #{self[:path]}"
       self.status = 'OK'
+      skip_rest = true
     end
 
-    if self[:selectors].present?
-      self[:selectors].each do |selector|
-        body = HTTParty.get( "#{site.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'
+    if !skip_rest
+
+      if self[:meta_description].present?
+        out = doc.search( 'head meta[name="description"]' )[0]['content']
+        if out.include?( self[:meta_description] )
+          results.push "OK #{self[:path]} meta_description"
+        else
+          self.status = 'NOT_OK'
+          results.push "NOT OK [meta-description-no-contain] #{self[:path]}" # .red
+        end
+      end
+
+      if self[:selectors].present?
+        self[:selectors].each do |selector|
+          out = doc.search selector
+          if out.present?
+            results.push "OK #{self[:path]} selectors:#{selector}"
+          else
+            self.status = 'NOT_OK'
+            results.push "NOT OK [selectors-missing:#{selector}] #{self[:path]}" # .red
+          end
+        end
+      end
+
+      if self[:title].present?
+        out = doc.search( 'head title' )[0].text
+        if out.include?( self[:title] )
+          results.push "OK #{self[:path]} title"
         else
-          results.push "NOT OK [selectors-missing:#{selector}] #{self[:path]}".red
+          self.status = 'NOT_OK'
+          results.push "NOT OK [title-no-contain] #{self[:path]}" # .red
         end
       end
+
     end
+
     self.save
   end
 

data/app/models/wco_email/message_stub.rb

@@ -23,7 +23,7 @@ class WcoEmail::MessageStub
   field :status, default: STATUS_PENDING
   scope :pending, ->{ where( status: STATUS_PENDING ) }
 
-  field     :bucket # 'ish-ses', 'ish-ses-2024'
+  field     :bucket # 'ish-ses' (current), 'ish-ses-2024'
 
   field     :object_key
   validates :object_key, presence: true, uniqueness: true

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

@@ -8,16 +8,24 @@
   = form_for spath, url: url, as: :spath do |f|
     = hidden_field_tag 'spath[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
+    .field.d-flex
+      %label Path
+      = f.text_field :path, class: [ 'flex-grow' ]
+    .field.d-flex
+      %label redirect_to
+      = f.text_field :redirect_to, class: [ 'flex-grow' ]
+      %label selector
+      = f.text_field :selector, class: [ 'flex-grow' ]
+    %br
+    .field.d-flex
+      %label selectors (.a, .b , #c)
+      = f.text_field :selectors, value: spath.selectors.join(','), class: [ 'flex-grow' ]
+    .field.d-flex
+      %label meta_description
+      = f.text_field :meta_description, class: [ 'flex-grow' ]
+    .field.d-flex
+      %label title
+      = f.text_field :title, class: [ 'flex-grow' ]
 
-      .actions
-        = f.submit 'Go'
+    .actions
+      = f.submit 'Go'

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

@@ -19,4 +19,7 @@
                 = spath.redirect_to
             - if spath.selector
               .green.ml-5= spath.selector
+              .green.ml-5= spath.selectors
+              .green.ml-5 Title: #{spath.title}
+              .green.ml-5 meta-descr: #{spath.meta_description}
           %td= spath.status

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

@@ -1,3 +1,13 @@
 
-.spaths-check
-  = @spath.results.inspect
+.sitemap-paths-check.maxwidth
+
+  .d-flex
+    = link_to 'Index', site_path(@spath.site)
+    %b.ml-3.mr-3= link_to @spath.path, spath_path(@spath)
+    = link_to '[~]', edit_spath_path(@spath)
+    = button_to 'clear', clear_spath_path(@spath), data: { confirm: 'Are you sure?' }
+
+  .spaths-check
+    %ul
+      - @spath.results.each do |pt|
+        %li= pt

data/config/routes.rb

@@ -62,7 +62,8 @@ 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
+  get  'sitemap_paths/:id/check', to: 'sitemap_paths#check', as: :check_spath
+  post 'sitemap_paths/:id/clear', to: 'sitemap_paths#clear', as: :clear_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.173
+  version: 3.1.0.175
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey