locomotivecms 3.0.0.rc3 → 3.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb0a5ebc0f40fc62072340ff10f15d6029d14bb
-  data.tar.gz: c7d3971de7bd5e22fc8d32b94445e3c6ff96f2cc
+  metadata.gz: 2b022aa4b532f3b4ab72f8e7218af9f6eb77f834
+  data.tar.gz: 7fa421098346655a1eb58290defc5ffe2d2b1e0f
 SHA512:
-  metadata.gz: 470554e8983fb56b3d2e88bc02dd1276b21baa7153dc9afcd8c98b29e4b4ea9ecb3cbe1eef5bba2df822da81024ac1682ec29eec4c157dd4337709bcf9499ea3
-  data.tar.gz: e38ef2a4463cd47412a61cc2843242e843db154d8e78f0e58486939535e6318b70453c0763fb5bd6c1eaf0884bca322f65cb35730513fd2180cf4421a732fa27
+  metadata.gz: 4dcd634a7df28ca685eb12c1cd2634d259db84a82a77336bd0abcc600d3e91e685129701ff10503367069c36aa3f2e3cb616bfd0b2f9174fcc11ef18ffb17f8d
+  data.tar.gz: 514754acae872d4b2ea2c0721990885136f0ba305d4e42b84ad0721ff289d0d4ae9d781b0ddff9053ac97d86553c2d1bcd914b4cebca1f72462e2723bfccf963

data/Gemfile

@@ -19,10 +19,10 @@ end
 group :development do
   # gem 'custom_fields', path: '../custom_fields'
   # gem 'custom_fields', path: '../gems/custom_fields' # for Developers
-  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '15cceb66ed'
+  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '279c6744eb6b7dd'
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c9cb7f6', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'b4aa09a', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers
@@ -64,7 +64,7 @@ group :test do
   gem 'factory_girl_rails'
   gem 'pickle'
   gem 'json_spec',            '~> 1.1.4'
-  gem 'database_cleaner',     '~> 1.4.1'
+  gem 'database_cleaner',     git: 'https://github.com/DatabaseCleaner/database_cleaner.git'
   gem 'timecop',              '~> 0.7.1'
 
   gem 'email_spec'

data/README.md

@@ -44,7 +44,7 @@ Here is a list of the main gems used to power the Locomotive platform:
 
 - Rails 4.2   - *web framework*
 - Bootstrap   - *UI framework*
-- Mongoid 4.0 - *Object-Document-Mapper for MongoDB*
+- Mongoid 5   - *Object-Document-Mapper for MongoDB 2/3*
 - Devise 3.4  - *Authentication*
 - Carrierwave - *Upload*
 - Pundit      - *Permissions*

data/app/assets/stylesheets/locomotive/unauthorized/_public.scss

@@ -16,24 +16,26 @@
 }
 
 // Centers the content of a public page.
+
 .public-container {
-  height: 100%;
   width: 100%;
+  height: 100%;
   text-align: center;
   animation: fade-down 1s ease-out;
   &:before {
-    content: ' ';
     display: inline-block;
-    vertical-align: middle;
     height: 100%;
+    vertical-align: middle;
+    content: " ";
   }
 }
 
 // Wraps and centers all content of the public forms.
 
 .public-form-wrapper {
-  width: 480px;
   display: inline-block;
+  width: 480px;
+  margin: 25px 0;
   vertical-align: middle;
 }
 
