locomotive_cms 2.0.3 → 2.1.0

data/features/step_definitions/snippet_steps.rb

@@ -19,7 +19,7 @@ end
 
 Given /^a snippet named "([^"]*)" with id "([^"]*)" and template:$/ do |name, id, template|
   @snippet = new_snippet(name, template)
-  @snippet.id = BSON::ObjectId(id)
+  @snippet.id = Moped::BSON::ObjectId(id)
   @snippet.save!
 end
 

data/features/step_definitions/theme_asset_steps.rb

@@ -24,7 +24,7 @@ end
 
 Given /^a javascript asset named "([^"]*)" with id "([^"]*)"$/ do |name, id|
   @asset = new_plain_text_asset(name, 'javascript')
-  @asset.id = BSON::ObjectId(id)
+  @asset.id = Moped::BSON::ObjectId(id)
   @asset.save!
 end
 
@@ -34,7 +34,7 @@ end
 
 Given /^a stylesheet asset named "([^"]*)" with id "([^"]*)"$/ do |name, id|
   @asset = new_plain_text_asset(name, 'stylesheet')
-  @asset.id = BSON::ObjectId(id)
+  @asset.id = Moped::BSON::ObjectId(id)
   @asset.save!
 end
 

data/features/step_definitions/translation_steps.rb

@@ -1,6 +1,6 @@
 Given /^a translation with key "(.*?)" and id "(.*?)" with values:$/ do |key, id, table|
   translation = @site.translations.build
-  translation.id = BSON::ObjectId(id)
+  translation.id = Moped::BSON::ObjectId(id)
   translation.key = key
   translation.values = table.raw.inject({}) { |memo,values| memo.merge(values.first => values.last) }
   translation.save!

data/features/step_definitions/web_steps.rb

@@ -40,7 +40,7 @@ When /^(?:|I )press "([^"]*)"$/ do |button|
 end
 
 When /^(?:|I )follow "([^"]*)"$/ do |link|
-  click_link(link)
+  first(:link, link).click
 end
 
 When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|

data/features/support/http.rb

@@ -8,7 +8,7 @@ module HTTPHelpers
 
   def do_request(type, base_url, url, params)
     request_method = type.downcase.to_sym
-    send(request_method, "#{base_url}/#{url}", default_params.merge(params))
+    send(request_method, URI.join(base_url, url).to_s, default_params.merge(params))
   end
 
   protected

data/features/support/locales.rb

@@ -0,0 +1,5 @@
+Before do
+  # everything in English
+  I18n.locale = :en
+  Mongoid::Fields::I18n.locale = :en
+end

data/lib/generators/locomotive/install/install_generator.rb

@@ -16,15 +16,10 @@ module Locomotive
 
       template 'mongoid.yml', 'config/mongoid.yml'
     end
-    
-    def copy_migrations
-      rake("db:mongoid:migration:install")
-      rake("db:mongoid:migrate")
-    end
 
     def insert_engine_routes
       route %(
-  mount Locomotive::Engine => '/locomotive', :as => 'locomotive' # you can change the value of the path, by default set to "/locomotive"
+  mount Locomotive::Engine => '/locomotive', as: 'locomotive' # you can change the value of the path, by default set to "/locomotive"
       )
     end
 

data/lib/generators/locomotive/install/templates/carrierwave.rb

@@ -12,10 +12,10 @@ CarrierWave.configure do |config|
     # the following configuration works for Amazon S3
     config.storage          = :fog
     config.fog_credentials  = {
-      :provider                 => 'AWS',
-      :aws_access_key_id        => ENV['S3_KEY_ID'],
-      :aws_secret_access_key    => ENV['S3_SECRET_KEY'],
-      :region                   => ENV['S3_BUCKET_REGION']
+      provider:                 'AWS',
+      aws_access_key_id:        ENV['S3_KEY_ID'],
+      aws_secret_access_key:    ENV['S3_SECRET_KEY'],
+      region:                   ENV['S3_BUCKET_REGION']
     }
     config.fog_directory    = ENV['S3_BUCKET']
 

data/lib/generators/locomotive/install/templates/locomotive.rb

@@ -18,19 +18,24 @@ Locomotive.configure do |config|
 
   # configure how many items we display in sub menu in the "Contents" section.
   # config.ui = {
-  #   :latest_entries_nb => 5,
-  #   :max_content_types  => 4
+  #   latest_entries_nb:  5,
+  #   max_content_types:  4,
+  #   per_page:           10
   # }
 
