locomotive_cms 2.0.3 → 2.1.0

data/app/cells/locomotive/main_menu/show.html.haml

@@ -1,10 +1,10 @@
 %ul#menu
   - @list.each_with_index do |entry, index|
-    %li{ :class => "entry entry-#{index} #{entry[:class]}" }
+    %li{ class: "entry entry-#{index} #{entry[:class]}" }
       %div.left
         %span
       = link_to entry[:url] do
-        %i{ :class => entry[:icon] }
+        %i{ class: entry[:icon] }
         %span= entry[:label]
       %div.right
         %span

data/app/cells/locomotive/main_menu_cell.rb

@@ -4,8 +4,8 @@ module Locomotive
     protected
 
     def build_list
-      add :contents,  :url => pages_url,							:icon => 'icon-folder-open'
-      add :settings,  :url => edit_current_site_url,	:icon => 'icon-cog'
+      add :contents,  url: pages_url,             icon: 'icon-folder-open'
+      add :settings,  url: edit_current_site_url, icon: 'icon-cog'
     end
 
   end

data/app/cells/locomotive/menu_cell.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     include ::Locomotive::Engine.routes.url_helpers
 
-    delegate :main_app, :sections, :to => :parent_controller
+    delegate :main_app, :sections, to: :parent_controller
 
     attr_accessor :list
 
@@ -19,10 +19,10 @@ module Locomotive
 
     def url_options
       super.reverse_merge(
-        :host               => request.host_with_port,
-        :protocol           => request.protocol,
-        :_path_segments     => request.symbolized_path_parameters
-      ).merge(:script_name  => request.script_name)
+        host:               request.host_with_port,
+        protocol:           request.protocol,
+        _path_segments:     request.symbolized_path_parameters
+      ).merge(script_name:  request.script_name)
     end
 
     class MenuProxy
@@ -65,7 +65,7 @@ module Locomotive
         attributes[:label] = localize_label(name)
       end
 
-      attributes.merge!(:name => name, :class => name.to_s.dasherize.downcase)
+      attributes.merge!(name: name, class: name.to_s.dasherize.downcase)
     end
 
     def add(name, attributes)

data/app/cells/locomotive/partials_cell.rb

@@ -0,0 +1,21 @@
+module Locomotive
+  class PartialsCell < Cell::Rails
+    cattr_accessor :templates
+
+    def self.add_template(namespace, name)
+      self.templates ||= {}
+      self.templates[namespace] ||= []
+      self.templates[namespace] << name
+    end
+
+    def display(namespace, locals = {})
+      return unless self.class.templates && self.class.templates[namespace].present?
+
+      locals.each_pair do |k,v|
+        instance_variable_set("@#{k}", v)
+      end
+
+      self.class.templates[namespace].map { |template| render view: template }.join.html_safe
+    end
+  end
+end

data/app/cells/locomotive/settings_menu_cell.rb

@@ -4,10 +4,10 @@ module Locomotive
     protected
 
     def build_list
-      add :site,          :url => edit_current_site_url
-      add :theme_assets,  :url => theme_assets_url
-      add :translations,  :url => translations_url
-      add :account,       :url => edit_my_account_url
+      add :site,          url: edit_current_site_url
+      add :theme_assets,  url: theme_assets_url
+      add :translations,  url: translations_url
+      add :account,       url: edit_my_account_url
     end
 
   end

data/app/cells/locomotive/sub_menu/show.html.haml

@@ -1,4 +1,4 @@
 - @list.each do |item|
   %li
-    = link_to item[:url], :class => item[:class] do
-      %span= item[:label]
+    = link_to item[:url], class: item[:class] do
+      %span= item[:label]

data/app/cells/locomotive/sub_menu_cell.rb

@@ -6,7 +6,7 @@ module Locomotive
     def build_item(name, attributes)
       item = super
       enhanced_class = "#{'on' if name.to_s == sections(:sub).to_s} #{item[:class]}"
-      item.merge(:class => enhanced_class)
+      item.merge(class: enhanced_class)
     end
 
   end

data/app/controllers/locomotive/accounts_controller.rb

@@ -4,15 +4,15 @@ module Locomotive
     sections 'settings'
 
     def new
-      @account = Account.new(:email => params[:email])
+      @account = Account.new(email: params[:email])
       respond_with @account
     end
 
     def create
       @account = Account.create(params[:account])
-      current_site.memberships.create(:account => @account) if @account.errors.empty?
-      respond_with @account, :location => edit_current_site_url
+      current_site.memberships.create(account: @account) if @account.errors.empty?
+      respond_with @account, location: edit_current_site_url
     end
 
   end
-end
+end

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

@@ -5,6 +5,7 @@ module Locomotive
       load_and_authorize_resource class: Locomotive::Account
 
       def index
+        @accounts = @accounts.ordered
         respond_with(@accounts)
       end
 

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

@@ -31,4 +31,4 @@ module Locomotive
 
     end
   end
