pulitzer 0.12.5 → 0.13.0

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

@@ -0,0 +1,14 @@
+<div class="pulitzer-row">
+  <%= render 'pulitzer/shared/error_messages', object: sequence_flow_style %>
+  <%= form_for sequence_flow_style, html: ajax_form_hash(dom_target(sequence_flow_style)) do |f| %>
+    <%= render partial: 'form_fields', locals: { f: f, sequence_flow_style: sequence_flow_style } %>
+    <div class="pulitzer-span ten-percent">
+      <%= f.submit "Update" %>
+    </div>
+    <div class="pulitzer-span ten-percent">
+      <%= link_to('Cancel', sequence_flow_style_path(sequence_flow_style), :class => 'button',
+        data: { ajax_link: true, ajax_target: dom_target(sequence_flow_style) } ) %>
+    </div>
+  <% end %>
+
+</div>

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

@@ -0,0 +1,6 @@
+<div class="pulitzer-span one-fifth">
+  <%= f.text_field :display_name %>
+</div>
+<div class="pulitzer-span one-fifth">
+  <%= f.text_field :css_class_name %>
+</div>

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

@@ -0,0 +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 %>
+    <%= 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>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,10 @@
+<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>
+</div>

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

@@ -0,0 +1,3 @@
+<div class="pulitzer-row" id="<%= dom_id(sequence_flow_style) %>">
+  <%= render partial: '/pulitzer/sequence_flow_styles/show', locals: {sequence_flow_style: sequence_flow_style} %>
+</div>

data/config/routes.rb

@@ -34,7 +34,11 @@ Pulitzer::Engine.routes.draw do
       patch :update_all
     end
   end
-  resources :layouts
+  resources :background_styles
+  resources :justification_styles
+  resources :sequence_flow_styles
+  resources :arrangement_styles
+
   resources :free_form_sections
   root to: 'post_types#index'
 end

data/db/migrate/20170518142411_create_pulitzer_background_classes.rb

@@ -0,0 +1,9 @@
+class CreatePulitzerBackgroundClasses < ActiveRecord::Migration[5.0]
+  def change
+    create_table :pulitzer_background_styles do |t|
+      t.integer :post_type_id
+      t.string :display_name
+      t.string :css_class_name
+    end
+  end
+end

data/db/migrate/20170518144418_create_pulitzer_justification_classes.rb

@@ -0,0 +1,9 @@
+class CreatePulitzerJustificationClasses < ActiveRecord::Migration[5.0]
+  def change
+    create_table :pulitzer_justification_styles do |t|
+      t.integer :post_type_id
+      t.string :display_name
+      t.string :css_class_name
+    end
+  end
+end

data/db/migrate/20170518144449_create_pulitzer_sequence_flow_classes.rb

@@ -0,0 +1,9 @@
+class CreatePulitzerSequenceFlowClasses < ActiveRecord::Migration[5.0]
+  def change
+    create_table :pulitzer_sequence_flow_styles do |t|
+      t.integer :post_type_id
+      t.string :display_name
+      t.string :css_class_name
+    end
+  end
+end

data/db/migrate/20170518144515_create_pulitzer_arrangement_classes.rb

@@ -0,0 +1,9 @@
+class CreatePulitzerArrangementClasses < ActiveRecord::Migration[5.0]
+  def change
+    create_table :pulitzer_arrangement_styles do |t|
+      t.integer :post_type_id
+      t.string :display_name
+      t.string :view_file_name
+    end
+  end
+end

data/db/migrate/20170518145318_convert_pulitzer_layouts.rb

@@ -0,0 +1,9 @@
+class ConvertPulitzerLayouts < ActiveRecord::Migration[5.0]
+  def change
+    add_column :pulitzer_partials, :background_style_id, :integer
+    add_column :pulitzer_partials, :justification_style_id, :integer
+    add_column :pulitzer_partials, :sequence_flow_style_id, :integer
+    add_column :pulitzer_partials, :arrangement_style_id, :integer
+  end
+
+end

data/lib/pulitzer/content_element_helper.rb

@@ -1,6 +1,10 @@
 module Pulitzer
   module ContentElementHelper
 
+    def cms_content_present?(element)
+      element.present? && element.has_content?
+    end
+
     def render_cms_element(element,options = {})
       if element.image_type?
         render_image(element,options)
