locomotive_cms 2.1.4 → 2.2.0

data/features/backoffice/content_types/localized.feature

@@ -0,0 +1,63 @@
+Feature: Localized Content Entries
+  As an editor
+  In order to manage translations of custom content entries
+  I want to edit localized fields of custom contents of my site
+
+Background:
+  Given I have the site: "test site" set up with name: "test site"
+  And the site "test site" has locales "en, de"
+  And I have a custom model named "Proverbs" with
+    | label       | type        | required    | localized   |
+    | Proverb     | string      | true        | true        |
+    | Author      | string      | false       | false       |
+  And I have entries for "Proverbs" with
+    | proverb                   | author    |
+    | Jump on the bandwagon     | John      |
+  And I am an authenticated user
+
+Scenario: See original entry in list
+  When I go to the list of "Proverbs"
+  Then I should see "Jump on the bandwagon"
+  And I should not see "untranslated"
+
+@javascript
+Scenario: See untranslated entry in list
+  When I switch the locale to "de"
+  And I go to the list of "Proverbs"
+  Then I should see "Jump on the bandwagon"
+  And I should see "untranslated"
+
+Scenario: See original entry details
+  When I go to the list of "Proverbs"
+  And I follow "Jump on the bandwagon" within the main content
+  Then the "Proverb" field should contain "Jump on the bandwagon"
+  And the "Author" field should contain "John"
+
+@javascript
+Scenario: See untranslated entry details
+  When I switch the locale to "de"
+  And I go to the list of "Proverbs"
+  And I follow "Jump on the bandwagon" within the main content
+  Then the "Proverb" field should contain "Jump on the bandwagon"
+  And the "Author" field should contain "John"
+
+@javascript
+Scenario: Translate entry
+  When I switch the locale to "de"
+  And I go to the list of "Proverbs"
+  And I follow "Jump on the bandwagon" within the main content
+  
+  When I fill in "Proverb" with "Auf einen fahrenden Zug aufspringen"
+  And I press "Save" within the main form
+  Then I should see "Entry was successfully updated."
+  
+  When I go to the list of "Proverbs"
+  Then I should see "Auf einen fahrenden Zug aufspringen"
+  And I should not see "Jump on the bandwagon"
+  And I should not see "untranslated"
+  
+  When I switch the locale to "en"
+  And I go to the list of "Proverbs"
+  Then I should not see "Auf einen fahrenden Zug aufspringen"
+  And I should see "Jump on the bandwagon"
+  And I should not see "untranslated"

data/features/backoffice/pages.feature

@@ -4,7 +4,7 @@ Feature: Manage Pages
   I want to add/edit/delete pages of my site
 
 Background:
-  Given I have the site: "test site" set up with name: "test site"
+  Given I have the site: "test site" set up with name: "test site", timezone_name: "Paris"
   And I am an authenticated user
 
 Scenario: Pages list is not accessible for non authenticated accounts
@@ -32,6 +32,8 @@ Scenario: Updating a valid page
   And I change the page template to "My new content is here"
   And I press "Save"
   Then I should see "Page was successfully updated."
+  Then I go to pages
+  And updated_at of the index page should respect site's timezone
   And I should have "My new content is here" in the index page
 
 @javascript

data/features/backoffice/site.feature

@@ -32,6 +32,13 @@ Scenario: Add a new site with chosen locale
   When I press "Create"
   Then I should see "Site was successfully created." in the html code
 
+Scenario: Change timezone of site
+  Given I am an authenticated user
+  When I go to the site settings
+  And I select "(GMT+04:00) Moscow" from "Timezone"
+  Then I press "Save"
+  Then I should see "My site was successfully updated." in the html code
+
 @javascript
 Scenario: Adding a domain to a site
   Given I am an authenticated user

data/features/public/contact_form.feature

@@ -10,6 +10,8 @@ Feature: Contact form
       | label       | type      | required    |
       | Email       | string    | true        |
       | Message     | text      | true        |
