pulitzer 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 439b5ac81e2a0888a034c86a10e484889940a97f
-  data.tar.gz: a27c70139d2212a1d71e9123b580ae5596af976f
+  metadata.gz: 0f63ebe9b07ab0474e255a16a33374d0eb001506
+  data.tar.gz: 3f9f50630a0bceae4deb42bee8b7069f282a59c6
 SHA512:
-  metadata.gz: f22be4df663f12dec01aa6322a6caaef3d0eb1a93c87404dff52725ee7fac5e806444af2d150e857473af5fd7f6a6e0461a93adf5671e46ae2354b1ab9e9e31e
-  data.tar.gz: e3c05afd18b57d204f6549c666f57f5c6007a8ba14bef5332731d768910a5d760120e8fd9964e84989f49a3e487777b37ee82ffc92bf6faab5733bae21d87dd7
+  metadata.gz: 9d6560fc2250800a2921293211d5244da76769920d975cd66804882083f080668604f6ca99b693020a1fbebb5b6eeb6b38927ba27cfb9df098cc1a2111541771
+  data.tar.gz: bd0215be4171c56bd682a95e43481b7ef67c160ba12bea05d7b4d2f3afd26a32c0b9d7eca222f49a6f7589f3b79044e78980d6bacf0d20ff4c426ac539176f95

data/app/controllers/pulitzer/versions_controller.rb

@@ -14,12 +14,18 @@ class Pulitzer::VersionsController < Pulitzer::ApplicationController
     if status_updater.errors.any?
       processing_version  = @version
       flash_message       = processing_version.errors.first
+      status = :conflict
     else
       processing_version  = status_updater.call
-      flash_message       = "The new version of #{@post.title} has been activated."
+      if processing_version.errors.empty?
+        status = :ok
+        flash_message     = "The new version of #{@post.title} has been activated."
+      else
+        status = :conflict
+      end
     end
     render json: {html: render_to_string(partial: '/pulitzer/versions/edit', locals: {version: processing_version}),
-                  flash_message: flash_message}
+                  flash_message: flash_message}, status: status
   end
 
 private

data/app/interactions/pulitzer/update_version_status.rb

@@ -23,16 +23,17 @@ class Pulitzer::UpdateVersionStatus
   def make_version_active
     @new_active_version = @transitional_version
     @old_active_version = @new_active_version.post.active_version
-    begin
-      @new_active_version.update!(status: :active)
-    rescue ActiveRecord::RecordInvalid => invalid
-      Rails.logger.error(invalid.record.errors.messages.to_s)
+    @new_active_version.update(status: :active)
+    if @new_active_version.errors.any?
+      @new_active_version.update(status: :processing_failed, cloning_errors: @new_active_version.errors.full_messages)
+      @processing_version = @new_active_version
+    else
+      @new_active_version.tags.each &:touch
+      @old_active_version.update(status: :archived) if @old_active_version
+      @processing_version = @post.create_processing_version
+      Pulitzer::CloneVersionJob.perform_later(@new_active_version)
+      instance_eval(&Pulitzer.publish_callback) unless Pulitzer.skip_publish_callback?
     end
-    @new_active_version.tags.each &:touch
-    @old_active_version.update(status: :archived) if @old_active_version
-    @processing_version = @post.create_processing_version
-    Pulitzer::CloneVersionJob.perform_later(@new_active_version)
-    instance_eval(&Pulitzer.publish_callback) unless Pulitzer.skip_publish_callback?
     @post.reload
     @processing_version.reload
   end
@@ -40,14 +41,20 @@ class Pulitzer::UpdateVersionStatus
   def make_version_abandoned
     @active_version = @transitional_version.post.active_version
     @transitional_version.update(status: :abandoned)