@@ -51,9 +55,7 @@ module Pulitzer
 
     def render_cms_section(version, section_name)
       version.section(section_name).partials.collect do |partial|
-        if partial.has_display?
-          render partial: partial.full_view_path, locals: {partial: partial}
-        end
+        render partial: partial.full_view_path, locals: {partial: partial}
       end.join.html_safe
     end
   end

data/lib/pulitzer/version.rb

@@ -1,3 +1,3 @@
 module Pulitzer
-  VERSION = '0.12.5'
+  VERSION = '0.13.0'
 end

data/spec/controllers/pulitzer/free_form_section_types_controller_spec.rb

@@ -7,36 +7,36 @@ describe Pulitzer::FreeFormSectionTypesController do
   let(:post_type) { Pulitzer::PostType.create(name: 'free as a bird', plural: true, kind: Pulitzer::PostType.kinds[:template]) }
   let(:free_form_section_type) { post_type.free_form_section_types.create(name: 'main content') }
 
-  describe "#amenities" do
+  describe "#amenities", type: :request do
     it "renders the new form" do
       post_type
-      get :new, post_type_id: post_type.id
+      get pulitzer.new_free_form_section_type_path post_type_id: post_type.id
       expect(response.status).to eq 200
       expect(response.body).to match /free_form_section_type\[name\]/
     end
 
     it "creates a new free form section type" do
-      post :create, free_form_section_type: {post_type_id: post_type.id, name: 'test sidebar'}
+      post pulitzer.free_form_section_types_path free_form_section_type: {post_type_id: post_type.id, name: 'test sidebar'}
       expect(response.status).to eq 200
       ffst = Pulitzer::FreeFormSectionType.order(id: :desc).first
       expect(ffst.name).to eq "test sidebar"
     end
 
     it "edits an free_form_section_type" do
-      get :edit, id: free_form_section_type.id
+      get pulitzer.edit_free_form_section_type_path id: free_form_section_type.id
       expect(response.status).to eq 200
       
       expect(response.body).to match 'main content'
     end
 
     it "updates an free_form_section_type" do
-      patch :update, id: free_form_section_type.id, free_form_section_type: {name: 'edited name'}
+      patch pulitzer.free_form_section_type_path id: free_form_section_type.id, free_form_section_type: {name: 'edited name'}
       expect(response.status).to eq 200
       expect(free_form_section_type.reload.name).to eq 'edited name'
     end
 
     it "deletes an free_form_section_type" do
-      delete :destroy, id: free_form_section_type.id
+      delete pulitzer.free_form_section_type_path id: free_form_section_type.id
       expect(response.status).to eq 200
       expect(Pulitzer::FreeFormSectionType.find_by(id: free_form_section_type.id)).to be nil
     end

data/spec/controllers/pulitzer/partials_controller_spec.rb

@@ -6,18 +6,18 @@ describe Pulitzer::PartialsController do
 
   let(:post_type) { Pulitzer::PostType.create(name: 'Centered Text White BG', plural: true, kind: Pulitzer::PostType.kinds[:partial]) }
   let(:free_form_section) { Pulitzer::FreeFormSection.create(name: 'free as a bird') }
-  let(:partial) { free_form_section.partials.create(post_type_id: post_type.id) }
+  let(:partial) { free_form_section.partials.create(post_type_id: post_type.id, label: 'test partial') }
 
-  describe "#amenities" do
+  describe "#amenities", type: :request do
     it "renders the new form" do
       post_type
-      get :new, partial: {free_form_section_id: free_form_section.id}
+      get pulitzer.new_partial_path partial: {free_form_section_id: free_form_section.id}
       expect(response.status).to eq 200
       expect(response.body).to match post_type.name      
     end
 
     it "creates a new partial" do
-      post :create, partial: {post_type_id: post_type.id, free_form_section_id: free_form_section.id}
+      post pulitzer.partials_path partial: {post_type_id: post_type.id, free_form_section_id: free_form_section.id}
       expect(response.status).to eq 200
       partial = Pulitzer::Partial.order(id: :desc).first
       expect(partial.free_form_section_id).to eq free_form_section.id
@@ -25,15 +25,15 @@ describe Pulitzer::PartialsController do
     end
 
     it "edits a partial" do
-      get :edit, id: partial.id
+      get pulitzer.edit_partial_path id: partial.id
       expect(response.status).to eq 200
       
