locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/lib/locomotive/simple_form.rb

@@ -1,3 +1,5 @@
+# require 'pry-byebug'
+
 module Locomotive
   module SimpleForm
     module BootstrapHelpers
@@ -30,14 +32,47 @@ module Locomotive
       end
 
     end
+
+    module Inputs
+
+      module FasterTranslate
+
+        def translate_from_namespace(namespace, default = '')
+          if (model_names = lookup_model_names)[0] == 'locomotive'
+            model_name = model_names.join('.')
+
+            _key = [
+              I18n.locale,
+              template.instance_variable_get(:"@virtual_path"),
+              namespace,
+              model_name,
+              reflection_or_attribute_name].join('/')
+
+            Rails.cache.fetch(_key) do
+              lookups = [:"#{model_name}.#{lookup_action}.#{reflection_or_attribute_name}"]
+              lookups << :"#{model_name}.#{reflection_or_attribute_name}"
+              lookups << default
+
+              t(lookups.shift, scope: :"#{i18n_scope}.#{namespace}", default: lookups).presence
+            end
+          else
+            super
+          end
+        end
+
+      end
+
+      ::SimpleForm::FormBuilder.mappings.values.uniq.each do |klass|
+        klass.send(:include, FasterTranslate)
+      end
+    end
+
   end
 
   class FormBuilder < ::SimpleForm::FormBuilder
 
     def inputs(name = nil, options = {}, &block)
-      label = translate_text(name, :titles)
-
-      html = template.content_tag(:legend, template.content_tag(:span, label))
+      html = template.content_tag(:legend, template.content_tag(:span, name))
       html += template.capture(&block)
 
       options[:class] ||= 'inputs'
@@ -59,13 +94,13 @@ module Locomotive
 
       template.content_tag(:div, action +
         '&nbsp;'.html_safe +
-        template.t('simple_form.buttons.default.locomotive.or') +
+        translate_button(:or) +
         '&nbsp;'.html_safe +
         back_button, class: 'text-right form-actions')
     end
 
     def back_button_action(options = {})
-      label  = template.t('simple_form.buttons.default.locomotive.cancel')
+      label  = translate_button(:cancel)
       url    = options[:back_url]
 
       if options[:use_stored_location]
@@ -77,8 +112,8 @@ module Locomotive
 
     def action(misc_class = '')
       action        = object.persisted? ? :update : :create
-      label         = translate_text(action, :buttons)
-      loading_text  = translate_text(:loading_text, :buttons)
+      label         = translate_button(action)
+      loading_text  = translate_button(:loading_text)
 
       template.content_tag :button, label,
         type:   'submit',
@@ -87,27 +122,33 @@ module Locomotive
     end
 
     def submit_text(action = :submit)
-      translate_text(action, :buttons, action)
+      translate_button(action)
     end
 
-    # Translate text for the submits and titles namespace.
-    # it differs from the simple_form translate_from_namespace method
-    # in that this does not care about the attribute.
-    #
-    def translate_text(key, namespace, default = '')
-      model_names = lookup_model_names.dup
-      lookups     = []
+    # # Translate text for the submits and titles namespace.
+    # # it differs from the simple_form translate_from_namespace method
+    # # in that this does not care about the attribute.
+    # #
+    # def translate_text(key, namespace, default = '')
+    #   model_names = lookup_model_names.dup
+    #   lookups     = []
 
-      while !model_names.empty?
-        joined_model_names = model_names.join(".")
-        model_names.shift
+    #   while !model_names.empty?
+    #     joined_model_names = model_names.join(".")
+    #     model_names.shift
 
-        lookups << :"#{joined_model_names}.#{key}"
-      end
-      lookups << :"defaults.locomotive.#{key}"
-      lookups << default.to_s
+    #     lookups << :"#{joined_model_names}.#{key}"
+    #   end
+    #   lookups << :"defaults.locomotive.#{key}"
+    #   lookups << default.to_s
+
+    #   puts "#{i18n_scope}.#{namespace}.#{lookups.first} - #{lookups.inspect}"
 
-      I18n.t(lookups.shift, scope: :"#{i18n_scope}.#{namespace}", default: lookups).presence
+    #   I18n.t(lookups.shift, scope: :"#{i18n_scope}.#{namespace}", default: lookups).presence
+    # end
+
+    def translate_button(key)
+      template.t("simple_form.buttons.defaults.locomotive.#{key}")
     end
 
     # Extract the model names from the object_name mess, ignoring numeric and
@@ -130,9 +171,9 @@ module Locomotive
       end
     end
 
