smithycms 0.5.99.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca4665e2f72f5d87ea065b7df312438c6232cd6
-  data.tar.gz: 10a3f2115fedf0a67e382da327868669ae9efb3c
+  metadata.gz: 5729808381e189d354b575a074129abbb0bd33b6
+  data.tar.gz: 49a72ccb62fb0f11a31edf3f70cc2f1af81fd372
 SHA512:
-  metadata.gz: c823ae8476ebff90a5b3eff03eb31ed9c0e5aaf693d252c49361f768156dc1a05f665bcbf77ac454f2aef8dbf0c55643f43e2f733868885176b93a0c0f04926a
-  data.tar.gz: d5e484af0dc93eaec79aa02788f4a830a2005674c27ef1e9796fe49f626e8a8e5e4b4c57b60cdc5c7cb60527fa4d70dd2c52612bba5571674c271b1c3c1289eb
+  metadata.gz: 390e6f97961063ad08c0e2d673c01896e4f296b9ffe4e37c5384033ebfde23f04fcee62f2c0b31bd787f4508900099a05c5a45d4db8236cb8c4589ff3ba55539
+  data.tar.gz: 2dd09ff917ef0d96379610d38b29b7af7d78cd95cb5e1d983b4d80972d416e99f640c8e328df21eeebb96f2b14348eb1cac7765cab0f4e5243a33888678f3083

data/README.md

@@ -74,6 +74,19 @@ Alternatively, you can add a boolean field (via migration) named `smithy_admin`
 
 Restart your local server and you should be good to go.
 
+## Upgrading from 0.5.* to 0.6+
+
+In version 0.6, Smithy switched it's asset engine from Dragonfly to Refile. Your assets should automatically be migrated to Refile, but if you have any direct links to assets in your content, the migration will warn you that they need to be changed. Refile doesn't store images the same way, so it isn't possible to link directly to them.
+
+Pay close attention to the database migration. If any warnings come up, make sure you follow the instructions to fix them.
+
+There are two different errors that might occur:
+
+1. Dragonfly asset not found. If this occurs, you need to find the asset on S3, and manually move it to the new path provided in the message. If the asset no longer exists, you will need to remove it manually from the console for the smithy assets page to load properly.
+`[WARNING] Asset Not Found in S3`
+2. Direct link found in the content. This message will point out places in the smithy content that link directly to S3 images. Replace these links in the content with the links provided in the message to fix.
+`[WARNING] Direct Link found in the page`
+
 ### Templates
 
 Create your first Template, naming it whatever you want ("Home" or "Default" or something equally original). In the content, add `{{ page.container.main_content }}`. In the background, this will auto-create a container that will be used by any page using your template. You can name your container whatever you would like: `{{ page.container.foo }}` works as well. After you have created new page containers, they will automatically show up on the Page edit screen and allow you to add content to the container.

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

@@ -1,9 +1,11 @@
 //= require jquery
 //= require jquery_ujs
+//= require jquery.remotipart
 //= require 'smithy/jquery-ui.min'
-//= require jquery-fileupload/basic
-//= require jquery-fileupload/vendor/tmpl
 //= require bootstrap-sprockets
+//= require dataTables/jquery.dataTables
+//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+//= require dataTables/extras/dataTables.responsive
 //= require ace-1.1.3/ace
 //= require ace-1.1.3/mode-css.js
 //= require ace-1.1.3/mode-html.js
@@ -11,4 +13,5 @@
 //= require ace-1.1.3/mode-liquid.js
 //= require ace-1.1.3/mode-markdown.js
 //= require zeroclipboard-2.2.0/ZeroClipboard.min.js
+//= require refile
 //= require_tree .

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

