wco_models 3.4.0.5 → 3.4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0bb6771d05e882c4932770f8c12855ae9963030689e18ec2f5395d357e1d045
-  data.tar.gz: 623682dbcff63dabe928ae7c2783e793ae341c5a54957d60a703b74b8598abbc
+  metadata.gz: 6ef24908267939f55a22c88d1b022ca293b985ad0a32da5f01a4f528679c6358
+  data.tar.gz: 1f297824e345b3e6cb9e03f6dcb743b711619e523f4e0a94fb1978305c1b4bd1
 SHA512:
-  metadata.gz: 314511fdd0abade9ea2466385f22703173b2ddaa6526efb5f88844697b762fd483d51014fbee9bc6c0e2e76a3d6833f29bf0ed008efe8f58952f971fd229ff45
-  data.tar.gz: 638e823d9431c1235c8db0d24538780fb96d272328380854c5e572023baaddee1a87d584de8a36d001bec665de939ea5329876a65e34443321c24969f30a3a34
+  metadata.gz: 7a5341afd4417a5da9c157ce93e56f09bb443526ed7f2cc6b6812ea4328d95d58d7d2f948412a0a15ac60f748ee9b8216a05541ad77e7557fce4607cb4680c34
+  data.tar.gz: f066464898892187c146167ba6cd0889231abae7ac1a48118105dd0bc801ef032a08a64603b914f46b117d197b37d8f690d228adf8f924b6f7615a65af8a15b0

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

