locomotive_cms 2.0.0.rc12 → 2.0.0

data/lib/locomotive/carrierwave.rb

@@ -1,3 +1,5 @@
+require 'carrierwave/processing/mime_types'
+
 require 'locomotive/carrierwave/base'
 require 'locomotive/carrierwave/asset'
 require 'locomotive/carrierwave/patches'

data/lib/locomotive/carrierwave/asset.rb

@@ -5,9 +5,12 @@ module Locomotive
 
         extend ActiveSupport::Concern
 
-        included do
+        included do |base|
+
+          include ::CarrierWave::MimeTypes
 
           process :set_content_type
+          process :set_content_type_of_model
           process :set_size
           process :set_width_and_height
 
@@ -22,16 +25,19 @@ module Locomotive
               :pdf        => ['application/pdf', 'application/x-pdf'],
               :stylesheet => ['text/css'],
               :javascript => ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript', 'text/x-component'],
-              :font       => ['application/x-font-ttf', 'application/vnd.ms-fontobject', 'image/svg+xml', 'application/x-woff']
+              :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
 
         end
 
-        def set_content_type(*args)
-          value = :other
+        def set_content_type_of_model(*args)
+          value         = :other
+          content_type  = file.content_type
 
-          content_type = file.content_type == 'application/octet-stream' ? File.mime_type?(original_filename) : file.content_type
+          if content_type.blank? || content_type == 'application/octet-stream'
+            content_type = File.mime_type?(original_filename)
+          end
 
           self.class.content_types.each_pair do |type, rules|
             rules.each do |rule|
@@ -51,8 +57,12 @@ module Locomotive
 
         def set_width_and_height
           if model.image?
-            magick = ::Magick::Image.read(current_path).first
-            model.width, model.height = magick.columns, magick.rows
+            conf = Dragonfly.app.configuration
+            if conf[:identify_command] == conf[:convert_command]
+              Rails.logger.warn "WARNING: Old Dragonfly config detected, image uploads might be broken. Use 'rails g locomotive:install' to get the latest configuration files."
+            end
+            dragonfly_img = Dragonfly.app.fetch_file(current_path)
+            model.width, model.height = dragonfly_img.width, dragonfly_img.height
           end
         end
 

data/lib/locomotive/configuration.rb

@@ -7,8 +7,8 @@ module Locomotive
       :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 pt-BR it nl nb es ru et},
-      :site_locales           => %w{en de fr pt-BR it nl nb es ru et},
+      :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,
@@ -57,6 +57,10 @@ module Locomotive
       self.manage_subdomain? && self.manage_domains?
     end
 
+    def multi_sites_or_manage_domains?
+      self.multi_sites? || self.manage_domains?
+    end
+
     def reserved_subdomains
       if self.multi_sites?
         if self.multi_sites.reserved_subdomains.blank?

data/lib/locomotive/core_ext.rb

@@ -4,12 +4,13 @@
 
 class String #:nodoc
 
-  def permalink
-    self.to_ascii.parameterize('-')
+  def permalink(underscore = false)
+    permalink = self.to_url
+    underscore ? permalink.underscore : permalink
   end
 
-  def permalink!
-    replace(self.permalink)
+  def permalink!(underscore = false)
+    replace(self.permalink(underscore))
   end
 
   alias :parameterize! :permalink!

data/lib/locomotive/custom_fields.rb

