alchemy_cms 3.1.0.beta3 → 3.1.0.beta4

data/app/controllers/alchemy/pages_controller.rb

@@ -78,7 +78,7 @@ module Alchemy
     def render_page_or_redirect
       @page ||= load_page
       if signup_required?
-        redirect_to signup_path
+        redirect_to Alchemy.signup_path
       elsif @page.nil? && last_legacy_url
         @page = last_legacy_url.page
 

data/config/initializers/simple_form.rb

@@ -100,7 +100,7 @@ SimpleForm.setup do |config|
   config.label_class = 'control-label'
 
   # You can define the class to use on all forms. Default is simple_form.
-  config.form_class = nil
+  config.default_form_class = nil
 
   # You can define which elements should obtain additional classes
   # config.generate_additional_classes_for = [:wrapper, :label, :input]

data/config/routes.rb

@@ -30,7 +30,7 @@ Alchemy::Engine.routes.draw do
   get "/pictures/:id/thumbnails/:size(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#thumbnail',
         :as => :thumbnail, :defaults => {:format => 'png', :name => "thumbnail"}
 
-  get '/admin/leave' => 'base#leave', :as => :leave_admin
+  get '/admin/leave' => 'admin/base#leave', :as => :leave_admin
 
   resources :messages, :only => [:index, :new, :create]
   resources :elements, :only => :show

data/lib/alchemy/auth_accessors.rb

@@ -3,19 +3,22 @@
 # Alchemy has some defaults for user model name and login logout path names:
 #
 # +Alchemy.user_class_name+ defaults to +'User'+
+# +Alchemy.signup_path defaults to +'/signup'+
 # +Alchemy.login_path defaults to +'/login'+
 # +Alchemy.logout_path defaults to +'/logout'+
 #
 # Anyway, you can tell Alchemy about your authentication model configuration:
 #
 #   1. Your user class name - @see: Alchemy.user_class
-#   2. The path to the login form - @see: Alchemy.login_path
-#   3. The path to the logout method - @see: Alchemy.logout_path
+#   2. The path to the signup form - @see: Alchemy.signup_path
+#   3. The path to the login form - @see: Alchemy.login_path
+#   4. The path to the logout method - @see: Alchemy.logout_path
 #
 # == Example
 #
 #     # config/initializers/alchemy.rb
 #     Alchemy.user_class_name = 'Admin'
+#     Alchemy.signup_path = '/auth/signup'
 #     Alchemy.login_path = '/auth/login'
 #     Alchemy.logout_path = '/auth/logout'
 #
@@ -29,12 +32,17 @@
 #     Alchemy.register_ability MyCustom::Ability
 #
 module Alchemy
-  mattr_accessor :user_class_name, :current_user_method, :login_path, :logout_path
+  mattr_accessor :user_class_name,
+    :current_user_method,
+    :signup_path,
+    :login_path,
+    :logout_path
 
   # Defaults
   #
   @@user_class_name = 'User'
   @@current_user_method = 'current_user'
+  @@signup_path = '/signup'
   @@login_path = '/login'
   @@logout_path = '/logout'
 
@@ -57,6 +65,20 @@ module Alchemy
         raise 'Alchemy.user_class_name must be a String, not a Class.'
       end
     end
+  rescue NameError => e
+    if e.message.match(/#{Regexp.escape(@@user_class_name)}/)
+      abort <<-MSG
+
+AlchemyCMS cannot find any user class!
+
+Please add a user class and tell Alchemy about it or, if you don't want
+to create your own class, add the `alchemy-devise` gem to your Gemfile.
+
+gem 'alchemy-devise', '~> 2.1.0'
+MSG
+    else
+      raise e
+    end
   end
 
   # Register a CanCan Ability class
@@ -71,5 +93,4 @@ module Alchemy
   def self.registered_abilities
     @abilities ||= []
   end
-
 end

data/lib/alchemy/engine.rb

@@ -96,9 +96,6 @@ module Alchemy
 
     config.after_initialize do
       require_relative './userstamp'
-      # In order to have Alchemy's helpers and basic controller methods
-      # available in the host app, we patch the ApplicationController.
-      ApplicationController.send(:include, Alchemy::ControllerActions)
     end
   end
 end

data/lib/alchemy/permissions.rb

@@ -99,6 +99,7 @@ module Alchemy
         ]
 
         # Controller actions
+        can :leave,                     :alchemy_admin
         can [:info, :help],             :alchemy_admin_dashboard
         can :manage,                    :alchemy_admin_clipboard
         can :index,                     :trash

data/lib/alchemy/resource.rb

@@ -118,6 +118,15 @@ module Alchemy
       namespace_array
     end
 
+    # Returns an array of underscored association names
+    #
+    def model_association_names
+      return unless model_associations
+      model_associations.map do |assoc|
+        assoc.name.to_sym
+      end
+    end
+
     def attributes
       @_attributes ||= self.model.columns.collect do |col|
         unless self.skipped_attributes.include?(col.name)