-      expect(response.body).to match post_type.name
+      expect(response.body).to match partial.label
     end
 
     it "updates a partial" do
       other_post_type = Pulitzer::PostType.create(name: 'Left Text White BG', plural: true, kind: Pulitzer::PostType.kinds[:partial])
-      patch :update, id: partial.id, partial: {post_type_id: other_post_type.id}
+      patch pulitzer.partial_path id: partial.id, partial: {post_type_id: other_post_type.id}
       expect(response.status).to eq 200
       expect(partial.reload.name).to eq 'Left Text White BG'
     end

data/spec/controllers/pulitzer/post_types_controller_spec.rb

@@ -4,16 +4,16 @@ describe Pulitzer::PostTypesController do
   routes { Pulitzer::Engine.routes }
   render_views
 
-  describe "#create" do
+  describe "#create", type: :request do
     it "Creates a plural post type without an intial post" do
-      post :create, post_type: { name: 'Flock of birds', kind: 'template', plural: '1' }
+      post pulitzer.post_types_path post_type: { name: 'Flock of birds', kind: 'template', plural: '1' }
       expect(response.status).to eq 200
       expect(response.body).to match /Flock of birds/
       expect(Pulitzer::PostType.find_by(name: 'Flock of birds').posts.any?).to be false
     end
 
     it "Creates a single post type with an intial post" do
-      post :create, post_type: { name: 'Crow', kind: 'template', plural: '0' }
+      post pulitzer.post_types_path post_type: { name: 'Crow', kind: 'template', plural: '0' }
       post_type = Pulitzer::PostType.find_by(name: 'Crow')
       expect(response.status).to eq 200
       expect(response.body).to match post_type.name

data/spec/controllers/pulitzer/versions_controller_spec.rb

@@ -6,15 +6,15 @@ describe Pulitzer::VersionsController do
 
   let(:post_type) { Pulitzer::PostType.named('Welcome') }
   let(:content_element_type) { post_type.post_type_content_element_types.first.content_element_type }
-  let(:post) { post_type.posts.first }
-  let(:version) {post.preview_version}
+  let(:ppost) { post_type.posts.first }
+  let(:version) {ppost.preview_version}
 
-  describe "updating versions" do
+  describe "updating versions", type: :request do
     it "abandons a post that was never published" do
-      active_version = post.active_version
+      active_version = ppost.active_version
       active_version.destroy
       old_post_id = version.post.id
-      patch :update, id: version.id, status: 'abandoned'
+      patch pulitzer.version_path id: version.id, status: 'abandoned'
       expect(response.status).to eq 200
       expect(Pulitzer::Version.find_by(id: version.id)).to eq nil
       expect(Pulitzer::Post.find_by(id: old_post_id)).to eq nil
@@ -25,7 +25,7 @@ describe Pulitzer::VersionsController 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'
+      patch pulitzer.version_path 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
@@ -36,7 +36,7 @@ describe Pulitzer::VersionsController do
       active_version = version
       expect(active_version.status).to eq 'active'
       old_preview = version.post.preview_version
-      patch :update, id: old_preview.id, status: 'abandoned'
+      patch pulitzer.version_path 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'
@@ -45,7 +45,7 @@ describe Pulitzer::VersionsController do
     it "responds with errors if the interaction has one" do
       ptcet = post_type.post_type_content_element_types.create(label: 'test', required: true, content_element_type: content_element_type)
       version.content_elements.first.update_columns(body: nil, post_type_content_element_type_id: ptcet.id)
-      patch :update, id: version.id, status: 'active'
+      patch pulitzer.version_path id: version.id, status: 'active'
       expect(response.status).to eq 409
       expect(response.body).to match "It's not possible to activate a version without filling required content elements"
     end

data/spec/controllers/tags_controller_spec.rb

@@ -5,50 +5,49 @@ describe Pulitzer::TagsController do
   routes { Pulitzer::Engine.routes }
   render_views
 
-  describe "#index" do
+  describe "#index", type: :request do
     let!(:flat_tag) { create :tag, hierarchical: false }
     let!(:root_tag) { create :tag, hierarchical: true  }
 
-    before { get :index }
+    before { get pulitzer.tags_path }
 
     it "renders the index template" do
       expect(response).to render_template("_index")
     end
 