@@ -6,12 +6,19 @@ CustomFields.options = {
 module CustomFields
 
   class Field
+
+    include Locomotive::Mongoid::Presenter
+
     field :ui_enabled, :type => Boolean, :default => true
 
     def class_name_to_content_type
       self._parent.send :class_name_to_content_type, self.class_name
     end
 
+    def self.presenter_class
+      Locomotive::ContentFieldPresenter
+    end
+
     protected
 
     def ensure_class_name_security
@@ -25,6 +32,10 @@ module CustomFields
 
       class FileUploader < ::CarrierWave::Uploader::Base
 
+        include ::CarrierWave::MimeTypes
+
+        process :set_content_type
+
         # Set correct paths
         def store_dir
           "sites/#{model.site_id}/content_#{model.class.model_name.demodulize.underscore}/#{model.id}/files"

data/lib/locomotive/dependencies.rb

@@ -1,6 +1,7 @@
 require 'mongoid'
 require 'mongoid/railtie'
 require 'mongoid/tree'
+require 'mongoid_migration'
 require 'devise'
 require 'devise/orm/mongoid'
 require 'devise-encryptable'
@@ -17,12 +18,11 @@ require 'httparty'
 require 'redcloth'
 require 'dragonfly'
 require 'cancan'
-require 'RMagick'
 require 'cells'
 require 'sanitize'
-require 'unidecoder'
+require 'stringex'
 
-require 'compass'
+require 'compass-rails'
 require 'codemirror/rails'
 require 'jquery/rails'
 require 'backbone-rails'

data/lib/locomotive/dragonfly.rb

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

data/lib/locomotive/engine.rb

@@ -8,6 +8,7 @@ module Locomotive
 
     isolate_namespace Locomotive
 
+    paths['mongodb/migrate'] = 'mongodb/migrate'
     # config.autoload_once_paths += %W( #{config.root}/app/controllers #{config.root}/app/models #{config.root}/app/helpers #{config.root}/app/uploaders)
 
     initializer 'locomotive.cells' do |app|
@@ -18,17 +19,32 @@ module Locomotive
       ::ActionController::Base.wrap_parameters :format => [:json]
     end
 
-    initializer "Locomotive precompile hook", :group => :all do |app|
-      app.config.assets.precompile += %w(locomotive.js locomotive.css locomotive/inline_editor.js locomotive/inline_editor.css
-      locomotive/not_logged_in.js locomotive/not_logged_in.css
-      locomotive/aloha.js)
+    initializer 'locomotive.devise' do |app|
+      ::DeviseController.respond_to :html, :json
+    end
+
+    initializer "locomotive.precompile.hook", :group => :all do |app|
+      app.config.assets.precompile += %w(
+        locomotive.js
+        locomotive.css
+        locomotive/inline_editor.js
+        locomotive/inline_editor.css
+        locomotive/not_logged_in.js
+        locomotive/not_logged_in.css
+        locomotive/aloha.js
+        tinymce/plugins/jqueryinlinepopups/editor_plugin.js
+        tinymce/plugins/locomotive_media/*.js
+        tinymce/plugins/locomotive_media/langs/*.js
+        tinymce/themes/advanced/skins/locomotive/*.css
+        aloha/plugins/custom/locomotive_media/**/*.js
+        aloha/plugins/custom/locomotive_media/**/*.css)
 
       # Uncomment the lines below to view the names of assets as they are
       # precompiled for the rails asset pipeline
-      #def compile_asset?(path)
-        #puts "Compiling: #{path}"
-        #true
-      #end
+      # def compile_asset?(path)
+      #   puts "Compiling: #{path}"
+      #   true
+      # end
 
       #app.config.assets.precompile = [ method(:compile_asset?).to_proc ]
     end

data/lib/locomotive/formtastic.rb

@@ -10,4 +10,29 @@ module Formtastic
       end
     end
   end
-end
+
+  # See: https://github.com/justinfrench/formtastic/issues/796
+  module Helpers
+    module InputHelper
+
+      def input_class_with_const_defined(as)
+        input_class_name = custom_input_class_name(as)
+
+        # get the parent module
+        module_class_name = input_class_name.deconstantize
+        module_class = module_class_name.blank? ? ::Object : module_class_name.constantize
+
+        # the input class name without the module part
+        input_class_name_wo_module = input_class_name.demodulize
+
+        if module_class.const_defined?(input_class_name_wo_module)
+          input_class_name.constantize
+        elsif Formtastic::Inputs.const_defined?(input_class_name)
+          standard_input_class_name(as).constantize
+        else
+          raise Formtastic::UnknownInputError, "Unable to find input class #{input_class_name}"
+        end
+      end
+    end
+  end
+end

data/lib/locomotive/liquid/drops/current_user.rb

@@ -1,4 +1,4 @@
-module Locomotive	
+module Locomotive
   module Liquid
     module Drops
       class CurrentUser < Base
@@ -7,7 +7,7 @@ module Locomotive
           _source.present?
         end
 
-	def name
+        def name
           _source.name if logged_in?
         end
 

data/lib/locomotive/liquid/drops/page.rb

@@ -3,7 +3,7 @@ module Locomotive
     module Drops
       class Page < Base
 
-        delegate :seo_title, :meta_keywords, :meta_description, :to => '_source'
+        delegate :seo_title, :meta_keywords, :meta_description, :redirect_url, :to => '_source'
 
         def title
           self._source.templatized? ? @context['entry']._label : self._source.title
@@ -41,6 +41,10 @@ module Locomotive
           self._source.published?
         end
 
+        def redirect?
+          self._source.redirect?
+        end
+
         def before_method(meth)
           self._source.editable_elements.where(:slug => meth).try(:first).try(:content)
         end

data/lib/locomotive/liquid/filters/date.rb

@@ -3,6 +3,14 @@ module Locomotive
     module Filters
       module Date
 
+        def distance_of_time_in_words(input, from_time = Time.now)
+          # make sure we deals with instances of Time
+          input     = to_time(input)
+          from_time = to_time(from_time)
+
+          ::ActionController::Base.helpers.distance_of_time_in_words(input, from_time)
+        end
+
         def localized_date(input, *args)
           return '' if input.blank?
 
@@ -27,6 +35,17 @@ module Locomotive
 
         alias :format_date :localized_date
 
+        private
+
+        def to_time(input)
+          case input
+          when Date   then input.to_time
+          when String then Time.parse(input)
+          else
+            input
+          end
+        end
+
       end
 
       ::Liquid::Template.register_filter(Date)

data/lib/locomotive/liquid/filters/html.rb

@@ -14,7 +14,7 @@ module Locomotive
           type  = options[:type] || Mime::Type.lookup_by_extension('rss').to_s
           title = options[:title] || 'RSS'
 
-          %{<link rel="#{rel}" type="#{type}" title="#{title}" href="#{input}" />}
+          %{<link rel="#{rel}" type="#{type}" title="#{title}" href="#{input}">}
         end
 
         # Write the url of a theme stylesheet
@@ -38,7 +38,7 @@ module Locomotive
 
           input = stylesheet_url(input)
 
-          %{<link href="#{input}" media="#{media}" rel="stylesheet" type="text/css" />}
+          %{<link href="#{input}" media="#{media}" rel="stylesheet" type="text/css">}
         end
 
         # Write the url to javascript resource
@@ -75,11 +75,11 @@ module Locomotive
 
         # Write a theme image tag
         # input: name of file including folder
-        # example: 'about/myphoto.jpg' | theme_image # <img src="images/about/myphoto.jpg" />
+        # example: 'about/myphoto.jpg' | theme_image # <img src="images/about/myphoto.jpg">
         def theme_image_tag(input, *args)
           image_options = inline_options(args_to_options(args))
 
-          "<img src=\"#{theme_image_url(input)}\" #{image_options}/>"
+          "<img src=\"#{theme_image_url(input)}\" #{image_options}>"
         end
 
         # Write an image tag
@@ -87,7 +87,7 @@ module Locomotive
         def image_tag(input, *args)
           image_options = inline_options(args_to_options(args))
 
-          "<img src=\"#{get_url_from_asset(input)}\" #{image_options}/>"
+          "<img src=\"#{get_url_from_asset(input)}\" #{image_options}>"
         end
 
         # Embed a flash movie into a page
@@ -99,8 +99,8 @@ module Locomotive
           embed_options = inline_options(args_to_options(args))
           %{
             <object #{embed_options}>
-              <param name="movie" value="#{path}" />
-              <embed src="#{path}" #{embed_options}/>
+              <param name="movie" value="#{path}">
+              <embed src="#{path}" #{embed_options}>
               </embed>
             </object>
           }.gsub(/ >/, '>').strip

data/lib/locomotive/liquid/filters/misc.rb

@@ -3,16 +3,14 @@ module Locomotive
     module Filters
       module Misc
 
-        def modulo(word, index, modulo)
+        # was called modulo at first
+        def str_modulo(word, index, modulo)
           (index.to_i + 1) % modulo == 0 ? word : ''
         end
 
-        def first(input)
-          input.first
-        end
-
-        def last(input)
-          input.last
+        # Get the nth element of the passed in array
+        def index(array, position)
+          array.at(position) if array.respond_to?(:at)
         end
 
         def default(input, value)

data/lib/locomotive/liquid/filters/text.rb

@@ -11,6 +11,7 @@ module Locomotive
           input.to_s.gsub(' ', '-').gsub('/', '-').dasherize
         end
 
+        # alias newline_to_br
         def multi_line(input)
           input.to_s.gsub("\n", '<br/>')
         end
@@ -21,6 +22,16 @@ module Locomotive
           result
         end
 
+        # right justify and padd a string
+        def rjust(input, integer, padstr = '')
+          input.to_s.rjust(integer, padstr)
+        end
+
+        # left justify and padd a string
+        def ljust(input, integer, padstr = '')
+          input.to_s.ljust(integer, padstr)
+        end
+
         def textile(input)
           ::RedCloth.new(input).to_html
         end

data/lib/locomotive/liquid/filters/translate.rb

@@ -0,0 +1,16 @@
+module Locomotive
+  module Liquid
+    module Filters
+      module Translate
+
+        def translate(input, locale = nil)
+          translation = Locomotive::Translation.where(key: input).first
+          translation.values[locale] || translation.values[I18n.locale.to_s]
+        end
+
+      end
+
+      ::Liquid::Template.register_filter(Translate)
+    end
+  end
+end

data/lib/locomotive/liquid/patches.rb

@@ -0,0 +1,21 @@
+module Liquid
+  module StandardFilters
+
+    private
+
+      # Fixme: Handle DateTime, Date and Time objects, convert them
+      # into seconds (integer)
+      def to_number(obj)
+        case obj
+        when Numeric
+          obj
+        when String
+          (obj.strip =~ /^\d+\.\d+$/) ? obj.to_f : obj.to_i
+        when DateTime, Date, Time
+          obj.to_time.to_i
+        else
+          0
+        end
+      end
+  end
+end