-    def i18n_scope
-      ::SimpleForm.i18n_scope
-    end
+    # def i18n_scope
+    #   ::SimpleForm.i18n_scope
+    # end
 
   end
 end

data/lib/locomotive/steam/middlewares/missing_translations.rb

@@ -0,0 +1,48 @@
+module Locomotive
+  module Steam
+    module Middlewares
+
+      class MissingTranslations
+
+        def initialize(app, opts = {})
+          @app = app
+        end
+
+        def call(env)
+          find_and_persist_missing_translations(env['steam.site']) do
+            @app.call(env)
+          end
+        end
+
+        def find_and_persist_missing_translations(site)
+          translations = []
+
+          subscription = ActiveSupport::Notifications.subscribe('steam.missing_translation') do |name, start, finish, id, payload|
+            translations << { key: payload[:input], values: { payload[:input] => false } }
+          end
+
+          yield.tap do
+            ActiveSupport::Notifications.unsubscribe(subscription)
+            persist_missing_translations(site, translations) unless translations.empty?
+          end
+        end
+
+        def persist_missing_translations(site, translations)
+          new_translations = []
+
+          translations.each do |attributes|
+            if existing = site.translations.where(key: attributes[:key]).first
+              existing.update_attribute :values, existing.values.merge(attributes[:values])
+            else
+              new_translations << attributes
+            end
+          end
+
+          site.translations.create(new_translations) unless new_translations.empty?
+        end
+
+      end
+
+    end
+  end
+end

data/lib/locomotive/steam/middlewares/page_editing.rb

