wco_models 3.1.0.164 → 3.1.0.166

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c87e9885f96f8af28fb6dfe8b42737feebd4ea51fe9930a1644aabb6b3cb13b
-  data.tar.gz: addac291921ea6de9403cc874433454bca207c10873e440c9e32c130801fd917
+  metadata.gz: 8cccae822c2a979265b1d9cd46ac96dbf4bdfd453277eead17e30adc6c0e647b
+  data.tar.gz: b6a40fa99dc9940ce4be719fcb79dcf20aaa991eba6f7e40993f2a84ed296586
 SHA512:
-  metadata.gz: 7f82577f7d2deec1559c9680a9ca112297f2707b9eb67dfb6e21d619fa56d9aedab23c6f14b2681e78d06e50ad4585c268217d0a0bd8088acf253c46facc0594
-  data.tar.gz: e7649c671c0071be4e81ef15d0f67a2bdf70d6cbda15d8928f08fdc190fbf78376734df98d8b30314f95e90e28c27c51e4f6ead4b94ac1198b3ef23859a735ae
+  metadata.gz: 703af5c6c55f3442d3a9195b08e8db619778ff8330333ee60c75772c304aaea575cf66bc54fd0a4a098dc7c3a05d92008c263a563a0141d5474031d5cb9f2876
+  data.tar.gz: 311d50550ff7c4e336ac24c068be4b60eb04a729b38c7f71c3669d7a2dac0f4e4fb0508ea56ca23e6ffad64b84a71a7d8da177dd35e8c938edfa37bc46b2418e

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

@@ -0,0 +1,13 @@
+
+.Leads {
+  border: 1px solid var(--wco-color-2);
+  border-radius: .5em;
+  padding: 0.5em;
+}
+
+
+.Leadsets {
+  border: 1px solid var(--wco-color-2);
+  border-radius: .5em;
+  padding: 0.5em;
+}

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

@@ -0,0 +1,7 @@
+
+.office-actions--actions {
+  h5 {
+    font-size: 1em;
+    padding-right: 0.5em;
+  }
+}

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

