locomotive_cms 2.2.3 → 2.3.0

data/features/backoffice/pages.feature

@@ -12,6 +12,22 @@ Scenario: Pages list is not accessible for non authenticated accounts
   When I go to pages
   Then I should see "You need to sign in or sign up before continuing"
 
+Scenario: Templatized pages are avaiable to authors
+  Given I am not authenticated
+  And I am an authenticated "author"
+  And I have a custom model named "Articles" with
+      | label       | type      | required    |
+      | Title       | string    | true        |
+  And I have entries for "Articles" with
+    | title             |
+    | Hello world       |
+  And a templatized page for the "Articles" model and with the template:
+    """
+    Here is the title: "{{ article.title }}"
+    """
+  When I go to pages
+  Then I should see "Template for Articles"
+
 @javascript
 Scenario: Creating a valid page
   When I go to pages

data/features/backoffice/regressions.feature

@@ -0,0 +1,19 @@
+Feature: Specific tests to avoid bug regressions
+
+@javascript
+Scenario: Changing a field requiredness when the first field is a file (WTF)
+  Given I have the site: "test site" set up
+  And I have a custom model named "Projects" with
+    | label       | type        | required    | target  |
+    | Image       | file        | true        |         |
+    | Description | string      | true        |         |
+  And I am an authenticated user
+  Given I go to the list of "Projects"
+  And I follow "new entry" within the main content
+  Then I should see "Description*"
+  Given I go to the "Projects" model edition page
+  And I click on the 2nd required flag
+  And I press "Save"
+  And I wait 100ms
+  When I follow "new entry" within the main content
+  Then I should not see "Description*"

data/features/public/contact_form.feature

@@ -87,3 +87,12 @@ Feature: Contact form
     And I fill in "Message" with "LocomotiveCMS rocks"
     And I press "Submit"
     Then I should see "Email is required"
+
+  Scenario: Make sure to use the right locale
+    When I view the rendered page at "/contact"
+    And the locale of the current ruby thread changes to "fr"
+    And I fill in "E-Mail Address" with "did@locomotivecms.com"
+    And I fill in "Message" with "LocomotiveCMS rocks"
+    And I select "Code" from "Category"
+    And I press "Submit"
+    Then I should see "Thanks did@locomotivecms.com"

data/features/step_definitions/api_steps.rb

@@ -1,4 +1,3 @@
-
 def api_base_url
   "http://#{Locomotive::Site.first.domains.first}/locomotive/api/"
 end
@@ -159,6 +158,10 @@ Then /^the JSON at "([^"]*)" should match \/(.+)\/$/ do |path, regex|
   parse_json(last_json, path).should =~ /#{regex}/
 end
 
+Then /^the response content type should match \/(.+)\/$/ do |regex|
+  @json_response.header['Content-Type'].should =~ /#{regex}/
+end
+
 Then /^the JSON at "([^"]*)" should be the time "(.+)"$/ do |path, time_str|
   format = '%Y-%m-%dT%H:%M:%S%Z'
   json_time_str = parse_json(last_json, path)

data/features/step_definitions/content_types_steps.rb

@@ -122,3 +122,8 @@ Then %r{^there should not be any notified accounts on the "([^"]*)" model$} do |
   content_type = Locomotive::ContentType.where(name: name).first
   content_type.reload.public_submission_accounts.should eq([])
 end
+
+Given(/^I click on the (\d+)[a-z]+ required flag$/) do |nth|
+  find(".custom-field:nth-child(#{nth}) .required-input .switchHandle").click
+  sleep(0.1)
+end

data/features/step_definitions/more_web_steps.rb

@@ -1,3 +1,7 @@
+When(/^the locale of the current ruby thread changes to "(.*?)"$/) do |locale|
+  ::I18n.locale = ::Mongoid::Fields::I18n.locale = 'fr'
+end
+
 When /^I follow image link "([^"]*)"$/ do |img_alt|
   find(:xpath, "//img[@alt = '#{img_alt}']/parent::a").click()
 end

data/features/step_definitions/web_steps.rb

@@ -212,3 +212,7 @@ end
 Then /^show me the page$/ do
   save_and_open_page
 end
+
+Then(/^I click on "(.*?)"$/) do |selector|
+  find(selector).click
+end

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

@@ -23,11 +23,11 @@ Locomotive.configure do |config|
   #   per_page:           10
   # }
 
-  # default locale (for now, only en, de, fr, pl, pt-BR, it, nb, ja and zh-CN are supported)
+  # default locale (for now, only en, de, fr, pl, pt-BR, it, nb, ja, zh-CN, cs and bg 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 ja zh-CN}
+  # config.site_locales = %w{en de fr pl pt-BR it nl nb es ru ja zh-CN cs bg}
 
   # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true

data/lib/locomotive.rb

@@ -7,6 +7,7 @@ require 'locomotive/haml'
 require 'locomotive/formtastic'
 require 'locomotive/dragonfly'
 require 'locomotive/kaminari'
+require 'locomotive/markdown'
 require 'locomotive/liquid'
 require 'locomotive/presentable'
 require 'locomotive/mongoid'
@@ -61,14 +62,6 @@ module Locomotive
     # add middlewares (dragonfly, font, seo, ...etc)
     self.add_middlewares
 
-    # Load all the dynamic classes (custom fields)
-    begin
-      ContentType.all.collect { |content_type| content_type.klass_with_custom_fields(:entries) }
-    rescue Exception => e
-      # let assume it's because of the first install (meaning no config.yml file)
-      Locomotive.log :warn, "WARNING: unable to load the content types, #{e.message}"
-    end
-
     # enable the hosting solution if both we are not in test or dev and that the config.hosting option has been filled up
     self.enable_hosting
 

data/lib/locomotive/action_controller.rb

@@ -2,5 +2,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/timezone'
 require 'locomotive/action_controller/responder'
 require 'locomotive/action_controller/public_responder'

data/lib/locomotive/action_controller/ssl.rb

@@ -3,9 +3,18 @@ module Locomotive
     module Ssl
 
       def require_ssl
-        redirect_to protocol: 'https://' if Locomotive.config.enable_admin_ssl && !request.ssl?
+        # already a ssl request or ssl disabled ?
+        return if !Locomotive.config.enable_admin_ssl || request.ssl?
+
+        # only require ssl for requests for the main domain
+        if !Locomotive.config.multi_sites? || Locomotive.config.multi_sites.domain == request.domain
+          redirect_to protocol: 'https://'
+        end
+
+        true
       end
 
     end
   end
-end
+end
+

data/lib/locomotive/action_controller/timezone.rb

@@ -0,0 +1,13 @@
+module Locomotive
+  module ActionController
+    module Timezone
+
+      protected
+
+      def set_timezone(&block)
+        Time.use_zone(current_site.try(:timezone) || 'UTC', &block)
+      end
+
+    end
+  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 pl pt-BR it nl nb es ru et ja zh-CN},
-      site_locales:           %w{en de fr pl pt-BR it nl nb es ru et ja zh-CN},
+      locales:                %w{en de fr pl pt-BR it nl nb es ru et ja zh-CN cs bg},
+      site_locales:           %w{en de fr pl pt-BR it nl nb es ru et ja zh-CN cs bg},
       cookie_key:             '_locomotive_session',
       enable_logs:            false,
       enable_admin_ssl:       false,

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(id _id send created_at updated_at)
 }
 
 module CustomFields

data/lib/locomotive/dependencies.rb

@@ -9,6 +9,7 @@ require 'devise-encryptable'
 require 'kaminari'
 require 'haml'
 require 'liquid'
+require 'solid'
 require 'formtastic'
 require 'responders'
 require 'carrierwave'
@@ -17,6 +18,7 @@ require 'mimetype_fu'
 require 'actionmailer_with_request'
 require 'httparty'
 require 'redcloth'
+require 'redcarpet'
 require 'dragonfly'
 require 'cancan'
 require 'cells'

data/lib/locomotive/engine.rb

@@ -11,6 +11,16 @@ module 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.content_types' do |app|
+      # Load all the dynamic classes (custom fields)
+      begin
+        ContentType.all.collect { |content_type| content_type.klass_with_custom_fields(:entries) }
+      rescue Exception => e
+        # let assume it's because of the first install (meaning no config.yml file)
+        Locomotive.log :warn, "WARNING: unable to load the content types, #{e.message}"
+      end
+    end
+
     initializer 'locomotive.cells' do |app|
       Cell::Base.prepend_view_path("#{config.root}/app/cells")
     end