-    if @active_version == @transitional_version
-      @transitional_version.post.preview_version
-      instance_eval(&Pulitzer.publish_callback) unless Pulitzer.skip_publish_callback?
-    else
-      @processing_version = @post.create_processing_version
-      Pulitzer::CloneVersionJob.perform_later(@active_version)
-      @processing_version
+    @transitional_version.tags.each &:touch
+    if @active_version.is_a? Pulitzer::Version
+      if @active_version == @transitional_version
+        @processing_version = @transitional_version.post.preview_version
+        instance_eval(&Pulitzer.publish_callback) unless Pulitzer.skip_publish_callback?
+      else
+        @processing_version = @post.create_processing_version
+        Pulitzer::CloneVersionJob.perform_later(@active_version)
+        @processing_version
+      end
+    else # There is no active version, we never published this one
+      @processing_version = @transitional_version
     end
+    @transitional_version
   end
 
 end

data/lib/pulitzer/version.rb

@@ -1,3 +1,3 @@
 module Pulitzer
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

data/spec/controllers/pulitzer/versions_controller_spec.rb

@@ -0,0 +1,39 @@
+require 'rails_helper'
+
+describe Pulitzer::VersionsController do
+  routes { Pulitzer::Engine.routes }
+  render_views
+
+  let(:version) {create(:version, :with_content_elements)}
+
+  describe "updating versions" do
+    it "abandons a post that was never published" do
+      patch :update, id: version.id, status: 'abandoned'
+      expect(response.status).to eq 200
+      expect(version.reload.status).to eq 'abandoned'
+    end
+
+    it "abandons a post that was published" do
+      Pulitzer::UpdateVersionStatus.new(version, 'active').call
+      expect(version.status).to eq 'active'
+      expect(version.post.active_version).not_to be_nil
+      patch :update, id: version.id, status: 'abandoned'
+      expect(response.status).to eq 200
+      expect(version.reload.status).to eq 'abandoned'
+      expect(version.post.active_version).to be_nil
+    end
+
+    it "abandons changes" do
+      Pulitzer::UpdateVersionStatus.new(version, 'active').call
+      active_version = version
+      expect(active_version.status).to eq 'active'
+      old_preview = version.post.preview_version
+      patch :update, id: old_preview.id, status: 'abandoned'
+      expect(response.status).to eq 200
+      expect(active_version.reload.status).to eq 'active'
+      expect(old_preview.reload.status).to eq 'abandoned'
+      expect(active_version.post.preview_version.status).to eq 'preview'
+      expect(version.post.preview_version.id).not_to eq old_preview.id
+    end
+  end
+end

data/spec/dummy/db/migrate/20150618224344_create_pulitzer_post_types.rb

@@ -0,0 +1,9 @@
+class CreatePulitzerPostTypes < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_post_types do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150618225402_create_pulitzer_content_element_types.rb

@@ -0,0 +1,9 @@
+class CreatePulitzerContentElementTypes < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_content_element_types do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150619204615_create_pulitzer_posts.rb

@@ -0,0 +1,11 @@
+class CreatePulitzerPosts < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_posts do |t|
+      t.string :title
+      t.integer :post_type_id
+      t.string :status, default: 'unpublished'
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150619204708_create_pulitzer_content_elements.rb

@@ -0,0 +1,15 @@
+class CreatePulitzerContentElements < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_content_elements do |t|
+      t.string :label
+      t.string :title
+      t.text :body
+      t.string :image
+      t.integer :post_id
+      t.integer :post_type_content_element_type_id
+      t.integer :content_element_type_id
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150619213436_create_pulitzer_tags.rb

@@ -0,0 +1,9 @@
+class CreatePulitzerTags < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_tags do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150619213457_create_pulitzer_post_tags.rb

@@ -0,0 +1,11 @@
+class CreatePulitzerPostTags < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_post_tags do |t|
+      t.integer :post_id
+      t.integer :label_id
+      t.integer :label_type
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150619215914_create_pulitzer_post_type_content_element_types.rb

@@ -0,0 +1,13 @@
+class CreatePulitzerPostTypeContentElementTypes < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_post_type_content_element_types do |t|
+      t.integer :post_type_id
+      t.integer :content_element_type_id
+      t.string :label
+      t.integer :height, default: 100
+      t.integer :width, default: 100
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20150629195832_add_plural_and_template_to_pulitzer_post_types.rb