+      | Category    | select    | true        |
+    And I have "Design, Code, Business" as "Category" values of the "Messages" model
     And I enable the public submission of the "Messages" model
     And a page named "contact" with the template:
       """
@@ -23,6 +25,13 @@ Feature: Contact form
             <label for="email">E-Mail Address</label>
             <input type="text" id="email" name="content[email]" />
             {% if message.errors.email %}Email is required{% endif %}
+            <label for="category">Category</label>
+            <select id="category" name="content[category]">
+              <option value=""></option>
+              {% for name in contents.messages.category_options %}
+              <option value="{{ name }}">{{ name }}</option>
+              {% endfor %}
+            </select>
             <label for="message">Message</label>
             <textarea name="content[message]" id="message"></textarea>
             <input name="submit" type="submit" id="submit" value="Submit" />
@@ -54,6 +63,7 @@ Feature: Contact form
     When I view the rendered page at "/contact"
     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"
 
@@ -68,6 +78,7 @@ Feature: Contact form
     And I view the rendered page at "/contact"
     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/public/content_entries.feature

@@ -53,4 +53,17 @@ Scenario: Filter by a date
   Then the rendered output should look like:
     """
     Lorem ipsum, Yadi Yada
+    """
+    
+Scenario: Filter with regexp
+  Given a page named "my-articles" with the template:
+    """
+    {% with_scope title: /ello|adi/ %}
+    {% for article in contents.articles %}{{ article.title }}, {% endfor %}
+    {% endwith_scope %}
+    """
+  When I view the rendered page at "/my-articles"
+  Then the rendered output should look like:
+    """
+    Hello world, Yadi Yada
     """

data/features/public/pages.feature

@@ -67,6 +67,30 @@ Scenario: link_to tag
       <i class="icon-info-sign"></i> Acerca de
     </a>
     """