@@ -194,6 +194,10 @@ textarea.monospace {
 
 /* R */
 
+.red {
+  color: red;
+}
+
 label.required {
   &:after {
     content: ' *';

data/app/controllers/wco/office_action_templates_controller.rb

@@ -22,6 +22,14 @@ class Wco::OfficeActionTemplatesController < Wco::ApplicationController
     authorize! :new, @oat
   end
 
+  def perform
+    @oat = OAT.find params[:id]
+    authorize! :run, @oat
+    @conversations = WcoEmail::Conversation.find( params[:conversation_ids] )
+    out = eval( @oat.action_exe )
+    flash_notice out
+  end
+
   def show
     @oat = OAT.find params[:id]
     authorize! :show, @oat

data/app/controllers/wco/sitemap_paths_controller.rb

@@ -0,0 +1,25 @@
+
+class Wco::SitemapPathsController < Wco::ApplicationController
+
+  def edit
+    @spath = Wco::SitemapPath.find params[:id]
+    authorize! :edit, @spath
+  end
+
+  def update
+    @spath = Wco::SitemapPath.find params[:id]
+    authorize! :update, @spath
+    flag = @spath.update params[:sitemap_path].permit!
+    if flag
+      flash_notice 'Success'
+      redirect_to site_path(@spath.site)
+    else
+      flash_alert 'No luck.'
+      render action: 'edit'
+    end
+
+  end
+
+
+end
+

data/app/controllers/wco/sites_controller.rb

@@ -4,8 +4,11 @@ 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
+    out          = @site.check_sitemap
+    @results     = out[:results]
+    @total_count = out[:total_count]
+    @error_count = out[:error_count]
+    # redirect_to request.referrer
   end
 
   def create

data/app/models/wco/leadset.rb

@@ -12,6 +12,20 @@ class Wco::Leadset
   def normalize_company_url
     company_url.downcase!
   end
+  def domain; company_url; end # for anti-spam
+  def self.from_email email
+    _domain = email.split('@')[1]
+    words = _domain.split('.')
+    if %w| com net gov org |.include?( words[-2] )
+      words = words[-3, 3]
+    else
+      words = words[-2, 2]
+    end
+    _domain = words.join('.')
+    find_or_create_by( company_url: _domain )
+  end
+
+
 
   field :email
   index({ email: 1 }, { name: 'email' })
@@ -20,6 +34,7 @@ class Wco::Leadset
 
   has_many :appliances,    class_name: '::WcoHosting::Appliance',   inverse_of: :leadset
   has_many :appliance_tmpl_prices, class_name: 'Wco::Price'
+
   has_many :environments,  class_name: '::WcoHosting::Environment', inverse_of: :leadset
   has_many :invoices,      class_name: 'Wco::Invoice'
   has_many :leads,         class_name: 'Wco::Lead'
@@ -27,7 +42,10 @@ class Wco::Leadset
 
   has_many :profiles,      class_name: 'Wco::Profile',              inverse_of: :leadset
   has_many :subscriptions, class_name: 'Wco::Subscription',         inverse_of: :leadset
-  has_and_belongs_to_many :tags, class_name: 'Wco::Tag'
+  has_and_belongs_to_many :conversations, class_name: '::WcoEmail::Conversation', index: true
+  def convs; conversations; end
+  has_and_belongs_to_many :tags,          class_name: 'Wco::Tag'
+  has_and_belongs_to_many :email_filters, class_name: 'WcoEmail::EmailFilter'
 
 
   field :next_invoice_number, type: :integer, default: 100

data/app/models/wco/profile.rb

@@ -9,7 +9,13 @@ class Wco::Profile
   index({ email: 1 }, { name: 'email' })
   validates :email, presence: true, uniqueness: true
 
+
   field :per_page, type: :integer, default: 25
+
+  field :schwab_access_token,  type: :string
+  field :schwab_refresh_token, type: :string
+  field :schwab_id_token,      type: :string
+
   field :show_n_thumbs, type: :integer, default: 8
 
   has_many :reports, class_name: 'Wco::Report'

data/app/models/wco/site.rb

@@ -105,19 +105,19 @@ class Wco::Site
   end
 
   def check_sitemap
-    results = []
-    total_count = 0
-    error_count = 0
+    @results = []
+    @total_count = 0
+    @error_count = 0
 
     sitemap_paths.each do |check|
-      total_count += 1
+      @total_count += 1
 
-      # puts "Checking #{check[:path]}:"
-      if check[:selector]
+      puts "Checking #{check[:path]}:"
+      if check[:selector].present?
         begin
           body = HTTParty.get( "#{origin}#{check[:path]}" ).body
         rescue OpenSSL::SSL::SSLError => err
-          results.push "NOT OK [ssl-exception] #{check[:path]}".red
+          @results.push "NOT OK [ssl-exception] #{check[:path]}".red
           logg "NOT OK [ssl-exception] #{check[:path]}"
           check.update status: 'NOT OK'
 
@@ -126,71 +126,71 @@ class Wco::Site
         doc = Nokogiri::HTML( body )
         out = doc.search check[:selector]
         if out.present?
-          results.push "OK #{check[:path]}"
+          @results.push "OK #{check[:path]}"
           logg "OK #{check[:path]}"
           check.update status: 'OK'
         else
-          results.push "NOT OK [selector-missing] #{check[:path]}".red
+          @results.push "NOT OK [selector-missing] #{check[:path]}".red
           logg "NOT OK [selector-missing] #{check[:path]}"
           check.update status: 'NOT OK'
-          error_count += 1
+          @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"
+            @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
+            @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
+            @error_count += 1
           end
         end
 
-      elsif check[:redirect_to]
+      elsif check[:redirect_to].present?
         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]}"
+          @results.push "OK #{check[:path]}"
           logg "OK #{check[:path]}"
           check.update status: 'OK'
         else
-          results.push "NOT OK [redirect-missing] #{check[:path]}".red
+          @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
+          @error_count += 1
 
           puts "NOT OK #{check[:path]}".red
           puts out.headers[:location]
           puts check[:redirect_to]
         end
       else
-        results.push "SKIP #{check[:path]}"
+        @results.push "SKIP #{check[:path]}"
         logg "SKIP #{check[:path]}"
         check.update status: 'SKIP'
       end
 
-      if check[:selectors]
+      if check[:selectors]&[0]
         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}"
+            @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
+            @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
+            @error_count += 1
           end
         end
       end
@@ -198,11 +198,12 @@ class Wco::Site
     end
 
     puts "Results:".green
-    results.each do |r|
+    @results.each do |r|
       puts r
     end
-    puts "Total count: #{total_count}"
-    puts "Error count: #{error_count}"
+    puts "Total count: #{@total_count}"
+    puts "Error count: #{@error_count}"
+    return { total_count: @total_count, error_count: @error_count, results: @results }
   end
 
   def logg msg

data/app/models/wco_email/conversation.rb

