locomotive_cms 2.0.0.rc12 → 2.0.0

data/features/step_definitions/within_steps.rb

@@ -0,0 +1,14 @@
+# http://mislav.uniqpath.com/2010/09/cuking-it-right/
+
+{
+  # 'as a movie title in the results' => 'ol.movies h1',
+  # 'in a button' => 'button, input[type=submit]',
+  # 'in the navigation' => 'nav'
+}.
+each do |within, selector|
+  Then /^(.+) #{within}$/ do |step|
+    with_scope(selector) do
+      Then step
+    end
+  end
+end

data/features/support/cleaner.rb

@@ -0,0 +1,4 @@
+require 'database_cleaner'
+DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.orm = "mongoid"
+Before{ DatabaseCleaner.clean }

data/features/support/env.rb

@@ -0,0 +1,82 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+ENV['RAILS_ENV']  ||= 'test'
+ENV["RAILS_ROOT"] ||= File.join(File.dirname(__FILE__), '../', '../', 'spec', 'dummy')
+
+require 'cucumber/rails'
+require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
+require 'cucumber/rails/rspec'
+require 'cucumber/rails/world'
+
+require 'factory_girl'
+
+require 'capybara'
+require 'capybara/rails'
+require 'capybara/cucumber'
+require 'capybara/session'
+require 'capybara/poltergeist'
+
+require 'json_spec/cucumber'
+
+require 'resolv'
+require 'uri'
+
+def ensure_host_resolution(app_host)
+  hosts = Resolv::Hosts.new
+  app_host_name = URI.parse(app_host).host
+  begin
+    hosts.getaddress(app_host_name)
+  rescue Resolv::ResolvError
+    raise "Unable to resolve ip address for #{app_host_name}. Please consider adding an entry to '/etc/hosts' that associates #{app_host_name} with '127.0.0.1'."
+  end
+end
+
+JsonSpec.configure do
+  exclude_keys "id", "_id", "created_at", "updated_at"
+end
+
+Capybara.configure do |config|
+  config.default_selector   = :css
+  config.server_port        = 9886
+  config.app_host           = 'http://test.example.com:9886'
+
+  ensure_host_resolution(config.app_host)
+end
+
+Capybara.default_wait_time = 5
+
+Capybara.javascript_driver = :poltergeist
+
+# Stop endless errors like
+# ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16:
+# warning: regexp match /.../n against to UTF-8 string
+# more information here: https://github.com/jnicklas/capybara/issues/243
+$VERBOSE = nil
+
+# By default, any exception happening in your Rails application will bubble up
+# to Cucumber so that your scenario will fail. This is a different from how
+# your application behaves in the production environment, where an error page will
+# be rendered instead.
+#
+# Sometimes we want to override this default behaviour and allow Rails to rescue
+# exceptions and display an error page (just like when the app is running in production).
+# Typical scenarios where you want to do this is when you test your error pages.
+# There are two ways to allow Rails to rescue exceptions:
+#
+# 1) Tag your scenario (or feature) with @allow-rescue
+#
+# 2) Set the value below to true. Beware that doing this globally is not
+# recommended as it will mask a lot of errors for you!
+#
+ActionController::Base.allow_rescue = false
+
+require File.expand_path(File.dirname(__FILE__) + '/../../spec/support/carrierwave')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec/support/locomotive')
+
+World(Locomotive::Engine.routes.url_helpers) # Load engine routes
+
+Locomotive.configure_for_test(true)

data/features/support/factory_girl.rb

@@ -0,0 +1,2 @@
+require 'factory_girl'
+

data/features/support/http.rb

@@ -0,0 +1,22 @@
+module HTTPHelpers
+
+  attr_accessor :default_params
+
+  def add_default_params(params)
+    default_params.merge!(params)
+  end
+
+  def do_request(type, base_url, url, params)
+    request_method = type.downcase.to_sym
+    send(request_method, "#{base_url}/#{url}", default_params.merge(params))
+  end
+
+  protected
+
+  def default_params
+    @default_params ||= {}
+  end
+
+end
+
+World(HTTPHelpers)

data/features/support/paths.rb

