pulitzer 0.14.4 → 0.15.0

data/app/views/pulitzer/posts/_breadcrumbs.html.erb

@@ -0,0 +1,4 @@
+<%= ajax_link "all #{post_type.kind.pluralize} >", post_types_path(post_type_kind: post_type.kind), {}, '[data-tab-id="' + post_type.kind.pluralize + '"]' %>
+<% if Pulitzer.skip_metadata_auth? || self.instance_eval(&Pulitzer.metadata_closure) %>
+  <%= ajax_link "template versions for #{post_type.name} >", post_type_versions_path(post_type_id: post_type.id), {}, '[data-tab-id="' + post_type.kind.pluralize + '"]' %>
+<% end %>

data/app/views/pulitzer/posts/_edit.html.erb

@@ -1,7 +1,8 @@
-<h1>Editing <%= post.title %></h1>
-<div class="pulitzer-row margin-bottom list-item">
-  <%= link_back_to_posts(post.post_type, "Back to #{post.post_type.name.singularize} Posts", 'Back to post types') %>
-</div>
+<%= render partial: '/pulitzer/posts/breadcrumbs', locals: {post_type: post.post_type} %>
+<% if post.plural? %>
+  <%= ajax_link "#{post.post_type.name.singularize} Posts >", pulitzer.posts_path(post_type_version_id: post.post_type_version_id), {}, '[data-tab-id="templates"]' %>
+<% end %>
+<h1>Editing <%= post.editor_title %></h1>
 
 <div id="<%= dom_id(post, :preview_version)%>">
 </div>

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

@@ -1,9 +1,9 @@
-<h1><%= @post_type.name.singularize %> Post</h1>
+<%= render partial: '/pulitzer/posts/breadcrumbs', locals: {post_type: @post_type_version.post_type} %>
+<h1><%= @post_type_version.name.singularize %> Post</h1>
 
 <div class="pulitzer-row margin-bottom list-item">
-  <%= link_to "Back to post types", post_types_path %>
   <br>
-  <%= ajax_link "Add a new #{@post_type.name.singularize} Post", new_post_path(post_type_id: params[:post_type_id]), {}, '#new_post' %>
+  <%= ajax_link "Add a new #{@post_type_version.name.singularize} Post", new_post_path(post_type_version_id: params[:post_type_version_id]), {}, '#new_post' %>
   <div id="new_post"></div>
 </div>
 

data/app/views/pulitzer/posts/_new.html.erb

@@ -1,7 +1,7 @@
 <%= form_for post, html: ajax_form_hash('#posts_container', insert_method: 'prepend', sub_class: "AddALineForm", container: '#new_post') do |f| %>
   <%= f.label :title %>
   <%= f.text_field :title %>
-  <%= f.hidden_field :post_type_id %>
+  <%= f.hidden_field :post_type_version_id %>
   <%= f.submit %>
   <%= link_to('Cancel', '#', :class => 'button',
     data: { emptier: true, target: '#new_post' } ) %>

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

@@ -7,7 +7,7 @@
       <%= ajax_link "Edit post name", edit_title_post_path(post), {}, dom_target(post) %>
     </li>
     <li>
-      <%= link_to 'Edit content', edit_post_path(post) %>
+      <%= ajax_link 'Edit content', edit_post_path(post), {}, '[data-tab-id="templates"]' %>
     </li>
   </ul>
 </div>

data/app/views/pulitzer/posts/_show_slug.html.erb

@@ -1,7 +1,7 @@
 <div class="pulitzer-row">
   <ul class="list">
     <li><%= post.slug %></li>
-    <% unless post.post_type.singleton_post? %>
+    <% unless post.post_type_version.singleton_post? %>
       <li><%= ajax_link "Edit", edit_slug_post_path(post, version_id: version), {}, dom_target(post) %></li>
     <% end %>
   </ul>

data/app/views/pulitzer/sequence_flow_styles/_new.html.erb

@@ -1,12 +1,12 @@
 <div class="pulitzer-row">
-  <%= form_for sequence_flow_style, html: ajax_form_hash(dom_target(sequence_flow_style.post_type, :sequence_flow_styles_container), insert_method: 'append', reset_on_success: true) do |f| %>
-    <%= f.hidden_field :post_type_id %>
+  <%= form_for sequence_flow_style, html: ajax_form_hash(dom_target(sequence_flow_style.post_type_version, :sequence_flow_styles_container), insert_method: 'append', reset_on_success: true) do |f| %>
+    <%= f.hidden_field :post_type_version_id %>
     <%= render partial: 'form_fields', locals: { f: f, sequence_flow_style: sequence_flow_style } %>
     <div class="pulitzer-span ten-percent">
       <%= f.submit "Create", data: {disable_with: false} %>
     </div>
     <div class="pulitzer-span ten-percent">
-      <a class="button" data-emptier="true" data-target="<%= dom_target(sequence_flow_style.post_type, :new_sequence_flow_style) %>">Close</a>
+      <a class="button" data-emptier="true" data-target="<%= dom_target(sequence_flow_style.post_type_version, :new_sequence_flow_style) %>">Close</a>
     </div>
   <% end %>
 </div>

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

@@ -1,10 +1,14 @@
 <div class="pulitzer-row">
   <div class="pulitzer-span one-fifth"><%= sequence_flow_style.display_name %></div>
   <div class="pulitzer-span one-fifth"><%= sequence_flow_style.css_class_name %></div>
-  <div class="pulitzer-span ten-percent">
-    <%= ajax_link "Edit", edit_sequence_flow_style_path(sequence_flow_style), {}, dom_target(sequence_flow_style) %>
-  </div>
-  <div class="pulitzer-span ten-percent">
-    <%= ajax_delete 'Delete', sequence_flow_style_path(sequence_flow_style), {}, dom_target(sequence_flow_style) %>
-  </div>
+  <% if sequence_flow_style.post_type_version.locked? %>
+    <div class="pulitzer-span one-fifth">live</div>
+  <% else %>
+    <div class="pulitzer-span ten-percent">
+      <%= ajax_link "Edit", edit_sequence_flow_style_path(sequence_flow_style), {}, dom_target(sequence_flow_style) %>
+    </div>
+    <div class="pulitzer-span ten-percent">
+      <%= ajax_delete 'Delete', sequence_flow_style_path(sequence_flow_style), {}, dom_target(sequence_flow_style) %>
+    </div>
+  <% end %>
 </div>

data/config/routes.rb

@@ -19,15 +19,17 @@ Pulitzer::Engine.routes.draw do
   end
 
   resources :tags
-  resources :custom_option_lists
-  resources :custom_options
-  
-  resources :post_types do
+  resources :post_types
+  resources :post_type_versions do
     member do
       get :template
+      patch :change_state
     end
   end
 
+  resources :custom_option_lists
+  resources :custom_options
+  
   resources :versions
   resources :content_element_types
   resources :post_type_content_element_types

data/db/migrate/20170515230633_create_post_type_version.rb

@@ -0,0 +1,9 @@
+class CreatePostTypeVersion < ActiveRecord::Migration[5.0]
+  def change
+    create_table :pulitzer_post_type_versions do |t|
+      t.references :pulitzer_post_type, index: true
+      t.integer :version_number, default: 1, null: false
+      t.string :status, default: 'preview', null: false
+    end
+  end
+end

data/db/migrate/20170515232938_reconnect_post_type_to_post.rb

@@ -0,0 +1,13 @@
+class ReconnectPostTypeToPost < ActiveRecord::Migration[5.0]
+  def change
+    add_column :pulitzer_posts, :post_type_version_id, :integer
+    Pulitzer::Post.reset_column_information
+    Pulitzer::PostType.all.each do |pt|
+      ptv = pt.published_type_version
+      ptv ||= pt.post_type_versions.create(status: 'active')
+      Pulitzer::Post.where(post_type_id: pt.id).update_all post_type_version_id: ptv.id
+    end
+    remove_column :pulitzer_posts, :post_type_id
+    add_index :pulitzer_posts, :post_type_version_id
+  end
+end

data/lib/generators/pulitzer/post_type_generator.rb

@@ -74,6 +74,11 @@ module Pulitzer
       empty_directory partial_path
       layouts.each do |layout_name|
         copy_file  "post_view.html.erb", layout_path(layout_name)