-  # default locale (for now, only en, de, fr, pl, pt-BR, it and nb are supported)
+  # default locale (for now, only en, de, fr, pl, pt-BR, it, nb and ja are supported)
   config.default_locale = :en
 
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
-  # config.site_locales = %w{en de fr pl pt-BR it nl nb es ru}
+  # config.site_locales = %w{en de fr pl pt-BR it nl nb es ru ja}
 
   # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true
 
+  # Uncomment this line to force LocomotiveCMS to redirect all requests in the
+  # back-office to https in production.
+  # config.enable_admin_ssl = Rails.env.production?
+
   # configure the e-mail address which will be shown in the DeviseMailer, NotificationMailer, ...etc
   # if you do not put the domain name in the email, LocomotiveCMS will take the default domain name depending
   # on your deployment target (server, Heroku, Bushido, ...etc)
@@ -57,9 +62,9 @@ Locomotive.configure do |config|
 
   # Rack-cache settings, mainly used for the inline resizing image module. Default options:
   # config.rack_cache = {
-  #   :verbose     => true,
-  #   :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
-  #   :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
+  #   verbose:     true,
+  #   metastore:   URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
+  #   entitystore: URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
   # }
   # If you do want to disable it for good, just use the following syntax
   # config.rack_cache = false

data/lib/locomotive.rb

@@ -54,8 +54,8 @@ module Locomotive
 
     # cookies stored in mongodb (mongoid_store)
     Rails.application.config.session_store :mongoid_store, {
-      :key    => self.config.cookie_key,
-      :domain => :all
+      key:    self.config.cookie_key,
+      domain: :all
     }
 
     # add middlewares (dragonfly, font, seo, ...etc)
@@ -87,7 +87,7 @@ module Locomotive
       self.app_middleware.insert_before 'Dragonfly::Middleware', '::Locomotive::Middlewares::Cache', self.config.rack_cache
     end
 
-    self.app_middleware.insert_after 'Dragonfly::Middleware', '::Locomotive::Middlewares::Fonts', :path => %r{^/fonts}
+    self.app_middleware.insert_after 'Dragonfly::Middleware', '::Locomotive::Middlewares::Fonts', path: %r{^/fonts}
 
     self.app_middleware.use '::Locomotive::Middlewares::SeoTrailingSlash'
 
@@ -143,4 +143,4 @@ module Locomotive
     Rails.application.middleware
   end
 
-end
+end

data/lib/locomotive/action_controller.rb

@@ -1,5 +1,6 @@
 require 'locomotive/action_controller/locale_helpers'
 require 'locomotive/action_controller/section_helpers'
 require 'locomotive/action_controller/url_helpers'
+require 'locomotive/action_controller/ssl'
 require 'locomotive/action_controller/responder'
 require 'locomotive/action_controller/public_responder'

data/lib/locomotive/action_controller/responder.rb

@@ -15,9 +15,9 @@ module Locomotive
         ability         = current_site.nil? || current_account.nil? ? nil : self.controller.send(:current_ability)
 
         super.merge({
-          :current_site     => current_site,
-          :current_account  => current_account,
-          :ability          => ability
+          current_site:     current_site,
+          current_account:  current_account,
+          ability:          ability
         })
       end
 
@@ -26,23 +26,23 @@ module Locomotive
           display resource
         elsif has_errors?
           with_flash_message(:alert) do
-            display resource.errors, :status => :unprocessable_entity
+            display resource.errors, status: :unprocessable_entity
           end
         elsif post?
           in_header = controller.request.headers['X-Flash'] == 'true'
           with_flash_message(:notice, in_header) do
-            display resource, :location => api_location
+            display resource, location: api_location
           end
         elsif put?
           with_flash_message do |message|
-            display resource, :status => :ok, :location => api_location
+            display resource, status: :ok, location: api_location
           end
         elsif delete?
           with_flash_message do |message|
-            display resource, :status => :ok, :location => api_location
+            display resource, status: :ok, location: api_location
           end
         elsif has_empty_resource_definition?
-          display empty_resource, :status => :ok
+          display empty_resource, status: :ok
         else
           with_flash_message do
             head :ok
@@ -55,10 +55,9 @@ module Locomotive
       def with_flash_message(type = :notice, in_header = true)
         if in_header
           set_flash_message!
-          message = controller.flash[type]
+          message = URI::escape(controller.flash[type].to_str) if controller.flash[type] 
 
           unless message.blank?
-            # controller.headers['X-Message']       = message
             controller.headers['X-Message']       = ActiveSupport::JSON::Encoding.escape(message)
             controller.headers['X-Message-Type']  = type.to_s
           end