@@ -0,0 +1,62 @@
+module NavigationHelpers
+  include Locomotive::Engine.routes.url_helpers # Load engine routes
+
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in web_steps.rb
+  #
+  def path_to(page_name)
+    case page_name
+
+    when /the home\s?page$/
+      '/'
+    when /login/
+      new_locomotive_account_session_path
+    when /logout/
+      destroy_locomotive_account_session_url
+    when /pages( list)?/
+      pages_path
+    when /new page/
+      new_page_path
+    when /"(.*)" edition page/
+      page = Locomotive::Site.first.pages.where(:slug => $1).first
+      edit_page_path(page)
+    when /theme assets/
+      theme_assets_path
+    when /translations/
+      translations_path
+    when /site settings/
+      edit_current_site_path
+    when /account settings/
+      edit_my_account_path
+    when /the list of "(.*)"/
+      content_type = Locomotive::Site.first.content_types.where(:name => $1).first
+      content_entries_path(content_type.slug)
+    when /the "(.*)" model edition page/
+      content_type = Locomotive::Site.first.content_types.where(:name => $1).first
+      edit_content_type_path(content_type)
+    when /the sitemap/
+      "/sitemap.xml"
+
+    # Add more mappings here.
+    # Here is an example that pulls values out of the Regexp:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
+    else
+      begin
+        page_name =~ /^the (.*) page$/
+        path_components = $1.split(/\s+/)
+        self.send(path_components.push('path').join('_').to_sym)
+      rescue NoMethodError, ArgumentError
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+          "Now, go and add a mapping in #{__FILE__}"
+      end
+    end
+  end
+end
+
+World(NavigationHelpers)

data/features/support/pickle.rb

@@ -0,0 +1,24 @@
+# this file generated by script/generate pickle [paths] [email]
+#
+# Make sure that you are loading your factory of choice in your cucumber environment
+#
+# For machinist add: features/support/machinist.rb
+#
+#    require 'machinist/active_record' # or your chosen adaptor
+#    require File.dirname(__FILE__) + '/../../spec/blueprints' # or wherever your blueprints are
+#    Before { Sham.reset } # to reset Sham's seed between scenarios so each run has same random sequences
+#
+# For FactoryGirl add: features/support/factory_girl.rb
+#
+#    require 'factory_girl'
+#    require File.dirname(__FILE__) + '/../../spec/factories' # or wherever your factories are
+#
+# You may also need to add gem dependencies on your factory of choice in <tt>config/environments/cucumber.rb</tt>
+
+require 'pickle/world'
+# Example of configuring pickle:
+#
+Pickle.configure do |config|
+  config.adapters = [:factory_girl]
+  # config.map 'I', 'myself', 'me', 'my', :to => 'user: "me"'
+end

data/features/support/selectors.rb

@@ -0,0 +1,57 @@
+module HtmlSelectorsHelpers
+  # Maps a name to a selector. Used primarily by the
+  #
+  #   When /^(.+) within (.+)$/ do |step, scope|
+  #
+  # step definitions in web_steps.rb
+  #
+  def selector_for(locator)
+    case locator
+
+    when 'the page'
+      'html > body'
+
+    when 'the main form'
+      'form.formtastic'
+
+    when 'the main content'
+      '#content'
+
+    when 'the dialog popup'
+      '.content-entry-popup'
+
+    when 'the list of entries'
+      'li.input.relationship'
+
+    when 'the role'
+      '.role'
+
+    when 'the submit button'
+      'form.formtastic #local-actions-bottom-bar input[type=submit]'
+
+    # Add more mappings here.
+    # Here is an example that pulls values out of the Regexp:
+    #
+    #  when /^the (notice|error|info) flash$/
+    #    ".flash.#{$1}"
+
+    # You can also return an array to use a different selector
+    # type, like:
+    #
+    #  when /the header/
+    #    [:xpath, "//header"]
+
+    # This allows you to provide a quoted selector as the scope
+    # for "within" steps as was previously the default for the
+    # web steps:
+    when /^"(.+)"$/
+      $1
+
+    else
+      raise "Can't find mapping from \"#{locator}\" to a selector.\n" +
+        "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+end
+
+World(HtmlSelectorsHelpers)

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

