locomotive_cms 2.0.0.rc4 → 2.0.0.rc5

data/app/models/locomotive/extensions/site/subdomain_domains.rb

@@ -37,9 +37,13 @@ module Locomotive
 
         module InstanceMethods
 
+          def subdomain=(subdomain)
+            super(subdomain.try(:downcase))
+          end
+
           def domains=(array)
             array.reject!(&:blank?)
-            array = [] if array.blank?; super(array)
+            array = [] if array.blank?; super(array.map(&:downcase))
           end
 
           def add_subdomain_to_domains
@@ -84,4 +88,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/app/models/locomotive/page.rb

@@ -52,7 +52,7 @@ module Locomotive
     scope :published,           :where => { :published => true }
     scope :fullpath,            lambda { |fullpath| { :where => { :fullpath => fullpath } } }
     scope :handle,              lambda { |handle| { :where => { :handle => handle } } }
-    scope :minimal_attributes,  lambda { |attrs = []| { :only => (attrs || []) + %w(title slug fullpath position depth published templatized redirect listed response_type parent_id site_id created_at updated_at) } }
+    scope :minimal_attributes,  lambda { |attrs = []| { :only => (attrs || []) + %w(title slug fullpath position depth published templatized redirect listed response_type parent_id parent_ids site_id created_at updated_at) } }
     scope :dependent_from,      lambda { |id| { :where => { :template_dependencies.in => [id] } } }
 
     ## methods ##

data/app/views/locomotive/notifications/new_content_entry.html.haml

@@ -10,13 +10,20 @@
 %hr
 
 %ul
-  - @type.entries_custom_fields.each do |field|
-    - value = @entry.value_for(field)
+  - @type.ordered_entries_custom_fields.each do |field|
+    - value = @entry.send(field.name)
     %li
       %strong= field.label
        - 
       %i
-        - if field.type == 'file'
-          = link_to File.basename(value), value
-        - else
+        - case field.type.to_s
+        - when 'string', 'text', 'boolean', 'date'
           = value
+        - when 'file'
+          = link_to File.basename(value.to_s), value.to_s
+        - when 'select'
+          = value
+        - when 'belongs_to'
+          = value.try(:_label)
+        - when 'has_many', 'many_to_many'
+          = value.map(&:_label).join(', ')

data/app/views/locomotive/pages/_form.html.haml

@@ -36,7 +36,7 @@
 
     = f.input :templatized, :as => :'Locomotive::Toggle', :style => "#{'display: none' if @page.redirect? || @page.templatized_from_parent?}"
 
-    = f.input :target_klass_name, :as => :select, :collection => options_for_target_klass_name, :include_blank => false, :wrapper_html => { :style => "#{'display: none' unless @page.templatized? && !@page.templatized_from_parent?}" }
+    = f.input :target_klass_name, :as => :select, :collection => options_for_target_klass_name, :include_blank => false, :wrapper_html => { :style => "#{'display: none' if !@page.templatized? || @page.templatized_from_parent?}" }
 
     = f.input :published, :as => :'Locomotive::Toggle'
 

data/app/views/locomotive/shared/_form_actions.html.haml

@@ -9,6 +9,6 @@
 
   .span-12.last
     %p
-      = submit_tag button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label
+      = submit_tag button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label, :disable_with => t('.disable_with'), :'data-sending-form-message' => t('locomotive.messages.sending_form')
 
   .clear

data/app/views/locomotive/shared/_head.html.haml

@@ -7,6 +7,10 @@
 %meta{ :name => 'key-param', :content => Rails.application.config.session_options[:key] }
 %meta{ :name => 'key-token', :content => cookies[key] }
 
+%script{ :type => 'text/javascript' }
+  :plain
+    window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' };
+
 = stylesheet_link_tag     'locomotive', :media => 'screen'
 = javascript_include_tag  'locomotive'
 
@@ -15,7 +19,6 @@
     window.locale         = '#{I18n.locale}';
     window.content_locale = '#{::Mongoid::Fields::I18n.locale}';
 