-    it "assigns to flat tags" do
-      expect(assigns[:flat_tags]).to eq [flat_tag]
+    it "renders flat tags" do
+      expect(response.body).to match(flat_tag.name)
     end
 
-    it "assigns to root tags" do
-      expect(assigns[:root_tags]).to eq [root_tag]
+    it "renders root tags" do
+      expect(response.body).to match(root_tag.name)
     end
   end
 
-  describe "#show" do
+  describe "#show", type: :request do
     let(:tag) { create :tag }
 
     it "finds the right tag" do
-      get :show, id: tag.id
-      expect(assigns[:tag]).to eq tag
+      get pulitzer.tag_path id: tag.id
+      expect(response.body).to match(tag.name)
     end
 
     it "renders the right template" do
-      get :show, id: tag.id
+      get pulitzer.tag_path id: tag.id
       expect(response).to render_template(partial: "show", locals: { tag: tag })
     end
   end
 
-  describe "#new" do
+  describe "#new", type: :request do
     it "builds a new tag with the right params" do
-      get :new, tag: { hierarchical: true }
-      expect(assigns[:tag]).to be_a Pulitzer::Tag
-      expect(assigns[:tag].new_record?).to eq true
-      expect(assigns[:tag].hierarchical?).to eq true
+      get pulitzer.new_tag_path tag: { hierarchical: true }
+      expect(response).to have_http_status(:success)
+      expect(response.body).to match('tag\[name\]')
     end
 
     context "with hierarchical: true" do
       it "responds with the right template" do
-        get :new, tag: { hierarchical: true }
+        get pulitzer.new_tag_path tag: { hierarchical: true }
         expect(response).to render_template('_new_hierarchical')
       end
 
@@ -56,22 +55,22 @@ describe Pulitzer::TagsController do
 
     context "with hierarchical: false" do
       it "responds with the right template" do
-        get :new, tag: { hierarchical: false }
+        get pulitzer.new_tag_path tag: { hierarchical: false }
         expect(response).to render_template('_new_flat')
       end
     end
   end
 
-  describe "#create" do
+  describe "#create", type: :request do
     let(:attributes) { attributes_for :tag }
     context "with good arguments" do
 
       it "creates the tag" do
-        expect { post :create, tag: attributes }.to change { Pulitzer::Tag.count }.by(1)
+        expect { post pulitzer.tags_path tag: attributes }.to change { Pulitzer::Tag.count }.by(1)
       end
 
       it "renders the right template" do
-        post :create, tag: attributes
+        post pulitzer.tags_path tag: attributes
         expect(response).to render_template('_show_wrapper')
       end
     end
@@ -84,26 +83,26 @@ describe Pulitzer::TagsController do
       end
 
       it "doesn't save the tag" do
-        expect { post :create, tag: attributes }.not_to change { Pulitzer::Tag.count }
+        expect { post pulitzer.tags_path tag: attributes }.not_to change { Pulitzer::Tag.count }
       end
 
       it "renders the right template" do
-        post :create, tag: attributes
+        post pulitzer.tags_path tag: attributes
         expect(response).to render_template("_new_flat")
       end
     end
   end
 
-  describe "#edit" do
+  describe "#edit", type: :request do
     let(:tag) { create :tag }
 
     it "finds the right tag" do
-      get :edit, id: tag.id
-      expect(assigns[:tag]).to eq tag
+      get pulitzer.edit_tag_path id: tag.id
+      expect(response.body).to match(tag.name)
     end
 
     it "renders the right template" do
-      get :edit, id: tag.id
+      get pulitzer.edit_tag_path id: tag.id
       expect(response).to render_template("_form")
     end
   end
@@ -148,7 +147,7 @@ describe Pulitzer::TagsController do
     end
   end
 
-  describe "#destroy" do
+  describe "#destroy", type: :request do
     let(:tag) { create :tag }
     render_views
 
@@ -156,11 +155,11 @@ describe Pulitzer::TagsController do
 
     it "destroys the record" do
       expect(tag).to receive(:destroy)
-      delete :destroy, id: tag.id
+      delete pulitzer.tag_path id: tag.id
     end
 
     it "renders nothing" do
-      delete :destroy, id: tag.id
+      delete pulitzer.tag_path id: tag.id
       expect(response.body).to eq ""
     end
   end