@@ -135,7 +144,7 @@ module Alchemy
     # For now it only uses string type columns
     #
     def searchable_attributes
-      self.attributes.select { |a| a[:type] == :string }
+      self.attributes.select { |a| a[:type].to_sym == :string }
     end
 
     def in_engine?

data/lib/alchemy/upgrader/three_point_one.rb

@@ -1,5 +1,6 @@
 module Alchemy
   module Upgrader::ThreePointOne
+
     private
 
     def alchemy_3_1_todos
@@ -35,9 +36,20 @@ using 'toolbarN' syntax. Please update your TinyMCE configuration.
 
 Visit http://www.tinymce.com/wiki.php/Configuration:toolbar for more information.
 
+
+ApplicationController patch removed
+-----------------------------------
+
+If you have controllers that loads Alchemy content or uses Alchemy helpers in
+the views (i.e. `render_navigation` or `render_elements`) you should
+
+  include Alchemy::ControllerActions
+
+in these controllers.
+
+
 NOTE
       todo notice, 'Alchemy v3.1 changes'
     end
-
   end
 end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.1.0.beta3"
+  VERSION = "3.1.0.beta4"
 
   def self.version
     VERSION

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -135,6 +135,5 @@ module Alchemy
         end
       end
     end
-
   end
 end

data/spec/controllers/admin/resources_controller_spec.rb

@@ -32,6 +32,22 @@ describe EventsController do
         expect(assigns(:events)).to include(peter)
         expect(assigns(:events)).not_to include(lustig)
       end
+
+      context "but searching for record with certain association" do
+        let(:bauwagen) { Location.create(name: 'Bauwagen') }
+        let(:params)   { {query: 'Bauwagen'} }
+
+        before do
+          peter.location = bauwagen
+          peter.save
+        end
+
+        it "returns only matching records" do
+          get :index, params
+          expect(assigns(:events)).to include(peter)
+          expect(assigns(:events)).not_to include(lustig)
+        end
+      end
     end
   end
 end

data/spec/features/admin/navigation_feature_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'Admin navigation feature' do
+
+  context 'admin users' do
+    before { authorize_as_admin }
+
+    it "can leave the admin area" do
+      visit ('/admin/leave')
+      expect(page).to have_content('You are about to leave Alchemy')
+    end
+  end
+end

data/spec/features/security_spec.rb

@@ -1,12 +1,24 @@
 require 'spec_helper'
 
 describe "Security." do
-  before { Alchemy::Page.root.children.destroy_all }
-
   context "If user is not logged in" do
     it "should see login form" do
       visit '/admin/dashboard'
       expect(current_path).to eq(Alchemy.login_path)
     end
   end
+
+  context "If ssl is enforced" do
+    before do
+      allow_any_instance_of(Alchemy::BaseController)
+        .to receive(:ssl_required?)
+        .and_return(true)
+      authorize_as_admin(DummyUser.new(alchemy_roles: %w(admin)))
+    end
+
+    it "redirects every request to https." do
+      visit '/admin/dashboard'
+      expect(current_url).to eq('https://www.example.com/admin/dashboard')
+    end
+  end
 end

data/spec/libraries/auth_accessors_spec.rb

@@ -6,19 +6,33 @@ module Alchemy
 
   describe 'AuthAccessors' do
     describe '.user_class' do
-      before {
+      before do
         # prevent memoization
         Alchemy.class_variable_set('@@user_class', nil)
-      }
+      end
 
       it "raises error if user_class_name is not a String" do
         Alchemy.user_class_name = MyCustomUser
         expect {Alchemy.user_class }.to raise_error
       end
 
-      after {
+      after do
         Alchemy.user_class_name = 'DummyUser'
-      }
+      end
+    end
+
+    describe 'defaults' do
+      it 'has default value for Alchemy.signup_path' do
+        expect(Alchemy.signup_path).to eq('/signup')
+      end
+
+      it 'has default value for Alchemy.login_path' do
+        expect(Alchemy.login_path).to eq('/login')
+      end
+
+      it 'has default value for Alchemy.logout_path' do
+        expect(Alchemy.logout_path).to eq('/logout')
+      end
     end
   end
 end

data/spec/libraries/permissions_spec.rb

@@ -127,6 +127,10 @@ describe Alchemy::Permissions do
   context "An author" do
     let(:user) { author_user }
 
+    it "can leave the admin area" do
+      is_expected.to be_able_to(:leave, :alchemy_admin)
+    end
+
     it "can visit the dashboard" do
       is_expected.to be_able_to(:index, :alchemy_admin_dashboard)
       is_expected.to be_able_to(:info, :alchemy_admin_dashboard)

data/spec/libraries/resource_spec.rb

@@ -306,6 +306,12 @@ module Alchemy
         end
       end
 