data/lib/locomotive/httparty/webservice.rb

@@ -23,13 +23,14 @@ module Locomotive
 
         # puts "[WebService] consuming #{path}, #{options.inspect}"
 
-        response = self.get(path, options)
+        response        = self.get(path, options)
+        parsed_response = response.parsed_response
 
         if response.code == 200
-          if response.respond_to?(:underscore_keys)
-            response.underscore_keys
+          if parsed_response.respond_to?(:underscore_keys)
+            parsed_response.underscore_keys
           else
-            response.collect(&:underscore_keys)
+            parsed_response.collect(&:underscore_keys)
           end
         else
           nil
@@ -39,4 +40,4 @@ module Locomotive
 
     end
   end
-end
+end

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

@@ -6,8 +6,6 @@ module Locomotive
 
         @@forbidden_attributes = %w{_id _version _index}
 
-        attr_reader :_source
-
         def initialize(source)
           @_source = source
         end

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

@@ -3,14 +3,14 @@ module Locomotive
     module Drops
       class ContentEntry < Base
 
-        delegate :_slug, :_permalink, :seo_title, :meta_keywords, :meta_description, to: '_source'
+        delegate :_slug, :_permalink, :seo_title, :meta_keywords, :meta_description, to: :@_source
 
         def _id
-          self._source._id.to_s
+          @_source._id.to_s
         end
 
         def _label
-          @_label ||= self._source._label
+          @_label ||= @_source._label
         end
 
         # Returns the next content for the parent content type.
@@ -23,7 +23,7 @@ module Locomotive
         # {% endif %}
         #
         def next
-          @next ||= self._source.next.to_liquid
+          @next ||= @_source.next.to_liquid
         end
 
         # Returns the previous content for the parent content type.
@@ -36,14 +36,18 @@ module Locomotive
         # {% endif %}
         #
         def previous
-          @previous ||= self._source.previous.to_liquid
+          @previous ||= @_source.previous.to_liquid
+        end
+
+        def errors
+          @_source.errors.messages.to_hash.stringify_keys
         end
 
         def before_method(meth)
-          return '' if self._source.nil?
+          return '' if @_source.nil?
 
           if not @@forbidden_attributes.include?(meth.to_s)
-            value = self._source.send(meth)
+            value = @_source.send(meth)
 
             if value.respond_to?(:all) # check for an association
               filter_and_order_list(value)

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

@@ -48,45 +48,61 @@ module Locomotive
           @collection ||= @content_type.ordered_entries(@context['with_scope']).visible
         end
 
+        # Modify the attributes of the with_scope tag so that
+        # they can be resolved by MongoDB.
+        #
         def modify_with_scope
-          fields = @content_type.ordered_custom_fields(:entries)
-
           @context['with_scope'].dup.each do |key, value|
-            if relation = self.relation_with(key)
-              # belongs_to, has_many, many_to_many relationships: use the _id
-              self.modify_with_scope_with_relation(key, value, relation)
-            elsif field = fields.detect { |f| f.name == key && f.type == 'select' }
-              # use the id of the option instead of the name
-              self.modify_with_scope_with_select(key, value, field)
+            field = @content_type.find_entries_custom_field(key.to_s)
+
+            next if field.nil?
+
+            case field.type.to_sym
+            when :belongs_to
+              self.modify_with_scope_key(key, "#{key.to_s}_id", self.object_to_id(field, value))
+            when :many_to_many
+              self.modify_with_scope_key(key, "#{key.to_s.singularize}_ids", self.object_to_id(field, value))
+            when :select
+              option = field.select_options.detect { |option| [option.name, option._id.to_s].include?(value) }
+              self.modify_with_scope_key(key, "#{key.to_s}_id", option.try(:_id))
             end
           end
         end
 