@@ -119,6 +121,7 @@
 @media (max-width: $screen-xs-min) {
   .public-form-wrapper {
     left: 0;
+    width: 99%;
     padding: 20px 10px;
     margin-left: 0;
   }

data/app/controllers/locomotive/errors_controller.rb

@@ -11,5 +11,9 @@ module Locomotive
       render '500', status: :internal_server_error
     end
 
+    def no_site
+      render 'no_site', status: :not_found
+    end
+
   end
 end

data/app/helpers/locomotive/errors_helper.rb

@@ -8,12 +8,10 @@ module Locomotive
     def no_site_message_and_link
       options = Locomotive.config.host ? { host: Locomotive.config.host } : { only_path: true }
 
-      if Locomotive::Account.count == 0
-        [no_site_message(:create_account), sign_up_url(options)]
-      elsif current_locomotive_account
+      if current_locomotive_account
         [no_site_message(:add_domain), sites_url(options)]
       else
-        [no_site_message(:sign_in), new_locomotive_account_session_url(options)]
+        [no_site_message(:sign_in), sign_in_url(options)]
       end
     end
 

data/app/models/locomotive/concerns/content_entry/csv.rb

@@ -56,6 +56,10 @@ module Locomotive
           # @return [ String ] The well-generated CSV document
           #
           def to_csv(options = {})
+            # puts "to_csv #{all.count.inspect} / #{all.first.inspect}"
+            # puts "#{all.first.content_type_id.inspect}"
+            # puts "#{all.first.content_type.inspect}"
+            # binding.pry
             content_type  = options.delete(:content_type) || all.first.try(:content_type)
             csv_options   = options.select do |k, v|
               CSV::DEFAULT_OPTIONS.keys.include?(k.to_sym)

data/app/models/locomotive/concerns/content_entry/slug.rb

@@ -65,8 +65,6 @@ module Locomotive
           _last = self.class.where(:_id.ne => self._id, _slug: /^#{slug}-?\d*$/i)
                     .only(:_slug)
                     .order_by(:_id.desc)
-                    .context
-                    .query
                     .first
 
           if _last

data/app/models/locomotive/concerns/content_type/sync.rb

@@ -60,11 +60,11 @@ module Locomotive
 
           operations['$set']['entries_custom_fields_version'] = content_type.entries_custom_fields_version
 
-          self.collection.find(_id: content_type._id).update(operations)
+          self.collection.find(_id: content_type._id).update_one(operations)
 
           collection, selector = content_type.entries.collection, content_type.entries.criteria.selector
 
-          collection.find(selector).update({ '$set' => { 'custom_fields_recipe' => content_type.custom_fields_recipe_for(:entries) } }, multi: true)
+          collection.find(selector).update_many('$set' => { 'custom_fields_recipe' => content_type.custom_fields_recipe_for(:entries) })
         end
 
       end

data/app/models/locomotive/concerns/page/templatized.rb

@@ -199,7 +199,7 @@ module Locomotive
             }
           }
 
-          self.collection.find(selector).update(operations, multi: true)
+          self.collection.find(selector).update_many(operations)
         end
 
       end

data/app/models/locomotive/concerns/site/access_points.rb

@@ -29,9 +29,9 @@ module Locomotive
           after_destroy     :emit_domain_deletion_event
 
           ## named scopes ##
-          scope :match_domain, lambda { |domain| { any_in: { domains: [*domain] } } }
-          scope :match_domain_with_exclusion_of, lambda { |domain, site|
-            { any_in: { domains: [*domain] }, where: { :_id.ne => site.id } }
+          scope :match_domain, ->(domain) { any_in(domains: [*domain]) }
+          scope :match_domain_with_exclusion_of, ->(domain, site) {
+            any_in(domains: [*domain]).where(:_id.ne => site.id)
           }
         end
 

data/app/models/locomotive/theme_asset.rb

@@ -46,7 +46,6 @@ module Locomotive
 
     def local_path(short = false)
       if short && self.read_attribute(:local_path)
-        # self.read_attribute(:local_path).gsub(/^#{self.content_type.to_s.pluralize}\//, '')
         self.read_attribute(:local_path).split('/')[1..-1].join('/')
       else
         self.read_attribute(:local_path)

data/app/views/locomotive/developers_documentation/_wagon.html.slim

@@ -31,7 +31,7 @@ h3 Run your site locally
 
 pre
   code.bash
-    | cd #{current_site_name_with_underscores}</br>wagon serve
+    | cd #{current_site_name_with_underscores}</br>bundle exec wagon serve
 
 p Now, update any files of your site and see the results locally.
 
@@ -39,4 +39,4 @@ h3 Deploy your modifications
 
 pre
   code.bash
-    | wagon push production
+    | bundle exec wagon push production

data/app/views/locomotive/devise_mailer/reset_password_instructions.html.slim

@@ -10,3 +10,4 @@ p
   == t('.wrong_request_instruction')
 p
   == t('.unchange_password_message')
+

data/app/views/locomotive/errors/no_site.json

@@ -0,0 +1 @@
+{"error":"no site found"}

data/app/views/locomotive/shared/_sidebar.html.slim

@@ -22,5 +22,5 @@
 
   = render 'locomotive/shared/sidebar/link', icon: 'fa-suitcase', label: t(:sites, scope: 'locomotive.shared.header'), url: sites_path, section_class: 'visible-xs-block'
 
-  = render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }, section_class: 'visible-xs-block'
+  = render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: sign_out_path, data: { method: 'delete' }, section_class: 'visible-xs-block'
 