-    Locomotive.mounted_on       = '#{Locomotive.mounted_on}';
     Locomotive.current_site     = new Locomotive.Models.Site(#{current_site.to_json});
     Locomotive.current_account  = new Locomotive.Models.Account(#{current_locomotive_account.to_json});
 
@@ -32,4 +35,4 @@
 
 = yield :head
 
-= render 'locomotive/shared/main_app_head'
+= render 'locomotive/shared/main_app_head'

data/app/views/locomotive/theme_assets/index.html.haml

@@ -27,7 +27,7 @@
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ThemeAsset)
-    = form_tag theme_assets_url(:json), :id => 'theme-assets-quick-upload', :class => 'quick-upload' do
+    = form_tag theme_assets_url(:json), :id => 'theme-assets-quick-upload', :class => 'quick-upload', :'data-sending-form-message' => t('locomotive.messages.sending_form')  do
       = file_field_tag 'theme_asset[source]', :multiple => 'multiple'
       = local_action_button :quick_upload, '#', :class => 'new'
 

data/config/initializers/haml.rb

@@ -1 +1,2 @@
-# Haml::Template.options[:ugly] = true # improve performance in dev
+Haml::Template.options[:format] = :html5
+Haml::Template.options[:ugly]   = true # improve performance in dev

data/config/locales/admin_ui.de.yml

@@ -48,6 +48,7 @@ de:
         create: Neu
         update: Speichern
         send: Senden
+        disable_with: "locomotive.disable_with.form_actions"
       footer:
         who_is_behind: "Dienst entwickelt von %{development} und entworfen von <a href=\"http://www.sachagreif.com\">Sacha Greif</a> &mdash; <small>version</small> %{version}"
 

data/config/locales/admin_ui.en.yml

@@ -22,6 +22,7 @@ en:
 
     messages:
       confirm: Are you sure ?
+      sending_form: Your form is being submitted
 
     shared:
       header:
@@ -48,6 +49,7 @@ en:
         create: Create
         update: Save
         send: Send
+        disable_with: Pending...
       list:
         untranslated: untranslated
       footer:
@@ -193,6 +195,7 @@ en:
       index:
         title: Listing theme files
         help: "The theme files section is the place where you manage the files needed by your layout, snippets...etc. If you need to manage an image gallery, create a new content type instead.<br/><b>Warning:</b> you may not see all the assets depending on your rights."
+        quick_upload: Quick upload
         new: new file
         snippets: Snippets
         css_and_js: Style and javascript

data/config/locales/admin_ui.es.yml

@@ -37,6 +37,7 @@ es:
         account: Mi Cuenta
         site: Sitio
         theme_assets: Ficheros del Tema
+        disable_with: "locomotive.disable_with.form_actions"
       footer:
         who_is_behind: "Servicio desarrollado por %{development} y diseñado por <a href=\"http://www.sachagreif.com\">Sacha Greif</a>"
       form_actions:

data/config/locales/admin_ui.fr.yml

@@ -31,6 +31,7 @@ fr:
 
     messages:
       confirm: "Êtes-vous sûr(e) ?"
+      sending_form: "Votre formulaire est en cours d'envoi"
 
     shared:
       header:
@@ -57,6 +58,7 @@ fr:
         create: Créer
         update: Mettre à jour
         send: Envoyer
+        disable_with: En cours...
 
     notifications:
       new_content_entry:

data/config/locales/admin_ui.it.yml

@@ -34,6 +34,7 @@ it:
         create: Crea
         update: Salva
         send: Invia
+        disable_with: "locomotive.disable_with.form_actions"
 
     errors:
       "500":

data/config/locales/admin_ui.nl.yml

@@ -31,6 +31,7 @@ nl:
         create: Maak
         update: Update
         send: Verstuur
+        disable_with: "locomotive.disable_with.form_actions"
 
     errors:
       "500":

data/config/locales/admin_ui.no.yml

@@ -34,6 +34,7 @@
         create: Opprett
         update: Lagre
         send: Send
+        disable_with: "locomotive.disable_with.form_actions"
 
     errors:
       "500":

data/config/locales/admin_ui.pt-BR.yml

@@ -31,6 +31,7 @@ pt-BR:
         create: Criar
         update: Atualizar
         send: Enviar
+        disable_with: "locomotive.disable_with.form_actions"
 
     errors:
       "500":

data/config/locales/admin_ui.ru.yml

@@ -34,6 +34,7 @@ ru:
         create: Создать
         update: Сохранить
         send: Отправить
+        disable_with: "locomotive.disable_with.form_actions"
 
     errors:
       "500":

data/config/locales/default.en.yml

@@ -12,6 +12,8 @@ en:
         extname_changed: "New file does not have the original extension"
         array_too_short: "is too small (minimum element number is %{count})"
         invalid_theme_file: "can't be blank or isn't a zip file"
+        site:
+          default_locale_removed: The previous default locale can not be removed right away.
         page:
           liquid_syntax: "Liquid Syntax error ('%{error}' on '%{fullpath}')"
           liquid_extend: "The page '%{fullpath}' extends a template which does not exist"

data/config/locales/default.fr.yml

@@ -33,6 +33,8 @@ fr:
       extname_changed: "Nouveau fichier n'a pas l'extension original"
       array_too_short: "est trop petit (le nombre minimum d'éléments est %{count})"
       security: "présente un problème de sécurité"
+      site:
+        default_locale_removed: La langue par défaut ne peut pas être supprimée de cette façon.
       page:
         liquid_syntax: "Erreur de syntaxe dans les sections de page, veuillez vérifier la syntaxe ('%{error}'/'%{fullpath}')"
         liquid_extend: "La page '%{fullpath}' étend le contenu d'une page qui n'existe pas"

data/lib/generators/locomotive/install/templates/README

@@ -19,8 +19,8 @@ The Locomotive Engine has been correctly installed in your Rails application.
 
     > open localhost:8080
 
-  4. Follow the installation wizzard steps
+  4. Follow the installation wizard steps
 
   5. Enjoy !
 
-===============================================================================
+===============================================================================

data/lib/locomotive.rb

@@ -2,6 +2,7 @@ require 'locomotive/version'
 require 'locomotive/core_ext'
 require 'locomotive/configuration'
 require 'locomotive/logger'
+require 'locomotive/haml'
 require 'locomotive/formtastic'
 require 'locomotive/dragonfly'
 require 'locomotive/kaminari'

data/lib/locomotive/action_controller/responder.rb

@@ -9,6 +9,14 @@ module Locomotive
         super || has_errors?
       end
 
+      def options
+        super.merge({
+          :current_site     => self.controller.send(:current_site),
+          :current_account  => self.controller.send(:current_locomotive_account),
+          :ability          => self.controller.send(:current_ability)
+        })
+      end
+
       def to_json
         if get?
           display resource

data/lib/locomotive/core_ext.rb

@@ -5,7 +5,7 @@
 class String #:nodoc
 
   def permalink
-    self.parameterize('-')
+    self.to_ascii.parameterize('-')
   end
 
   def permalink!

data/lib/locomotive/dependencies.rb

@@ -19,6 +19,7 @@ require 'cancan'
 require 'RMagick'
 require 'cells'
 require 'sanitize'
+require 'unidecoder'
 
 require 'compass'
 require 'codemirror/rails'

data/lib/locomotive/haml.rb

@@ -0,0 +1,32 @@
+require 'haml/helpers/action_view_mods'
+
+module ActionView
+  module Helpers
+    module TagHelper
+
+      # Only preserve whitespace in the tag's content: https://github.com/nex3/haml/pull/503
+      def content_tag_with_haml_and_preserve(name, content_or_options_with_block = nil, *args, &block)
+        return content_tag_without_haml(name, content_or_options_with_block, *args, &block) unless is_haml?
+
+        preserve = haml_buffer.options[:preserve].include?(name.to_s)
+
+        if block_given?
+          if block_is_haml?(block) && preserve
+            content_tag_without_haml(name, content_or_options_with_block, *args) {preserve(&block)}
+          else
+            content_tag_without_haml(name, content_or_options_with_block, *args, &block)
+          end
+        else
+          if preserve && content_or_options_with_block
+            content_or_options_with_block = Haml::Helpers.preserve(content_or_options_with_block)
+          end
+          content_tag_without_haml(name, content_or_options_with_block, *args, &block)
+        end
+      end
+
+      alias_method :content_tag_without_haml_and_preserve, :content_tag
+      alias_method :content_tag, :content_tag_with_haml_and_preserve
+      alias_method :content_tag_with_haml, :content_tag_with_haml_and_preserve
+    end
+  end
+end

data/lib/locomotive/render.rb

@@ -88,7 +88,8 @@ module Locomotive
         fresh_when :etag => @page, :last_modified => @page.updated_at.utc, :public => true
 
         if @page.cache_strategy != 'simple' # varnish
-          response.cache_control[:max_age] = @page.cache_strategy
+          response.headers['Editable']      = ''
+          response.cache_control[:max_age]  = @page.cache_strategy
         end
       end
 

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.0.0.rc4'
+  VERSION = '2.0.0.rc5'
 end

data/lib/locomotive_cms.rb

@@ -0,0 +1 @@
+require 'locomotive/engine'

data/vendor/assets/javascripts/locomotive/form_submit_notification.js

@@ -0,0 +1,39 @@
+/**
+ * Version 0.0.1
+ * Display a message letting the user know the form is being submitted
+ * Didier Lafforgue
+ */
+$.fn.formSubmitNotification = function(settings) {
+
+  function show() {
+    $('#form-submit-notification').fadeIn()
+  }
+
+  function hide() {
+    $('#form-submit-notification').fadeOut()
+  }
+
+  function create(message) {
+    if ($('#form-submit-notification').size() == 0) {
+      var element = $("<div id=\"form-submit-notification\"><div>" + message + "</div></div>").hide();
+      $('body').append(element);
+    }
+  }
+
+  return this.each(function() {
+    var form    = $(this);
+    var message = form.attr('data-sending-form-message');
+
+    if (typeof(message) == 'undefined')
+      message = form.find('input[type=submit]').attr('data-sending-form-message');
+
+    if (typeof(message) == 'undefined')
+      return ;
+
+    create(message);
+
+    form.bind('ajax:beforeSend', function(event) { show() });
+    form.bind('ajax:complete', function(event) { hide() });
+
+  });
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc4
+  version: 2.0.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156428480 !ruby/object:Gem::Requirement
+  requirement: &2152269500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156428480
+  version_requirements: *2152269500
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156426280 !ruby/object:Gem::Requirement
+  requirement: &2152268040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156426280
+  version_requirements: *2152268040
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2156440220 !ruby/object:Gem::Requirement
+  requirement: &2152133040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156440220
+  version_requirements: *2152133040
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2156437720 !ruby/object:Gem::Requirement
+  requirement: &2152132220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156437720
+  version_requirements: *2152132220
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2156448180 !ruby/object:Gem::Requirement
+  requirement: &2152130880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156448180
+  version_requirements: *2152130880
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2156445200 !ruby/object:Gem::Requirement
+  requirement: &2152129900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156445200
+  version_requirements: *2152129900
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2156444480 !ruby/object:Gem::Requirement
+  requirement: &2152128800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156444480
+  version_requirements: *2152128800
 - !ruby/object:Gem::Dependency
   name: locomotive-mongoid-tree
-  requirement: &2156443660 !ruby/object:Gem::Requirement
+  requirement: &2152127880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156443660
+  version_requirements: *2152127880
 - !ruby/object:Gem::Dependency
   name: custom_fields
-  requirement: &2156457700 !ruby/object:Gem::Requirement
+  requirement: &2152126860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.0.0.rc9
   type: :runtime
   prerelease: false
-  version_requirements: *2156457700
+  version_requirements: *2152126860
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2156456400 !ruby/object:Gem::Requirement
+  requirement: &2152125800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156456400
+  version_requirements: *2152125800
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2156451720 !ruby/object:Gem::Requirement
+  requirement: &2152161020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156451720
+  version_requirements: *2152161020
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2156466360 !ruby/object:Gem::Requirement
+  requirement: &2152159520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *2156466360
+  version_requirements: *2152159520
 - !ruby/object:Gem::Dependency
   name: rails-backbone
-  requirement: &2156465280 !ruby/object:Gem::Requirement
+  requirement: &2152157680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156465280
+  version_requirements: *2152157680
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &2156463980 !ruby/object:Gem::Requirement
+  requirement: &2152155460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,32 +164,32 @@ dependencies:
         version: '2.21'
   type: :runtime
   prerelease: false
-  version_requirements: *2156463980
+  version_requirements: *2152155460
 - !ruby/object:Gem::Dependency
   name: locomotive-tinymce-rails
-  requirement: &2156461160 !ruby/object:Gem::Requirement
+  requirement: &2152212800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.7.1
+        version: 3.4.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156461160
+  version_requirements: *2152212800
 - !ruby/object:Gem::Dependency
   name: locomotive-aloha-rails
-  requirement: &2156474220 !ruby/object:Gem::Requirement
+  requirement: &2152210420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.1.1
+        version: 0.20.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156474220
+  version_requirements: *2152210420
 - !ruby/object:Gem::Dependency
   name: flash_cookie_session
-  requirement: &2156472380 !ruby/object:Gem::Requirement
+  requirement: &2152209360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156472380
+  version_requirements: *2152209360
 - !ruby/object:Gem::Dependency
   name: locomotive_liquid
-  requirement: &2156470960 !ruby/object:Gem::Requirement
+  requirement: &2152208600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -208,10 +208,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156470960
+  version_requirements: *2152208600
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2156469420 !ruby/object:Gem::Requirement
+  requirement: &2152207760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156469420
+  version_requirements: *2152207760
 - !ruby/object:Gem::Dependency
   name: responders
-  requirement: &2156482960 !ruby/object:Gem::Requirement
+  requirement: &2152316820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156482960
+  version_requirements: *2152316820
 - !ruby/object:Gem::Dependency
   name: cells
-  requirement: &2156476380 !ruby/object:Gem::Requirement
+  requirement: &2152316020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -241,10 +241,10 @@ dependencies:
         version: 3.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156476380
+  version_requirements: *2152316020
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2156495100 !ruby/object:Gem::Requirement
+  requirement: &2152315200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,10 +252,10 @@ dependencies:
         version: 4.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *2156495100
+  version_requirements: *2152315200
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &2156493720 !ruby/object:Gem::Requirement
+  requirement: &2152314280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -263,10 +263,10 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156493720
+  version_requirements: *2152314280
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2156504940 !ruby/object:Gem::Requirement
+  requirement: &2152313520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -274,10 +274,21 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156504940
+  version_requirements: *2152313520
+- !ruby/object:Gem::Dependency
+  name: unidecoder
+  requirement: &2152312740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152312740
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2156503960 !ruby/object:Gem::Requirement
+  requirement: &2152310080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -285,10 +296,10 @@ dependencies:
         version: 2.12.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156503960
+  version_requirements: *2152310080
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
-  requirement: &2156500700 !ruby/object:Gem::Requirement
+  requirement: &2152445600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -296,10 +307,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156500700
+  version_requirements: *2152445600
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &2156515160 !ruby/object:Gem::Requirement
+  requirement: &2152443360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -307,21 +318,21 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156515160
+  version_requirements: *2152443360
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2156512280 !ruby/object:Gem::Requirement
+  requirement: &2152440280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156512280
+  version_requirements: *2152440280
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2156509840 !ruby/object:Gem::Requirement
+  requirement: &2152437840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -329,10 +340,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *2156509840
+  version_requirements: *2152437840
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2156508580 !ruby/object:Gem::Requirement
+  requirement: &2152436720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -340,10 +351,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156508580
+  version_requirements: *2152436720
 - !ruby/object:Gem::Dependency
   name: mimetype-fu
-  requirement: &2156521480 !ruby/object:Gem::Requirement
+  requirement: &2152435240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -351,10 +362,21 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156521480
+  version_requirements: *2152435240
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &2152433720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152433720
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2156516860 !ruby/object:Gem::Requirement
+  requirement: &2152426200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -362,10 +384,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156516860
+  version_requirements: *2152426200
 - !ruby/object:Gem::Dependency
   name: actionmailer-with-request
-  requirement: &2156515560 !ruby/object:Gem::Requirement
+  requirement: &2152418020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -373,7 +395,7 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156515560
+  version_requirements: *2152418020
 description: Locomotive is a next generation CMS system with sexy admin tools, liquid
   templating, and inline editing powered by mongodb and rails 3.2
 email:
@@ -839,6 +861,7 @@ files:
 - lib/locomotive/dragonfly.rb
 - lib/locomotive/engine.rb
 - lib/locomotive/formtastic.rb
+- lib/locomotive/haml.rb
 - lib/locomotive/httparty/patches.rb
 - lib/locomotive/httparty/webservice.rb
 - lib/locomotive/httparty.rb
@@ -893,6 +916,7 @@ files:
 - lib/locomotive/session_store.rb
 - lib/locomotive/version.rb
 - lib/locomotive.rb
+- lib/locomotive_cms.rb
 - lib/tasks/cucumber.rake
 - lib/tasks/locomotive.rake
 - public/favicon.ico
@@ -902,6 +926,7 @@ files:
 - vendor/assets/javascripts/locomotive/cookies.js
 - vendor/assets/javascripts/locomotive/datepicker_fr.js
 - vendor/assets/javascripts/locomotive/editable_field.js
+- vendor/assets/javascripts/locomotive/form_submit_notification.js
 - vendor/assets/javascripts/locomotive/growl.js
 - vendor/assets/javascripts/locomotive/handlebars.js
 - vendor/assets/javascripts/locomotive/ICanHandlebarz.js
@@ -950,7 +975,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 55090259143407847
+      hash: -3180682494187684957
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: