pulitzer 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adeb7be1843dbcb42723663653597c6c530ad838
-  data.tar.gz: 5e7f95b9d7407b8e69996062524949d83cc898c6
+  metadata.gz: 5e01e95cdb9ec9d3fbb0f484ab7263519409140c
+  data.tar.gz: 18fcb0fecbab662836112e3ec7a155c8129fa2d6
 SHA512:
-  metadata.gz: bff6cd1558ebc4f4f18cf6371220868a95725d8dba1eebc2c886b7fdd732045487db356534b2261a95d7e99f17004cb98f8e91e39bf591d0848a9509c4928518
-  data.tar.gz: f7ee3e8d1a5a5d89761754d02a981ca4d2701deaf7d4086f3e99540516837301e694ee1c44d3ed13484973aa9ac3687e6177f5a5cef8a5d5c23cb0e0f520e3bd
+  metadata.gz: 7f048a22b01c550868720e74b75e6c53dd22eec334bdd99bac68481c3c0caee046d384611bb793ec9771585b26b33c52d0f2f430c33bb44b69c2e5f46f7cca5f
+  data.tar.gz: d220bf23ba6638104df2cd56bd75f31c46ac8b94ac229b487c8fe26c578b2e67f2b7ce2d83d3027e860d2a51a63345bc922ad09f537dc2f22e79f3d260900bc5

data/app/assets/stylesheets/pulitzer.scss