@@ -0,0 +1,35 @@
+$upload_button = $('#choose-files')
+$upload_form = $upload_button.closest('form')
+$file_input = $('#presigned_upload_field').find('input[type="file"]')
+presigned_upload_field_url = $upload_button.attr('data-presigned-upload-field-url')
+
+$upload_button.on 'click', (e) ->
+  $file_input.click();
+
+upload_files = (e) ->
+  files = e.target.files
+  if files.length
+    $upload_form.submit()
+
+    # Reset the file input, so that it can be used again
+    $.get presigned_upload_field_url, ->
+      $file_input = $('#presigned_upload_field').find('input[type="file"]')
+      bind_file_input()
+
+    $progress_bar = $($upload_form).append('<div class="progress"><div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:0;"></div></div>').find('.progress-bar')
+    total_size = 0; (total_size += file.size for file in files)
+    total_uploaded = 0
+
+    $(this).find("input[type=submit]").attr("disabled", true)
+    $(document).on "upload:success", $upload_form, (e) ->
+      total_uploaded += e.originalEvent.detail.file.size
+      progress = parseInt(total_uploaded/total_size * 100, 10)
+      $progress_bar.css('width', "#{progress}%").attr('aria-valuenow', progress)
+      setTimeout((-> $progress_bar.parent().remove()), 2000) if progress >= 100
+    $(document).on "upload:failed", $upload_form, (e) ->
+      $(this).addClass("upload-failed").append("<p>Something went wrong, please check your connection and try again</p>")
+
+bind_file_input = ->
+  $file_input.on 'change', upload_files
+
+bind_file_input()

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

@@ -1,37 +1,45 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
-jQuery ->
-  $('#fileupload').fileupload
-    add: (e, data) ->
-      types = /(\.|\/)(gif|jpe?g|png|pdf|svgz?)$/i
-      file = data.files[0]
-      if types.test(file.type) || types.test(file.name)
-        data.context = $(tmpl("template-upload", file))
-        $(this).find('#Content-Type').val(file.type)
-        $(this).append(data.context)
-        data.submit()
-      else
-        alert("#{file.name} is not a gif, jpeg, png, svg or pdf file")
-
-    progress: (e, data) ->
-      if data.context
-        progress = parseInt(data.loaded / data.total * 100, 10)
-        data.context.find('.bar').css('width', progress + '%')
-
-    done: (e, data) ->
-      file = data.files[0]
-      domain = $('#fileupload').attr('action')
-      path = $('#fileupload input[name=key]').val().replace('${filename}', file.name)
-      to = $('#fileupload').data('post') + ".js"
-      content = {}
-      content[$('#fileupload').data('as')] = domain + path
-      setTimeout ->
-        $.post(to, content)
-      , 1500
-      data.context.remove() if data.context # remove progress bar
-
-    fail: (e, data) ->
-      alert("#{data.files[0].name} failed to upload.")
-      console.log("Upload failed:")
-      console.log(data)
+$select_all_checkbox = $('#assets_table_select_all')
+$delete_selected_button = $('#delete_selected_assets')
+
+$('#assets').DataTable {
+  "responsive": true,
+  "serverSide": true,
+  "processing": true,
+  "ajax": $('#assets').attr('data-source'),
+  "order": [[2, 'asc']],
+  "columnDefs": [
+    { "targets": [0,1,5], "searchable": false, "orderable": false },
+    { "targets": [1], "className": "preview" }
+  ],
+  "language": {
+    "emptyTable": "No assets have been added yet. Upload files above to create new assets.",
+    "processing": "<span>Processing...</span>"
+  },
+  "dom": 'l<"toolbar">frtip'
+}
+
+window.$assets_table = $('#assets').dataTable()
+window.assets_table_api = $assets_table.api()
+
+$('#assets_wrapper').find('.toolbar').append($delete_selected_button.remove())
+
+$(document).on 'click', '#assets_table_select_all', (e) ->
+  $checkbox = $(e.target)
+  $assets_table.find('input.delete').prop('checked', $checkbox.prop('checked'))
+
+$(document).on 'click', '#assets_wrapper input[type="checkbox"]', (e) ->
+  if $('#assets_wrapper input[type="checkbox"]:checked').length > 0
+    $delete_selected_button.show()
+  else
+    $delete_selected_button.hide()
+
+$assets_table.on 'draw.dt', ->
+  $(document).trigger('updateCopyLinks')
+
+window.assets_table_add_rows = (rows) ->
+  assets_table_api.rows.add(rows).draw()
+
+window.assets_table_delete_rows = () ->
+  assets_table_api.draw()
+  $select_all_checkbox.prop('checked', false)
+  $delete_selected_button.hide()

