locomotive_cms 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 243b2783fdaefcb54415d93da1d0918dd81890f7
-  data.tar.gz: 4652d77c5a747fa2fdf429eef59b7ef2f56b3642
+  metadata.gz: b5296380d468cf4e5522e01268698e14df1be493
+  data.tar.gz: f55fa2c7671c33d05b6d93c12cd6a33034b69b61
 SHA512:
-  metadata.gz: 864e756b9dfab5708b8e89ae55229879518a44fb2f91ed207537e19e4f0a3189948d60ad0f93b66d4f757dfa765866b00df1000bacdcd60cdfc9b1c663939d44
-  data.tar.gz: 3268fb0c1d076f4084208593ffe762f360c496304ea9d911b5dfc92655ae3cbe794286e502386dfd658e6d1c91b7f229c0b9520b35313b75ba27aa7579cd23ad
+  metadata.gz: 3c1bfd20751c88557fe805ba6b3e2292c4c9f03c71e8034f5cb6cd3ad5f2120b830b9fedcdb03eda475b34c97b6fc752d93cefd9f5c4f09286d9a392b33bc295
+  data.tar.gz: 7db9d6cb249af95f012abb14833df09945373194d487515c84a879611ed3605707992069a4011ab8bf3a3a13bfb173c3a24c90c3485c735ca5a629ea06e0a585

data/app/assets/javascripts/locomotive/models/editable_element.js.coffee

@@ -23,5 +23,16 @@ class Locomotive.Models.EditableElementsCollection extends Backbone.Collection
   by_block: (name) ->
     @filter (editable) -> editable.get('block_name') == name
 
+  find_similar: (editable) ->
+    @find (_editable) ->
+      editable.get('block') == _editable.get('block') &&
+      editable.get('slug')  == _editable.get('slug') &&
+      editable.get('type')  == _editable.get('type')
+
+  update_content_from: (collection) ->
+    collection.each (element) =>
+      _element = @find_similar(element)
+      _element.set('content', element.get('content')) if _element
+
   toJSONForSave: ->
     @map (model) => model.toJSONForSave()

data/app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee

@@ -159,5 +159,4 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
         @$('li#page_redirect_url_input, li#page_redirect_type_input').hide()
 
   enable_other_checkboxes: ->
-    _.each ['published', 'listed'], (exp) =>
-      @$('li#page_' + exp + '_input input[type=checkbox]').checkToggle()
+    @$('li.toggle input[type=checkbox].simple-toggle').checkToggle()

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

@@ -11,6 +11,11 @@ class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
 
     @clear_errors()
 
+    # store the previous editable elements in case we
+    # need to use the content of these elements for
+    # the new ones (same block and slug).
+    editable_elements = _.clone @model.get('editable_elements')
+
     @model.save {},
       success: (model, response) =>
         form.trigger('ajax:complete')
@@ -18,6 +23,7 @@ class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
         model._normalize()
 
         if model.get('template_changed') == true
+          model.get('editable_elements').update_content_from(editable_elements)
           @reset_editable_elements()
         else
           @refresh_editable_elements()

data/app/controllers/locomotive/api/base_controller.rb

@@ -32,7 +32,7 @@ module Locomotive
       end
 
       def current_ability
-        @current_ability ||= Ability.new(current_locomotive_account, current_site)
+        @current_ability ||= Locomotive::Ability.new(current_locomotive_account, current_site)
       end
 
       def require_account

data/app/controllers/locomotive/base_controller.rb

@@ -56,7 +56,7 @@ module Locomotive
     end
 
     def current_ability
-      @current_ability ||= Ability.new(current_locomotive_account, current_site)
+      @current_ability ||= Locomotive::Ability.new(current_locomotive_account, current_site)
     end
 
     def require_account

data/app/helpers/locomotive/pages_helper.rb

@@ -19,12 +19,10 @@ module Locomotive
     end
 
     def parent_pages_options
