pulitzer 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d72706941967474e2ee4e72b60bea2eb1a61fdee
-  data.tar.gz: a13c69ade04a17a54d56256ea81542f02eeb2075
+  metadata.gz: 360eaeb2c8f4bcac11c3d82ef0a50e9c4e99c638
+  data.tar.gz: ed16e77f203e19643949a826815cb136d09b4195
 SHA512:
-  metadata.gz: 8b339c1808d1c59593750b3a3df4fac0077a1f63ec053fb885f91c4c5e430408d84af4e99d8c78f2b6d2777c7961ab378524fd368eaa9a56c8175f7c2fa96b4f
-  data.tar.gz: fb8b437f4f441072eb48ce9173598240b172dc2459e46958758d19ba1e9a0b0939ab1c2499764eff231b24a78dd81451f27b2d438b40f5325f15f610fdd155a5
+  metadata.gz: d222161e37a3d82d1a5a4f1c45cf5a69bc2a97794af248a56045be5ecae0214ed7ce9bedef3d34f6d1b3084502226b0c29ef7dc3c3c55623ba33900a736c4865
+  data.tar.gz: 3153a24cba105ba8db89ebaf8502660e34fb87bddb85c0df349ea7fe11ad95115f56e5f76bbb64e452ec4b24a3ca2d8100bd5e1536c96401e6d226ea0c39b737

data/app/assets/javascripts/pulitzer.js

@@ -27,6 +27,54 @@ var Select2Trigger = Class.extend({
 });
 
 var RichTextEditor = Class.extend({
+  init: function($textarea){
+    this.$textarea = $textarea
+    var editor_kind = $textarea.data('rich-text-editor')
+    var editor_class_name = editor_kind + 'Editor'
+    var editor_class = eval(editor_class_name)
+    this.editor = new editor_class($textarea)
+  },
+  handleRemove: function(){
+    this.editor.handleRemove()
+  }
+})
+
+var TinyMCEEditor = Class.extend({
+  init: function($textarea){
+    this.editor_selector = $textarea.data('editor-selector')
+    this.editor_id = $textarea.attr('id')
+    this.custom_params = $textarea.data('mce-params')
+    var tinymceeditor = this;
+    var editor_params = this.getParams()
+    tinymce.init(this.getParams())
+  },
+  handleRemove: function(){
+    if($(this.editor_selector).length == 0){
+      var editor = this
+      $.each(tinymce.editors, function(){if(this.id == editor.editor_id){this.destroy()}})
+    }
+  },
+  getParams: function(){
+    if(this.custom_params){
+      var these_params = $.extend({},this.defaultParams(),this.custom_params)
+    } else {
+      var these_params = this.defaultParams()
+    }
+    return these_params
+  },
+  defaultParams: function(){
+    return {
+      selector: this.editor_selector,
+      plugins: "link",
+      menubar: false,
+      insert_toolbar: 'link unlink',
+      toolbar: 'undo redo | styleselect | bold italic | link',
+      statusbar: false
+    }
+  }
+})
+
+var WysiHtmlEditor = Class.extend({
   init: function($textarea){
     var rich_text_editor = this
     this.$form = $textarea.parents("form")
@@ -36,6 +84,11 @@ var RichTextEditor = Class.extend({
       stylesheets: wysihtml5Stylesheets,
       parserRules: wysihtml5ParserRules
     });
+  },
+  handleRemove: function(){
+    if(this.$textarea.parents('body').length == 0){ //the form has been removed from the dom
+      this.editor.fire('destroy:composer')
+    }    
   }
 })
 