@@ -0,0 +1,6 @@
+class AddPluralAndTemplateToPulitzerPostTypes < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_post_types, :plural, :boolean
+    add_column :pulitzer_post_types, :template, :boolean
+  end
+end

data/spec/dummy/db/migrate/20150702150819_add_pulitzer_content_element_types.rb

@@ -0,0 +1,13 @@
+class AddPulitzerContentElementTypes < ActiveRecord::Migration
+  ELEMENT_TYPES = %w(Text Image Video)
+
+  def up
+    ELEMENT_TYPES.each do |type|
+      Pulitzer::ContentElementType.create(name: type)
+    end
+  end
+
+  def down
+    Pulitzer::ContentElementType.where(name: ELEMENT_TYPES).destroy_all
+  end
+end

data/spec/dummy/db/migrate/20150724150230_add_slug_to_pulitzer_posts.rb

@@ -0,0 +1,6 @@
+class AddSlugToPulitzerPosts < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_posts, :slug, :string
+    add_index :pulitzer_posts, :slug, unique: true
+  end
+end

data/spec/dummy/db/migrate/20150902212741_change_label_type_from_pulitzer_post_tags.rb

@@ -0,0 +1,5 @@
+class ChangeLabelTypeFromPulitzerPostTags < ActiveRecord::Migration
+  def change
+    change_column :pulitzer_post_tags, :label_type, :string
+  end
+end

data/spec/dummy/db/migrate/20151026180630_add_text_editor_to_pulitzer_post_type_content_element_types.rb

@@ -0,0 +1,10 @@
+class AddTextEditorToPulitzerPostTypeContentElementTypes < ActiveRecord::Migration
+  def up
+    add_column :pulitzer_post_type_content_element_types, :text_editor, :string
+    Pulitzer::PostTypeContentElementType.update_all(text_editor: 'None')
+  end
+
+  def down
+    remove_column :pulitzer_post_type_content_element_types, :text_editor
+  end
+end

data/spec/dummy/db/migrate/20151029194354_create_pulitzer_versions.rb

@@ -0,0 +1,10 @@
+class CreatePulitzerVersions < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_versions do |t|
+      t.integer :status, default: 0
+      t.integer :post_id
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20151029220558_change_post_elements_to_versions.rb

@@ -0,0 +1,20 @@
+class ChangePostElementsToVersions < ActiveRecord::Migration
+  def up
+    rename_column :pulitzer_content_elements, :post_id, :version_id
+    rename_column :pulitzer_post_tags, :post_id, :version_id
+    Pulitzer::ContentElement.reset_column_information
+    Pulitzer::PostTag.reset_column_information
+
+    # Clone post content elements and clone tags, and assign them to the new version
+    Pulitzer::Post.find_each do |post|
+      version = post.create_preview_version
+      Pulitzer::ContentElement.where(version_id: post.id).update_all(version_id: version.id)
+      Pulitzer::PostTag.where(version_id: post.id).update_all(version_id: version.id)
+    end
+  end
+
+  def down
+    rename_column :pulitzer_content_elements, :version_id, :post_id
+    rename_column :pulitzer_post_tags, :version_id, :post_id
+  end
+end

data/spec/dummy/db/migrate/20151113183344_add_post_type_content_element_attributes_to_content_elements.rb

@@ -0,0 +1,21 @@
+class AddPostTypeContentElementAttributesToContentElements < ActiveRecord::Migration
+  def up
+    add_column :pulitzer_content_elements, :text_editor, :string
+    add_column :pulitzer_content_elements, :height, :integer, default: 100
+    add_column :pulitzer_content_elements, :width, :integer, default: 100
+    add_column :pulitzer_content_elements, :sort_order, :integer
+    Pulitzer::ContentElement.reset_column_information
+    Pulitzer::ContentElement.find_each do |ce|
+      if ptce = ce.post_type_content_element_type
+        ce.update(text_editor: ptce.text_editor, height: ptce.height, width: ptce.width)
+      end
+    end
+  end
+
+  def down
+    remove_column :pulitzer_content_elements, :text_editor
+    remove_column :pulitzer_content_elements, :height
+    remove_column :pulitzer_content_elements, :width
+    remove_column :pulitzer_content_elements, :sort_order
+  end
+end