data/lib/locomotive/action_controller/section_helpers.rb

@@ -17,7 +17,7 @@ module Locomotive
         def sections(main, sub = nil)
           before_filter do |c|
             sub = sub.call(c) if sub.respond_to?(:call)
-            sections = { :main => main, :sub => sub }
+            sections = { main: main, sub: sub }
             c.instance_variable_set(:@locomotive_sections, sections)
           end
         end

data/lib/locomotive/action_controller/ssl.rb

@@ -0,0 +1,11 @@
+module Locomotive
+  module ActionController
+    module Ssl
+
+      def require_ssl
+        redirect_to protocol: 'https://' if Locomotive.config.enable_admin_ssl && !request.ssl?
+      end
+
+    end
+  end
+end

data/lib/locomotive/action_controller/url_helpers.rb

@@ -13,7 +13,7 @@ module Locomotive
       end
 
       def switch_to_site_url(site, options = {})
-        options = { :fullpath => true, :protocol => true }.merge(options)
+        options = { fullpath: true, protocol: true }.merge(options)
 
         url = "#{site.subdomain}.#{Locomotive.config.domain}"
         url += ":#{request.port}" if request.port != 80
@@ -24,12 +24,16 @@ module Locomotive
       end
 
       def public_page_url(page, options = {})
-        # Rails.logger.debug "[public_page_url] =====> #{page.attributes.inspect} / #{page.fullpath.inspect}\n\n"
+        # Rails.logger.debug "[public_page_url] =====> #{page.attributes.inspect} / #{page.fullpath.inspect} / #{current_site_public_url}\n\n"
+
+        locale    = options[:locale]
+        fullpath  = current_site.localized_page_fullpath(page, locale)
+
         if content = options.delete(:content)
-          File.join(current_site_public_url, page.fullpath.gsub('content_type_template', ''), content._slug)
-        else
-          File.join(current_site_public_url, page.fullpath)
+          fullpath = File.join(fullpath.gsub('content_type_template', ''), content._slug)
         end
+
+        File.join(current_site_public_url, fullpath)
       end
 
     end

data/lib/locomotive/carrierwave/asset.rb

@@ -20,12 +20,12 @@ module Locomotive
 
           def content_types
             {
-              :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg', 'image/x-icon'],
-              :media      => [/^video/, 'application/x-shockwave-flash', 'application/x-flash-video', 'application/x-swf', /^audio/, 'application/ogg', 'application/x-mp3'],
-              :pdf        => ['application/pdf', 'application/x-pdf'],
-              :stylesheet => ['text/css'],
-              :javascript => ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript', 'text/x-component'],
-              :font       => [/^application\/.*font/, 'application/x-font-ttf', 'application/vnd.ms-fontobject', 'image/svg+xml', 'application/x-woff', 'application/x-font-truetype', 'application/x-font-woff']
+              image:      ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg', 'image/x-icon'],
+              media:      [/^video/, 'application/x-shockwave-flash', 'application/x-flash-video', 'application/x-swf', /^audio/, 'application/ogg', 'application/x-mp3'],
+              pdf:        ['application/pdf', 'application/x-pdf'],
+              stylesheet: ['text/css'],
+              javascript: ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript', 'text/x-component'],
+              font:       [/^application\/.*font/, 'application/x-font-ttf', 'application/vnd.ms-fontobject', 'image/svg+xml', 'application/x-woff', 'application/x-font-truetype', 'application/x-font-woff']
             }
           end
 

data/lib/locomotive/configuration.rb