+      describe '#model_association_names' do
+        it 'returns an array of association names' do
+          expect(resource.model_association_names).to eq [:location]
+        end
+      end
+
       describe '#attributes' do
         it "contains the attribute of the related model" do
           expect(resource.attributes.detect { |a| a[:name] == 'location_id' }.keys).to include(:relation)

data/spec/models/element_spec.rb

@@ -244,11 +244,22 @@ module Alchemy
 
     describe '#essence_error_messages' do
       let(:element) { Element.new(name: 'article') }
+
       it "should return the translation with the translated content label" do
-        I18n.should_receive(:t).with('content_names.content', default: 'Content').and_return('Content')
-        I18n.should_receive(:t).with('content', scope: "content_names.article", default: 'Content').and_return('Contenido')
-        I18n.should_receive(:t).with('article.content.invalid', {:scope=>"content_validations", :default=>[:"fields.content.invalid", :"errors.invalid"], :field=>"Contenido"})
-        element.should_receive(:essence_errors).and_return({'content' => [:invalid]})
+        expect(I18n).to receive(:t)
+          .with('content_names.content', default: 'Content')
+          .and_return('Content')
+        expect(I18n).to receive(:t)
+          .with('content', scope: "content_names.article", default: 'Content')
+          .and_return('Contenido')
+        expect(I18n).to receive(:t)
+          .with('article.content.invalid', {
+            scope: "content_validations",
+            default: [:"fields.content.invalid", :"errors.invalid"],
+            field: "Contenido"})
+        expect(element).to receive(:essence_errors)
+          .and_return({'content' => [:invalid]})
+
         element.essence_error_messages
       end
     end
@@ -554,6 +565,5 @@ module Alchemy
     it_behaves_like "having a hint" do
       let(:subject) { Element.new }
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -50,6 +50,7 @@ Capybara.ignore_hidden_elements = false
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
+  config.raise_errors_for_deprecations!
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.include Alchemy::Engine.routes.url_helpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta3
+  version: 3.1.0.beta4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,70 +12,84 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: actionpack-page_caching
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.8.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.8.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: actionpack-page_caching
+  name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: awesome_nested_set
+  name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.2
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.2
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: acts-as-taggable-on
+  name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -91,159 +105,165 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: dragonfly
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: compass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: acts_as_list
+  name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: magiclabs-userstamp
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
+  name: magiclabs-userstamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: non-stupid-digest-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: compass-rails
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 4.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 4.0.5
 - !ruby/object:Gem::Dependency
   name: sassy-buttons
   requirement: !ruby/object:Gem::Requirement
@@ -258,20 +278,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.6
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.3
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -293,19 +299,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: tvdeyen-handles_sortable_columns
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: spinner.rb
   requirement: !ruby/object:Gem::Requirement
@@ -321,83 +327,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turbolinks
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.11.3
 - !ruby/object:Gem::Dependency
-  name: non-stupid-digest-assets
+  name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: active_model_serializers
+  name: tvdeyen-handles_sortable_columns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -411,19 +411,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Alchemy is a powerful, userfriendly and flexible Rails 4 CMS.
 email:
 - alchemy@magiclabs.de
@@ -696,6 +696,7 @@ files:
 - app/views/alchemy/admin/layoutpages/_layoutpage.html.erb
 - app/views/alchemy/admin/layoutpages/edit.html.erb
 - app/views/alchemy/admin/layoutpages/index.html.erb
+- app/views/alchemy/admin/leave.html.erb
 - app/views/alchemy/admin/legacy_page_urls/_form.html.erb
 - app/views/alchemy/admin/legacy_page_urls/_label.html.erb
 - app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb
@@ -778,7 +779,6 @@ files:
 - app/views/alchemy/base/500.html.erb
 - app/views/alchemy/base/error_notice.html.erb
 - app/views/alchemy/base/error_notice.js.erb
-- app/views/alchemy/base/leave.html.erb
 - app/views/alchemy/base/permission_denied.js.erb
 - app/views/alchemy/base/redirect.js.erb
 - app/views/alchemy/base/update.js.erb
@@ -1030,6 +1030,7 @@ files:
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/locale_select_feature_spec.rb
 - spec/features/admin/modules_integration_spec.rb
+- spec/features/admin/navigation_feature_spec.rb
 - spec/features/admin/page_creation_feature_spec.rb
 - spec/features/admin/page_editing_feature_spec.rb
 - spec/features/admin/picture_library_integration_spec.rb
@@ -1298,6 +1299,7 @@ test_files:
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/locale_select_feature_spec.rb
 - spec/features/admin/modules_integration_spec.rb
+- spec/features/admin/navigation_feature_spec.rb
 - spec/features/admin/page_creation_feature_spec.rb
 - spec/features/admin/page_editing_feature_spec.rb
 - spec/features/admin/picture_library_integration_spec.rb