data/app/views/locomotive/shared/_sidebar_without_site.html.slim

@@ -2,4 +2,4 @@
 
 = render 'locomotive/shared/sidebar/link', icon: 'fa-suitcase', label: t(:sites, scope: 'locomotive.shared.header'), url: sites_path
 
-= render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }
+= render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: sign_out_path, data: { method: 'delete' }

data/app/views/locomotive/shared/header/_account_menu.html.slim

@@ -1,5 +1,5 @@
 li= link_to t(:sites, scope: 'locomotive.shared.header'), sites_path
 li= link_to t(:account, scope: 'locomotive.shared.header'), edit_my_account_path(_location: request.fullpath)
-li= link_to t(:help, scope: 'locomotive.shared.header'), 'http://doc.locomotivecms.com'
+li= link_to t(:help, scope: 'locomotive.shared.header'), 'http://locomotive-v3.readme.io'
 li class="divider"
-li= link_to t(:logout, scope: 'locomotive.shared.header'), destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }
+li= link_to t(:logout, scope: 'locomotive.shared.header'), sign_out_path, data: { method: 'delete' }

data/config/locales/en.yml

@@ -21,7 +21,7 @@ en:
       sr: Serbian
 
     messages:
-      confirm: Are you sure ?
+      confirm: Are you sure?
 
     shared:
       header:

data/config/routes.rb

@@ -10,8 +10,10 @@ Locomotive::Engine.routes.draw do
     failure_app:  'Locomotive::Devise::FailureApp'
 
   devise_scope :locomotive_account do
-    get   'sign_up'  => 'registrations#new', as: :sign_up
-    post  'sign_up'  => 'registrations#create'
+    get     'sign_up'  => 'registrations#new',    as: :sign_up
+    post    'sign_up'  => 'registrations#create'
+    get     'sign_in'  => 'sessions#new',         as: :sign_in
+    delete  'sign_out' => 'sessions#destroy',     as: :sign_out
   end
 
   root to: 'sites#index'

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

@@ -12,8 +12,6 @@ module Locomotive
 
       template 'locomotive.rb', 'config/initializers/locomotive.rb'
 
-      template 'carrierwave.rb', 'config/initializers/carrierwave.rb'
-
       template 'devise.rb', 'config/initializers/devise.rb'
 
       template 'dragonfly.rb', 'config/initializers/dragonfly.rb'
@@ -21,6 +19,15 @@ module Locomotive
       template 'mongoid.yml', 'config/mongoid.yml'
     end
 