+        inject_into_file layout_path(layout_name), before: "<%# END Auto-generated by Pulitzer %>", force: false do
+          <<-BEGIN_COMMENT
+<!-- BEGIN #{layout_short_path} -->
+          BEGIN_COMMENT
+        end
         content_element_names.each do |content_element_name|
           inject_into_file layout_path(layout_name), before: "<%# END Auto-generated by Pulitzer %>", force: false do
             <<-VIEW
@@ -82,6 +87,11 @@ module Pulitzer
             VIEW
           end
         end
+        inject_into_file layout_path(layout_name), before: "<%# END Auto-generated by Pulitzer %>", force: false do
+          <<-BEGIN_COMMENT
+<!-- END #{layout_short_path} -->
+          BEGIN_COMMENT
+        end
       end
     end
 
@@ -97,6 +107,10 @@ module Pulitzer
       File.join(Rails.root,'app','views', Pulitzer.public_controller, "#{action_name}.html.erb")
     end
 
+    def layout_short_path(layout_name)
+      File.join(action_name, "_#{layout_name}.html.erb")
+    end
+
     def layout_path(layout_name)
       File.join(Rails.root,'app','views', Pulitzer.partial_folder, action_name, "_#{layout_name}.html.erb")
     end
@@ -163,19 +177,25 @@ module Pulitzer
     end
 
     def plural_action(context)
-      <<-CACTION
+      <<-PACTION
 
   def #{action_name}
-    @post = Pulitzer::PostType.named('#{post_type_name}').posts.find_by!(slug: params[:slug]).get_#{context}_version!
+    @post_type_version = Pulitzer::PostType.named('#{post_type_name}').published_type_version
+    version_number = @post_type_version.version_number
+    @post = @post_type_version.posts.find_by!(slug: params[:slug]).get_#{context}_version!
+    render template: pulitzer_view_path(version_number)
   end
-      CACTION
+      PACTION
     end
 
     def singleton_action(context)
       <<-CACTION
 
   def #{action_name}
-    @post = Pulitzer::PostType.named('#{post_type_name}').singleton_post.get_#{context}_version!
+    @post_type_version = Pulitzer::PostType.named('#{post_type_name}').published_type_version
+    version_number = @post_type_version.version_number
+    @post = @post_type_version.singleton_post.get_#{context}_version!
+    render template: pulitzer_view_path(version_number)
   end
       CACTION
     end

data/lib/pulitzer.rb

@@ -6,6 +6,7 @@ require 'friendly_id'
 require 'select2-rails'
 require 'pulitzer/engine'
 require 'pulitzer/exceptions'
+require 'pulitzer/controller_helpers'
 
 module Pulitzer
   mattr_accessor  :base_controller, :metadata_closure, :authentication_closure, :unpublish_authorization,

data/lib/pulitzer/controller_helpers.rb

@@ -0,0 +1,9 @@
+module Pulitzer
+  module ControllerHelpers
+    def pulitzer_view_path(version_number)
+      File.join Pulitzer.public_controller,
+        action_name,
+        "v_#{version_number.to_s}.html.erb"
+    end
+  end
+end

data/lib/pulitzer/version.rb

@@ -1,3 +1,3 @@
 module Pulitzer
-  VERSION = '0.14.4'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulitzer
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -511,6 +511,7 @@ files:
 - app/controllers/pulitzer/partials_controller.rb
 - app/controllers/pulitzer/post_tags_controller.rb
 - app/controllers/pulitzer/post_type_content_element_types_controller.rb
+- app/controllers/pulitzer/post_type_versions_controller.rb
 - app/controllers/pulitzer/post_types_controller.rb
 - app/controllers/pulitzer/posts_controller.rb
 - app/controllers/pulitzer/sequence_flow_styles_controller.rb
@@ -528,9 +529,12 @@ files:
 - app/interactions/pulitzer/create_post_type_content_elements.rb
 - app/interactions/pulitzer/create_post_type_free_form_sections.rb
 - app/interactions/pulitzer/create_singleton_post.rb
-- app/interactions/pulitzer/destroy_free_form_section_partials.rb
 - app/interactions/pulitzer/destroy_post_type_content_elements.rb
 - app/interactions/pulitzer/destroy_post_type_free_form_sections.rb