-        def modify_with_scope_with_relation(key, value, relation)
-          model = Locomotive::ContentType.class_name_to_content_type(relation.class_name, @context.registers[:site])
-          entry = model.entries.where(model.label_field_name => value).first
-
-          # modify the scope
-          @context['with_scope'].delete(key)
-          @context['with_scope'][relation.key] = entry
-        end
-
-        def relation_with(name)
-          @relations ||= @content_type.klass_with_custom_fields(:entries).relations
-
-          if @relations.keys.include?(name.to_s)
-            @relations[name]
-          elsif @relations.keys.include?(name.to_s.pluralize)
-            @relations[name.to_s.pluralize]
+        # Change the value of a key of the with_scope depending of its type.
+        # If the key is a Origin::Key, we only change the name.
+        # If the key is a String, we replace it.
+        #
+        # @param [ Object ] key Either a String or a Origin::Key
+        # @param [ String ] name The new name of the key
+        # @param [ String ] value The new value associated to the key
+        #
+        def modify_with_scope_key(key, name, value)
+          if key.respond_to?(:operator)
+            key.instance_variable_set :@name, name
+            @context['with_scope'][key] = value
+          else
+            @context['with_scope'].delete(key)
+            @context['with_scope'][name] = value
           end
         end
 
-        def modify_with_scope_with_select(key, value, field)
-          option = field.select_options.detect { |option| [option.name, option._id.to_s].include?(value) }
-
-          # modify the scope
-          @context['with_scope'].delete(key)
-          @context['with_scope']["#{key}_id"] = option.try(:_id)
+        # Get the _id attribute of a object or a list of objects which
+        # can include String (needed to retrieve a model
+        # based on its permalink or its label field) or ContentEntry instances.
+        #
+        # @param [ Object ] field The custom field
+        # @param [ Object ] value An object (content entry or label) or a list of objects
+        #
+        def object_to_id(field, value)
+          if value.respond_to?(:map)
+            value.map { |el| self.object_to_id(field, el) }
+          elsif value.respond_to?(:_id)
+            value._id
+          else
+            model = Locomotive::ContentType.class_name_to_content_type(field.class_name, @content_type.site)
+            model.entries.or({ _slug: value }, { model.label_field_name => value }).first.try(:_id)
+          end
         end
 
       end

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

@@ -4,15 +4,15 @@ module Locomotive
       class CurrentUser < Base
 
         def logged_in?
-          _source.present?
+          @_source.present?
         end
 
         def name
-          _source.name if logged_in?
+          @_source.name if logged_in?
         end
 
         def email
-          _source.email if logged_in?
+          @_source.email if logged_in?
         end
 
       end

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

@@ -3,62 +3,62 @@ module Locomotive
     module Drops
       class Page < Base
 
-        delegate :seo_title, :meta_keywords, :meta_description, :redirect_url, :handle, to: '_source'
+        delegate :seo_title, :meta_keywords, :meta_description, :redirect_url, :handle, to: :@_source
 
         def title
-          self._source.templatized? ? @context['entry']._label : self._source.title
+          @_source.templatized? ? @context['entry']._label : @_source.title
         end
 
         def slug
-          self._source.templatized? ? @context['entry']._slug.singularize : self._source.slug
+          @_source.templatized? ? @context['entry']._slug.singularize : @_source.slug
         end
 
         def parent
-          @parent ||= self._source.parent.to_liquid
+          @parent ||= @_source.parent.to_liquid
         end
 
         def breadcrumbs
-          @breadcrumbs ||= liquify(*self._source.ancestors_and_self)
+          @breadcrumbs ||= liquify(*@_source.ancestors_and_self)
         end
 
         def children
-          @children ||= liquify(*self._source.children)
+          @children ||= liquify(*@_source.children)
         end
 
         def fullpath
-          @fullpath ||= self._source.fullpath
+          @fullpath ||= @_source.fullpath
         end
 
         def depth
-          self._source.depth
+          @_source.depth
         end
 
         def listed?
-          self._source.listed?
+          @_source.listed?
         end
 
         def published?
-          self._source.published?
+          @_source.published?
         end
 
         def redirect?
-          self._source.redirect?
+          @_source.redirect?
         end
 
         def templatized?
-          self._source.templatized?
+          @_source.templatized?
         end
 
         def content_type
-          if self._source.content_type
-            ContentTypeProxyCollection.new(self._source.content_type)
+          if @_source.content_type
+            ContentTypeProxyCollection.new(@_source.content_type)
           else
             nil
           end
         end
 
         def before_method(meth)
-          self._source.editable_elements.where(slug: meth).try(:first).try(:content)
+          @_source.editable_elements.where(slug: meth).try(:first).try(:content)
         end
 
       end