data/app/assets/javascripts/smithy/copy_link.js.coffee.erb

@@ -5,15 +5,20 @@ jQuery ->
     swfPath: '<%= image_path "ZeroClipboard.swf" %>'
   });
 
-  ($ 'body').on "click", ".copy-to-clipboard", (e) ->
-    e.preventDefault()
-  $('.copy-to-clipboard').each ->
-    $link = ($ this)
-    clip = new ZeroClipboard( this )
-    clip.on "copy", (e) ->
-      clip.setText($link.data('clipboard-text'))
-      saved_text = $link.text()
-      $link.text 'Copied!'
-      setTimeout ->
-        $link.text(saved_text)
-      , 2000
+  setup_copy_links = ->
+    ($ 'body').on "click", ".copy-to-clipboard", (e) ->
+      e.preventDefault()
+    $('.copy-to-clipboard').each ->
+      $link = ($ this)
+      clip = new ZeroClipboard( this )
+      clip.on "copy", (e) ->
+        clip.setText($link.data('clipboard-text'))
+        saved_text = $link.text()
+        $link.text 'Copied!'
+        setTimeout ->
+          $link.text(saved_text)
+        , 2000
+  setup_copy_links()
+
+  $(document).on 'updateCopyLinks', ->
+    setup_copy_links()

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

@@ -8,7 +8,7 @@ $(function() {
       $(url).modal('open');
     } else {
       $.get(url, function(data) {
-        $('<div class="modal hide fade">' + data + '</div>').modal();
+        $('<div class="modal fade">' + data + '</div>').modal();
       }).success(function() { $('input:text:visible:first').focus(); });
     }
   });

data/app/assets/stylesheets/smithy/{application.css.scss → application.scss}

@@ -20,6 +20,8 @@
  */
 
 @import 'bootstrap_and_overrides';
+@import 'dataTables/bootstrap/3/jquery.dataTables.bootstrap';
+@import 'dataTables/extras/dataTables.responsive';
 @import 'layout';
 @import 'forms';
 @import 'guides';

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

@@ -0,0 +1,28 @@
+
+
+// .table-striped > tbody > tr:nth-child(odd) > td,
+// .table-striped > tbody > tr:nth-child(odd) > th { background:darken($table-bg-accent, 5%); }
+
+table#assets {
+  td { vertical-align:middle; }
+  .preview a {
+    height:30px; width:30px; display:block; position:relative;
+    img { position:absolute; bottom:0; top:0; left:0; right:0; margin:auto; max-width:100%; max-height:100%; }
+  }
+}
+
+#assets_wrapper {
+  position:relative;
+  #assets_processing {
+    width:100%; height:100%; top:0; left:0; text-align:center; margin:0; padding:0;
+    &:before { display:inline-block; vertical-align:middle; content:""; height:100%; }
+    span { display:inline-block; vertical-align:middle; }
+  }
+
+  #assets_length,
+  .toolbar { float:left; margin-right:10px; }
+  th.column_delete {
+    padding:8px;
+    input { margin-right:5px; }
+  }
+}

data/app/controllers/smithy/asset_sources_controller.rb

@@ -0,0 +1,25 @@
+require_dependency "smithy/base_controller"
+
+module Smithy
+  class AssetSourcesController < BaseController
+    respond_to :html, :json, :js
+
+    def update
+      @asset_source = AssetSource.find(params[:id])
+      if @asset_source.update_attributes(filtered_params)
+        flash.notice = "Your assets were saved"
+        @assets = @asset_source.assets
+      end
+      respond_with @asset_source do |format|
+        format.js { render json: AssetsDatatable.new(view_context).new_row(@assets), callback: 'assets_table_add_rows' }
+      end
+    end
+
+    def presigned_upload_field
+      @asset_source = AssetSource.find(params[:id])
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+end