@@ -0,0 +1,48 @@
+module Locomotive
+  module Steam
+    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, locale = env['steam.site'], env['steam.page'], env['steam.locale'].to_s
+
+          if page && !page.redirect && page.response_type == 'text/html' && response.first
+            html = %(
+              <meta name="locomotive-locale" content="#{locale}" />
+              <meta name="locomotive-editable-elements-path" content="#{editable_elements_path(site, page, locale, 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, locale, 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
+
+          options[:content_locale] = locale if site.locales.size > 1
+
+          super(site, page._id, options)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/locomotive/steam/services/api_entry_submission_service.rb

@@ -0,0 +1,38 @@
+module Locomotive
+  module Steam
+
+    class APIEntrySubmissionService < Struct.new(:site, :locale)
+
+      def submit(slug, attributes = {})
+        load_content_type(slug)
+        create_entry(attributes)
+      end
+
+      def to_json(entry)
+        make_entity(entry).to_json
+      end
+
+      private
+
+      def load_content_type(slug)
+        @content_type = site.content_types.where(slug: slug).first
+      end
+
+      def create_entry(attributes)
+        ::Mongoid::Fields::I18n.with_locale(locale) do
+          service.public_create(attributes)
+        end
+      end
+
+      def make_entity(entry)
+        Locomotive::API::Entities::ContentEntryEntity.represent(entry)
+      end
+
+      def service
+        Locomotive::ContentEntryService.new(@content_type, nil)
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/steam_adaptor.rb

@@ -2,11 +2,21 @@ require 'locomotive/steam'
 require 'locomotive/steam/server'
 
 Locomotive::Steam.configure do |config|
-  config.asset_path = Rails.root.join('spec', 'dummy', 'public')
+
+  # asset_host or asset_path? Depends on the Carrierwave configuration
+  storage = CarrierWave::Uploader::Base.storage.to_s
+
+  if asset_host = CarrierWave::Uploader::Base.asset_host
+    config.asset_host   = asset_host
+    config.serve_assets = false
+  elsif CarrierWave::Uploader::Base.storage_engines.invert[storage] == :file
+    config.asset_path = Rails.application.root.join('public')
+  end
 
   # rely on Mongoid for the connection information
   if mongoid = Mongoid.configure.sessions[:default]
-    config.adapter = { name: :'mongoDB', database: mongoid[:database], hosts: mongoid[:hosts] }
+    options = mongoid[:uri] ? mongoid.slice(:uri) : mongoid.slice(:database, :hosts, :username, :password)
+    config.adapter = { name: :'mongoDB' }.merge(options.symbolize_keys)
   end
 
   # if Steam is used inside the engine, we can rely on the Rails
@@ -14,11 +24,20 @@ 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
+  require_relative 'steam/middlewares/missing_translations'
+  require_relative 'steam/middlewares/page_editing'
+
+  config.middleware.insert_after Locomotive::Steam::Middlewares::Page, Locomotive::Steam::Middlewares::PageEditing
+  config.middleware.insert_after Locomotive::Steam::Middlewares::Page, Locomotive::Steam::Middlewares::MissingTranslations
+
+  require_relative 'steam/services/api_entry_submission_service'
+
+  # let the Rails engine handle the "no site" error
+  config.render_404_if_no_site = false
 
-  # config.services_hook = -> (services) {
-  #   Rails.logger.warn "TODO: change content entry submission"
-  # }
+  config.services_hook = -> (services) {
+    services.entry_submission = Locomotive::Steam::APIEntrySubmissionService.new(services.current_site, services.locale) if services.request
+  }
 end
 
 Locomotive::Common.reset

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.3'
+  VERSION = '3.0.0-beta.1'
 end

data/lib/tasks/locomotive.rake

@@ -9,34 +9,6 @@ namespace :locomotive do
   #   puts '...done'
   # end
 
-  desc 'Rebuild the serialized template of all the site pages'
-  task rebuild_serialized_page_templates: :environment do
-    Locomotive::Site.all.each do |site|
-      default_locale = site.default_locale
-
-      ([default_locale] + (site.locales - [default_locale])).each do |locale|
-        Mongoid::Fields::I18n.with_locale(locale) do
-          pages = site.pages.to_a
-          while !pages.empty? do
-            page = pages.pop
-            begin
-              page.send :_parse_and_serialize_template
-              page.instance_variable_set :@template_changed, true
-              page.save
-              puts "[#{site.name}][#{locale}] processing...#{page.title} [saved]"
-            rescue TypeError
-              pages.insert(0, page)
-            rescue ::Liquid::Error => e
-              puts "\tLiquid error: #{e.message} (#{page._id})"
-            rescue Exception => e
-              puts "\tUnknown error: #{e.message} (#{page._id})"
-            end
-          end
-        end
-      end
-    end
-  end
-
   desc 'Add a new admin user (NOTE: currently only supports adding user to first site)'
   task add_admin: :environment do
     name = ask('Display name: ') { |q| q.echo = true }
@@ -55,36 +27,44 @@ namespace :locomotive do
 
   namespace :upgrade do
 
-    desc 'Fix issue with the editable file and i18n in the 2.0.0.rc'
-    task fix_editable_files: :environment do
-      Locomotive::Page.all.each do |page|
-        page.editable_elements.each_with_index do |el, index|
-          next if el._type != 'Locomotive::EditableFile' || el.attributes['source'].is_a?(Hash)
+    desc 'Upgrade to Locomotive v3 from v2.5.x'
+    task v3: :environment do
+      puts '...'
 
-          value = el.attributes['source']
+      # content asset checksums
+      Locomotive::ContentAsset.all.each do |asset|
+        asset.send(:calculate_checksum)
+        asset.save
+      end
+      puts '[x] generate checksums for existing content assets'
 
-          page.collection.find(_id: page._id).update('$unset' => { "editable_elements.#{index}.content" => 1 }, '$set' => { "editable_elements.#{index}.source" => { 'en' => value } })
-        end
+      # translation completion
+      Locomotive::Translation.all.each do |translation|
+        translation.send(:set_completion)
+        translation.save
       end
+      puts '[x] set completion for translations'
+
+      puts "\nDone!"
     end
 
   end # namespace: upgrade
 
-  desc 'Generate the documentation about the REST API'
-  task generate_api_doc: :environment do
-
-    require 'locomotive/misc/api_documentation'
 
-    output = Locomotive::Misc::ApiDocumentation.generate
+  namespace :maintenance do
 
-    path = File.join(Dir.pwd, 'public')
+    desc 'Delete items older than N_DAYS days (30 by default) from the activity feed'
+    task clean_activity_feed: :environment do
+      days      = (ENV['N_DAYS'] ? ENV['N_DAYS'].to_i : 30).days.ago
+      criteria  = Locomotive::Activity.where(:created_at.lt => days)
 
-    File.open(File.join(path, 'locomotive_api.html'), 'w') do |file|
-      file.write(output)
+      if (size = criteria.count) > 0
+        criteria.destroy_all
+        puts "#{size} items from the activity feed have been deleted"
+      else
+        puts "No items from the activity feed have been deleted"
+      end
     end
-  end
-
-  namespace :maintenance do
 
     desc 'Unset the translation of the editable elements for a LOCALE'
     task unset_editable_elements_translation: :environment do

data/spec/dummy/app/views/foo/index.html.slim

@@ -0,0 +1 @@
+p Hello world!

data/spec/dummy/config.ru

@@ -2,6 +2,10 @@
 
 require ::File.expand_path('../config/environment',  __FILE__)
 
+if Rails.env.profile?
+ use Rack::RubyProf, :path => '/tmp/locomotive-profile'
+end
+
 run Dummy::Application