@@ -27,8 +27,9 @@ class WcoEmail::Conversation
 
   has_many :messages,             class_name: '::WcoEmail::Message'
 
-  has_and_belongs_to_many :tags,  class_name: 'Wco::Tag', index: true
-  has_and_belongs_to_many :leads, class_name: 'Wco::Lead', index: true
+  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
 

data/app/models/wco_email/email_filter.rb

@@ -25,7 +25,9 @@ class WcoEmail::EmailFilter
 
   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'
+  has_and_belongs_to_many :leadsets,     class_name: 'Wco::Leadset'
 
   belongs_to :tag, class_name: 'Wco::Tag', inverse_of: :email_filters, optional: true
 

data/app/models/wco_email/message_stub.rb

@@ -88,6 +88,10 @@ class WcoEmail::MessageStub
     ## Leadset, Lead
     from      = the_mail.from ? the_mail.from[0] : "nobody@unknown-doma.in"
     lead      = Wco::Lead.find_or_create_by_email( from )
+    conv.leads.push lead
+    leadset   = Wco::Leadset.from_email from
+    conv.leadsets.push leadset
+    # conv.save
 
     message   = WcoEmail::Message.unscoped.where( message_id: message_id ).first
     if message
@@ -150,9 +154,6 @@ class WcoEmail::MessageStub
       puts! @message.errors.full_messages.join(", "), "Could not save @message"
     end
 
-    conv.leads.push lead
-    conv.save
-
     the_mail.cc&.each do |cc|
       Wco::Lead.find_or_create_by_email( cc )
     end

data/app/views/wco/leads/_index_chips.haml

@@ -0,0 +1,5 @@
+
+.Leads.mb-2
+  .d-inline <b>Leads:</b>
+  - leads.each do |lead|
+    .Chip= link_to lead.email, wco.lead_path( lead )

data/app/views/wco/leadsets/_index_chips.haml

@@ -0,0 +1,5 @@
+
+.Leadsets.mb-2
+  .d-inline <b>Leadsets:</b>
+  - leadsets.each do |ls|
+    .Chip= link_to ls.company_url, wco.leadset_path( ls )

data/app/views/wco/office_actions/_actions.haml

@@ -0,0 +1,7 @@
+
+.office-actions--actions.Card.d-flex
+  %h5 Office Action
+  .d-inline-block
+    = select_tag :office_action_template, options_for_select(@office_action_templates_list), class: 'select2'
+  %a.btn.office-action-templates-perform-btn{ href: "javascript: void(0)", data: { url: wco.office_action_templates_perform_path } }
+    Perform

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

@@ -1,6 +1,11 @@
 
+- if spath.new_record?
+  - url = spaths_path
+- else
+  - url = spath_path(spath)
+
 .sitemap-paths--form
-  = form_for spath do |f|
+  = form_for spath, url: url do |f|
     = hidden_field_tag :site_id, spath[:site_id] || params[:site_id]
 
     .d-flex

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

@@ -3,13 +3,19 @@
   %table.bordered.data-table
     %thead
       %td Path
-      %td Redirect To
-      %td Selector
+      -# %td Redirect To
+      -# %td Selector
       %td Status
     %tbody
       - spaths.each do |spath|
         %tr
-          %td= spath.path
-          %td= spath.redirect_to
-          %td= spath.selector
+          %td
+            = link_to '[~]', edit_spath_path(spath)
+            = spath.path
+            - if spath.redirect_to
+              %div
+                \->  
+                = spath.redirect_to
+            - if spath.selector
+              .green.ml-5= spath.selector
           %td= spath.status

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

@@ -0,0 +1,5 @@
+
+.sitemap-paths-edit.maxwidth
+  .header
+    %h3.title Edit spath
+  = render 'form', spath: @spath

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

@@ -0,0 +1,15 @@
+
+.sites-check-sitemap.padded
+  .header
+    %h3.title Checked sitemap
+
+  %ul
+    %li
+      Total count: #{@total_count}
+    %li
+      Error count: #{@error_count}
+
+  %ul
+    - @results.each do |r|
+      %li= r
+

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

@@ -9,8 +9,8 @@
     = render '/wco/tags/index', tags: @site.tags
 
   %h5.d-flex
-    Sitemap Paths 
-    = link_to '[+]', new_sitemap_path_path( site_id: @site.id )
+    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

data/app/views/wco_email/conversations/_table.haml

@@ -4,7 +4,10 @@
     %thead
       %th.select-all.nosort
         = render '/wco/select_all'
