pulitzer 0.15.14 → 0.15.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28bc18b90e428c4175a5d10bd2d4a39f264233c1
-  data.tar.gz: fc3a3b64fd0f8c29d069aee7a6fd5a1c21113db6
+  metadata.gz: 257ca58d5e65ab4ed21ec10496f1b0304901e014
+  data.tar.gz: 63b3fa6ab76d1eda01eb948b422614d13ab390c9
 SHA512:
-  metadata.gz: d99829d36453d6ae958e0b599ef7098045b3425a267eeaec87630264265203c4d0b02f1a6cbe92e9d0e2e505226f26678058e05b99b37da2fbb2747c7d23fe8e
-  data.tar.gz: 7cd17af9eb7727fcd80de0530d3c89f491a9481eefe5c305c5dee60454e23fbb5d740918533d7ca7dc7e0ce803d2948f45a84ef70fffa465224b569e0f286c1c
+  metadata.gz: '0834f6c2053bae0a89d07407f5ef713f9e57d3f520eaee3876fc2764ed8577e51a2053a970abffb4a2465f8f92fc6e8fc5aaee6e7c7de4360d297999d8e3d1b5'
+  data.tar.gz: 3880a61be852368698131218084053bdee6f1d7977daf2a71b56ecc9acc541ce6f26c3b04483eccae4e61978c53eb3d79c47376ffa09e2c02302d18656c9ff71

data/app/controllers/pulitzer/partials_controller.rb

@@ -47,7 +47,7 @@ class Pulitzer::PartialsController < Pulitzer::ApplicationController
 
   def upgrade
     @partial = UpgradePartialVersion.new(@partial).call
-    render partial: 'show', locals: { partial: @partial }
+    render partial: 'show_wrapper', locals: { partial: @partial }
   end
 
   protected

data/app/controllers/pulitzer/post_type_versions_controller.rb

@@ -3,7 +3,7 @@ class Pulitzer::PostTypeVersionsController < Pulitzer::ApplicationController
 
   def index
     @post_type = Pulitzer::PostType.find(params[:post_type_id])
-    @post_type_versions = @post_type.post_type_versions
+    @post_type_versions = @post_type.post_type_versions.order(id: :desc)
     render_ajax
   end
 

data/app/interactions/pulitzer/clone_version.rb

@@ -5,8 +5,8 @@ class Pulitzer::CloneVersion
     @version = version
     @post = @version.post
     @new_version = new_version
-    Rails.logger.info("Pulitzer::CloneVersion !!! ")
-    Rails.logger.info($0)
+    Rails.logger.debug("Pulitzer::CloneVersion !!! ")
+    Rails.logger.debug($0)
   end
 
   def call

data/app/interactions/pulitzer/partials_controller/upgrade_partial_version.rb

@@ -8,6 +8,7 @@ class Pulitzer::PartialsController::UpgradePartialVersion
   def call
     most_recent_partial_version = @partial.post_type_version.post_type.most_recent_published_post_type_version
     new_partial = @free_form_section.partials.create(label: @partial.label, post_type_version_id: most_recent_partial_version.id)
+    clone_styles(@partial,new_partial)
     Pulitzer::CreatePartialContentElements.new(new_partial).call
     content_elements = new_partial.content_elements.to_a
     content_elements.each do |ce|
@@ -18,7 +19,56 @@ class Pulitzer::PartialsController::UpgradePartialVersion
         ce.destroy
       end
     end
+    @partial.remove_show = true
+    @partial.broadcast_change if defined? ForeignOffice
     @partial.destroy
+
+    new_partial.reload_show = true
+    new_partial.broadcast_change if defined? ForeignOffice
     new_partial
   end
+
+  def clone_styles(old_partial,new_partial)
+    old_arrangement_style = old_partial.arrangement_style
+    old_justification_style = old_partial.justification_style
+    old_background_style = old_partial.background_style
+    old_sequence_flow_style = old_partial.sequence_flow_style
+    new_arrangement_styles = new_partial.post_type_version.arrangement_styles.to_a
+    new_justification_styles = new_partial.post_type_version.justification_styles.to_a
+    new_background_styles = new_partial.post_type_version.background_styles.to_a
+    new_sequence_flow_styles = new_partial.post_type_version.sequence_flow_styles.to_a
+    if old_arrangement_style.present?
+      new_style = new_arrangement_styles.detect do |style|
+        old_arrangement_style.view_file_name == style.view_file_name
+      end
+      if new_style.present?
+        new_partial.arrangement_style_id = new_style.id
+      end
+    end
+    if old_justification_style.present?
+      new_style = new_justification_styles.detect do |style|
+        old_justification_style.css_class_name == style.css_class_name
+      end
+      if new_style.present?
+        new_partial.justification_style_id = new_style.id
+      end
+    end
+    if old_background_style.present?
+      new_style = new_background_styles.detect do |style|
+        old_background_style.css_class_name == style.css_class_name
+      end
+      if new_style.present?
+        new_partial.background_style_id = new_style.id
+      end
+    end
+    if old_sequence_flow_style.present?
+      new_style = new_sequence_flow_styles.detect do |style|
+        old_sequence_flow_style.css_class_name == style.css_class_name
+      end
+      if new_style.present?
+        new_partial.sequence_flow_style_id = new_style.id
+      end
+    end
+    new_partial.save
+  end
 end

