wco_models 3.1.0.81 → 3.1.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1225e5f8ee14fb9e0b74a9b203ee6d31867bfc649672b397feb577352e70e210
-  data.tar.gz: 5b3ec3262738f2d7d5204152aa709d2074ae152d19626280ac9e08da0dd2c4fa
+  metadata.gz: 136fd63ec2289135d50625c8ee250e34de0ba12757cec2a0d535264d8b3af9b4
+  data.tar.gz: f696b308e67bd35b454f11880fbf876d378c603983ae941396605ba0ca8e5a4a
 SHA512:
-  metadata.gz: 32b07eefa66c98d2634d18ee1d393371870bd91cee74d68c123878ea5f9d7e40d996ac01b90212b45cf7a68be55aa0782c719ca96057e24f51a12c8a9583f690
-  data.tar.gz: 5ea6c008eb0090d52248094f436a8c2296d6084f882945c01f141efcf9185213ae1bca2f360a50d2cc6549cb463a0c792e72a518f5dcc8eb4305b4a91d9909db
+  metadata.gz: 125155b3a50dc0c7ae25c9dcb0f642ef3127bf13a3fa11040c91240deab4ef7bfd787d0ec73065b6c31f25a111c524637822d45bc0c6739ab8676833e826cd9d
+  data.tar.gz: e8c8f58699d02a209e9be4bfa177a987e40d67daa22db0535ade103f55dc4874ef8fb45c412ab1da49b5723996b4c734ce5cec1f48172bb6a41a22b5b73c2bae

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/galleries_controller.rb

@@ -7,6 +7,8 @@ class Wco::GalleriesController < Wco::ApplicationController
   # Alphabetized! : )
 
   def create
+    params[:gallery][:tag_ids]&.delete ''
+
     # params[:gallery][:shared_profiles] ||= []
     # params[:gallery][:shared_profiles].delete('')
     # params[:gallery][:shared_profiles] = Wco::Profile.find params[:gallery][:shared_profiles]
@@ -99,6 +101,7 @@ class Wco::GalleriesController < Wco::ApplicationController
   end
 
   def update
+    params[:gallery][:tag_ids]&.delete ''
     authorize! :update, @gallery
 
     old_shared_profile_ids = @gallery.shared_profiles.map(&:id)

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/controllers/wco/reports_controller.rb

@@ -4,7 +4,7 @@ class Wco::ReportsController < Wco::ApplicationController
   before_action :set_lists
 
   def create
-    params[:report][:tag_ids].delete ''
+    params[:report][:tag_ids]&.delete ''
 
     @report = Wco::Report.new params[:report].permit!
     authorize! :create, @report
@@ -51,7 +51,7 @@ class Wco::ReportsController < Wco::ApplicationController
   end
 
   def update
-    params[:report][:tag_ids].delete ''
+    params[:report][:tag_ids]&.delete ''
 
     @report = Wco::Report.unscoped.find params[:id]
     authorize! :update, @report

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/models/wco/report.rb

@@ -14,6 +14,7 @@ class Wco::Report
   field :title
   validates :title, presence: true, uniqueness: true
   index({ title: 1 }, { unique: true })
+  def name ; title ; end
 
   field :subtitle
 
@@ -39,10 +40,6 @@ class Wco::Report
 
   # has_one :photo
 
-  def export_fields
-    %w| name descr |
-  end
-
   has_and_belongs_to_many :tags
 
 end

data/app/models/wco/utils.rb

@@ -21,7 +21,7 @@ module Wco::Utils
 
   def set_slug
     return if !slug.blank?
-    if name
+    if defined? name
       new_slug = name.downcase.gsub(/[^a-z0-9\s]/i, '').gsub(' ', '-')
     else
       new_slug = '1'

data/app/models/wco_email/message.rb

@@ -105,7 +105,11 @@ class WcoEmail::Message
       })
 
     when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
-      out = Sch.create!({
+      ##
+      ## This error is normal:
+      ## Mongoid::Errors::Validations `Email action template is already taken`
+      ##
+      out = Sch.create({
         email_action_template: filter.email_action_template,
         status:                Sch::STATUS_ACTIVE,
         lead_id:               lead.id,

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/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
 

metadata

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