-      roots = current_site.pages.roots.where(:slug.ne => '404').and(:_id.ne => @page.id)
-
       [].tap do |list|
-        roots.each do |page|
-          list = add_children_to_options(page, list)
-        end
+        root = Locomotive::Page.quick_tree(current_site).first
+
+        add_children_to_options(root, list)
       end
     end
 

data/app/models/locomotive/extensions/page/tree.rb

@@ -20,6 +20,7 @@ module Locomotive
           ## indexes ##
           index position: 1
           index depth:    1, position: 1
+          index site_id:  1, depth:    1, position: 1
 
           alias_method_chain :rearrange, :identity_map
           alias_method_chain :rearrange_children, :identity_map
@@ -83,12 +84,7 @@ module Locomotive
               end
             end
 
-            current_page.instance_eval do
-              def children=(list); @children = list; end
-              def children; @children || []; end
-            end
-
-            current_page.children = children
+            current_page.instance_variable_set(:@children, children || [])
 
             current_page
           end

data/app/models/locomotive/membership.rb

@@ -19,7 +19,7 @@ module Locomotive
 
     ## methods ##
 
-    Ability::ROLES.each do |_role|
+    Locomotive::Ability::ROLES.each do |_role|
       define_method("#{_role}?") do
         self.role == _role
       end
@@ -48,13 +48,13 @@ module Locomotive
     end
 
     def ability
-      @ability ||= Ability.new(self.account, self.site)
+      @ability ||= Locomotive::Ability.new(self.account, self.site)
     end
 
     protected
 
     def define_role
-      self.role = Ability::ROLES.include?(role.downcase) ? role.downcase : Ability::ROLES.first
+      self.role = Locomotive::Ability::ROLES.include?(role.downcase) ? role.downcase : Locomotive::Ability::ROLES.first
     end
 
     # Users should not be able to set the role of another user to be higher than
@@ -67,7 +67,7 @@ module Locomotive
       if current_membership.present?
         # The role cannot be set higher than the current one (we use the index in
         # the roles array to check role presidence)
-        errors.add(:role, :invalid) if Ability::ROLES.index(role) < Ability::ROLES.index(current_membership.role)
+        errors.add(:role, :invalid) if Locomotive::Ability::ROLES.index(role) < Locomotive::Ability::ROLES.index(current_membership.role)
       end
     end
 

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

@@ -35,9 +35,9 @@
 
     = 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'
+  = f.input :published, as: :'Locomotive::Toggle', input_html: { class: 'simple-toggle' }
 
-  = f.input :listed, as: :'Locomotive::Toggle'
+  = f.input :listed, as: :'Locomotive::Toggle', input_html: { class: 'simple-toggle' }
 
   = f.input :redirect, as: :'Locomotive::Toggle', wrapper_html: { style: "#{'display: none' if @page.templatized? || !@page.default_response_type?}" }
 
@@ -45,6 +45,8 @@
 
   = f.input :redirect_type, as: :select, collection: options_for_page_redirect_type, include_blank: false, wrapper_html: { style: "#{'display: none' unless @page.redirect?}" }
 
+  = render_cell 'locomotive/partials', :display, :page_form, g: f
+
   - if can?(:customize, @page)
 
     = f.input :cache_strategy, as: :select, collection: options_for_page_cache_strategy, include_blank: false, wrapper_html: { style: "#{'display: none' if @page.redirect?}" }

data/config/routes.rb

@@ -8,6 +8,10 @@ Locomotive::Engine.routes.draw do
     failure_app:  'Locomotive::Devise::FailureApp',
     controllers:  { sessions: 'locomotive/sessions', passwords: 'locomotive/passwords' }
 
+  authenticated :locomotive_account do
+    root to: 'pages#index'
+  end
+
   devise_scope :locomotive_account do
     match '/'         => 'sessions#new'
     delete 'signout'  => 'sessions#destroy', as: :destroy_locomotive_session

data/lib/locomotive/carrierwave.rb

