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

data/app/views/locomotive/shared/header/_site.html.haml

@@ -2,7 +2,7 @@
   .navbar-text
     = _title
 - else
+  = link_to current_site.name_was, dashboard_path(current_site)
   = link_to preview_path(current_site) do
-    = current_site.name_was
     %span.arrow
       %i.fa.fa-external-link

data/app/views/locomotive/shared/rte/_image_popover.html.haml

@@ -1,12 +1,12 @@
 .image-dialog-content{ style: 'display: none' }
-  = locomotive_form_for image_form, url: '#' do |f|
+  = locomotive_form_for image_form, url: '#', defaults: { placeholder: false, hint: false } do |f|
     = f.inputs do
       = f.input :src
       = f.input :title
       = f.input :alignment, include_blank: false, collection: [[:default, ''],
         [:left, 'wysiwyg-float-left'],
         [:right, 'wysiwyg-float-right']],
-        label_method: ->(el) { t("simple_form.options.locomotive.rte_input_image_form.target.#{el.first}") }
+        label_method: ->(el) { t("simple_form.options.locomotive.rte_input_image_form.alignment.#{el.first}") }
 
     %p.text-right
       %a.btn.btn-success.btn-sm.apply

data/app/views/locomotive/shared/rte/_link_popover.html.haml

@@ -1,5 +1,5 @@
 .link-dialog-content{ style: 'display: none' }