data/app/models/pulitzer/partial.rb

@@ -1,5 +1,7 @@
 module Pulitzer
   class Partial < Pulitzer::ApplicationRecord
+    include ForeignOffice::Broadcaster if defined? ForeignOffice
+
     belongs_to :free_form_section
     belongs_to :post_type_version
     belongs_to :background_style
@@ -12,7 +14,10 @@ module Pulitzer
 
     accepts_nested_attributes_for :content_elements
     
+    attr_accessor :reload_show, :remove_show
+
     delegate :name, :post_type_content_element_types, :has_display?, :post_type_id, :version_number, to: :post_type_version
+    delegate :most_recent_version_number, to: :post_type
     delegate :template_path, to: :layout, allow_nil: true
 
     before_save :handle_sort_order
@@ -107,5 +112,10 @@ module Pulitzer
     def upgradable?
       version_number < (post_type_version&.post_type&.post_type_versions&.published&.maximum(:version_number) || 0)
     end
+
+    def serialize
+      self.attributes.merge \
+        reload_show: self.reload_show
+    end
   end
 end

data/app/models/pulitzer/post_type.rb

@@ -24,4 +24,8 @@ class Pulitzer::PostType < Pulitzer::ApplicationRecord
   def most_recent_published_post_type_version
     post_type_versions&.published&.order(version_number: :desc)&.first
   end
+
+  def most_recent_version_number
+    most_recent_published_post_type_version&.version_number
+  end
 end

data/app/views/pulitzer/partials/_show.html.erb

@@ -15,7 +15,7 @@
 </div>
 <div class="pulitzer-row margin-bottom">
   <% if partial.upgradable? %>
-      <%= ajax_link "Upgrade #{partial.label} to the last partial version", upgrade_partial_path(partial), {class: 'button'}, dom_target(partial), http_method: 'PATCH' %>
+    <%= ajax_link "Upgrade #{partial.label} to the latest #{partial.name} version #{partial.most_recent_version_number}", upgrade_partial_path(partial), {class: 'button'}, dom_target(partial), insert_method: 'after', remove_on_success: dom_target(partial), http_method: 'PATCH' %>
   <% end %>
 </div>
 <div <%= collapsed(dom_id(partial)) %>>

data/app/views/pulitzer/partials/_show_wrapper.html.erb

@@ -1,3 +1,3 @@
-<div class="pulitzer-row margin-bottom list-item" id="<%= dom_id(partial) %>">
+<div class="pulitzer-row margin-bottom list-item" id="<%= dom_id(partial) %>" <%= listener_attrs(partial, :reload_show, endpoint: pulitzer.partial_path(partial)) if defined? ForeignOffice %>>
   <%= render partial: '/pulitzer/partials/show', locals: { partial: partial } %>
 </div>

data/app/views/pulitzer/post_type_versions/_index.html.erb

@@ -4,12 +4,12 @@
   <% if Pulitzer.skip_metadata_auth? || self.instance_eval(&Pulitzer.metadata_closure) %>
     <%= ajax_link "Create a blank version of this template",
           post_type_versions_path(post_type_version: {post_type_id: @post_type.id}),
-          {}, '#post_type_versions_container', http_method: 'POST', insert_method: 'append' %>
+          {}, '#post_type_versions_container', http_method: 'POST', insert_method: 'prepend' %>
     <br>
     <div class="pulitzer-span right">
       <div class="pulitzer-row bold margin-bottom">Import New Version from JSON file</div>
       <div class="pulitzer-row">
-        <%= form_for @post_type, url: import_version_post_type_path(@post_type), html: ajax_form_hash('#post_type_versions_container', insert_method: 'append').merge( multipart: true, method: 'PATCH') do |f| %>
+        <%= form_for @post_type, url: import_version_post_type_path(@post_type), html: ajax_form_hash('#post_type_versions_container', insert_method: 'prepend').merge( multipart: true, method: 'PATCH') do |f| %>
           <%= f.file_field :import_json %>
           <%= f.submit 'Import' %>
         <% end %>
@@ -18,7 +18,7 @@
     <% if @post_type.published_type_version %>
       <%= ajax_link "Clone the published version of this template",
             clone_post_type_versions_path(post_type_version: {post_type_id: @post_type.id}), {}, '#post_type_versions_container',
-            http_method: 'POST', insert_method: 'append' %>
+            http_method: 'POST', insert_method: 'prepend' %>
     <% end %>
   <% end %>
 </div>

data/lib/pulitzer/controller_helpers.rb

@@ -23,7 +23,7 @@ module Pulitzer
         if ptv.plural?
           ptv.posts.find_by!(slug: params[:slug]).send "get_#{status}_version!"
         else
-          ptv.singleton_post.get_active_version!
+          ptv.singleton_post.send "get_#{status}_version!"
         end
       else
         nil

data/lib/pulitzer/version.rb

@@ -1,3 +1,3 @@
 module Pulitzer
-  VERSION = '0.15.14'
+  VERSION = '0.15.15'
 end