@@ -7,4 +7,7 @@ require 'locomotive/carrierwave/patches'
 # register missing mime types
 EXTENSIONS[:eot] = 'application/vnd.ms-fontobject'
 EXTENSIONS[:woff] = 'application/x-woff'
-EXTENSIONS[:otf] = 'application/octet-stream'
+EXTENSIONS[:otf] = 'application/octet-stream'
+
+# Allow retina images
+CarrierWave::SanitizedFile.sanitize_regexp = /[^a-zA-Z0-9\.\-\+_\@]/

data/lib/locomotive/liquid/tags/link_to.rb

@@ -42,23 +42,17 @@ module Locomotive
         protected
 
         def retrieve_page_from_handle(site, context)
-          context.scopes.reverse_each do |scope|
-            handle = scope[@handle] || @handle
-
-            page = case handle
-            when Locomotive::Page                         then handle
-            when Locomotive::Liquid::Drops::Page          then handle.instance_variable_get(:@_source)
-            when String                                   then fetch_page(site, handle)
-            when Locomotive::ContentEntry                 then fetch_page(site, handle, true)
-            when Locomotive::Liquid::Drops::ContentEntry  then fetch_page(site, handle.instance_variable_get(:@_source), true)
-            else
-              nil
-            end
-
-            return page unless page.nil?
+          handle = context[@handle] || @handle
+
+          case handle
+          when Locomotive::Page                         then handle
+          when Locomotive::Liquid::Drops::Page          then handle.instance_variable_get(:@_source)
+          when String                                   then fetch_page(site, handle)
+          when Locomotive::ContentEntry                 then fetch_page(site, handle, true)
+          when Locomotive::Liquid::Drops::ContentEntry  then fetch_page(site, handle.instance_variable_get(:@_source), true)
+          else
+            nil
           end
-
-          nil
         end
 
         def fetch_page(site, handle, templatized = false)

data/lib/locomotive/render.rb

@@ -96,7 +96,7 @@ module Locomotive
 
     # Get the Locomotive page matching the request and scoped by the current Locomotive site
     #
-    # @param [ String ] path An optional path overriding the default default behaviour to get a page
+    # @param [ String ] path An optional path overriding the default behaviour to get a page
     #
     # @return [ Object ] The Locomotive::Page
     #

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

data/lib/tasks/development.rake

@@ -1,6 +1,7 @@
 require "highline/import"
 
 namespace :development do
+  desc "Setup sites and account for development"
   task bootstrap: :environment do
     if Locomotive::Site.count > 0 || Locomotive::Account.count > 0
       puts "This will wipe out all sites and accounts"

data/spec/models/locomotive/theme_asset_spec.rb

@@ -55,6 +55,12 @@ describe Locomotive::ThemeAsset do
         asset.local_path.should == 'images/a_la_poubelle/5k.png'
       end
 
+      it 'should keep the original name for a retina image' do
+        asset.source = FixturedAsset.open('5k@2x.png')
+        asset.save
+        asset.local_path.should == 'images/5k@2x.png'
+      end
+
     end
 
     describe '#validation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1269,6 +1269,7 @@ files:
 - spec/cells/locomotive/main_menu_cell_spec.rb
 - spec/cells/locomotive/settings_menu_cell_spec.rb
 - spec/fixtures/assets/5k.png
+- spec/fixtures/assets/5k@2x.png
 - spec/fixtures/assets/5k_2.png
 - spec/fixtures/assets/application.js
 - spec/fixtures/assets/main.css
@@ -1483,6 +1484,7 @@ test_files:
 - spec/cells/locomotive/main_menu_cell_spec.rb
 - spec/cells/locomotive/settings_menu_cell_spec.rb
 - spec/fixtures/assets/5k.png
+- spec/fixtures/assets/5k@2x.png
 - spec/fixtures/assets/5k_2.png
 - spec/fixtures/assets/application.js
 - spec/fixtures/assets/main.css