@@ -58,9 +111,7 @@ var ContentElementEditor = Class.extend({
 $(document).ajaxComplete(function(){
   if(window.any_time_manager.recordedObjects["RichTextEditor"]){
     $.each(window.any_time_manager.recordedObjects["RichTextEditor"], function(){
-      if(this.$form.parents('body').length == 0){ //the form has been removed from the dom
-        this.editor.fire('destroy:composer')
-      }
+      this.handleRemove();
     })
   }
 })

data/app/assets/stylesheets/pulitzer.scss

@@ -133,6 +133,9 @@ body {
     border-radius: 4px;
   }
 
+  .mce-panel, .mce-btn {
+    background-color: inherit;
+  }
 }
 .pulitzer-span {
   margin-left: 0;

data/app/interactions/pulitzer/update_content_element.rb

@@ -0,0 +1,15 @@
+class Pulitzer::UpdateContentElement
+
+  def initialize(content_element, params)
+    @content_element, @params = content_element, params.dup
+  end
+
+  def call
+    text_editor = Pulitzer.text_editor_toolbars.detect { |toolbar| toolbar[:name] == content_element.text_editor }
+    if 'Kramdown' == text_editor[:kind]
+      params[:body] = Kramdown::Document.new(params[:body]).to_html
+    end
+    @content_element.update params
+  end
+
+end

data/app/models/pulitzer/post.rb

@@ -7,7 +7,7 @@ module Pulitzer
 
     belongs_to :post_type
     delegate :post_type_content_element_types, :free_form_section_types, :has_free_form_sections?, :has_templated_content_elements?, to: :post_type
-    delegate :content_elements, :content_element, :section, :has_label_type, :has_label, :post_tags_for, to: :active_version, allow_nil: true
+    delegate :content_elements, :section, :has_label_type, :has_label, :post_tags_for, to: :active_version, allow_nil: true
 
     has_many :post_tags, through: :active_version
 
@@ -24,6 +24,12 @@ module Pulitzer
       post_tags.map(&:label)
     end
 
+    def content_element(label)
+      if content_elements
+        self.content_elements.find_by(label: label)
+      end
+    end
+
     def should_generate_new_friendly_id?
       new_record? || title_changed?
     end

data/app/models/pulitzer/version.rb

@@ -27,20 +27,12 @@ module Pulitzer
       post_tags.where(label_type: label_type)
     end
 
-    def cached_content_elements
-      @cached_content_elements ||= content_elements.to_a
-    end
-
     def content_element(label)
-      cached_content_elements.detect{|ce| ce.label == label}
-    end
-
-    def cached_free_form_sections
-      @cached_free_form_sections ||= free_form_sections.to_a
+      self.content_elements.find_by(label: label)
     end
 
     def section(name)
-      cached_free_form_sections.detect{|ffs| ffs.name == name}
+      self.free_form_sections.find_by(name: name)
     end
 
     def template_content_elements

data/app/views/pulitzer/content_elements/_text_fields.html.erb

@@ -1,5 +1,15 @@
 <% text_editor = Pulitzer.text_editor_toolbars.detect { |toolbar| toolbar[:name] == content_element.text_editor } %>
-<% data_rich_text = { "rich-text-editor" => true } unless text_editor[:name] == "None" %>
 
-<%= render partial: text_editor[:template] %>
-<%= f.text_area(:body, placeholder: 'Body', data: (data_rich_text)) %>
+<% input_params = {placeholder: 'Body', id: dom_id(content_element, :textarea)} %>
+<% unless 'None' == text_editor[:name] %>
+  <% if 'WysiHtml' == text_editor[:kind] %>
+    <%= render partial: text_editor[:template] %>
+    <% input_params[:data] = { rich_text_editor: text_editor[:kind], editor_selector: dom_target(content_element, :textarea) } %>
+  <% end %>
+  <% if 'TinyMCE' == text_editor[:kind] %>
+    <% input_params[:data] = { rich_text_editor: text_editor[:kind], editor_selector: dom_target(content_element, :textarea), mce_params: text_editor[:params].to_json } %>
+  <% end %>
+<% end %>
+
+<% input_params[:value] = Kramdown::Document.new(f.object.body, input: 'html').to_kramdown if 'Kramdown' == text_editor[:kind] %>
+<%= f.text_area(:body, input_params) %>

data/lib/pulitzer.rb

@@ -19,7 +19,7 @@ module Pulitzer
     @@tagging_models          = options[:tagging_models] || []
     @@layout                  = options[:layout] || 'application'
     @@partial_folder          = options[:partial_folder] || 'pulitzer_partials'
-    default_text_editor       = [{ name: 'None', template: 'pulitzer/text_editors/none'}]
+    default_text_editor       = [{ name: 'None', template: 'pulitzer/text_editors/none', kind: 'TinyMCE'}]
     user_text_editors         = options[:text_editor_toolbars].flatten || nil
     @@text_editor_toolbars    = default_text_editor.push(*user_text_editors).compact
     if options.has_key?( :active_job_queues)

data/lib/pulitzer/version.rb

@@ -1,3 +1,3 @@
 module Pulitzer
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulitzer
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -474,6 +474,7 @@ files:
 - app/interactions/pulitzer/create_singleton_post.rb
 - app/interactions/pulitzer/destroy_post_type_content_elements.rb
 - app/interactions/pulitzer/destroy_post_type_free_form_sections.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
 - app/interactions/pulitzer/update_singleton_post.rb