smithycms 0.7.3 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ddcfec9326cecb947ca8f6b438d922c50b9aade
-  data.tar.gz: a8baae438f9d3ecd2a51408d849a7483c9a9af62
+  metadata.gz: 4b8a748c87e90088c1ecde907900b0f65cd9e995
+  data.tar.gz: 74176f6fed35d9fc36e809a67885048d1e58dae3
 SHA512:
-  metadata.gz: cf299a6e9b5913807d587854ddb2140f311c1e12b4571695a6b42a5621b3dfd5135eb02c5f7f505726c335d7f15ee848ac0a7c7fedbb6f9268341410550a031e
-  data.tar.gz: b1c0bfccc3e54cc2917681625723bd9633f48c0e47e98ea6baa7f317a95c8bd03f164fe6260d9b4c7c5898f23119130759c45224a8ff7abd0a9ba954e7dd7e95
+  metadata.gz: d8b890ff799dc1439f26133149ea290e1c711e46faa1f53b4d426d70400e0672fa20aad5eb881b731989720b4a67ec243d93e2e975d2309fbb3602c8fdf3aa3f
+  data.tar.gz: 6991e5a9ee4b806b5baaebdb5a9bb5cc7169ba33f366d531ab48e965171c0bf3d0f648e610e60d91758f584f8fa4433046a824678fa1e94c39d66eb40a90b2a5

data/app/assets/javascripts/smithy/editor.coffee

@@ -26,10 +26,11 @@ window.ace_edit = (id, template_type, name) ->
     ,
     readOnly: false
   })
-  editor.setOptions({
-    enableBasicAutocompletion: true,
+  editor.setOptions
+    enableBasicAutocompletion: true
     enableSnippets: true
-  })
+    maxLines: 40
+    minLines: 2
   return editor
 
 create_ace_toolbar = (editor, assets_modal_url, pages_modal_url) ->

data/app/assets/javascripts/smithy/nested_forms.js