data/app/controllers/smithy/assets_controller.rb

@@ -2,11 +2,16 @@ require_dependency "smithy/base_controller"
 
 module Smithy
   class AssetsController < BaseController
+    skip_before_filter :authenticate_smithy_admin, :only => [ :url ]
     before_filter :load_assets, :only => :index
     respond_to :html, :json, :js
 
     def index
-      respond_with @assets, :layout => 'smithy/wide'
+      @asset_source = AssetSource.first
+      respond_with @assets, :layout => 'smithy/wide' do |format|
+        format.html
+        format.json { render json: ::Smithy::AssetsDatatable.new(view_context) }
+      end
     end
 
     def new
@@ -14,23 +19,17 @@ module Smithy
       respond_with @asset
     end
 
-    def show
-      @asset = Asset.find(params[:id])
-      respond_with @asset do |format|
-        format.html { redirect_to @asset.url }
-      end
-    end
-
-    def create
-      @asset = Asset.new(filtered_params)
-      @asset.save
-      respond_with @asset do |format|
-        format.html {
-          flash.notice = "Your asset was created" if @asset.persisted?
-          redirect_to assets_path
-        }
-      end
-    end
+    # def create
+    #   @asset = Asset.new(filtered_params)
+    #   @asset.save
+    #   respond_with @asset do |format|
+    #     format.html {
+    #       flash.notice = "Your asset was created" if @asset.persisted?
+    #       redirect_to assets_path
+    #     }
+    #     format.js { render json: ::Smithy::AssetsDatatable.new(view_context).new_row(@asset), callback: 'assets_table_add_row' }
+    #   end
+    # end
 
     def edit
       @asset = Asset.find(params[:id])
@@ -51,6 +50,19 @@ module Smithy
       respond_with @asset
     end
 
+    def batch_destroy
+      @assets = Asset.where(id: params[:ids])
+      @assets.destroy_all
+      respond_with @assets do |format|
+        format.js { render json: { ids: params[:ids] }, callback: "assets_table_delete_rows" }
+      end
+    end
+
+    def data
+      @asset = Asset.find(params[:id])
+      send_data @asset.data, filename: @asset.file_filename, disposition: "inline", type: ::File.extname(@asset.file_filename).downcase.sub(/^\./, '').to_sym
+    end
+
     private
       def load_assets
         @assets = Asset.order(:name).page(params[:page])

data/app/controllers/smithy/page_contents_controller.rb

@@ -2,6 +2,7 @@ require_dependency "smithy/base_controller"
 
 module Smithy
   class PageContentsController < BaseController
+    include Smithy::Liquid::Rendering
     before_filter :load_page
     before_filter :load_page_content, :only => [ :edit, :update, :destroy, :preview ]
     before_filter :build_content_block, :only => [ :edit, :update ]
@@ -50,7 +51,7 @@ module Smithy
 
     def preview
       respond_with @page_content do |format|
-        format.html { render :text => @page_content.render, :layout => 'smithy/modal' }
+        format.html { render :text => @page_content.render(liquid_context), :layout => 'smithy/modal' }
       end
     end
 

data/app/helpers/smithy/assets_helper.rb

@@ -3,7 +3,21 @@ module Smithy
     def asset_image_tag(asset_id)
       asset = Smithy::Asset.find_by_id(asset_id)
       return unless asset
-      image_tag(asset.file.url(:host => "#{request.protocol}#{request.host_with_port}"), :alt => asset.name)
+      image_tag(asset.url, :alt => asset.name)
+    end
+
+    def asset_preview_link(asset_id)
+      asset = Smithy::Asset.find_by_id(asset_id)
+      return unless asset
+      link_to attachment_url(asset, :file) do
+        if asset.file_type == :image
+          attachment_image_tag(asset, :file, :fit, 30, 30, alt: '')
+        elsif asset.file_type == :direct_image
+          attachment_image_tag(asset, :file, width: 30, alt: '')
+        else
+          image_tag file_type_icon(asset), alt: ''
+        end
+      end
     end
 
     def file_type_icon(asset)