-      %th.leads leads
+      %th.leads
+        leadsets
+        %span.red /
+        leads
       %th.subject subject, preview
       %th.tags Tags
       %th.latest-at latest_at
@@ -15,11 +18,13 @@
             .gray= idx+1
             = check_box_tag 'conversation_ids[]', conv.id.to_s, nil, { class: 'i-sel' }
           %td.leads.mini
-            -# - conv.from_emails.each do |from|
-            -#   = link_to from, wco.lead_path( from )
-            -# %hr
-            - conv.leads.each do |lead|
-              = link_to lead.email, wco.lead_path( lead )
+            %ul.m-0.p-0
+              - conv.leadsets.each do |ls|
+                %li= ls.company_url
+            %hr
+            %ul.m-0.p-0
+              - conv.leads.each do |lead|
+                %li= link_to lead.email, wco.lead_path( lead )
           %td.subject
             - if conv.unread?
               <b>#{link_to conv.subject, wco_email.conversation_path(conv)}</b>

data/config/routes.rb

@@ -41,7 +41,8 @@ Wco::Engine.routes.draw do
 
   resources :obfuscated_redirects
 
-  post 'office_action_templates', to: 'office_action_templates#update'
+  post 'office_action_templates',         to: 'office_action_templates#update'
+  post 'office_action_templates/perform', to: 'office_action_templates#perform', as: :office_action_templates_perform
   resources :office_action_templates
   resources :office_actions
 
@@ -61,7 +62,7 @@ Wco::Engine.routes.draw do
 
   post 'sites/:id/check_sitemap', to: 'sites#check_sitemap', as: :check_sitemap
   resources :sites
-  resources :sitemap_paths
+  resources :sitemap_paths, as: :spaths
   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.164
+  version: 3.1.0.166
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -419,7 +419,8 @@ files:
 - app/assets/stylesheets/wco/chip.scss
 - app/assets/stylesheets/wco/conversations.scss
 - app/assets/stylesheets/wco/galleries.scss
-- app/assets/stylesheets/wco/leads.scss
+- app/assets/stylesheets/wco/leads_leadsets.scss
+- app/assets/stylesheets/wco/office_action_templates.scss
 - app/assets/stylesheets/wco/pagination.scss
 - app/assets/stylesheets/wco/photos.scss
 - app/assets/stylesheets/wco/utils.scss
@@ -443,6 +444,7 @@ files:
 - app/controllers/wco/profiles_controller.rb
 - app/controllers/wco/publishers_controller.rb
 - app/controllers/wco/reports_controller.rb
+- app/controllers/wco/sitemap_paths_controller.rb
 - app/controllers/wco/sites_controller.rb
 - app/controllers/wco/subscriptions_controller.rb
 - app/controllers/wco/tags_controller.rb
@@ -553,6 +555,7 @@ files:
 - app/views/wco/leads/_form_import.haml
 - app/views/wco/leads/_header.haml
 - app/views/wco/leads/_index.haml
+- app/views/wco/leads/_index_chips.haml
 - app/views/wco/leads/_table.haml
 - app/views/wco/leads/edit.haml
 - app/views/wco/leads/index.haml
@@ -560,6 +563,7 @@ files:
 - app/views/wco/leads/show.haml
 - app/views/wco/leadsets/_form.haml
 - app/views/wco/leadsets/_header.haml
+- app/views/wco/leadsets/_index_chips.haml
 - app/views/wco/leadsets/edit.haml
 - app/views/wco/leadsets/index.haml
 - app/views/wco/leadsets/index_dataTables.haml
@@ -582,6 +586,7 @@ files:
 - app/views/wco/office_action_templates/index.haml
 - app/views/wco/office_action_templates/new.haml
 - app/views/wco/office_action_templates/show.haml
+- app/views/wco/office_actions/_actions.haml
 - app/views/wco/office_actions/_form.haml
 - app/views/wco/office_actions/_header.haml
 - app/views/wco/office_actions/_index.haml
@@ -629,8 +634,10 @@ 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/edit.haml
 - app/views/wco/sites/_form.haml
 - app/views/wco/sites/_header.haml
+- app/views/wco/sites/check_sitemap.haml
 - app/views/wco/sites/edit.haml
 - app/views/wco/sites/index.haml
 - app/views/wco/sites/new.haml

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

@@ -1,6 +0,0 @@
-
-.Leads {
-  border: 1px solid var(--wco-color-2);
-  border-radius: .5em;
-  padding: 0.5em;
-}