wco_models 3.1.0.82 → 3.1.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd7385bbbad06fcc84a31720f2f549a80703b2740d2031115b2479579c47a1d3
-  data.tar.gz: 6c19ad0bc735c05ebd457870aff9ca5e6b9368dbabd71cab789aa2bbadc8a06b
+  metadata.gz: e35d2da6576585f442b86b8ab7589e6338a8c621659f1cb3fbc9f83135c9803e
+  data.tar.gz: 2640b0995ab53af533155910cd90d607188754e87e6d58898eed2a1a3c98354e
 SHA512:
-  metadata.gz: f94c696a9048b71fa7497ec41033d74515d7136dbf342fa1c5c61c1430ef26c9ca4bad59b66b825a3ec3e11de3865a552ee0702c063bcde7aa40950dd6e7ead9
-  data.tar.gz: 9701df840501d675f1a6607fbb97dc7a7c0536052f490b29c902eee1e21f8f9fd038ec13bb7a2b7a28c90862cfd0170b083214997a7104fc53ba75d072f5e83b
+  metadata.gz: 0f55ff4f412e168ba9a2e715afd3e90abd8e44f5d209f544beec59e0d1e9125be0fe1e25763b62e14b131e9c986fb633594d974cedda643ceb8601c74f4b2c18
+  data.tar.gz: ee4b6abe4d93e40dabd416046b23fce7fea9a2596283fdcce523419eb33941c83855799b8201b32be22c21c554aed0212a50033ee45be56d91da197c8685c8aa

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