data/app/models/smithy/asset.rb

@@ -1,47 +1,32 @@
 module Smithy
   class Asset < ActiveRecord::Base
     validates_presence_of :file, :name
-
+    belongs_to :asset_source
     has_many :images, :dependent => :destroy
 
-    extend ::Dragonfly::Model
-    dragonfly_accessor :file
-    include ::Smithy::Dragonfly::AssetHelper
+    attachment :file
 
     before_validation :set_name
-    before_save :set_file_uid_manually
 
     default_scope -> { order(:name) }
 
-    def file
-      # check for the jquery uploaded file first, just in case one got past the manual check. Also keeps backwards-compatibility
-      if self.uploaded_file_url?
-        dragonfly_attachments[:file].app.datastore = self.class.dragonfly_remote_datastore
-        self.file_url = URI.escape(self.uploaded_file_url)
-      elsif dragonfly_attachments[:file].to_value
-        dragonfly_attachments[:file].app.datastore = self.class.dragonfly_datastore
-      end
-      dragonfly_attachments[:file].to_value
-    end
-
     def file_type
-      ext = File.extname(file.name).sub(/^\./, '')
-      case ext
-      when 'jpg', 'jpeg', 'gif', 'png'
-        :image
-      when 'svg', 'svgz'
+      case file_content_type
+      when /^image\/svg/
         :direct_image
-      when 'pdf'
+      when /^image\/?/
+        :image
+      when /pdf/
         :pdf
-      when 'doc', 'docx'
+      when /msword|wordprocessing/
         :word
-      when 'xls', 'xlsx'
+      when /excel|spreadsheet/
         :excel
-      when 'ppt', 'pps', 'pptx', 'ppsx'
+      when /powerpoint|presentation/
         :powerpoint
-      when 'txt'
+      when /txt/
         :text
-      when 'rtf'
+      when /rtf/
         :document
       else
         :default
@@ -52,41 +37,31 @@ module Smithy
       {
         'id' => self.id,
         'name' => self.name,
-        'content_type' => self.content_type,
+        'content_type' => self.file_content_type,
         'file' => self.file,
-        'file_name' => self.file_name,
+        'file_name' => self.file_filename,
         'file_width' => self.file_width,
         'file_height' => self.file_height,
         'file_size' => self.file_size,
-        'remote_url' => self.file.remote_url,
+        'remote_url' => self.url,
         'url' => self.url
       }
     end
 
     def url
-      self.file.url
+      Refile.attachment_url(self, :file)
     end
 
-    private
-      def set_content_types
-        set_content_type(self.file, :content_type)
-      end
-
-      # this allows dragonfly to take over management of the uploaded file. We are
-      # assuming that jquery-upload and dragonfly are using the same data storage...
-      def set_file_uid_manually
-        if self.uploaded_file_url? # this means it was uploaded via jquery-upload
-          uri = URI.parse(URI.encode(self.uploaded_file_url))
-          self.file_uid = self.uploaded_file_url.sub("#{uri.scheme}://#{uri.host}/", '')
-          self.uploaded_file_url = nil
-        end
-      end
+    def data
+      file.read
+    end
 
+    private
       def set_name
         if self.uploaded_file_url?
           self.name = File.basename(self.uploaded_file_url, '.*').titleize unless self.name?
         elsif self.file.present?
-          self.name = File.basename(self.file.name, '.*').titleize unless self.name?
+          self.name = File.basename(self.file_filename, '.*').titleize unless self.name?
         end
      end
   end

data/app/models/smithy/asset_source.rb

@@ -0,0 +1,7 @@
+module Smithy
+  class AssetSource < ActiveRecord::Base
+    has_many :assets, :dependent => :destroy
+
+    accepts_attachments_for :assets, append: true
+  end
+end

data/app/models/smithy/assets_datatable.rb