-  = locomotive_form_for link_form, url: '#' do |f|
+  = locomotive_form_for link_form, url: '#', defaults: { placeholder: false, hint: false } do |f|
     = f.inputs do
       = f.input :url
       = f.input :target, include_blank: false, collection: [[:not_set, ''],

data/app/views/locomotive/shared/sidebar/_page.html.haml

@@ -2,7 +2,9 @@
 
   %i{ class: "fa #{page.icon} icon #{page.draggable}" }
 
-  = link_to edit_page_path(current_site, page) do
+  - url = page.redirect? ? edit_page_path(current_site, page) : editable_elements_path(current_site, page)
+
+  = link_to url do
     %span.text= page.title
 
   - unless page.translated?
@@ -16,7 +18,8 @@
 
     %ul.leaves{ data: { url: sort_page_path(current_site, page) } }
 
-      = render partial: 'locomotive/shared/sidebar/page', collection: page.nodes
+      - unless page.content_type && page.nodes.count == 1
+        = render partial: 'locomotive/shared/sidebar/page', collection: page.nodes
 
       - if page.content_type
         %li.list-entries

data/config/locales/admin_ui.en.yml

@@ -56,20 +56,6 @@ en:
         site: Site
         theme_assets: Theme files
         translations: Translations
-      form:
-        file_input:
-          none: no file
-          choose: Choose
-          change: Change
-          delete: Delete
-          cancel: Cancel
-        array_input:
-          new: New
-          add: Add
-          edit: Edit
-        toggle_input:
-          on_text: "Yes"
-          off_text: "No"
       form_actions:
         back: Back without saving
         create: Create
@@ -177,7 +163,7 @@ en:
 
     pages:
       index:
-        title: Listing pages
+        title: Pages
         help: "Pages are organized as a tree. You can order pages as well as folders"
         no_items: "There are no pages for now. Just click <a href=\"%{url}\">here</a> to create the first one."
         new: new page
@@ -197,6 +183,14 @@ en:
             permanent: "Permanent (301)"
             temporary: "Temporary (302)"
 
+    editable_elements:
+      index:
+        redirection_error: "Editing a non Locomotive page is not allowed."
+      index_without_preview:
+        title: "%{title} &mdash; <small>%{fullpath}</small>"
+      edit:
+        settings_link: 'Settings'
+
     sites:
       index:
         title: My sites
@@ -286,7 +280,7 @@ en:
 
     content_types:
       index:
-        title: Listing models
+        title: Models
         new: new model
         edit: edit model
       new:

data/config/locales/inputs.en.yml

@@ -1,14 +1,21 @@
 en:
   locomotive:
     inputs:
-      rte:
-        link:
-          url: Link URL
-          target: Target
-          target_options:
-            "not_set": "--Not set--"
-            "self": "Open link in the same window"
-            "blank": "Open link in a new window"
-          title: Title
-          ok: Ok
-          cancel: Cancel
+      file:
+        none: no file
+        choose: Choose
+        change: Change
+        delete: Delete
+        cancel: Cancel
+        select_local_file: Upload local file
+        select_content_asset: Select among assets
+
+      array:
+        new: New
+        add: Add
+        edit: Edit
+
+      toggle:
+        on_text: "Yes"
+        off_text: "No"
+

data/config/locales/simple_form.en.yml

@@ -55,6 +55,8 @@ en:
         page:
           seo_title: Title
           target_klass_name: Model
+        editable_element:
+          region: Region
         site:
           locales: Languages
           timezone_name: Timezone
@@ -67,6 +69,10 @@ en:
           url: Link URL
           target: Target
           title: Title
+        rte_input_image_form:
+          src: Source
+          title: Title
+          alignment: Alignment
         image_resize_form:
           width: Width
           height: Height
@@ -154,6 +160,11 @@ en:
             not_set: "Not set"
             self: "Open link in the same window"
             blank: "Open link in a new window"
+        rte_input_image_form:
+          alignment:
+            default: Default
+            left: Left
+            right: Right
 
     buttons:
       defaults:
@@ -162,7 +173,8 @@ en:
           update: Save
           submit: Ok
           cancel: Cancel
-          loading_text: "Your form is being submitted"
+          loading_text: "Saving..."
+          or: or
       locomotive:
         image_resize_form:
           loading_text: Resizing...

data/config/routes.rb

@@ -33,7 +33,9 @@ Locomotive::Engine.routes.draw do
       get :get_path, on: :collection
     end
 
-    resources :editable_elements, only: [:index], path: 'pages/:page_id/editable_elements'
+    resources :editable_elements, only: [:index, :update_all], path: 'pages/:page_id/editable_elements' do
+      patch :update_all, on: :collection
+    end
 
     resources :accounts
 

data/lib/locomotive.rb

@@ -15,7 +15,7 @@ require 'locomotive/custom_fields'
 require 'locomotive/action_controller'
 require 'locomotive/rails'
 require 'locomotive/regexps'
-require 'locomotive/middlewares'
+# require 'locomotive/middlewares'
 
 module Locomotive
   extend ActiveSupport::Autoload

data/lib/locomotive/action_controller/responder.rb

@@ -16,6 +16,22 @@ module Locomotive
         super.merge(policy: policy)
       end
 
+      def to_html
+        if controller.request.headers['X-Flash'] == 'true'
+          with_flash_message(:notice, true) { super }
+        else
+          super
+        end
+      end
+
+      def to_js
+        if controller.request.headers['X-Flash'] == 'true'
+          with_flash_message(:notice, true) { super }
+        else
+          super
+        end
+      end
+
       def to_json
         if get?
           add_pagination_header if resource.respond_to?(:num_pages)

data/lib/locomotive/carrierwave/patches.rb

@@ -13,8 +13,62 @@ module CarrierWave
 
   module Uploader
 
+    module Base64Download
+
+      # Based on Yury Lebedev's work (https://github.com/lebedev-yury/carrierwave-base64)
+      # Our version relies on the remote_<name>_url field. Moreover, we support passing filename into the base64 string.
+      class Base64StringIO < StringIO
+        class ArgumentError < StandardError; end
+
+        attr_accessor :file_format, :original_filename
+
+        def initialize(encoded_file)
+          description, encoded_bytes = encoded_file.split(',')
+
+          raise ArgumentError unless encoded_bytes
+
+          @file_format        = get_file_format(description)
+          @original_filename  = get_original_filename(description)
+
+          bytes = ::Base64.decode64 encoded_bytes
+
+          super bytes
+        end
+
+        private
+
+        def get_original_filename(description)
+          regex = /\Adata:[^;]+;(.+);base64\Z/
+          regex.match(description).try(:[], 1) || default_filename
+        end
+
+        def get_file_format(description)
+          regex = /\Adata:([^;]+);/
+          regex.match(description).try(:[], 1)
+        end
+
+        def default_filename
+          File.basename("file.#{@file_format}")
+        end
+
+      end
+
+      def download!(uri_or_base64)
+        if uri_or_base64 =~ /\Adata:/
+          file = Base64StringIO.new(uri_or_base64)
+          cache!(file)
+        else
+          download_without_base64!(uri_or_base64)
+        end
+      end
+
+    end
+
     class Base
 
+      alias :download_without_base64! :download!
+      include CarrierWave::Uploader::Base64Download
+
       def build_store_dir(*args)
         default_dir = self.class.store_dir
 

data/lib/locomotive/dependencies.rb

@@ -34,6 +34,7 @@ require 'codemirror/rails'
 require 'jquery/rails'
 require 'jquery-ui-rails'
 require 'backbone-on-rails'
+require 'nprogress-rails'
 
 require 'grape'
 require 'grape-entity'

data/lib/locomotive/engine.rb

@@ -10,8 +10,9 @@ module Locomotive
 
     paths['mongodb/migrate'] = 'mongodb/migrate'
 
-    initializer 'steam' do |app|
-      require 'locomotive/steam_adaptor'
+    initializer "locomotive.params.filter" do |app|
+      # Do not log remote_<field>_url params because they can contain huge base64 string
+      app.config.filter_parameters += [/\Aremote_.+_url\Z/]
     end
 
     initializer 'locomotive.content_types' do |app|
@@ -52,9 +53,14 @@ module Locomotive
     end
 
     initializer 'locomotive.middlewares' do |app|
-      app.middleware.insert_before(Rack::Runtime, '::Locomotive::Middlewares::Permalink', nil)
+      require 'locomotive/middlewares'
+
       app.middleware.use '::Locomotive::Middlewares::Site'
     end
 
+    initializer 'steam' do |app|
+      require 'locomotive/steam_adaptor'
+    end
+
   end
 end

data/lib/locomotive/middlewares.rb

@@ -1,2 +1,2 @@
-require 'locomotive/middlewares/permalink'
 require 'locomotive/middlewares/site'
+require 'locomotive/middlewares/page_editing'

data/lib/locomotive/middlewares/page_editing.rb

@@ -0,0 +1,41 @@
+module Locomotive
+  module Middlewares
+    class PageEditing
+
+      include Locomotive::Engine.routes.url_helpers
+
+      def initialize(app, opts = {})
+        @app = app
+      end
+
+      def call(env)
+        status, headers, response = @app.call(env)
+        site, page = env['steam.site'], env['steam.page']
+
+        if page && !page.redirect && page.response_type == 'text/html' && response.first
+          html = %(
+            <meta name="locomotive-editable-elements-path" content="#{editable_elements_path(site, page, env)}" />
+            <meta name="locomotive-page-id" content="#{page._id}" />
+          )
+          response.first.gsub!('</head>', %(#{html}</head>))
+        end
+
+        [status, headers, response]
+      end
+
+      def editable_elements_path(site, page, env)
+        options = {}
+
+        if content_entry_id = env['steam.content_entry'].try(:_id)
+          options = {
+            content_entry_id: content_entry_id,
+            preview_path:     env['steam.path']
+          }
+        end
+
+        super(site, page._id, options)
+      end
+
+    end
+  end
+end

data/lib/locomotive/middlewares/site.rb

@@ -31,6 +31,8 @@ module Locomotive
           env['locomotive.mounted_on']  = env['steam.mounted_on'] = mounted_on
           env['locomotive.path']        = request.path_info.gsub(mounted_on, '')
 
+          env['steam.live_editing']     = true
+
           Locomotive::Site.where(handle: handle).first
         else
           env['locomotive.path'] = request.path_info

data/lib/locomotive/simple_form.rb

@@ -57,14 +57,15 @@ module Locomotive
     def actions_with_back_button(options = {})
       back_button = back_button_action(options)
 
-      template.content_tag(:div,
-        template.content_tag(:div, back_button, class: 'col-xs-6 text-left') +
-        template.content_tag(:div, action, class: 'col-xs-6 text-right'),
-        class: 'row')
+      template.content_tag(:div, action +
+        ' '.html_safe +
+        template.t('simple_form.buttons.default.locomotive.or') +
+        ' '.html_safe +
+        back_button, class: 'text-right form-actions')
     end
 
     def back_button_action(options = {})
-      label  = template.escape_once('← ') + template.t('.back')
+      label  = template.t('simple_form.buttons.default.locomotive.cancel')
       url    = options[:back_url]
 
       if options[:use_stored_location]

data/lib/locomotive/steam_adaptor.rb

@@ -14,6 +14,8 @@ Locomotive::Steam.configure do |config|
   config.middleware.delete Rack::Lint
   config.middleware.delete Rack::Session::Moneta
 
+  config.middleware.insert_after Locomotive::Steam::Middlewares::Page, Locomotive::Middlewares::PageEditing
+
   # config.services_hook = -> (services) {
   #   Rails.logger.warn "TODO: change content entry submission"
   # }

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.0.0-alpha.2'
+  VERSION = '3.0.0-alpha.3'
 end

data/lib/tasks/development.rake

@@ -23,6 +23,10 @@ namespace :development do
     account.api_key = 'd49cd50f6f0d2b163f48fc73cb249f0244c37074'
     account.save!
 
+    unassociated_account = Locomotive::Account.new email: "new_admin@locomotivecms.com", password: "locomotive", password_confirmation: "locomotive", name: "New Admin"
+    unassociated_account.api_key = 'd49cd50f6f0d2b163f48fc73cb249f0244c37074'
+    unassociated_account.save!
+
     site = Locomotive::Site.create! name: "LocomotiveCMS", handle: "www", domains: ["www.example.com"]
     site.memberships.build account: account, role: 'admin'
     site.save!

data/spec/dummy/config/environments/production.rb

@@ -26,6 +26,8 @@ Dummy::Application.configure do
 
   config.assets.compress = false
 
+  config.log_level = :info
+
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.

data/spec/dummy/config/initializers/devise.rb

@@ -14,6 +14,8 @@ Devise.setup do |config|
   # available as additional gems.
   require 'devise/orm/mongoid'
 
+  config.secret_key = '8d6ff8102c31815f8395a8c806c9e47d36ba6c607bf7054b4714b4131d8a372fef78adac89930170d77b6d9ec59347315ee1193cb535746249eebf3e5ad5b9b3'
+
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating a user. The default is
   # just :email. You can configure it to use [:username, :subdomain], so for