data/spec/dummy/db/migrate/20151116162508_change_template_to_pulitzer_post_types.rb

@@ -0,0 +1,11 @@
+class ChangeTemplateToPulitzerPostTypes < ActiveRecord::Migration
+  def up
+    remove_column :pulitzer_post_types, :template
+    add_column :pulitzer_post_types, :kind, :integer, default: 0
+  end
+
+  def down
+    remove_column :pulitzer_post_types, :kind
+    add_column :pulitzer_post_types, :template, :boolean
+  end
+end

data/spec/dummy/db/migrate/20151118031237_add_kind_to_pulitzer_content_elements.rb

@@ -0,0 +1,5 @@
+class AddKindToPulitzerContentElements < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_content_elements, :kind, :integer, default: 0
+  end
+end

data/spec/dummy/db/migrate/20160122204201_add_errors_to_version.rb

@@ -0,0 +1,5 @@
+class AddErrorsToVersion < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_versions, :cloning_errors, :jsonb
+  end
+end

data/spec/dummy/db/migrate/20160511192041_create_partials.rb

@@ -0,0 +1,9 @@
+class CreatePartials < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_partials do |t|
+      t.integer :post_type_id
+      t.integer :free_form_section_id
+      t.integer :sort_order
+    end
+  end
+end

data/spec/dummy/db/migrate/20160511201527_add_parent_id_to_pulitzer_tag.rb

@@ -0,0 +1,7 @@
+class AddParentIdToPulitzerTag < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_tags, :parent_id, :integer
+    add_column :pulitzer_tags, :hierarchical, :boolean, null: false, default: false
+    add_index :pulitzer_tags, :hierarchical
+  end
+end

data/spec/dummy/db/migrate/20160512214545_add_partial_to_content_element.rb

@@ -0,0 +1,5 @@
+class AddPartialToContentElement < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_content_elements, :partial_id, :integer
+  end
+end

data/spec/dummy/db/migrate/20160513153209_create_free_form_section_type.rb

@@ -0,0 +1,8 @@
+class CreateFreeFormSectionType < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_free_form_section_types do |t|
+      t.integer :post_type_id
+      t.string :name
+    end
+  end
+end

data/spec/dummy/db/migrate/20160513153214_create_free_form_section.rb

@@ -0,0 +1,9 @@
+class CreateFreeFormSection < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_free_form_sections do |t|
+      t.integer :version_id
+      t.integer :free_form_section_type_id
+      t.string :name
+    end
+  end
+end

data/spec/dummy/db/migrate/20160516150237_fix_post_type_kinds.rb

@@ -0,0 +1,7 @@
+class FixPostTypeKinds < ActiveRecord::Migration
+  def change
+    Pulitzer::PostType.where(kind: [1,2]).each do |pt|
+      pt.update_columns(kind: 0)
+    end
+  end
+end

data/spec/dummy/db/migrate/20160517181706_create_layouts.rb

@@ -0,0 +1,8 @@
+class CreateLayouts < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_layouts do |t|
+      t.integer :post_type_id
+      t.string :name
+    end
+  end
+end

data/spec/dummy/db/migrate/20160517182500_add_layout_to_partial.rb

@@ -0,0 +1,5 @@
+class AddLayoutToPartial < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_partials, :layout_id, :integer
+  end
+end

data/spec/dummy/db/migrate/20160519181030_add_label_to_partial.rb

@@ -0,0 +1,5 @@
+class AddLabelToPartial < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_partials, :label, :string
+  end
+end

data/spec/dummy/db/migrate/20160609214139_remove_title_from_content_elements.rb

@@ -0,0 +1,5 @@
+class RemoveTitleFromContentElements < ActiveRecord::Migration
+  def change
+    remove_column :pulitzer_content_elements, :title
+  end
+end