locomotivecms 3.0.0.pre.alpha.2 → 3.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10adf1633c36bc535a1fee5de2d222f04b412144
-  data.tar.gz: 941c8279d7f786e77f16a659745c9d3c74166172
+  metadata.gz: d4e648a311d3ce09779e9d4fed45788a010785e6
+  data.tar.gz: 27930ac44850b8afc52dc064057092c20433212a
 SHA512:
-  metadata.gz: b1023a316c88d96e7eb64e5b77c88027e1071f9b536fdd59d8db139a85f86160c44b8245f70829bd1fa8a91241dcc9bf4b6d87d10d9ad17298a99b11277367e3
-  data.tar.gz: bfd4756b7844f6013e639960b21a4ce8461a32b2c9af5cb6332d8a40abdf93eb294435975523a5d78173c491a7b9d120948e21f58b74fec81261235e7d58ec4d
+  metadata.gz: a199883b73bc3ba82d6e103bd9afbd6a1f87c7d3819dc38b78af40f869d699a353cfb9b5f0bbeceffbe0f6884ec3c07935f321635fc45e3d84e6c0501fa32be6
+  data.tar.gz: be98674b892846c91b6001dc6fd17e8d85b90b4e2b24737acefee63f9db30b116612b356ab66618a67d4a4f8ba17a6700c2f4fe8283e34744613317281558336

data/Gemfile

@@ -22,7 +22,7 @@ group :development do
   # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '15cceb66ed'
 
   # gem 'locomotivecms_steam', path: '../in_progress/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '7e41d29d6a', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c56798fc5d4a332', require: false
 
   # gem 'locomotive-aloha-rails', path: '../gems/aloha-rails' # for Developers
   # gem 'locomotive-tinymce-rails', path: '../gems/tinymce-rails' # for Developers
@@ -42,7 +42,8 @@ group :development do
   gem 'binding_of_caller'
 
   # gem 'unicorn-rails' # Using unicorn_rails instead of webrick (default server)
-  gem 'thin'
+  # gem 'thin'
+  gem 'puma'
 end
 
 group :test do

data/README.md