@@ -0,0 +1,75 @@
+module Smithy
+  class AssetsDatatable
+    include AssetsHelper
+    delegate :params, :link_to, :image_tag, :number_to_human_size, :attachment_url, :attachment_image_tag, :file_type_icon, :check_box_tag, :render, to: :@view
+
+    def initialize(view)
+      @view = view
+    end
+
+    def as_json(options = {})
+      {
+        draw: params[:draw].to_i,
+        recordsTotal: Asset.count,
+        recordsFiltered: assets.total_count,
+        data: data
+      }
+    end
+
+    def new_row(assets)
+      assets.map do |asset|
+        render_asset(asset)
+      end
+    end
+
+  private
+
+    def data
+      assets.map do |asset|
+        render_asset asset
+      end
+    end
+
+    def render_asset(asset)
+      [
+        check_box_tag('ids[]', asset.id, false, class: "delete"),
+        asset_preview_link(asset),
+        asset.name,
+        number_to_human_size(asset.file_size),
+        asset.file_content_type,
+        "#{render(partial: '/smithy/assets/actions', formats: :html, locals: { asset: asset })}"
+      ]
+    end
+
+    def assets
+      @assets ||= fetch_assets
+    end
+
+    def fetch_assets
+      assets = Asset.unscoped.order("#{sort_column} #{sort_direction}")
+      assets = assets.page(page).per(per_page)
+      # TODO: need to check for regex flag
+      if params[:search][:value].present?
+        assets = assets.where("name like :search or content_type like :search", search: "%#{params[:search][:value]}%")
+      end
+      assets
+    end
+
+    def page
+      params[:start].to_i/per_page + 1
+    end
+
+    def per_page
+      params[:length].to_i > 0 ? params[:length].to_i : 10
+    end
+
+    def sort_column
+      columns = %w[delete preview name file_size file_content_type actions]
+      columns[params[:order][:"0"][:column].to_i]
+    end
+
+    def sort_direction
+      params[:order][:"0"][:dir] == "desc" ? "desc" : "asc"
+    end
+  end
+end

data/app/models/smithy/content.rb

@@ -19,7 +19,7 @@ module Smithy
     def to_liquid
       {
         'id' => self.id,
-        'content' => Smithy::AssetLink.fix(self.content),
+        'content' => self.content,
         'formatted_content' => self.formatted_content
       }
     end

data/app/models/smithy/content_block_template.rb

@@ -12,14 +12,10 @@ module Smithy
     default_scope -> { order(:name) }
 
     def liquid_template
-      @liquid_template ||= ::Liquid::Template.parse(content_with_fixed_asset_links)
+      @liquid_template ||= ::Liquid::Template.parse(self.content)
     end
 
     private
-      def content_with_fixed_asset_links
-        Smithy::AssetLink.fix(self.content)
-      end
-
       def touch_page_contents
         self.page_contents.each(&:touch)
       end

data/app/models/smithy/page_content.rb

@@ -16,6 +16,8 @@ module Smithy
     scope :for_container, ->(container) { where(:container => container) }
     scope :publishable, -> { where(:publishable => true) }
 
+    delegate :name, to: :content_block, prefix: :content_block
+
     def attributes=(attributes = {})
       self.content_block_type = attributes[:content_block_type]
       super

data/app/models/smithy/permitted_params.rb

@@ -16,6 +16,10 @@ module Smithy
       [ :name, :file, :file_name, :file_url, :retained_file, :uploaded_file_url ]
     end
 
+    def asset_source_attributes
+      [ :name, assets_files: [] ]
+    end
+
     def content_attributes
       [ :content ]
     end

data/app/models/smithy/template.rb

@@ -26,14 +26,10 @@ module Smithy
 
     def liquid_template
       @liquid_template ||= Rails.cache.fetch("#{self.cache_key}-liquid_template") do
-        ::Liquid::Template.parse(self.content_with_fixed_asset_links)
+        ::Liquid::Template.parse(self.content)
       end
     end
 
-    def content_with_fixed_asset_links
-      Smithy::AssetLink.fix(self.content)
-    end
-
     private
       def load_containers
         return unless self.template_type == 'template'