@@ -5,7 +5,7 @@ $(function() {
   $('form').on('click', 'a.add_nested_fields', function() {
     // Setup
     var assoc   = $(this).attr('data-association');           // Name of child
-    var content = $('#' + assoc + '_fields_blueprint').html(); // Fields template
+    var content = $(this).attr('data-fields-blueprint');      // Fields template
 
     // Make the context correct by replacing new_<parents> with the generated ID
     // of each of the parent objects

data/app/assets/javascripts/smithy/page_contents.coffee

@@ -0,0 +1,11 @@
+$("form#new_page_content .page_content_block").click ->
+  $('#page_content_content_block_type').val($(this).attr('data-content_block'))
+  $('form#new_page_content').submit()
+
+$('.page_content .page_content-heading a[data-toggle="collapse"]').click (e) ->
+  e.preventDefault()
+  e.stopPropagation()
+  $(this).parent().siblings('.page_content-fields').collapse('toggle')
+
+# $ ->
+#   $('.page_content-fields').collapse('hide')

data/app/assets/stylesheets/smithy/forms.scss

@@ -1,3 +1,26 @@
 #template_content,
 #content_content,
 #content_block_content { height:100%; width:97%; }
+
+
+.page_content {
+  @extend .panel;
+  @extend .panel-default;
+  margin-bottom:8px;
+
+  .page_content-heading { @extend .panel-heading; }
+  .page_content-fields {
+    @extend .panel-collapse;
+    > div { @extend .panel-body; }
+  }
+  .page_content-toggle {
+    color:$text-color; display:inline-block; width:100%;
+    &:hover,
+    &:active,
+    &:focus { text-decoration: none; }
+    .name { font-weight: bold; }
+    .type,
+    .lastupdated { color:#BBB; font-size:$font-size-small; padding-left:1em; }
+    .lastupdated { float:right; font-style:italic; padding-top:$font-size-base - $font-size-small; }
+  }
+}

data/app/assets/stylesheets/smithy/pages.scss

@@ -2,6 +2,11 @@
   .handle { color:#999; cursor:move; padding-right:6px; }
 }
 
+.page-container {
+  border-top: 1px solid #AAA; margin: 1.5em 0; padding: 1.5em 0 1em;
+  &:first-child { margin-top: 3em }
+}
+
 #side .page-list {
   position:relative; overflow:hidden;
   .back { background:#444; }

data/app/assets/stylesheets/smithy/templates.scss

@@ -8,14 +8,9 @@ textarea[name="content[content]"],
 .template_content_editor,
 .ace_editor {
   display:none;
-  min-height:40em;
-  width:97%;
+  width:100%;
   position:relative;
-  &.short {
-    min-height:10em;
-  }
 }
-
 .ace-editor-toolbar {
   background:#f9f9f9; border:1px solid darken(#f9f9f9,10%); border-radius:$border-radius-base $border-radius-base 0 0; line-height:40px; width:97%; margin:0; padding:0;
   li {

data/app/controllers/smithy/pages_controller.rb

@@ -112,7 +112,7 @@ module Smithy
 
       def page_path
         params[:path] = '' if params[:id].nil? && params[:path].nil? # sets the root path when nothing else is passed
-        params[:path].nil? ? params[:id] : "/#{params[:path]}"
+        params[:path].nil? ? params[:id] : "/#{params[:path]}".downcase
       end
 
       def render_page

data/app/helpers/smithy/application_helper.rb

@@ -1,13 +1,10 @@
 module Smithy
   module ApplicationHelper
     def smithy_link_to_add_fields(name, association, form_builder)
-      html = content_tag(:div, :id => "#{association}_fields_blueprint", :style => "display:none;") do
-        form_builder.semantic_fields_for(association, model_object(form_builder, association), :child_index => "new_#{association}") do |builder|
-          form_builder.template.concat(raw render("#{form_builder.object.class.to_s.tableize}/#{association.to_s.singularize}_fields", :f => builder))
-        end
+      blueprint = form_builder.semantic_fields_for(association, model_object(form_builder, association), :child_index => "new_#{association}") do |builder|
+        raw render("#{form_builder.object.class.to_s.tableize}/#{association.to_s.singularize}_fields", :f => builder)
       end
-      form_builder.template.concat(html)
-      form_builder.template.link_to(name, "javascript:void(0)", :class => "add_nested_fields", "data-association" => association)
+      form_builder.template.link_to(name, "javascript:void(0)", :class => "add_nested_fields", "data-association" => association, 'data-fields-blueprint' => CGI.escapeHTML(blueprint).html_safe)
     end
 
     def smithy_link_to_remove_fields(name, form_builder)

data/app/inputs/markdown_input.rb

@@ -3,9 +3,12 @@ class MarkdownInput < FormtasticBootstrap::Inputs::TextInput
   def to_html
     self.options[:hint] = markdown_hint if self.options[:hint].blank?
     bootstrap_wrapping do
-      builder.text_area(method, form_control_input_html_options) +
-      builder.template.content_tag(:div, nil, id: editor_id, class: 'ace_editor', data: { id: id, type: :markdown, name: dom_id, init: "$('##{editor_id}').smithy_editor()".html_safe, assets_url: builder.template.selector_modal_assets_path, pages_url: builder.template.selector_modal_pages_path }) +
-      builder.template.content_tag(:div, nil, id: 'content-guide')
+      text_area = builder.text_area(method, form_control_input_html_options)
+      editor = builder.template.content_tag :div do
+        builder.template.content_tag(:div, nil, id: editor_id, class: 'ace_editor', data: { id: id, type: :markdown, name: dom_id, init: "$('##{editor_id}').smithy_editor()".html_safe, assets_url: builder.template.selector_modal_assets_path, pages_url: builder.template.selector_modal_pages_path }) +
+        builder.template.content_tag(:div, nil, id: 'content-guide')
+      end
+      text_area + editor
     end
   end
 

data/app/models/smithy/asset.rb

@@ -1,7 +1,7 @@
 module Smithy
   class Asset < ActiveRecord::Base
     validates_presence_of :file, :name
-    belongs_to :asset_source
+    belongs_to :asset_source, inverse_of: :assets
     has_many :images, :dependent => :destroy
 
     attachment :file

data/app/models/smithy/content_block_template.rb

@@ -1,6 +1,6 @@
 module Smithy
   class ContentBlockTemplate < ActiveRecord::Base
-    belongs_to :content_block, :touch => true
+    belongs_to :content_block, :touch => true, inverse_of: :templates
     has_many :page_contents
 
     validates_presence_of :name

data/app/models/smithy/image.rb

@@ -4,7 +4,7 @@ module Smithy
 
     validates_presence_of :asset
 
-    belongs_to :asset
+    belongs_to :asset, inverse_of: :images
 
     class << self
       def content_block_description

data/app/models/smithy/page.rb

@@ -5,7 +5,7 @@ module Smithy
     validate :validate_exclusion_of_reserved_words
     validate :validate_page_to_copy_exists
 
-    belongs_to :template
+    belongs_to :template, inverse_of: :pages
     has_many :containers, :through => :template
     has_many :contents, :class_name => "PageContent"
 
@@ -44,6 +44,7 @@ module Smithy
     end
 
     def duplicate_content_from(page_id)
+      page_id = page_id.id if page_id.is_a?(Smithy::Page)
       page = Page.find(page_id)
       self.contents = page.contents.map(&:amoeba_dup)
       self.contents.each do |content|
@@ -55,7 +56,7 @@ module Smithy
     def normalize_friendly_id(value) # normalize_friendly_id overrides the default creator for friendly_id
       return "/" if self.parent.blank?
       value = self.permalink? ? self.permalink.parameterize : value.to_s.parameterize
-      [(self.parent.present? && !self.parent.root? ? self.parent.path : nil), value].join('/')
+      [(self.parent.present? && !self.parent.root? ? self.parent.path : nil), value].join('/').downcase
     end
 
     def should_generate_new_friendly_id?

data/app/models/smithy/page_content.rb

@@ -4,13 +4,14 @@ module Smithy
     validates_presence_of :content_block_type, :on => :create
     validates_presence_of :label, :container, :page
 
-    belongs_to :page, :touch => true
-    belongs_to :content_block, :polymorphic => true
-    belongs_to :content_block_template
+    belongs_to :page, :touch => true, inverse_of: :contents
+    belongs_to :content_block, :polymorphic => true, inverse_of: :page_contents
+    belongs_to :content_block_template, inverse_of: :page_contents
 
     before_update :set_publishable
 
     accepts_nested_attributes_for :content_block, :allow_destroy => true
+
     amoeba do
       enable
       include_association :content_block
@@ -41,7 +42,10 @@ module Smithy
         # scopes as the original values as well, but this ensures they don't get clobbered
         liquid_context.merge('smithy' => liquid_context.scopes.last)
         liquid_context.merge(self.to_liquid)
-        content_block_template.liquid_template.render(liquid_context)
+        output = content_block_template.liquid_template.render(liquid_context)
+        # auto-wrap every page content in a div with the page_content-#id and the page_content#css_classes
+        wrapper = Smithy::PageContentWrapper.new(self)
+        wrapper.wrap(output)
       end
     end
 

data/app/models/smithy/permitted_params.rb

@@ -25,12 +25,11 @@ module Smithy
     end
 
     def content_block_attributes
-      # [ :name, templates_attributes: [ :id, :name, :content, :_destroy ] ]
-      :all
+      [ :name, templates_attributes: [ :id, :name, :content, :_destroy ] ]
     end
 
     def content_block_template_attributes
-      [ :content, :name ]
+      [ :name, :content ]
     end
 
     def image_attributes
@@ -38,12 +37,19 @@ module Smithy
     end
 
     def page_attributes
-      [ :browser_title, :cache_length, :description, :external_link, :keywords, :permalink, :publish, :published_at, :show_in_navigation, :title, :parent_id, :template_id, :copy_content_from ]
+      [
+        :browser_title, :cache_length, :description, :external_link, :keywords, :permalink, :publish, :published_at, :show_in_navigation, :title, :parent_id, :template_id, :copy_content_from,
+        contents_attributes: page_content_attributes + [:id, :_destroy]
+      ]
     end
 
     def page_content_attributes
-      # [ :label, :container, :content_block_type, :content_block_template_id, :position ]
-      :all
+      attributes = [ :label, :css_classes, :container, :content_block_type, :content_block_template_id, :position ]
+      content_block_attributes = ::Smithy::ContentBlocks::Registry.content_blocks.inject([]) do |association_attributes, content_block_type|
+        association_attributes += nested_content_block_attributes_for(content_block_type)
+      end
+      attributes << { content_block_attributes: content_block_attributes + [:id, :_destroy] } if content_block_attributes.present?
+      attributes
     end
 
     def page_list_attributes
@@ -61,5 +67,36 @@ module Smithy
     def template_container_attributes
       [ :name, :position ]
     end
+
+    private
+      def content_block_attributes_for(content_block_type)
+        attributes_method = "#{content_block_type.underscore}_attributes".to_sym
+        if self.respond_to?(attributes_method)
+          public_send(attributes_method)
+        else
+          klass = "Smithy::#{content_block_type.camelize}".safe_constantize || content_block_type.camelize.safe_constantize
+          klass.present? ? klass.column_names.delete_if { |n| n.to_s.presence_in %w(id updated_at created_at) }.map(&:to_sym) : []
+        end
+      end
+
+      def nested_content_block_attributes_for(content_block_type)
+        content_block_attributes = content_block_attributes_for(content_block_type)
+        association_attributes = []
+        reflected_content_block_associations(content_block_type).each do |reflection|
+          name, association = reflection
+          next if association.active_record.nested_attributes_options[name.to_sym].blank?
+          allowed_attributes = content_block_attributes_for(content_block_type) + [:id]
+          allowed_attributes += [:_destroy] if association.active_record.nested_attributes_options[name.to_sym][:allow_destroy] == true
+          association_attributes << {"#{name}_attributes".to_sym => allowed_attributes }
+        end
+        content_block_attributes += association_attributes
+        content_block_attributes.uniq
+      end
+
+      def reflected_content_block_associations(content_block_type)
+        klass = "Smithy::#{content_block_type}".safe_constantize || content_block_type.safe_constantize
+        reflections = klass.reflections.delete_if{|k,v| k.to_s.presence_in %w(id page_contents pages) }
+      end
+
   end
 end

data/app/models/smithy/template_container.rb

@@ -2,7 +2,7 @@ module Smithy
   class TemplateContainer < ActiveRecord::Base
     validates_presence_of :name, :template
 
-    belongs_to :template
+    belongs_to :template, inverse_of: :containers
     has_many :pages, :through => :template
 
     default_scope -> { order([:position, :name]) }

data/app/views/smithy/pages/_container.html.erb

@@ -1,24 +1,6 @@
-<div class="well">
+<div class="page-container">
 <%= f.inputs container.display_name do %>
-  <table class="table table-striped page-contents" data-reorder-href="<%= order_page_contents_path(@page.id) %>">
-  <% @page.contents.for_container(container.name).each do |page_content| %>
-    <%= content_tag_for :tr, page_content do %>
-      <td>
-        <i class="fa fa-reorder handle"></i>
-        <%= link_to "edit", edit_page_content_path(@page.id, page_content), class: "btn btn-primary btn-sm" %>
-      </td>
-      <td><strong><%= page_content.label %></strong></td>
-      <td><%= page_content.content_block_type.demodulize %></td>
-      <td><%= page_content.updated_at.strftime('%b %e, %Y %H:%M:%S') %></td>
-      <td>
-        <div class="pull-right">
-          <%= link_to "preview", preview_page_content_path(@page.id, page_content), class: "btn btn-default btn-sm", data: { previewtoggle: "modal" } %>
-          <%= link_to "<i class=\"fa fa-trash\"></i> delete".html_safe, page_content_path(@page.id, page_content), method: :delete, data: { confirm: "Do you really want to delete this content?" }, class: "btn btn-danger btn-sm" %>
-        </div>
-      </td>
-    <% end %>
-  <% end %>
-  </table>
+  <%= render :partial => "page_content", :collection => @page.contents.for_container(container.name), :locals => { :f => f } %>
   <div><%= link_to "Add to #{container.display_name}", new_page_content_path(@page.id, page_content: { container: container.name }), class: "btn btn-primary btn-sm" %></div>
 <% end %>
 </div>

data/app/views/smithy/pages/_page_content.html.erb

@@ -0,0 +1,27 @@
+<div class="page_content">
+<%= f.semantic_fields_for :contents, page_content do |f| %>
+  <div class="page_content-heading">
+    <a href="#page_content-<%= page_content.id %>" class="page_content-toggle" id="page_content-<%= page_content.id %>" data-toggle="collapse">
+      <span class="name"><%= page_content.label %></span>
+      <span class="type"><%= page_content.content_block_type.demodulize.underscore.humanize %></span>
+      <span class="lastupdated">Last Updated: <%= page_content.updated_at.strftime('%b %e, %Y %H:%M') %></span>
+    </a>
+  </div>
+  <div class="page_content-fields collapse" role="tabpanel">
+    <div>
+      <%= f.inputs do %>
+        <%= f.input :label, hint: "Internal CMS usage only - so you can identify it later" %>
+        <%= f.input :css_classes, label: 'CSS Classes', hint: 'If you need a hook to apply special styles' %>
+        <%= f.input :container, as: :hidden %>
+        <%= f.input :content_block_type, as: :hidden %>
+      <% end %>
+      <div class="well">
+        <%= f.input :content_block_template, collection: page_content.templates, include_blank: false %>
+        <%= f.semantic_fields_for(:content_block) do |builder| %>
+          <%= render partial: "#{page_content.content_block_type.underscore.pluralize}/form_fields", locals: { f: builder } %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+<% end %>
+</div>

data/db/migrate/20160819164547_add_css_classes_to_smithy_page_contents.rb

@@ -0,0 +1,5 @@
+class AddCssClassesToSmithyPageContents < ActiveRecord::Migration
+  def change
+    add_column :smithy_page_contents, :css_classes, :string
+  end
+end

data/lib/smithy.rb

@@ -6,6 +6,7 @@ require 'smithy/logger'
 require 'smithy/liquid'
 # content formatting
 require 'smithy/asset_link'
+require 'smithy/page_content_wrapper'
 require 'smithy/formatter'
 #
 require 'smithy/content_blocks'

data/lib/smithy/content_blocks/model.rb

@@ -3,7 +3,7 @@ module Smithy
     module Model
       extend ActiveSupport::Concern
       included do
-        has_many :page_contents, :as => :content_block, class_name: '::Smithy::PageContent', dependent: :destroy
+        has_many :page_contents, as: :content_block, class_name: '::Smithy::PageContent', dependent: :destroy
         has_many :pages, through: :page_contents, class_name: '::Smithy::Page'
         Smithy::ContentBlocks::Registry.register self
         amoeba do

data/lib/smithy/content_blocks/registry.rb

@@ -20,8 +20,7 @@ module Smithy
           return unless ActiveRecord::Base.connection.table_exists?(content_block.table_name)
           content_block_name = content_block.to_s.demodulize
           @@content_blocks << content_block_name unless @@content_blocks.include?(content_block_name)
-          cb = Smithy::ContentBlock.find_or_initialize_by(name: content_block_name)
-          cb.save
+          Smithy::ContentBlock.find_or_create_by(name: content_block_name)
           @@content_blocks
         end
       end

data/lib/smithy/dependencies.rb

@@ -15,5 +15,6 @@ require 'liquid'
 require 'refile/rails'
 require 'refile/mini_magick'
 require 'remotipart'
+require 'responders'
 require 'sass-rails'
 require 'slodown'

data/lib/smithy/engine.rb

@@ -26,7 +26,8 @@ module Smithy
     end
 
     initializer :assets do |config|
-      Rails.application.config.assets.precompile += %w( ZeroClipboard.swf smithy/logo-sm.png )
+      icons = %w(_blank _page doc pdf ppt txt xls xlsx)
+      Rails.application.config.assets.precompile += %w( ZeroClipboard.swf smithy/logo-sm.png) + icons.map{|icon| "smithy/icons/#{icon}.png" }
     end
 
     config.after_initialize do
@@ -40,8 +41,8 @@ module Smithy
       # we need to require all our model files so that ContentBlocks
       # are registered with the engine
       Dir[Smithy::Engine.root.join('app', 'models', 'smithy', '*.rb')].each do |file|
-        table_name = File.basename(file, '.rb').pluralize
-        require_dependency file if ActiveRecord::Base.connection.table_exists?(table_name)
+        table_name = "smithy_#{File.basename(file, '.rb').pluralize}"
+        require file if ActiveRecord::Base.connection.table_exists?(table_name)
       end
     end
 

data/lib/smithy/liquid/tags/html.rb

@@ -47,14 +47,18 @@ module Smithy
           def render(context)
             controller = context.registers[:controller]
             javascript = Smithy::Template.javascripts.find_by(name: tag_without_ext('js'))
-            controller.view_context.send(:javascript_include_tag, "/templates/javascripts/#{tag_with_ext('js')}?#{javascript.updated_at.to_s(:number) if javascript.present?}")
+            path = "/templates/javascripts/#{tag_with_ext('js')}"
+            path += "?#{javascript.updated_at.to_s(:number)}" if javascript.present?
+            controller.view_context.send(:javascript_include_tag, path)
           end
         end
         class SmithyStylesheetLinkTag < Base
           def render(context)
             controller = context.registers[:controller]
             stylesheet = Smithy::Template.stylesheets.find_by(name: tag_without_ext('css'))
-            controller.view_context.send(:stylesheet_link_tag, "/templates/stylesheets/#{tag_with_ext('css')}?#{stylesheet.updated_at.to_s(:number) if stylesheet.present?}")
+            path = "/templates/stylesheets/#{tag_with_ext('css')}"
+            path += "?#{stylesheet.updated_at.to_s(:number)}" if stylesheet.present?
+            controller.view_context.send(:stylesheet_link_tag, path)
           end
         end
       end