@@ -18,7 +18,7 @@ Visit the Locomotive official website [here](http://www.locomotivecms.com) for m
 
 As you can see from the commit logs, we are intensively working on the new V3 version. We kept all the features from our stable [v2 version](https://github.com/locomotivecms/engine/tree/v2.5.x), we just replace the UI, upgrade the gems and refactor our code.
 
-**[UPDATES]** Finally, we've been doing much more than we planed at first. We extracted the rendering functionality from the Engine and make it a gem named [Steam](https://github.com/locomotivecms/steam). This gem is also now used by [Wagon](https://github.com/locomotivecms/wagon) (version 2.0 in progress) which makes sure you get the same result between Wagon and Engine when you preview a page.
+**[UPDATES]** Finally, we've been doing much more than we planned at first. We extracted the rendering functionality from the Engine and make it a gem named [Steam](https://github.com/locomotivecms/steam). This gem is also now used by [Wagon](https://github.com/locomotivecms/wagon) (version 2.0 in progress) which makes sure you get the same result between Wagon and Engine when you preview a page.
 And last but not least, we added a Ruby API client for Locomotive that we called [Coal](https://github.com/locomotivecms/coal). That client consumes the API from Engine which embeds now GrapeAPI. [Nic Boie](https://github.com/boie0025) is in charge of it. Kudos to him!
 
 **TRELLO** [here](https://trello.com/b/kRiy1dZu/locomotive-v3)

data/app/api/locomotive/api/forms/membership_form.rb

@@ -4,6 +4,19 @@ module Locomotive
 
       class MembershipForm < BaseForm
         attrs :account_id, :role
+
+        attr_accessor :site
+        attr_reader   :account_email
+
+        def initialize(site, attributes = {})
+          self.site = site
+          super(attributes)
+        end
+
+        def account_email=(email)
+          self.account_id = Account.find_by(email: email).try(:_id)
+          @account_email = email
+        end
       end
 
     end

data/app/api/locomotive/api/resources/membership_resource.rb

@@ -13,7 +13,7 @@ module Locomotive
           end
 
           desc 'Index of memberships'
-          get :index do
+          get do
             authorize(memberships, :index?)
 
             present memberships, with: entity_klass
@@ -38,12 +38,13 @@ module Locomotive
             requires :membership, type: Hash do
               optional :role
               optional :account_id
+              optional :account_email
             end
           end
           post do
             authorize Membership, :create?
 
-            form = form_klass.new(membership_params)
+            form = form_klass.new(current_site, membership_params)
             persist_from_form(form)
 
             present membership, with: entity_klass, policy: current_policy
@@ -60,7 +61,8 @@ module Locomotive
           end
           put ':id' do
             authorize membership, :update?
-            form = form_klass.new(membership_params)
+
+            form = form_klass.new(current_site, membership_params)
             persist_from_form(form)
 
             present membership, with: entity_klass

data/app/assets/javascripts/locomotive.js

@@ -12,6 +12,8 @@
 //= require backbone
 //= require codemirror
 //= require select2
+//= require nprogress
+//= require nprogress-ajax
 //= require locomotive/vendor
 //= require ./locomotive/application
 

data/app/assets/javascripts/locomotive/utils/backbone_patches.js.coffee

@@ -1,6 +1,20 @@
-# https://github.com/jashkenas/backbone/issues/2822
+
 View = Backbone.View
+
 Backbone.View = View.extend
+  # https://github.com/jashkenas/backbone/issues/2822
   constructor: (options) ->
     @options = options || {}
     View.apply(@, arguments)
+
+  replace: ($new_el) ->
+    $(@el).hide()
+
+    $new_el.insertAfter($(@el))
+
+    _view = new @constructor(el: $new_el)
+    _view.render()
+
+    @remove()
+
+    _view

data/app/assets/javascripts/locomotive/utils/file.js.coffee

@@ -0,0 +1,20 @@
+(->
+  window.remote_file_to_base64 = (url, callback) ->
+    xhr = new XMLHttpRequest()
+    xhr.open('GET', url, true)
+    xhr.responseType = 'blob'
+
+    xhr.onload = (event) ->
+      if this.status == 200
+        blob = this.response
+
+        reader = new window.FileReader()
+        reader.readAsDataURL(blob)
+        reader.onloadend = -> callback(reader.result)
+      else
+        callback(null)
+
+    xhr.onerror = (event) -> callback(null)
+
+    xhr.send()
+)()

data/app/assets/javascripts/locomotive/utils/nprogress.js.coffee

@@ -0,0 +1,5 @@
+NProgress.configure
+  showSpinner:  false
+  ease:         'ease'
+  speed:        500
+  parent:       '.content'

data/app/assets/javascripts/locomotive/utils/rails_ujs.js.coffee

@@ -1,3 +1,5 @@
+# Feature: Confirm on action
+
 $.rails.safe_confirm = (question) ->
   prompt(question.question) == question.answer
 
@@ -18,3 +20,37 @@ $.rails.allowAction = (element) ->
     callback  = $.rails.fire(element, 'confirm:complete', [answer])
 
   answer && callback
+
+# Feature: AJAX File upload
+# Enhance the form: upload files in AJAX without monkey patching jQuery-UJS
+# Information: https://github.com/rails/jquery-ujs/issues/374
+$.rails.ajax = (options) ->
+  if _.isArray(options.data) # FormData
+    $.ajax(_.extend(options, contentType: false))
+  else
+    $.ajax(options)
+
+$ ->
+  # Tell the server to return flash messages in the header of the response
+  $('body').delegate $.rails.formSubmitSelector, 'ajax:beforeSend', (event, xhr, settings) ->
+    xhr.setRequestHeader('X-Flash', true)
+
+  # Once we receive the response from the server, we display a notification
+  # and also reset the submit button to its initial state (bootstrap)
+  $('body').delegate $.rails.formSubmitSelector, 'ajax:complete', (event, xhr, status) ->
+    $(this).find('button[type=submit], input[type=submit]').button('reset')
+
+    if message = xhr.getResponseHeader('X-Message')
+      type = if status == 'success' then 'success' else 'error'
+      Locomotive.notify decodeURIComponent($.parseJSON(message)), type
+
+  # We do not want forms to be aborted because of a file input
+  $('body').delegate $.rails.formSubmitSelector, 'ajax:aborted:file', (element) ->
+    $.rails.handleRemote($(this))
+    false
+
+  # Use the "new" FormData object (HTML5) to store the data, especially the uploaded files
+  $('body').delegate $.rails.formSubmitSelector, 'ajax:beforeSend', (event, xhr, settings) ->
+    settings.data = new FormData($(this)[0])
+    $(this).find('input[type=file]').each -> settings.data.append($(this).attr('name'), this.files[0])
+    true

data/app/assets/javascripts/locomotive/utils/wysihtml5.js.coffee

@@ -30,7 +30,7 @@ wysihtml5.commands.strike =
       console.log "[insertFile] exec(#{command}, #{param})"
 
     state: (composer, command) ->
-      console.log "[insertFile] state(#{command})"
+      # console.log "[insertFile] state(#{command})"
       wysihtml5.commands.insertImage.state(composer, command, "IMG")
       # wysihtml5.commands.formatBlock.state(composer, "formatBlock", null, CLASS_NAME, REG_EXP)
 

data/app/assets/javascripts/locomotive/views/content_assets/picker_view.js.coffee

@@ -17,9 +17,6 @@ class Locomotive.Views.ContentAssets.PickerView extends Backbone.View
     'a.refresh'
   ]
 
-  initialize: ->
-    @editor = @options.parent_view.editor
-
   render: ->
     console.log '[PickerView] rendering'
 
@@ -39,21 +36,17 @@ class Locomotive.Views.ContentAssets.PickerView extends Backbone.View
 
   select: (event) ->
     console.log '[PickerView] select'
-    event.stopPropagation() & event.preventDefault()
 
-    $link   = $(event.target)
-    title   = $link.attr('title')
-    url     = $link.attr('href')
+    event.stopPropagation() & event.preventDefault()
 
-    if $link.data('image')
-      @editor.composer.commands.exec 'insertImage',
-        src:    url
-        title:  title
-    else
-      html = "<a href='#{url}' title='#{title}'>#{title}</a>"
-      @editor.composer.commands.exec 'insertHTML', html
+    $link = $(event.target)
 
-    @options.parent_view.hide()
+    PubSub.publish 'file_picker.select',
+      parent_view:  @options.parent_view
+      image:        $link.data('image')
+      title:        $link.attr('title')
+      url:          $link.attr('href')
+      filename:     $link.attr('href').split(/[\\/]/).pop()
 
   open_edit_drawer: (event) ->
     console.log '[PickerView] open_edit_drawer'
@@ -69,8 +62,7 @@ class Locomotive.Views.ContentAssets.PickerView extends Backbone.View
   hide_from_drawer: (stack_size) ->
     console.log '[PickerView] hide_from_drawer'
     # we might need to re-open this view further
-    if @options.parent_view && stack_size == 0
-      @options.parent_view.opened.picker = false
+    @options.parent_view.hide_from_picker(stack_size) if @options.parent_view && @options.parent_view.hide_from_picker
 
   remove: ->
     console.log '[PickerView] remove'

data/app/assets/javascripts/locomotive/views/editable_elements/edit_view.js.coffee

@@ -0,0 +1,39 @@
+Locomotive.Views.EditableElements ||= {}
+
+class Locomotive.Views.EditableElements.EditView extends Locomotive.Views.Shared.FormView
+
+  el: '.content > .inner'
+
+  render: ->
+    super
+
+    $('form.edit_page').on 'ajax:success', (event, data, status, xhr) =>
+      if @need_reload?
+        window.location.reload()
+      else
+        @refresh_inputs $(data)
+
+    $('.info-row select[name=block]').select2().on 'change', (event) =>
+      @filter_elements_by(event.val)
+
+    # editable control elements
+    $('.editable-elements .form-group.input.select select').select2().on 'change', (event) =>
+      @need_reload = true
+
+  refresh_inputs: ($html) ->
+    @inputs = _.map @inputs, (view) =>
+      return view unless view.need_refresh?
+
+      dom_id    = $(view.el).attr('id')
+      $new_el   = $html.find("##{dom_id}")
+
+      view.replace $new_el if $new_el.size() > 0
+
+  filter_elements_by: (block) ->
+    @$('.editable-elements .form-group.input').each ->
+      $el = $(this)
+
+      if block == '' || (block == '_unknown' && $el.data('block') == '') || $el.data('block') == block
+        $el.parent().show()
+      else
+        $el.parent().hide()

data/app/assets/javascripts/locomotive/views/editable_elements/index_view.js.coffee

@@ -2,4 +2,107 @@ Locomotive.Views.EditableElements ||= {}
 
 class Locomotive.Views.EditableElements.IndexView extends Backbone.View
 
-  el: '#content'
+  el: '.wrapper'
+
+  events:
+    'click .expand-button': 'expand_preview'
+    'click .close-button':  'shrink_preview'
+
+  expand_preview: (event) ->
+    $('body').addClass('full-width-preview')
+
+  shrink_preview: (event) ->
+    $('body').removeClass('full-width-preview')
+
+  initialize: ->
+    _.bindAll(@, 'refresh_elements', 'refresh_image', 'refresh_image_on_remove', 'refresh_text')
+
+    view_options = if $('body').hasClass('live-editing') then {} else { el: '.main' }
+
+    @edit_view          = new Locomotive.Views.EditableElements.EditView(view_options)
+    @pubsub_text_token  = PubSub.subscribe('inputs.text_changed', @refresh_text)
+
+    @pubsub_image_changed_token = PubSub.subscribe('inputs.image_changed', @refresh_image)
+    @pubsub_image_removed_token = PubSub.subscribe('inputs.image_removed', @refresh_image_on_remove)
+
+    $('.preview iframe').load (event) => @on_iframe_load(event)
+
+  render: ->
+    super()
+    @edit_view.render()
+
+  refresh_elements: (type, view, callback) ->
+    $parent_view  = $(view.el).parent()
+    element_id    = $parent_view.find('input[name*="[humanized_id]"]').val().replace(/_/g, '-')
+    dom_id        = "locomotive-editable-#{type}-#{element_id}"
+
+    $iframe_document = $($('iframe')[0].contentWindow.document)
+
+    callback($iframe_document.find("##{dom_id}"), dom_id, $iframe_document)
+
+  refresh_image_on_remove: (msg, data) ->
+    data.url = $(data.view.el).parent().find('input[name*="[default_source_url]"]').val()
+    @refresh_image(msg, data)
+
+  refresh_image: (msg, data) ->
+    @refresh_elements 'image', data.view, ($elements, dom_id, $iframe_document) ->
+      current_image_url = data.view.$('input[name*="[content]"]').val()
+      image_url         = data.url || current_image_url
+
+      if $elements.size() > 0
+        $elements.each ->
+          if this.nodeName == 'IMG'
+            $(this).attr('src', image_url)
+          else
+            $(this).css("background-image", "url('" + image_url + "')")
+      else
+        # looking for DIVs with background-url property matching the previous image url
+        $el = $iframe_document.find("*[style*='#{current_image_url}']").attr('id', dom_id)
+        $el.css("background-image", "url('" + image_url + "')")
+
+        # looking for IMGs with src attribute matching the previous image url
+        $el = $iframe_document.find("img[src*='#{current_image_url}']").attr('id', dom_id)
+        $el.attr('src', image_url)
+
+  refresh_text: (msg, data) ->
+    @refresh_elements 'text', data.view, ($elements) ->
+      $elements.each -> $(this).html(data.content)
+
+  on_iframe_load: (event) ->
+    $iframe = $('.preview iframe')
+    $target_window = $iframe[0].contentWindow
+    editable_elements_path = null
+
+    # unable to display the iframe in the frame because it set 'X-Frame-Options' to 'SAMEORIGIN'
+    try
+      $iframe_document = $($target_window.document)
+      editable_elements_path = $iframe_document.find('meta[name=locomotive-editable-elements-path]').attr('content')
+    catch e
+      # reload the iframe with the previous url and display an error message
+      $iframe.attr('src', @preview_url)
+      Locomotive.notify $iframe.data('redirection-error'), 'warning'
+      return
+
+    # store the url
+    @preview_url = $('.preview iframe')[0].contentWindow.document.location.href
+
+    if editable_elements_path?
+      unless editable_elements_path == (window.location.pathname + window.location.search)
+        History.replaceState({ live_editing: true, url: @preview_url }, '', editable_elements_path)
+
+        @replace_edit_view(editable_elements_path)
+
+  replace_edit_view: (url) ->
+    $(@edit_view.el).load url, =>
+      @edit_view.remove()
+      @edit_view = new Locomotive.Views.EditableElements.EditView()
+      @edit_view.render()
+
+  remove: ->
+    super
+
+    @edit_view.remove()
+
+    PubSub.unsubscribe(@pubsub_image_changed_token)
+    PubSub.unsubscribe(@pubsub_image_removed_token)
+    PubSub.unsubscribe(@pubsub_text_token)

data/app/assets/javascripts/locomotive/views/inputs/file_view.js.coffee

@@ -6,34 +6,78 @@ class Locomotive.Views.Inputs.FileView extends Backbone.View
     'change input[type=file]':  'change_file'
     'click a.choose':           'begin_choose_file'
     'click a.change':           'begin_change_file'
+    'click a.content-assets':   'open_content_assets_drawer'
     'click a.cancel':           'cancel_new_file'
     'click a.delete':           'mark_file_as_deleted'
 
   initialize: ->
+    _.bindAll(@, 'use_content_asset')
+
     @$file          = @$('input[type=file]')
-    @$remove_file   = @$('input[type=hidden]')
+    @$remove_file   = @$('input[type=hidden].remove')
+    @$remote_url    = @$('input[type=hidden].remote-url')
     @$current_file  = @$('.current-file')
     @$no_file       = @$('.no-file')
     @$new_file      = @$('.new-file')
 
-    @$choose_btn    = @$('.buttons .choose')
-    @$change_btn    = @$('.buttons .change')
+    @$choose_btn    = @$('.buttons > .choose')
+    @$change_btn    = @$('.buttons > .change')
     @$cancel_btn    = @$('.buttons .cancel')
     @$delete_btn    = @$('.buttons .delete')
 
     @persisted_file = @$('.row').data('persisted-file')
 
-  render: ->
-    # do nothing
+    @pubsub_token   = PubSub.subscribe 'file_picker.select', @use_content_asset
+
+  begin_change_file: -> @$file.click()
+  begin_choose_file: -> @$file.click()
+
+  open_content_assets_drawer: (event) ->
+    event.stopPropagation() & event.preventDefault()
+
+    $(event.target).closest('.btn-group').removeClass('open')
+
+    window.application_view.drawer_view.open(
+      $(event.target).attr('href'),
+      Locomotive.Views.ContentAssets.PickerView,
+      { parent_view: @ })
+
+  use_content_asset: (msg, data) ->
+    return unless data.parent_view.cid == @.cid
 
-  begin_change_file: ->
-    @$file.click()
+    window.application_view.drawer_view.close()
 
-  begin_choose_file: ->
-    @$file.click()
+    url = @absolute_url(data.url)
+
+    window.remote_file_to_base64 url, (base64) =>
+      if base64
+        @update_ui_on_changing_file(data.title)
+
+        # add the filename to the base64 string
+        base64 = base64.replace(';base64,', ";#{data.filename};base64,")
+
+        @$remote_url.val(base64)
+
+        if data.image
+          @$new_file.html("<img src='#{url}' /> #{@$new_file.html()}")
+
+          PubSub.publish 'inputs.image_changed', { view: @, url: url }
+      else
+        Locomotive.notify 'Unable to load the asset', 'error'
 
   change_file: (event) ->
-    text = if event.target.files then event.target.files[0].name else 'New file'
+    file = if event.target.files then event.target.files[0] else null
+    text = if file? then file.name else 'New file'
+
+    @update_ui_on_changing_file(text)
+
+    if file.type.match('image.*')
+      @image_to_base_64 file, (base64) =>
+        @$new_file.html("<img src='#{base64}' /> #{@$new_file.html()}")
+
+        PubSub.publish 'inputs.image_changed', { view: @, url: base64, file: file }
+
+  update_ui_on_changing_file: (text) ->
     @$new_file.html(text)
 
     # show new file, hide the current one
@@ -46,6 +90,9 @@ class Locomotive.Views.Inputs.FileView extends Backbone.View
     # hide the new file
     @hideEl(@$new_file)
 
+    # reset remote url
+    @$remote_url.val('')
+
     # reset the file input
     @$file.wrap('<form>').closest('form').get(0).reset()
     @$file.unwrap()
@@ -71,6 +118,8 @@ class Locomotive.Views.Inputs.FileView extends Backbone.View
       # display the choose button
       @showEl(@$choose_btn)
 
+    PubSub.publish 'inputs.image_changed', { view: @ }
+
   mark_file_as_deleted: (event) ->
     # set true (or 1) as value for the remove_<method> hidden field
     @$remove_file.val('1')
@@ -81,5 +130,25 @@ class Locomotive.Views.Inputs.FileView extends Backbone.View
     # hide the change / delete buttons, show the cancel button
     @hideEl(@$change_btn) && @hideEl(@$delete_btn) && @showEl(@$cancel_btn)
 
+    PubSub.publish 'inputs.image_removed', { view: @ }
+
+  image_to_base_64: (file, callback) ->
+    reader = new FileReader()
+    reader.onload = (e) -> callback(e.target.result)
+    reader.readAsDataURL(file)
+
+  absolute_url: (url) ->
+    return url if url.indexOf('http') == 0
+
+    http = location.protocol
+    slashes = http.concat("//")
+    slashes.concat(window.location.host).concat(url)
+
   showEl: (el) -> el.removeClass('hide')
   hideEl: (el) -> el.addClass('hide')
+
+  need_refresh: -> true
+
+  remove: ->
+    super
+    PubSub.unsubscribe(@pubsub_token)