@@ -65,6 +65,9 @@ body {
   &.margin-bottom {
     margin-bottom: 1.4em;
   }
+  &.margin-top {
+    margin-top: 1.4em;
+  }
   &.margin-left {
     margin-left: 1.4em;
   }
@@ -185,6 +188,18 @@ body {
   &.empty {
     background-color: #eee;
   }
+  &.five-percent {
+    width: 5%;
+    &.margin {
+      width: 3%;
+      margin-right: 2%;
+    }
+    @media screen and (max-width: 480px) {
+      width: 100%;
+      margin-right: none;
+      margin-left: none;
+    }
+  }
   &.ten-percent {
     width: 10%;
     &.margin {
@@ -257,9 +272,20 @@ body {
       margin-left: none;
     }
   }
+  &.ninety-percent {
+    width: 90%;
+    &.margin{
+      width: 88%;
+      margin-right: 2%;
+    }
+    @media screen and (max-width: 480px) {
+      width: 100%;
+      margin-right: none;
+      margin-left: none;
+    }
+  }
   input[type="submit"] {
-    margin: 0 15% 0 0;
-    width: 85%;
+    margin: 0;
   }
 
   input[type="text"], select {

data/app/controllers/pulitzer/content_elements_controller.rb

@@ -10,8 +10,12 @@ class Pulitzer::ContentElementsController < Pulitzer::ApplicationController
   end
 
   def update
-    @content_element.update content_element_params
-    render partial: 'show', locals: { content_element: @content_element }
+    Update.new(@content_element, content_element_params).call
+    if @content_element.errors.empty?
+      render partial: 'show', locals: { content_element: @content_element }
+    else
+      render partial: 'form', locals: { content_element: @content_element }, status: :conflict
+    end
   end
 
   def update_all

data/app/controllers/pulitzer/custom_option_lists_controller.rb

@@ -0,0 +1,55 @@
+module Pulitzer
+  class CustomOptionListsController < ApplicationController
+    before_action :get_custom_option_list, except: [:index,:new, :create]
+
+    def index
+      @custom_option_lists = CustomOptionList.all
+      render_ajax
+    end
+
+    def new
+      @custom_option_list = CustomOptionList.new(custom_option_list_params)
+      render_ajax locals: { custom_option_list: @custom_option_list }
+    end
+
+    def edit
+      render_ajax locals: { custom_option_list: @custom_option_list }
+    end
+
+    def show
+      render_ajax locals: { custom_option_list: @custom_option_list }
+    end
+
+    def create
+      @custom_option_list = CustomOptionList.new(custom_option_list_params)
+      if @custom_option_list.save
+        render partial: 'show_wrapper', locals: { custom_option_list: @custom_option_list }
+      else
+        render partial: 'new', locals: { custom_option_list: @custom_option_list }, status: 409
+      end
+    end
+
+    def update
+      if @custom_option_list.update_attributes(custom_option_list_params)
+        render partial: 'show', locals: { custom_option_list: @custom_option_list }
+      else
+        render partial: 'edit', locals: { custom_option_list: @custom_option_list }, status: 409
+      end
+    end
+
+    def destroy
+      @custom_option_list.destroy
+      head :ok
+    end
+
+    protected
+
+    def custom_option_list_params
+      params[:custom_option_list].permit!
+    end
+
+    def get_custom_option_list
+      @custom_option_list = CustomOptionList.find(params[:id])
+    end
+  end
+end

data/app/controllers/pulitzer/custom_options_controller.rb

@@ -0,0 +1,55 @@
+module Pulitzer
+  class CustomOptionsController < ApplicationController
+    before_action :get_custom_option, except: [:index, :new, :create]
+
+    def index
+      @custom_options = CustomOption.all
+      render_ajax
+    end
+
+    def new
+      @custom_option = CustomOption.new(custom_option_params)
+      render_ajax locals: { custom_option: @custom_option }
+    end
+
+    def edit
+      render_ajax locals: { custom_option: @custom_option }
+    end
+
+    def show
+      render_ajax locals: { custom_option: @custom_option }
+    end
+
+    def create
+      @custom_option = CustomOption.new(custom_option_params)
+      if @custom_option.save
+        render partial: 'show_wrapper', locals: { custom_option: @custom_option }
+      else
+        render partial: 'new', locals: { custom_option: @custom_option }, status: 409
+      end
+    end
+
+    def update
+      if @custom_option.update_attributes(custom_option_params)
+        render partial: 'show', locals: { custom_option: @custom_option }
+      else
+        render partial: 'edit', locals: { custom_option: @custom_option }, status: 409
+      end
+    end
+
+    def destroy
+      @custom_option.destroy
+      head :ok
+    end
+
+    protected
+
+    def custom_option_params
+      params[:custom_option].permit!
+    end
+
+    def get_custom_option
+      @custom_option = CustomOption.find(params[:id])
+    end
+  end
+end

data/app/controllers/pulitzer/partial_types_controller.rb

@@ -28,17 +28,6 @@ class Pulitzer::PartialTypesController < Pulitzer::ApplicationController
     render partial: 'show', locals: { partial_type: @partial_type }
   end
 
-  def edit
-    render partial: 'form', locals: { partial_type: @partial_type }
-  end
-
-  def update
-    old_label = @partial_type.label
-    @partial_type.update_attributes(partial_type_params)
-    Pulitzer::UpdateFreeFormSectionPartials.new(@partial_type, old_label).call
-    render partial: 'show', locals: { partial_type: @partial_type }
-  end
-
   def destroy
     Pulitzer::DestroyFreeFormSectionPartials.new(@partial_type).call
     @partial_type.destroy

data/app/controllers/pulitzer/posts_controller.rb

@@ -6,11 +6,12 @@ class Pulitzer::PostsController < Pulitzer::ApplicationController
   def index
     @post_type = Pulitzer::PostType.find params[:post_type_id]
     @posts = Pulitzer::Post.where(post_type: @post_type).order(id: :desc)
+    render_ajax
   end
 
   def new
     @post = Pulitzer::Post.new(post_type_id: params[:post_type_id])
-    render partial: 'new', locals: { post: @post }
+    render_ajax locals: { post: @post }
   end
 
   def create
@@ -20,17 +21,15 @@ class Pulitzer::PostsController < Pulitzer::ApplicationController
   end
 
   def show
-    render partial: 'show', locals: { post: @post }
+    render_ajax locals: { post: @post }
   end
 
   def edit
-    if request.xhr?
-      render partial: 'edit', locals: { post: @post }
-    end
+    render_ajax locals: { post: @post }
   end
 
   def edit_title
-     render partial: 'form', locals: { post: @post }
+    render partial: 'form', locals: { post: @post }
   end
 
   def update

data/app/controllers/pulitzer/styles_controller.rb

@@ -0,0 +1,42 @@
+class Pulitzer::StylesController < Pulitzer::ApplicationController
+  before_action :get_style, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @ptcet = Pulitzer::PostTypeContentElementType.find(params[:post_type_content_element_type_id])
+    render partial: 'index', locals: { ptcet: @ptcet }
+  end
+
+  def new
+    @style = Pulitzer::Style.new(style_params)
+    render partial: 'new', locals: { ptcet: @ptcet, style: @style }
+  end
+
+  def create
+    @style = Pulitzer::Style.create(style_params)
+    if @style.errors.empty?
+      render partial: 'show_wrapper', locals: { style: @style }
+    else
+      render partial: 'new', locals: { style: @style }
+    end
+  end
+
+  def show
+    render partial: 'show', locals: { style: @style }
+  end
+
+  def destroy
+    @style.destroy
+    head :ok
+  end
+
+  protected
+
+  def get_style
+    @style = Pulitzer::Style.find(params[:id])
+  end
+
+  def style_params
+    params[:style].permit!
+  end
+
+end

data/app/helpers/pulitzer/posts_helper.rb

@@ -3,17 +3,17 @@ module Pulitzer
 
     def link_to_posts(post_type, plural_label, singular_label)
       if post_type.plural?
-        link_to plural_label, posts_path(post_type_id: post_type.id)
+        ajax_link plural_label, posts_path(post_type_id: post_type.id), {}, '[data-tab-id="templates"]'
       else
-        link_to singular_label, edit_post_path(post_type.singleton_post)
+        ajax_link singular_label, edit_post_path(post_type.singleton_post), {}, '[data-tab-id="templates"]'
       end
     end
 
     def link_back_to_posts(post_type, plural_label, singular_label)
       if post_type.plural?
-        link_to plural_label, pulitzer.posts_path(post_type_id: post_type.id)
+        ajax_link plural_label, pulitzer.posts_path(post_type_id: post_type.id), {}, '[data-tab-id="templates"]'
       else
-        link_to singular_label, pulitzer.post_types_path
+        ajax_link singular_label, pulitzer.post_types_path, {}, '[data-tab-id="templates"]'
       end
     end
 
@@ -21,11 +21,22 @@ module Pulitzer
       content_tag(:iframe, nil, src: element.video_link) if element.video_link
     end
 
+    def render_clickable(element)
+      content_tag(:span, 'clickabe text:&nbsp'.html_safe, class: 'pulitzer-span heading') +
+      content_tag(:span, element.title, class: 'pulitzer-span margin') +
+      content_tag(:span, 'action: '.html_safe, class: 'pulitzer-span heading') +
+      content_tag(:span, element.content_display, class: 'pulitzer-span margin') +
+      content_tag(:span, 'style: '.html_safe, class: 'pulitzer-span heading') +
+      content_tag(:span, element.style_display, class: 'pulitzer-span margin')
+    end
+
     def render_element(element)
       if element.image_type?
         image_tag(element.image_url(:thumb)) if element.image?
       elsif element.video_type?
         render_video(element)
+      elsif element.clickable_type?
+        render_clickable(element)
       else
         element.body.html_safe if element.body
       end

data/app/interactions/pulitzer/content_elements_controller/update.rb

@@ -0,0 +1,21 @@
+class Pulitzer::ContentElementsController::Update
+
+  def initialize(content_element, params)
+    @content_element, @params = content_element, params.to_h.to_hash.symbolize_keys
+  end
+
+  def call
+    prune_params
+    @content_element.update @params
+  end
+
+  def prune_params
+    clickable_kind = @params.delete :clickable_kind
+    custom_option_list = GlobalID::Locator.locate(clickable_kind)
+    if custom_option_list.present?
+      @params[:body] = nil
+    else
+      @params[:custom_option_id] = nil
+    end
+  end
+end

data/app/models/pulitzer/content_element.rb

@@ -1,14 +1,18 @@
 module Pulitzer
   class ContentElement < ActiveRecord::Base
     mount_uploader :image, Pulitzer::ImageUploader
-    enum kind: [ :template, :free_form ]
 
     # Associations
     belongs_to :version
     belongs_to :content_element_type
     belongs_to :post_type_content_element_type
-    delegate :type, :text_type?, :image_type?, :video_type?, to: :content_element_type
-    delegate :required?, :sort_order, to: :post_type_content_element_type, allow_nil: true
+    belongs_to :style
+    belongs_to :custom_option
+
+    delegate :type, :text_type?, :image_type?, :video_type?, :clickable_type?, to: :content_element_type
+    delegate :required?, :sort_order, :custom_option_list, :custom_options, :any_clickable_kind?,
+      :url_clickable_kind?, :clickable_kinds, :custom_clickable_kinds,
+      to: :post_type_content_element_type, allow_nil: true
     delegate :post, to: :version
 
     attr_accessor :version_unavailable, :ensure_unique
@@ -21,7 +25,6 @@ module Pulitzer
 
     # Scopes
     default_scope { order(id: :asc) }
-    scope :free_form, -> { where(kind: kinds[:free_form]).reorder(sort_order: :asc) }
     scope :required, -> { joins(:post_type_content_element_type).where(pulitzer_post_type_content_element_types: { required: true}) }
 
     # def reprocess_versions
@@ -44,11 +47,63 @@ module Pulitzer
     end
 
     def empty_body?
-      image_type? ? !image? : body.blank?
+      !has_content?
     end
 
     def has_content?
-      image_type? ? image? : body.present?
+      if image_type?
+        image?
+      elsif custom_type?
+        custom_content.present?
+      else
+        body.present?
+      end
+    end
+
+    def custom_content
+      custom_option.value
+    end
+
+    def custom_display
+      "#{custom_option.display} #{custom_option.custom_option_list.name.singularize}"
+    end
+
+    def content
+      if custom_type?
+        custom_content
+      else
+        body
+      end
+    end
+
+    def content_display
+      if custom_type?
+        custom_display
+      else
+        body
+      end
+    end
+
+    def custom_type?
+      custom_option.present?
+    end
+
+    def clickable_kind
+      if custom_type?
+        custom_option.custom_option_list
+      elsif body.present?
+        Pulitzer::PostTypeContentElementType.url_clickable
+      else
+        Pulitzer::PostTypeContentElementType.any_clickable
+      end
+    end
+
+    def style_options
+      post_type_content_element_type.styles
+    end
+
+    def style_display
+      style.display_name
     end
 
     def clone_me
@@ -97,8 +152,8 @@ private
     end
 
     def handle_sort_order
-      if new_record? && sort_order.nil? && free_form?
-        self.sort_order = version.free_form_content_elements.maximum(:sort_order).to_i + 1
+      if new_record? && sort_order.nil? && version.present?
+        self.sort_order = version.content_elements.maximum(:sort_order).to_i + 1
       end
     end