@@ -2,33 +2,35 @@ module Locomotive
   class Configuration
 
     @@defaults = {
-      :name                   => 'LocomotiveApp',
-      :domain                 => 'example.com',
-      :reserved_subdomains    => %w{www admin email blog webmail mail support help site sites},
-      # :forbidden_paths      => %w{layouts snippets stylesheets javascripts assets admin system api},
-      :reserved_slugs         => %w{stylesheets javascripts assets admin locomotive images api pages edit},
-      :locales                => %w{en de fr pl pt-BR it nl nb es ru et},
-      :site_locales           => %w{en de fr pl pt-BR it nl nb es ru et},
-      :cookie_key             => '_locomotive_session',
-      :enable_logs            => false,
-      :delayed_job            => false,
-      :default_locale         => :en,
-      :mailer_sender          => 'support@example.com',
-      :manage_subdomain       => false,
-      :manage_manage_domains  => false,
-      :ui                     => {
-        :latest_entries_nb    => 5,
-        :max_content_types    => 2
+      name:                   'LocomotiveApp',
+      domain:                 'example.com',
+      reserved_subdomains:    %w{www admin email blog webmail mail support help site sites},
+      # forbidden_paths:      %w{layouts snippets stylesheets javascripts assets admin system api},
+      reserved_slugs:         %w{stylesheets javascripts assets admin locomotive images api pages edit},
+      locales:                %w{en de fr pl pt-BR it nl nb es ru et ja},
+      site_locales:           %w{en de fr pl pt-BR it nl nb es ru et ja},
+      cookie_key:             '_locomotive_session',
+      enable_logs:            false,
+      enable_admin_ssl:       false,
+      delayed_job:            false,
+      default_locale:         :en,
+      mailer_sender:          'support@example.com',
+      manage_subdomain:       false,
+      manage_manage_domains:  false,
+      ui:                     {
+        latest_entries_nb:    5,
+        max_content_types:    2,
+        per_page:             10
       },
-      :rack_cache             => {
-        :verbose     => true,
-        :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
-        :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
+      rack_cache:             {
+        verbose:     true,
+        metastore:   URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
+        entitystore: URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
       },
-      :devise_modules             => [:rememberable, :database_authenticatable, :token_authenticatable, :recoverable, :trackable, :validatable, :encryptable, { :encryptor => :sha1 }],
-      :context_assign_extensions  => { },
-      :models_for_templatization  => [],
-      :csrf_protection            => false
+      devise_modules:             [:rememberable, :database_authenticatable, :token_authenticatable, :recoverable, :trackable, :validatable, :encryptable, { encryptor: :sha1 }],
+      context_assign_extensions:  { },
+      models_for_templatization:  [],
+      csrf_protection:            false
     }
 
     cattr_accessor :settings
@@ -123,4 +125,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/core_ext.rb

@@ -61,5 +61,4 @@ class Boolean #:nodoc
   def self.get(value)
     value
   end
-end
-
+end

data/lib/locomotive/custom_fields.rb

@@ -1,6 +1,6 @@
 # Custom options for CustomFields
 CustomFields.options = {
-  :reserved_names => Mongoid.destructive_fields + %w(created_at updated_at)
+  reserved_names: Mongoid.destructive_fields + %w(created_at updated_at)
 }
 
 module CustomFields
@@ -9,7 +9,7 @@ module CustomFields
 
     include Locomotive::Mongoid::Presenter
 
-    field :ui_enabled, :type => Boolean, :default => true
+    field :ui_enabled, type: Boolean, default: true
 
     def class_name_to_content_type
       self._parent.send :class_name_to_content_type, self.class_name
@@ -45,12 +45,19 @@ module CustomFields
         # we need to know the url of the file without breaking the upload process.
         # Actually, the uploaded file will be written on the filesystem after the email is sent.
         #
+        # @param [ String ] host Required to build the full url in the Filesystem is used (optional)
+        #
         # @return [ String ] The url to the soon uploaded file
         #
-        def guess_url
+        def guess_url(host = nil)
           this = self.class.new(model, mounted_as)
           this.retrieve_from_store!(model.read_uploader(mounted_as))
-          this.url.to_s
+
+          if this.url =~ /^http/ || host.blank?
+            this.url
+          else
+            URI.join("http://#{host}", this.url).to_s
+          end
         end
 
         def cache_dir
@@ -62,5 +69,4 @@ module CustomFields
     end
 
   end
-end
-
+end

data/lib/locomotive/dependencies.rb

@@ -21,6 +21,7 @@ require 'cancan'
 require 'cells'
 require 'sanitize'
 require 'stringex'
+require 'csv'
 
 require 'compass-rails'
 require 'codemirror/rails'

data/lib/locomotive/dragonfly.rb

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

data/lib/locomotive/engine.rb

@@ -16,14 +16,14 @@ module Locomotive
     end
 
     initializer 'locomotive.action_controller' do |app|
-      ::ActionController::Base.wrap_parameters :format => [:json]
+      ::ActionController::Base.wrap_parameters format: [:json]
     end
 
     initializer 'locomotive.devise' do |app|
       ::DeviseController.respond_to :html, :json
     end
 
-    initializer "locomotive.precompile.hook", :group => :all do |app|
+    initializer "locomotive.precompile.hook", group: :all do |app|
       app.config.assets.precompile += %w(
         locomotive.js
         locomotive.css
@@ -50,4 +50,4 @@ module Locomotive
     end
 
   end
-end
+end