+
+Scenario: link_to templatized page
+  Given 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 }}"
+    """
+  And a page named "page-with-links" with the template:
+    """
+    {% for article in contents.articles %}
+      Link to article: {% link_to article %}
+    {% endfor %}
+    """
+  When I view the rendered page at "/page-with-links"
+  And I follow "Hello world"
+  Then the rendered output should look like:
+  """
+  Here is the title: "Hello world"
+  """
     
 Scenario: Default locale fallback
   Given the site "test site" has locales "en, es"

data/features/step_definitions/page_steps.rb

@@ -124,4 +124,10 @@ Then /^I should not see delete page buttons$/ do
   page.has_css?("ul#pages-list li .more a.remove").should be_false
 end
 
+Then /^updated_at of the (.*) page should respect site's timezone$/ do |slug|
+  edited_page = @site.pages.where(slug: slug).first
+  t = edited_page.updated_at.in_time_zone(@site.timezone)
+  page.source.should =~ /#{t.strftime('%-d %b %H:%M')}/
+end
+
 

data/features/step_definitions/web_steps.rb

@@ -44,11 +44,11 @@ When /^(?:|I )follow "([^"]*)"$/ do |link|
 end
 
 When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 # Use this to fill in an entire form with data from a table. Example:
@@ -69,7 +69,24 @@ When /^(?:|I )fill in the following:$/ do |fields|
 end
 
 When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, :from => field)
+  begin
+    select(value, from: field)
+  rescue Capybara::ElementNotFound
+    container = find('.select2', text: field)
+    container.find('a').click
+    find(:css, 'input.select2-input').set(value.first)
+    page.has_css?('ul.select2-results li.select2-result', visible: true)
+    clicked = false
+    page.all('ul.select2-results li.select2-result').each do |e|
+      if e.text == value
+        e.click
+        clicked = true
+        break
+      end
+    end
+    find('.select2-drop').click unless clicked
+    page.has_no_css?("ul.select2-results li.select2-result", visible: true)
+  end
 end
 
 When /^(?:|I )check "([^"]*)"$/ do |field|
@@ -100,9 +117,9 @@ Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
 
   if page.respond_to? :should
-    page.should have_xpath('//*', :text => regexp)
+    page.should have_xpath('//*', text: regexp)
   else
-    assert page.has_xpath?('//*', :text => regexp)
+    assert page.has_xpath?('//*', text: regexp)
   end
 end
 
@@ -118,9 +135,9 @@ Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
 
   if page.respond_to? :should
-    page.should have_no_xpath('//*', :text => regexp)
+    page.should have_no_xpath('//*', text: regexp)
   else
-    assert page.has_no_xpath?('//*', :text => regexp)
+    assert page.has_no_xpath?('//*', text: regexp)
   end
 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 and ja are supported)
+  # default locale (for now, only en, de, fr, pl, pt-BR, it, nb, ja and zh-CN 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}
+  # config.site_locales = %w{en de fr pl pt-BR it nl nb es ru ja zh-CN}
 
   # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true

data/lib/generators/locomotive/install/templates/mongoid.yml

@@ -1,34 +1,28 @@
-defaults: &defaults
-  host: localhost
-  port: 27017
-  # slaves:
-  #   - host: slave1.local
-  #     port: 27018
-  #   - host: slave2.local
-  #     port: 27019
-
 development:
-  <<: *defaults
-  database: locomotive_dev
+  sessions:
+    default:
+      database: locomotive_dev
+      hosts:
+        - localhost:27017
+  options:
+    identity_map_enabled: true
 
 test:
-  <<: *defaults
-  database: locomotive_test
+  sessions:
+    default:
+      database: locomotive_test
+      hosts:
+        - localhost:27017
+  options:
+    identity_map_enabled: true
 
-# set these environment variables on your prod server
 production:
-  # <<: *defaults
-  # database: locomotive_prod
-
-  # other settings for production
-  # host: <%%= ENV['MONGOID_HOST'] %>
-  # port: <%%= ENV['MONGOID_PORT'] %>
-  # username: <%%= ENV['MONGOID_USERNAME'] %>
-  # password: <%%= ENV['MONGOID_PASSWORD'] %>
-  # database: <%%= ENV['MONGOID_DATABASE'] %>
-
-  # heroku
-  # uri: <%%= ENV['MONGOHQ_URL'] %>
-
-  # bushido (mongohq_url will also work)
-  uri: <%%= ENV['MONGODB_URL'] %>
+  sessions:
+    default:
+      database: locomotive_production
+      # heroku
+      # uri: <%%= ENV['MONGOHQ_URL'] %>
+      hosts:
+        - localhost:27017
+  options:
+    identity_map_enabled: true

data/lib/locomotive.rb

@@ -20,7 +20,6 @@ require 'locomotive/cancan'
 require 'locomotive/regexps'
 require 'locomotive/render'
 require 'locomotive/middlewares'
-require 'locomotive/session_store'
 
 module Locomotive
   extend ActiveSupport::Autoload
@@ -89,8 +88,6 @@ 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.use '::Locomotive::Middlewares::SeoTrailingSlash'
 
     self.app_middleware.use '::Locomotive::Middlewares::InlineEditor'
@@ -145,4 +142,4 @@ module Locomotive
     Rails.application.middleware
   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},
-      site_locales:           %w{en de fr pl pt-BR it nl nb es ru et ja},
+      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},
       cookie_key:             '_locomotive_session',
       enable_logs:            false,
       enable_admin_ssl:       false,
@@ -125,4 +125,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/dependencies.rb

@@ -2,6 +2,7 @@ require 'mongoid'
 require 'mongoid/railtie'
 require 'mongoid/tree'
 require 'mongoid_migration'
+require 'mongo_session_store-rails3'
 require 'devise'
 require 'devise/orm/mongoid'
 require 'devise-encryptable'

data/lib/locomotive/engine.rb

@@ -37,7 +37,8 @@ module Locomotive
         tinymce/plugins/locomotive_media/langs/*.js
         tinymce/themes/advanced/skins/locomotive/*.css
         aloha/plugins/custom/locomotive_media/**/*.js
-        aloha/plugins/custom/locomotive_media/**/*.css)
+        aloha/plugins/custom/inputcontrol/**/*.css
+        aloha/plugins/custom/inputcontrol/**/*.js)
 
       # Uncomment the lines below to view the names of assets as they are
       # precompiled for the rails asset pipeline

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, :redirect_url, 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

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

@@ -2,7 +2,7 @@ module Locomotive
   module Liquid
     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)
@@ -30,6 +30,8 @@ module Locomotive
 
           return input.to_s unless input.respond_to?(:strftime)
 
+          input = input.in_time_zone(@context.registers[:site].timezone) if input.respond_to?(:in_time_zone)
+          
           I18n.l input, format: format, locale: locale
         end
 

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

@@ -56,6 +56,10 @@ module Locomotive
             </div>}
         end
 
+        def random(input)
+          rand(input.to_i)
+        end
+
       end
 
       ::Liquid::Template.register_filter(Misc)

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

@@ -11,6 +11,10 @@ module Locomotive
           input.to_s.gsub(' ', '-').gsub('/', '-').dasherize
         end
 
+        def encode(input)
+          Rack::Utils.escape(input)
+        end
+
         # alias newline_to_br
         def multi_line(input)
           input.to_s.gsub("\n", '<br/>')

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

@@ -1,5 +1,4 @@
 require 'locomotive/liquid/tags/editable/base'
-require 'locomotive/liquid/tags/editable/short_text'
-require 'locomotive/liquid/tags/editable/long_text'
+require 'locomotive/liquid/tags/editable/text'
 require 'locomotive/liquid/tags/editable/file'
 require 'locomotive/liquid/tags/editable/control'