+    def install_aws
+      if options.heroku? || yes?('Do you want to store your assets on Amazon S3?')
+        template 'carrierwave_aws.rb', 'config/initializers/carrierwave.rb'
+        gem 'carrierwave-aws'
+      else
+        template 'carrierwave.rb', 'config/initializers/carrierwave.rb'
+      end
+    end
+
     def insert_engine_routes
       route %(
   # Locomotive Back-office
@@ -60,13 +67,6 @@ end
         RUBY
         end
 
-        inject_into_file 'config/initializers/carrierwave.rb', after: "    config.fog_directory    = ENV['S3_BUCKET']\n" do <<-'RUBY'
-
-    # Put your CDN host below instead
-    config.asset_host       = ENV['S3_BUCKET_REGION'].present? ? "s3-#{ENV['S3_BUCKET_REGION']}.amazonaws.com" : 's3.amazonaws.com'
-        RUBY
-        end
-
         gem 'platform-api', '~> 0.3.0'
       end
     end

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

@@ -9,20 +9,31 @@ CarrierWave.configure do |config|
     config.root = File.join(Rails.root, 'public')
 
   when :production
-    # the following configuration works for Amazon S3
+    config.storage = :file
+    config.root = File.join(Rails.root, 'public')
+
+    # # put your CDN host below instead
+    # # config.asset_host = 'http://cdn.example.com'
+
+    # # You can also use Amazon S3 instead. The following configuration works for AWS
+    # #
+    # # WARNING: add the "carrierwave-aws" gem in your Rails app Gemfile.
+    # # More information here: https://github.com/sorentwo/carrierwave-aws
+    #
+    # config.storage          = :aws
+    # config.aws_bucket       = ENV['S3_BUCKET']
+    # config.aws_acl          = 'public-read'
     #
-    # WARNING: add the "carrierwave-aws" gem in your Rails app Gemfile.
-    # More information here: https://github.com/sorentwo/carrierwave-aws
+    # config.aws_credentials  = {
+    #   access_key_id:      ENV['S3_KEY_ID'],
+    #   secret_access_key:  ENV['S3_SECRET_KEY'],
+    #   region:             ENV['S3_BUCKET_REGION']
+    # }
     #
-    config.storage          = :aws
-    config.aws_bucket       = ENV['S3_BUCKET']
-    config.aws_acl          = 'public-read'
-
-    config.aws_credentials  = {
-      access_key_id:      ENV['S3_KEY_ID'],
-      secret_access_key:  ENV['S3_SECRET_KEY'],
-      region:             ENV['S3_BUCKET_REGION']
-    }
+    # # Put your CDN host below instead
+    # if ENV['S3_ASSET_HOST_URL'].present?
+    #   config.asset_host = ENV['S3_ASSET_HOST_URL']
+    # end
 
   else
     # settings for the local filesystem

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

@@ -0,0 +1,36 @@
+CarrierWave.configure do |config|
+
+  config.cache_dir = File.join(Rails.root, 'tmp', 'uploads')
+
+  case Rails.env.to_sym
+
+  when :development
+    config.storage = :file
+    config.root = File.join(Rails.root, 'public')
+
+  when :production
+    # WARNING: add the "carrierwave-aws" gem in your Rails app Gemfile.
+    # More information here: https://github.com/sorentwo/carrierwave-aws
+
+    config.storage          = :aws
+    config.aws_bucket       = ENV['S3_BUCKET']
+    config.aws_acl          = 'public-read'
+
+    config.aws_credentials  = {
+      access_key_id:      ENV['S3_KEY_ID'],
+      secret_access_key:  ENV['S3_SECRET_KEY'],
+      region:             ENV['S3_BUCKET_REGION']
+    }
+
+    # Put your CDN host below instead
+    if ENV['S3_ASSET_HOST_URL'].present?
+      config.asset_host = ENV['S3_ASSET_HOST_URL']
+    end
+
+  else
+    # settings for the local filesystem
+    config.storage = :file
+    config.root = File.join(Rails.root, 'public')
+  end
+
+end

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

@@ -1,46 +1,115 @@
 development:
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
+  # Configure available database clients. (required)
+  clients:
+    # Defines the default client. (required)
     default:
       # Defines the name of the default database that Mongoid can connect to.
       # (required).
       database: <%= Rails.application.class.parent.to_s.underscore.downcase %>_dev
-      # Provides the hosts the default session can connect to. Must be an array
+      # Provides the hosts the default client can connect to. Must be an array
       # of host:port pairs. (required)
       hosts:
         - localhost:27017
       options:
-        # Change whether the session persists in safe mode by default.
-        # (default: false)
-        # safe: false
-
-        # Change the default consistency model to :eventual or :strong.
-        # :eventual will send reads to secondaries, :strong sends everything
-        # to master. (default: :eventual)
-        # consistency: :strong
-  # Configure Mongoid specific options. (optional)
-  options:
-    # Configuration for whether or not to allow access to fields that do
-    # not have a field definition on the model. (default: true)
-    # allow_dynamic_fields: true
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        #   w: 1
+
+        # Change the default read preference. Valid options for mode are: :secondary,
+        # :secondary_preferred, :primary, :primary_preferred, :nearest
+        # (default: primary)
+        # read:
+        #   mode: :secondary_preferred
+
+        # The name of the user for authentication.
+        # user: 'user'
+
+        # The password of the user for authentication.
+        # password: 'password'
+
+        # The user's database roles.
+        # roles:
+        #   - 'dbOwner'
+
+        # Change the default authentication mechanism. Valid options are: :scram,
+        # :mongodb_cr, :mongodb_x509, and :plain. (default on 3.0 is :scram, default
+        # on 2.4 and 2.6 is :plain)
+        # auth_mech: :scram
+
+        # The database or source to authenticate the user against. (default: admin)
+        # auth_source: admin
+
+        # Force a the driver cluster to behave in a certain manner instead of auto-
+        # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
+        # when connecting to hidden members of a replica set.
+        # connect: :direct
+
+        # Changes the default time in seconds the server monitors refresh their status
+        # via ismaster commands. (default: 10)
+        # heartbeat_frequency: 10
+
+        # The time in seconds for selecting servers for a near read preference. (default: 5)
+        # local_threshold: 5
+
+        # The timeout in seconds for selecting a server for an operation. (default: 30)
+        # server_selection_timeout: 30
+
+        # The maximum number of connections in the connection pool. (default: 5)
+        # max_pool_size: 5
+
+        # The minimum number of connections in the connection pool. (default: 1)
+        # min_pool_size: 1
 
-    # Enable the identity map, needed for eager loading. (default: false)
-    # identity_map_enabled: true
+        # The time to wait, in seconds, in the connection pool for a connection
+        # to be checked in before timing out. (default: 5)
+        # wait_queue_timeout: 5
 
+        # The time to wait to establish a connection before timing out, in seconds.
+        # (default: 5)
+        # connect_timeout: 5
+
+        # The timeout to wait to execute operations on a socket before raising an error.
+        # (default: 5)
+        # socket_timeout: 5
+
+        # The name of the replica set to connect to. Servers provided as seeds that do
+        # not belong to this replica set will be ignored.
+        # replica_set: name
+
+        # Whether to connect to the servers via ssl. (default: false)
+        # ssl: true
+
+        # The certificate file used to identify the connection against MongoDB.
+        # ssl_cert: /path/to/my.cert
+
+        # The private keyfile used to identify the connection against MongoDB.
+        # Note that even if the key is stored in the same file as the certificate,
+        # both need to be explicitly specified.
+        # ssl_key: /path/to/my.key
+
+        # A passphrase for the private key.
+        # ssl_key_pass_phrase: password
+
+        # Whether or not to do peer certification validation. (default: false)
+        # ssl_verify: true
+
+        # The file containing a set of concatenated certification authority certifications
+        # used to validate certs passed from the other end of the connection.
+        # ssl_ca_cert: /path/to/ca.cert
+
+
+  # Configure Mongoid specific options. (optional)
+  options:
     # Includes the root model name in json serialization. (default: false)
     # include_root_in_json: false
 
-    # Include the _type field in serializaion. (default: false)
+    # Include the _type field in serialization. (default: false)
     # include_type_for_serialization: false
 
     # Preload all models in development, needed when models use
     # inheritance. (default: false)
     # preload_models: false
 
-    # Protect id and type from mass assignment. (default: true)
-    # protect_sensitive_fields: true
-
     # Raise an error when performing a #find and the document is not found.
     # (default: true)
     # raise_not_found_error: true
@@ -49,33 +118,26 @@ development:
     # existing method. (default: false)
     # scope_overwrite_exception: false
 
-    # Skip the database version check, used when connecting to a db without
-    # admin access. (default: false)
-    # skip_version_check: false
-
-    # User Active Support's time zone in conversions. (default: true)
+    # Use Active Support's time zone in conversions. (default: true)
     # use_activesupport_time_zone: true
 
     # Ensure all times are UTC in the app side. (default: false)
     # use_utc: false
 
 test:
-  sessions:
+  clients:
     default:
       database: <%= Rails.application.class.parent.to_s.underscore.downcase %>_test
       hosts:
         - localhost:27017
       options:
-        # consistency: :strong
-        # identity_map_enabled: true
+        max_pool_size: 1
 
 production:
-  sessions:
+  clients:
     default:
       database: <%= Rails.application.class.parent.to_s.underscore.downcase %>_production
       hosts:
         - localhost:27017
       options:
-        # consistency: :strong
-        # identity_map_enabled: true
-      # uri: <%%= ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] %>
+        max_pool_size: 1

data/lib/locomotive/dependencies.rb

@@ -1,5 +1,5 @@
 require 'bson'
-require 'moped'
+require 'mongo'
 require 'mongoid'
 require 'mongoid/railtie'
 require 'mongoid/tree'

data/lib/locomotive/middlewares/site.rb

@@ -25,7 +25,7 @@ module Locomotive
           begin
             @app.call(env)
           rescue ::Locomotive::Steam::NoSiteException => exception
-            handle_no_account_or_site(env)
+            handle_no_account_or_site(env, request)
           end
         end
       end
@@ -50,10 +50,12 @@ module Locomotive
 
       # if no account in the database, must be a fresh install,
       # then ask the user to create the first account.
-      # if accounts but not no site, render a specific error page.
-      def handle_no_account_or_site(env)
+      # if accounts but no site, redirect to the sign in page
+      def handle_no_account_or_site(env, request)
         if Locomotive::Account.count == 0
-          [301, { 'Location' => sign_up_path, 'Content-Type' => 'text/html' }, []]
+          redirect_to(sign_up_path)
+        elsif default_host?(request)
+          redirect_to(sign_in_path)
         else
           Locomotive::ErrorsController.action(:no_site).call(env)
         end
@@ -93,6 +95,10 @@ module Locomotive
         nil
       end
 
+      def redirect_to(destination)
+        [301, { 'Location' => destination, 'Content-Type' => 'text/html' }, []]
+      end
+
       def site_handle_regexp
         @regexp ||= /#{Locomotive.mounted_on}\/([^\/]+)/o
       end

data/lib/locomotive/mongoid/patches.rb

@@ -127,7 +127,7 @@ module Mongoid #:nodoc:
       fields    = _criteria.options[:fields]
       sort      = _criteria.options[:sort]
 
-      document = collection.find(selector).select(fields).sort(sort).limit(1).first
+      document = collection.find(selector).projection(fields).sort(sort).limit(1).first
       document ? document[field.to_s].to_i : nil
     end
 

data/lib/locomotive/steam_adaptor.rb

@@ -9,14 +9,16 @@ Locomotive::Steam.configure do |config|
   # Dragonfly instance embedded in Steam needs a secret key
   config.image_resizer_secret = Locomotive.config.steam_image_resizer_secret
 
-  if asset_host = CarrierWave::Uploader::Base.asset_host
+  if asset_host = CarrierWave::Uploader::Base.asset_host # CDN?
     config.asset_host = asset_host
-  else
-    config.asset_host = CarrierWave.base_host
+  elsif asset_host = CarrierWave.base_host # Example: AWS storage
+    config.asset_host = asset_host
+  else # Example: File storage
+    config.asset_path = Rails.root.join('public').to_s
   end
 
   # rely on Mongoid for the connection information
-  if mongoid = Mongoid.configure.sessions[:default]
+  if mongoid = Mongoid.configure.clients[:default]
     options = mongoid[:uri] ? mongoid.slice(:uri) : mongoid.slice(:database, :hosts, :username, :password)
     config.adapter = { name: :'mongoDB' }.merge(options.symbolize_keys)
   end

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.0.0.rc3'
+  VERSION = '3.0.0.rc4'
 end

data/spec/dummy/config/application.rb

@@ -10,9 +10,6 @@ require "sprockets/railtie"
 
 Bundler.require(*Rails.groups)
 
-# require 'bson'
-# require 'moped'
-
 require 'locomotive/engine'
 
 module Dummy