+- app/interactions/pulitzer/post_type_versions_controller/change_state.rb
+- app/interactions/pulitzer/post_type_versions_controller/create.rb
+- app/interactions/pulitzer/post_types_controller/create_singleton_post.rb
+- app/interactions/pulitzer/post_types_controller/create_template_version.rb
 - app/interactions/pulitzer/update_content_element.rb
 - app/interactions/pulitzer/update_post_type_content_elements.rb
 - app/interactions/pulitzer/update_post_type_free_form_sections.rb
@@ -554,10 +558,14 @@ files:
 - app/models/pulitzer/post_type.rb
 - app/models/pulitzer/post_type_content_element_type.rb
 - app/models/pulitzer/post_type_element.rb
+- app/models/pulitzer/post_type_version.rb
 - app/models/pulitzer/sequence_flow_style.rb
 - app/models/pulitzer/style.rb
 - app/models/pulitzer/tag.rb
 - app/models/pulitzer/version.rb
+- app/services/pulitzer/post_type_version/preview.rb
+- app/services/pulitzer/post_type_version/publish.rb
+- app/services/pulitzer/post_type_version/retire.rb
 - app/uploaders/pulitzer/base_uploader.rb
 - app/uploaders/pulitzer/image_uploader.rb
 - app/validators/pulitzer/content_element_validator.rb
@@ -622,14 +630,18 @@ files:
 - app/views/pulitzer/post_type_content_element_types/_new.html.erb
 - app/views/pulitzer/post_type_content_element_types/_show.html.erb
 - app/views/pulitzer/post_type_content_element_types/_show_wrapper.html.erb
+- app/views/pulitzer/post_type_versions/_index.html.erb
+- app/views/pulitzer/post_type_versions/_show.html.erb
+- app/views/pulitzer/post_type_versions/_show_wrapper.html.erb
+- app/views/pulitzer/post_type_versions/_template.html.erb
 - app/views/pulitzer/post_types/_form.html.erb
 - app/views/pulitzer/post_types/_form_fields.html.erb
 - app/views/pulitzer/post_types/_index.html.erb
 - app/views/pulitzer/post_types/_new.html.erb
 - app/views/pulitzer/post_types/_show.html.erb
 - app/views/pulitzer/post_types/_show_wrapper.html.erb
-- app/views/pulitzer/post_types/_template.html.erb
 - app/views/pulitzer/post_types/index.html.erb
+- app/views/pulitzer/posts/_breadcrumbs.html.erb
 - app/views/pulitzer/posts/_edit.html.erb
 - app/views/pulitzer/posts/_form.html.erb
 - app/views/pulitzer/posts/_form_slug.html.erb
@@ -695,6 +707,8 @@ files:
 - db/migrate/20160927160910_add_required_to_pulitzer_post_type_content_element_type.rb
 - db/migrate/20170502210827_add_sort_to_post_elements.rb
 - db/migrate/20170508145431_create_pulitzer_partial_types.rb
+- db/migrate/20170515230633_create_post_type_version.rb
+- db/migrate/20170515232938_reconnect_post_type_to_post.rb
 - db/migrate/20170518142411_create_pulitzer_background_classes.rb
 - db/migrate/20170518144418_create_pulitzer_justification_classes.rb
 - db/migrate/20170518144449_create_pulitzer_sequence_flow_classes.rb
@@ -711,6 +725,7 @@ files:
 - lib/generators/pulitzer/templates/post_view.html.erb
 - lib/pulitzer.rb
 - lib/pulitzer/content_element_helper.rb
+- lib/pulitzer/controller_helpers.rb
 - lib/pulitzer/engine.rb
 - lib/pulitzer/exceptions.rb
 - lib/pulitzer/version.rb

data/app/interactions/pulitzer/destroy_free_form_section_partials.rb

@@ -1,17 +0,0 @@
-class Pulitzer::DestroyFreeFormSectionPartials
-
-  def initialize(partial_type)
-    @partial_type = partial_type
-  end
-
-  def call
-    free_form_section_type  = @partial_type.free_form_section_type
-    post_type               = free_form_section_type.post_type
-    post_type.posts.each do |post|
-      if post.preview_version
-        free_form_section = post.preview_version.free_form_sections.find_by(name: free_form_section_type.name)
-        partial = free_form_section.partials.find_by(label: @partial_type.label)&.destroy
-      end
-    end
-  end
-end