-end
+end

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

@@ -43,4 +43,4 @@ module Locomotive
 
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ module Locomotive
       load_and_authorize_resource class: Locomotive::ContentType, through: :current_site
 
       def index
-        @content_types = @content_types.order_by([[:name, :asc]])
+        @content_types = @content_types.order_by(:name.asc)
         respond_with(@content_types)
       end
 
@@ -80,4 +80,4 @@ module Locomotive
 
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ module Locomotive
       load_and_authorize_resource class: Locomotive::Page, through: :current_site
 
       def index
-        @pages = @pages.order_by([[:depth, :asc], [:position, :asc]])
+        @pages = @pages.order_by(:depth.asc, :position.asc)
         respond_with(@pages)
       end
 

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

@@ -5,7 +5,7 @@ module Locomotive
       load_and_authorize_resource class: Locomotive::Snippet, through: :current_site
 
       def index
-        @snippets = @snippets.order_by([[:name, :asc]])
+        @snippets = @snippets.order_by(:name.asc)
         respond_with(@snippets)
       end
 

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

@@ -29,6 +29,53 @@ module Locomotive
         respond_with @theme_asset
       end
 
+      def self.description
+        {
+          overall: %{Manage the assets (stylesheets, javascripts, images, fonts) used by a site},
+          actions: {
+            index: {
+              description: %{Return all the theme assets},
+              example: {
+                command: %{curl 'http://mysite.com/locomotive/api/theme_assets.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            },
+            show: {
+              description: %{Return the attributes of a theme asset},
+              response: Locomotive::ThemeAssetPresenter.getters_to_hash,
+              example: {
+                command: %{curl 'http://mysite.com/locomotive/api/theme_assets/4244af4ef0000002.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            },
+            create: {
+              description: %{Create a theme asset},
+              params: Locomotive::ThemeAssetPresenter.setters_to_hash,
+              example: {
+                command: %{curl -d '...' 'http://mysite.com/locomotive/api/theme_assets.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            },
+            update: {
+              description: %{Update a theme asset},
+              params: Locomotive::ThemeAssetPresenter.setters_to_hash,
+              example: {
+                command: %{curl -d '...' -X UPDATE 'http://mysite.com/locomotive/api/theme_assets/4244af4ef0000002.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            },
+            destroy: {
+              description: %{Delete a theme asset},
+              example: {
+                command: %{curl -X DELETE 'http://mysite.com/locomotive/api/theme_assets/4244af4ef0000002.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            }
+          }
+        }
+      end
+
+
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Locomotive
 
       def create
         begin
-          token = Account.create_api_token(current_site, params[:email], params[:password])
+          token = Account.create_api_token(current_site, params[:email], params[:password], params[:api_key])
           respond_with({ token: token }, location: root_url)
         rescue Exception => e
           respond_with({ message: e.message }, status: 401, location: root_url)
@@ -29,7 +29,7 @@ module Locomotive
           overall: %{Manage a session token which will be passed to all the other REST calls},
           actions: {
             create: {
-              description: %{Generate a session token from an email and a password},
+              description: %{Generate a session token from either an email and a password OR an api key},
               params: { email: 'String', password: 'String' },
               response: { token: 'String' },
               example: {

data/app/controllers/locomotive/base_controller.rb

@@ -5,9 +5,12 @@ module Locomotive
     include Locomotive::ActionController::LocaleHelpers
     include Locomotive::ActionController::SectionHelpers
     include Locomotive::ActionController::UrlHelpers
+    include Locomotive::ActionController::Ssl
 
     layout '/locomotive/layouts/application'
 
+    before_filter :require_ssl
+
     before_filter :require_account
 
     before_filter :require_site
@@ -34,7 +37,7 @@ module Locomotive
       ::Locomotive.log "[CanCan::AccessDenied] #{exception.inspect}"
 
       if request.xhr?
-        render :json => { :error => exception.message }
+        render json: { error: exception.message }
       else
         flash[:alert] = exception.message
 
@@ -58,4 +61,4 @@ module Locomotive
     end
 
   end
-end
+end

data/app/controllers/locomotive/content_assets_controller.rb

@@ -1,7 +1,7 @@
 module Locomotive
   class ContentAssetsController < BaseController
 
-    respond_to :json, :only => [:index, :create, :destroy]
+    respond_to :json, only: [:index, :create, :destroy]
 
     def index
       @content_assets = current_site.content_assets

data/app/controllers/locomotive/content_entries_controller.rb

@@ -5,21 +5,34 @@ module Locomotive
 
     localized
 
-    before_filter :back_to_default_site_locale, :only => %w(new create)
+    before_filter :back_to_default_site_locale, only: %w(new create)
 
     before_filter :set_content_type
 
-    respond_to :json, :only => [:show, :edit, :create, :update, :sort]
-
     skip_load_and_authorize_resource
 
     before_filter :authorize_content
 
+    respond_to :json, only: [:show, :edit, :create, :update, :sort]
+
+    respond_to :csv,  only: [:export]
+
     def index
-      @content_entries = @content_type.list_or_group_entries
+      options = { page: params[:page] || 1, per_page: Locomotive.config.ui[:per_page] }
+      @content_entries = @content_type.list_or_group_entries(options)
       respond_with @content_entries
     end
 
+    def export
+      @content_entries = @content_type.ordered_entries
+      respond_with @content_entries, {
+        filename:     @content_type.slug,
+        col_sep:      ';',
+        content_type: @content_type,
+        host:         request.host_with_port
+      }
+    end
+
     def show
       @content_entry = @content_type.entries.find(params[:id])
       respond_with @content_entry
@@ -32,7 +45,7 @@ module Locomotive
 
     def create
       @content_entry = @content_type.entries.create(params[:content_entry])
-      respond_with @content_entry, :location => edit_content_entry_url(@content_type.slug, @content_entry._id)
+      respond_with @content_entry, location: edit_content_entry_url(@content_type.slug, @content_entry._id)
     end
 
     def edit
@@ -43,7 +56,7 @@ module Locomotive
     def update
       @content_entry = @content_type.entries.find(params[:id])
       @content_entry.update_attributes(params[:content_entry])
-      respond_with @content_entry, :location => edit_content_entry_url(@content_type.slug, @content_entry._id)
+      respond_with @content_entry, location: edit_content_entry_url(@content_type.slug, @content_entry._id)
     end
 
     def sort
@@ -54,13 +67,13 @@ module Locomotive
     def destroy
       @content_entry = @content_type.entries.find(params[:id])
       @content_entry.destroy
-      respond_with @content_entry, :location => content_entries_url(@content_type.slug)
+      respond_with @content_entry, location: content_entries_url(@content_type.slug)
     end
 
     protected
 
     def set_content_type
-      @content_type ||= current_site.content_types.where(:slug => params[:slug]).first
+      @content_type ||= current_site.content_types.where(slug: params[:slug]).first
     end
 
     def authorize_content
@@ -68,4 +81,4 @@ module Locomotive
     end
 
   end
-end
+end

data/app/controllers/locomotive/content_types_controller.rb

@@ -3,9 +3,9 @@ module Locomotive
 
     sections 'contents'
 
-    before_filter :back_to_default_site_locale, :only => %w(new create)
+    before_filter :back_to_default_site_locale, only: %w(new create)
 
-    respond_to :json, :only => [:create, :update, :destroy]
+    respond_to :json, only: [:create, :update, :destroy]
 
     helper 'Locomotive::Accounts', 'Locomotive::CustomFields'
 
@@ -16,7 +16,7 @@ module Locomotive
 
     def create
       @content_type = current_site.content_types.create(params[:content_type])
-      respond_with @content_type, :location => edit_content_type_url(@content_type._id)
+      respond_with @content_type, location: edit_content_type_url(@content_type._id)
     end
 
     def edit
@@ -27,14 +27,14 @@ module Locomotive
     def update
       @content_type = current_site.content_types.find(params[:id])
       @content_type.update_attributes(params[:content_type])
-      respond_with @content_type, :location => edit_content_type_url(@content_type._id)
+      respond_with @content_type, location: edit_content_type_url(@content_type._id)
     end
 
     def destroy
       @content_type = current_site.content_types.find(params[:id])
       @content_type.destroy
-      respond_with @content_type, :location => pages_url
+      respond_with @content_type, location: pages_url
     end
 
   end
-end
+end

data/app/controllers/locomotive/current_site_controller.rb

@@ -7,15 +7,15 @@ module Locomotive
 
     skip_load_and_authorize_resource
 
-    load_and_authorize_resource :class => 'Site'
+    load_and_authorize_resource class: 'Site'
 
     helper 'Locomotive::Sites'
 
     before_filter :filter_attributes
 
-    before_filter :ensure_domains_list, :only => :update
+    before_filter :ensure_domains_list, only: :update
 
-    respond_to :json, :only => :update
+    respond_to :json, only: :update
 
     def edit
       @site = current_site
@@ -25,7 +25,7 @@ module Locomotive
     def update
       @site = current_site
       @site.update_attributes(params[:site])
-      respond_with @site, :location => edit_current_site_url(new_host_if_subdomain_changed)
+      respond_with @site, location: edit_current_site_url(new_host_if_subdomain_changed)
     end
 
     protected
@@ -40,7 +40,7 @@ module Locomotive
       if !Locomotive.config.manage_subdomain? || @site.domains.include?(request.host)
         {}
       else
-        { :host => site_url(@site, { :fullpath => false, :protocol => false }) }
+        { host: site_url(@site, { fullpath: false, protocol: false }) }
       end
     end
 
@@ -49,4 +49,4 @@ module Locomotive
     end
 
   end
-end
+end