@@ -62,6 +62,14 @@ table.bordered {
 
 /* C */
 
+.Card {
+  border: 1px solid gray;
+  border-radius: 5px;
+
+  padding: 0.5em;
+  margin: 0 0.5em 0.5em 0;
+}
+
 .code,
 .mono,
 .monospace {
@@ -149,3 +157,16 @@ h5.title {
   word-break: break-word;
 }
 
+/* W */
+
+.w-300px {
+  width: 300px;
+}
+
+.w-400px {
+  width: 400px;
+}
+
+.w-500px {
+  width: 500px;
+}

data/app/controllers/wco/publishers_controller.rb

@@ -20,7 +20,9 @@ class Wco::PublishersController < Wco::ApplicationController
     @publisher = Wco::Publisher.find params[:id]
     authorize! :do_run, @publisher
 
-    @publisher.do_run binding
+    @publisher.props = OpenStruct.new( JSON.parse params[:publisher][:props] )
+    # @publisher.do_run binding
+    @publisher.do_run
 
     flash_notice "Probably ok"
 

data/app/models/wco/headline.rb

@@ -12,7 +12,8 @@ class Wco::Headline
   field :name
   validates :name, presence: true, uniqueness: true
 
-  belongs_to :site, class_name: 'Wco::Site'
+  ## @TODO: remove this entirely. 2024-01-16
+  belongs_to :site, class_name: 'Wco::Site', optional: true
 
   has_and_belongs_to_many :tags, class_name: 'Wco::Tag'
 

data/app/models/wco/office_action.rb

@@ -23,9 +23,25 @@ class Wco::OfficeAction
 
   field :perform_at, type: :time
 
+  def do_run
+    sch = self
+    sch.update!({ status: STATUS_INACTIVE })
+
+    eval( sch.tmpl.action_exe )
+
+    # schedule next actions & update the action
+    sch.tmpl.ties.each do |tie|
+      next_sch = self.class.find_or_initialize_by({
+        office_action_template_id: tie.next_tmpl.id,
+      })
+      next_sch.perform_at = eval(tie.next_at_exe)
+      next_sch.status     = STATUS_ACTIVE
+      next_sch.save!
+    end
+  end
+
   def to_s
     slug
   end
-
 end
 

data/app/models/wco/office_action_template_tie.rb

@@ -7,10 +7,10 @@ class Wco::OfficeActionTemplateTie
   attr_accessor :to_delete
 
   belongs_to :office_action_template,      class_name: 'OfficeActionTemplate', inverse_of: :ties
-  def oat; office_action_template; end
+  def tmpl; office_action_template; end
 
   belongs_to :next_office_action_template, class_name: 'OfficeActionTemplate', inverse_of: :prev_ties
-  def next_oat; next_office_action_template; end
+  def next_tmpl; next_office_action_template; end
   # def tmpl;     next_office_action_template; end
 
 

data/app/models/wco/publisher.rb

@@ -17,14 +17,17 @@ class Wco::Publisher
   field :context_eval
   field :after_eval
   field :post_body_tmpl
+  field :post_path
 
   has_many :oats, class_name: 'Wco::OfficeActionTemplate'
 
-  ## @TODO: move to PublisherDrupal
+  attr_accessor :props
+
   def do_run
-    @report = report
+    @site    = site
+    @headers = {}
+    @ctx     = OpenStruct.new
 
-    @ctx = OpenStruct.new
     eval( context_eval )
     puts! @ctx, '@ctx'
 
@@ -32,14 +35,9 @@ class Wco::Publisher
     body = JSON.parse tmpl.result(binding)
     puts! body, 'body'
 
-    headers = {}
-    if Wco::Site::KIND_DRUPAL == site.kind
-      headers['Content-Type'] = 'application/hal+json'
-    end
-
-    out = Wco::HTTParty.post( "#{site.origin}#{site.post_path}", {
+    out = Wco::HTTParty.post( "#{@site.origin}#{post_path}", {
       body: body.to_json,
-      headers: headers,
+      headers: @headers,
       basic_auth: { username: site.username, password: site.password },
     })
     puts! out.response, 'out'
@@ -47,33 +45,6 @@ class Wco::Publisher
     eval( after_eval )
   end
 
-  def publish_report report
-    @report = report
-    @site   = site
-
-    @ctx = OpenStruct.new
-    eval( context_eval )
-    puts! @ctx, '@ctx'
-
-
-    tmpl = ERB.new post_body_tmpl
-    body = JSON.parse tmpl.result(binding)
-    puts! body, 'body'
-
-    headers = {}
-    if Wco::Site::KIND_DRUPAL == site.kind
-      headers['Content-Type'] = 'application/hal+json'
-    end
-
-    out = Wco::HTTParty.post( "#{site.origin}#{site.post_path}", {
-      body: body.to_json,
-      headers: headers,
-      basic_auth: { username: site.username, password: site.password },
-    })
-    puts! out.response, 'out'
-
-    eval( after_eval )
-  end
 
   def to_s
     "#{slug}: #{kind} => #{site}"
@@ -82,7 +53,6 @@ class Wco::Publisher
   def self.list
     [[nil,nil]] + all.map { |p| [p, p.id] }
   end
-
 end
 
 =begin

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

@@ -13,14 +13,14 @@
       %label action_exe
       = f.text_area :action_exe, class: :monospace
 
-    .field.flex-row
-      %label From
-      = f.select :from_type, options_for_select( @from_types_list, selected: params[:from_type] || oat.from_type )
-      = f.select :from_id, options_for_select( @from_ids_list ), {}, class: 'select2'
-
-    .field.flex-row
-      %label Publisher
-      = f.select :publisher, options_for_select( @publishers_list, selected: oat.publisher ), {}, class: 'select2'
+    -# .field.flex-row
+    -#   %label From
+    -#   = f.select :from_type, options_for_select( @from_types_list, selected: params[:from_type] || oat.from_type )
+    -#   = f.select :from_id, options_for_select( @from_ids_list ), {}, class: 'select2'
+
+    -# .field.flex-row
+    -#   %label Publisher
+    -#   = f.select :publisher, options_for_select( @publishers_list, selected: oat.publisher ), {}, class: 'select2'
 
     .row
       .col-md-4

data/app/views/wco/office_action_templates/_ties.haml

@@ -1,5 +1,5 @@
 
-- oat ||= nil
+- tmpl ||= nil
 - depth ||= 5
 - depth = depth - 1
 
@@ -10,9 +10,9 @@
       %li
         = tie.next_at_exe
         %br
-        = link_to '[~]', edit_office_action_template_path(tie.next_oat)
-        = link_to tie.next_oat, office_action_template_path(tie.next_oat)
-        - if tie.next_oat == oat
+        = link_to '[~]', edit_office_action_template_path(tie.next_tmpl)
+        = link_to tie.next_tmpl, office_action_template_path(tie.next_tmpl)
+        - if tie.next_tmpl == tmpl
           <b>[Same]</b>
-        - elsif tie.next_oat.ties.present?
-          = render '/wco/office_action_templates/ties', ties: tie.next_oat.ties, depth: depth, oat: tie.next_oat
+        - elsif tie.next_tmpl.ties.present?
+          = render '/wco/office_action_templates/ties', ties: tie.next_tmpl.ties, depth: depth, tmpl: tie.next_tmpl

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

@@ -7,6 +7,8 @@
        
       = link_to oa.slug, office_action_path(oa)
       %ul
+        %li
+          .gray.mini= oa.id
         %li <b>status:</b> #{oa.status}
         %li
           <b>tmpl:</b>

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

@@ -1,9 +1,11 @@
 
 .publishers--form
   = form_for publisher do |f|
-    .field
+    .actions
+      = f.submit
+    .d-flex
       = f.label :slug
-      = f.text_field :slug
+      = f.text_field :slug, class: 'w-100'
 
     -## this is unnecessary b/c I use eval() :
     -# .field
@@ -12,9 +14,12 @@
     -#   = f.label :from_gallery
     -#   = f.select :from_gallery, options_for_select( @galleries_list, selected: publisher.from_gallery ), class: 'select2'
 
-    .field
+    .d-flex
       %label site
       = f.select :site, options_for_select( @sites_list, selected: publisher.site_id ), {}, class: 'select2'
+    .d-flex
+      %label post_path
+      = f.text_field :post_path, class: 'w-100'
     .field
       %label.d-block context_eval
       = f.text_area :context_eval, class: 'monospace'

data/app/views/wco/publishers/index.haml

@@ -1,5 +1,5 @@
 
-.publishers-index.padded
+.publishers-index.maxwidth
   %h5
     Publishers
     = link_to '[+]', wco.new_publisher_path
@@ -9,29 +9,26 @@
       %th  
       %th
         slug
-        %br
+      %th
         site
       %th
-        context_eval
-        %br
-        post_body_eval
+        Run
     - @publishers.each do |item|
       %tr
         %td
           .flex-row
-            = button_to '[x]',   wco.publisher_path(item), method: :delete, data: { confirm: 'Are you sure?' }
+            = button_to 'x',   wco.publisher_path(item), method: :delete, data: { confirm: 'Are you sure?' }
             = link_to '[~]',     wco.edit_publisher_path(item)
-            = button_to '[run]', wco.do_run_publisher_path( item ), data: { confirm: 'Are you sure?' }
         %td
+          -# = link_to item.slug, publisher_path(item)
           = item.slug
-          %hr
-          = item.site.origin
         %td
-          %pre.monospace
-            = item.context_eval
-          %hr
-          %pre.monospace
-            = item.post_body_tmpl
-          %hr
-          %pre.monospace
-            = item.after_eval
+          = link_to '[~]', edit_site_path(item.site)
+          -# = link_to item.site.origin, site_path(item.site)
+          = item.site
+        %td
+          .Card
+            = form_for item, url: wco.run_publisher_path( item ), method: :post do |f|
+              %label props
+              = f.text_field :props, class: 'w-400px'
+              = f.submit 'run', data: { confirm: 'Are you sure?' }

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

@@ -17,7 +17,7 @@
 
     .field
       %label Body
-      = f.text_area :body, class: 'p-2'
+      = f.text_area :body, class: 'tinymce'
 
     .field
       %label Tags (#{report.tags.length}):

data/app/views/wco/reports/index.haml

@@ -6,12 +6,16 @@
 
   %ul
     - @reports.each do |ttt|
-      %li
+      %li.Card
         .flex-row
           = button_to '[x]', report_path(ttt), method: :delete, data: { confirm: 'Are you sure?' }
           = link_to '[~]', edit_report_path(ttt)
-          = link_to ttt.slug, report_path(ttt)
+          .a
+            = link_to ttt.title, report_path(ttt)
+            %br
+            `#{ttt.slug}`
+            .gray.mini= ttt.id
         .flex-row
-          <b>Tags (#{ttt.tags.length}):</b>&nbsp;
+
           = render '/wco/tags/index_inline', tags: ttt.tags
 

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

@@ -1,6 +1,11 @@
 
 .reports-show.maxwidth
-  %h5 Report `#{@report.slug}`
+  %h5
+    = link_to '[~]', edit_report_path(@report)
+    Report #{link_to @report.title, report_path(@report)}
+    %br
+    `#{@report.slug}`
+    .gray.mini= @report.id
 
   .descr= raw @report.body
   -# %pre.descr= raw @report.body

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

@@ -1,17 +1,20 @@
 
 .sites--form
   = form_for site do |f|
+    .actions
+      = f.submit
     .field
       %label Slug
       = f.text_field :slug
 
-      = f.label :kind
-      = f.select :kind, options_for_select( Wco::Site.kinds_list, selected: site.kind )
+    -#   = f.label :kind
+    -#   = f.select :kind, options_for_select( Wco::Site.kinds_list, selected: site.kind )
+
     .field
       = f.label :origin
       = f.text_field :origin
-      = f.label :post_path
-      = f.text_field :post_path
+      -# = f.label :post_path
+      -# = f.text_field :post_path
     .field
       = f.label :username
       = f.text_field :username

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

@@ -1,5 +1,5 @@
 
-.sites-index.padded
+.sites-index.flexwidth
   %h5
     Sites
     = link_to '[+]', new_site_path
@@ -8,17 +8,17 @@
     %tr
       %th  
       %th slug
-      %th kind
+      -# %th kind
       %th origin
-      %th post_path
+      -# %th post_path
     - @sites.each do |ttt|
       %tr
         %td
           .flex-row
             = button_to '[x]', site_path(ttt), method: :delete, data: { confirm: 'Are you sure?' }
             = link_to '[~]', edit_site_path(ttt)
-          = ttt.id
+            .gray.mini= ttt.id
         %td= ttt.slug
-        %td= ttt.kind
+        -# %td= ttt.kind
         %td= ttt.origin
-        %td= ttt.post_path
+        -# %td= ttt.post_path

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

@@ -3,6 +3,7 @@
   %ul
     - tags.each do |tag|
       %li
+        = link_to '[~]', edit_tag_path(tag)
         = link_to tag.slug, tag_path(tag)
         <b>N headlines:</b> #{tag.headlines.length}
         <b>N reports:</b> #{tag.reports.length}

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

@@ -1,7 +1,7 @@
 
 
 .tags--index-inline
-  <b>Tags:</b>
+  <b>Tags (#{tags.length}):</b>
   - tags.each_with_index do |tag, idx|
     = link_to tag.slug, tag_path(tag)
     - if idx+1 != tags.length

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

@@ -0,0 +1,4 @@
+
+.tags-edit.maxwidth
+
+  = render 'form', tag: @tag

data/config/routes.rb

@@ -37,7 +37,7 @@ Wco::Engine.routes.draw do
   resources :prices
   resources :products
   resources :profiles
-  post 'publishers/:id/do-run', to: 'publishers#do_run', as: :do_run_publisher
+  post 'publishers/:id/do-run', to: 'publishers#do_run', as: :run_publisher
   resources :publishers
   resources :photos
 

data/lib/tasks/office_tasks.rake

@@ -2,34 +2,26 @@
 require 'business_time'
 require 'httparty'
 
-namespace :office do
+namespace :wco do
 
-  desc 'run_office_actions'
+
+  desc 'run office actions'
   task run_office_actions: :environment do
+    puts! "Starting wco_email:run_office_actions..."
     while true do
 
-      OA  = Wco::OfficeAction
-      OAT = Wco::OfficeActionTemplate
-
-      OA.active.where( :perform_at.lte => Time.now ).each do |oa|
-        puts "+++ +++ Office Action: #{oa}"
+      schs = Wco::OfficeAction.active.where({ :perform_at.lte => Time.now })
+      print "[#{schs.length}]" if schs.length != 0
+      schs.each do |sch|
 
-        oa.update({ status: INACTIVE })
-        oa.tmpl.do_run
-        oa.tmpl.ties.each do |tie|
-          next_oa = OA.find_or_initialize_by({
-            office_action_template_id: tie.next_oat.id,
-          })
-          next_oa.perform_at = eval( tie.next_at_exe )
-          next_oa.status     = ACTIVE
-          next_oa.save!
-        end
+        sch.do_run
 
-        print '^'
+        print "[#{sch.id}]^"
+        sleep 15
       end
 
       print '.'
-      sleep Rails.env.production? ? 60 : 5 # seconds
+      sleep 15
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.82
+  version: 3.1.0.85
 platform: ruby
 authors:
 - Victor Pudeyev