@@ -16,6 +16,11 @@ 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 %(

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

@@ -11,9 +11,8 @@ app.configure_with(:imagemagick)
 Dragonfly[:images].configure do |c|
   # Convert absolute location needs to be specified
   # to avoid issues with Phusion Passenger not using $PATH
-  convert = `which convert`.strip.presence || "/usr/local/bin/convert"
-  c.convert_command  = convert
-  c.identify_command = convert
+  c.convert_command  = `which convert`.strip.presence || "/usr/local/bin/convert"
+  c.identify_command = `which identify`.strip.presence || "/usr/local/bin/identify"
 
   c.allow_fetch_url  = true
   c.allow_fetch_file = true

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

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

data/lib/locomotive.rb

@@ -8,6 +8,7 @@ require 'locomotive/formtastic'
 require 'locomotive/dragonfly'
 require 'locomotive/kaminari'
 require 'locomotive/liquid'
+require 'locomotive/presentable'
 require 'locomotive/mongoid'
 require 'locomotive/carrierwave'
 require 'locomotive/custom_fields'
@@ -15,6 +16,7 @@ require 'locomotive/httparty'
 require 'locomotive/action_controller'
 require 'locomotive/rails'
 require 'locomotive/routing'
+require 'locomotive/cancan'
 require 'locomotive/regexps'
 require 'locomotive/render'
 require 'locomotive/middlewares'
@@ -68,16 +70,25 @@ module Locomotive
 
     # 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
+
+    # Check for outdated Dragonfly config
+    conf = Dragonfly.app.configuration
+    if conf[:identify_command] == conf[:convert_command]
+      Locomotive.log :warn, "WARNING: Old Dragonfly config detected, image uploads might be broken. Use 'rails g locomotive:install' to get the latest configuration files."
+    end
   end
 
   def self.add_middlewares
-    self.app_middleware.insert 0, 'Dragonfly::Middleware', :images
+    self.app_middleware.insert 0, '::Locomotive::Middlewares::Permalink'
+
+    self.app_middleware.insert 1, 'Dragonfly::Middleware', :images
 
     if self.rack_cache?
       self.app_middleware.insert_before 'Dragonfly::Middleware', '::Locomotive::Middlewares::Cache', self.config.rack_cache
     end
 
-    self.app_middleware.insert_before Rack::Lock, '::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'
 
     self.app_middleware.use '::Locomotive::Middlewares::InlineEditor'

data/lib/locomotive/action_controller/locale_helpers.rb

@@ -37,7 +37,7 @@ module Locomotive
       end
 
       def setup_i18n_fallbacks
-        (current_site.locales || []).each do |locale|
+        (current_site.try(:locales) || []).each do |locale|
           ::Mongoid::Fields::I18n.fallbacks_for(locale, current_site.locale_fallbacks(locale))
         end
       end

data/lib/locomotive/action_controller/public_responder.rb

@@ -6,8 +6,24 @@ module Locomotive
         if get?
           raise error
         elsif has_errors? && default_action
-          redirect_to navigation_location
+          # get the content entry from the controller
+          entry = self.controller.instance_variable_get :@entry
+
+          if navigation_location =~ %r(^http://)
+            # simple redirection for outside urls
+            redirect_to navigation_location
+          else
+            # render the locomotive page
+            self.controller.send :render_locomotive_page, navigation_location, {
+              entry.content_type.slug.singularize => entry.to_presenter(include_errors: true).as_json
+            }
+          end
         else
+          entry = self.controller.instance_variable_get :@entry
+
+          self.controller.flash['submitted_entry_id'] = entry.try(:_id).try(:to_s)
+
+          # redirect to a locomotive page
           redirect_to navigation_location
         end
       end

data/lib/locomotive/action_controller/responder.rb

@@ -12,7 +12,7 @@ module Locomotive
       def options
         current_site    = self.controller.send(:current_site)
         current_account = self.controller.send(:current_locomotive_account)
-        ability         = current_account.nil? ? nil : self.controller.send(:current_ability)
+        ability         = current_site.nil? || current_account.nil? ? nil : self.controller.send(:current_ability)
 
         super.merge({
           :current_site     => current_site,
@@ -58,7 +58,8 @@ module Locomotive
           message = controller.flash[type]
 
           unless message.blank?
-            controller.headers['X-Message']       = message
+            # 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/url_helpers.rb

@@ -24,7 +24,7 @@ module Locomotive
       end
 
       def public_page_url(page, options = {})
-        Rails.logger.info "[public_page_url] =====> #{page.attributes.inspect} / #{page.fullpath.inspect}\n\n"
+        # Rails.logger.debug "[public_page_url] =====> #{page.attributes.inspect} / #{page.fullpath.inspect}\n\n"
         if content = options.delete(:content)
           File.join(current_site_public_url, page.fullpath.gsub('content_type_template', ''), content._slug)
         else

data/lib/locomotive/cancan.rb

@@ -0,0 +1,22 @@
+module Locomotive
+  module Api
+    module CanCan
+
+      class ControllerResource < ::CanCan::ControllerResource
+
+        def build_resource
+          # FIXME: within the API scope, we do not have to pass directly the params
+          # to the new instance because we use presenters instead.
+          resource = resource_base.new
+          resource.send("#{parent_name}=", parent_resource) if @options[:singleton] && parent_resource
+          initial_attributes.each do |attr_name, value|
+            resource.send("#{attr_name}=", value)
+          end
+          resource
+        end
+
+      end
+
+    end
+  end
+end