@@ -117,7 +117,10 @@ textarea.monospace {
 /* D */
 
 .d-flex {
-  align-items: baseline;
+  align-items: baseline; /* 2026-11-12: I dont want this alignment */
+}
+.no-align {
+  align-items: unset;
 }
 
 .descr {

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

@@ -10,10 +10,11 @@
 
 div.thumb {
   margin: 0 0.5em 0.5em 0;
+  flex-shrink: 0;
 }
 
 .photos-thumbs img,
-img.thumb {
+.thumb {
   border: 1px solid red;
   width: 100px;
   height: 100px;

data/app/controllers/wco/publishers_controller.rb

@@ -17,9 +17,13 @@ class Wco::PublishersController < Wco::ApplicationController
     authorize! :do_run, @publisher
 
     @publisher.props = OpenStruct.new( JSON.parse params[:props] )
-    @publisher.do_run
+    flag = @publisher.do_run
+    if !flag
+      flash_alert @publisher.errors
+    else
+      flash_notice "#do_run_any Probably ok"
+    end
 
-    flash_notice "#do_run_any Probably ok"
     redirect_to request.referrer || { action: 'index' }
   end
 

data/app/models/wco/publisher.rb

@@ -1,4 +1,11 @@
 
+def url_exists?(url)
+  response = HTTParty.head(url, timeout: 5, follow_redirects: true)
+  response.code == 200
+rescue StandardError
+  false
+end
+
 class Wco::Publisher
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -19,6 +26,7 @@ class Wco::Publisher
   field :post_path
 
   has_many :oats, class_name: 'Wco::OfficeActionTemplate'
+  has_and_belongs_to_many :tags
 
   attr_accessor :props
 
@@ -33,6 +41,11 @@ class Wco::Publisher
     eval( context_eval )
     puts! @ctx, '@ctx'
 
+    if @abort
+      errors.add(:base, 'aborted')
+      return false
+    end
+
     tmpl = ERB.new publisher.post_body_tmpl
     body = JSON.parse tmpl.result(binding)
     puts! body, 'body'

data/app/models/wco/report.rb

@@ -25,8 +25,16 @@ class Wco::Report
 
   field :body
   def body_json
-    body.gsub(/\r/, '').gsub(/\n\n+/, '<br /><br />').to_json
+    out = body
+    if FORMAT_PLAINTEXT == body_format
+      out = out.gsub(/\r/, '').gsub(/\n\n+/, '<br /><br />')
+    end
+    out.to_json
   end
+  FORMAT_PLAINTEXT = 'format-plaintext'
+  FORMAT_FULLHTML  = 'format-fullhtml'
+  FORMATS = [ FORMAT_PLAINTEXT, FORMAT_FULLHTML ]
+  field :body_format, type: :string, default: FORMAT_PLAINTEXT
 
   field :x, :type => Float
   field :y, :type => Float

data/app/models/wco/tag.rb

@@ -29,6 +29,7 @@ class Wco::Tag
   has_and_belongs_to_many :message_stubs, class_name: '::WcoEmail::MessageStub'
   has_and_belongs_to_many :newsvideos, class_name: '::Wco::Newsvideo'
   has_and_belongs_to_many :reports,    class_name: '::Wco::Report'
+  has_and_belongs_to_many :publishers, class_name: '::Wco::Publisher'
   has_and_belongs_to_many :videos,     class_name: '::Wco::Video'
 
 
@@ -73,9 +74,13 @@ class Wco::Tag
 
 
   def to_s
-    slug
+    if site
+      "#{slug}@#{site}"
+    else
+      slug
+    end
   end
   def self.list
-    [[nil,nil]] + all.order_by( slug: :asc ).map { |p| [ p.slug, p.id ] }
+    [[nil,nil]] + all.includes(:site).order_by( slug: :asc ).map { |t| [ t.to_s, t.id.to_s ] }
   end
 end

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

@@ -23,7 +23,7 @@
     .field.d-flex.flex-column
       %label.d-block context_eval
       .descr
-        @headers, @props
+        @abort, @headers, @props, @site
       = f.text_area :context_eval, class: 'monospace'
     .field.d-flex.flex-column
       %label.d-block post_body_tmpl
@@ -33,5 +33,10 @@
     .field
       %label.d-block after_eval
       = f.text_area :after_eval, class: 'monospace'
+
+    .field
+      %label Tags (#{publisher.tags.length}):
+      = f.select :tag_ids, options_for_select(@tags_list, selected: publisher.tag_ids), {}, { multiple: true, class: 'select2' }
+
     .actions
       = f.submit

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

@@ -19,7 +19,10 @@
       %label Summary
       = f.text_area :summary
 
-    .field
+    .field.d-flex.flex-column
+      %label body_format
+      = f.select :body_format, options_for_select(Wco::Report::FORMATS, selected: report.body_format)
+
       %label Body
       = f.text_area :body, class: 'tinymce'
 
@@ -33,9 +36,9 @@
       %label image
       = f.file_field :image_thumb
 
-      - if report.image_thumb&.image?
+      - if report.image_thumb
         %p Current:
-        = image_tag report.image_thumb.image.url(:thumb)
+        = image_tag report.image_thumb.photo.url(:thumb)
 
     -# .field
     -#   %label Newsvideo:

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

@@ -3,17 +3,24 @@
 
 .reports--index
   = paginate reports, :param_name => :reports_page, :views_prefix => 'wco'
-  - reports.each do |ttt|
+  - reports.each do |report|
     .Card
-      .flex-row
-        = button_to '[x]', report_path(ttt), method: :delete, data: { confirm: 'Are you sure?' }
-        = link_to '[~]', edit_report_path(ttt)
-        .a
-          = link_to ttt.title, report_path(ttt)
-          %br
-          `#{ttt.slug}`
-          .gray.mini= ttt.id
-      - if !config[:skip_tags]
+      .d-flex.no-align
+        .thumb
+          - if report.image_thumb
+            = image_tag report.image_thumb.photo.url(:thumb)
+
+
         .flex-row
-          = render '/wco/tags/list_chips', tags: ttt.tags
+          = button_to '[x]', report_path(report), method: :delete, data: { confirm: 'Are you sure?' }
+          = link_to '[~]', edit_report_path(report)
+          .a
+            = link_to report.title, report_path(report)
+            %br
+            .gray slug: `#{report.slug}`
+            .gray.mini= report.id
+            - if !config[:skip_tags]
+              .flex-row
+                = render '/wco/tags/list_chips', tags: report.tags
+
   = paginate reports, :param_name => :reports_page, :views_prefix => 'wco'

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

@@ -21,7 +21,12 @@
   %hr
   - if @report.image_thumb
     = image_tag @report.image_thumb.photo.url(:thumb)
-  .descr= raw @report.body
+  = @report.body_format
+  .descr
+    - if @report.body_format == 'format-plaintext'
+      %pre= @report.body
+    - if @report.body_format == 'format-fullhtml'
+      = raw @report.body
   %hr
 
   .actions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.4.0.5
+  version: 3.4.0.7
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-11-07 00:00:00.000000000 Z
+date: 2026-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3