alchemy_cms 3.1.0.beta5 → 3.1.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d78b3cd4366f28718898767bfd2212e69395d267
-  data.tar.gz: 140a0432a7d56ebf61bea01496a2a595dc4d01d2
+  metadata.gz: ee349e3c1603a85fa273cfbb168e88190db26c8f
+  data.tar.gz: c3288e7a9f128291320f6646dd41ab78f65f23ea
 SHA512:
-  metadata.gz: 27f13644e9cb1b682087d700fc8bc8832bc631eec3050afceb6de0c208b2529240bf4c305e6834d6be3a0108cd5e0450c4a2760711fcc1280db8e100b12aaa39
-  data.tar.gz: cf7ea49cb254531558138aa382e3cdba384e318dcadf7545abc467bb04393308a6fa71c5713faf3747ef6d38a4d2a92156d9217a1cfa4d3bfe7a509c352cc93c
+  metadata.gz: a4b86afe18307827a65c0ecff2894ac39df62a39430d8c9da38d455a49ace528caf9a94b0b91b7e93477a2188ea407c21c700f161ac067e11b26411481f6e5f1
+  data.tar.gz: 52dcf130529e8494da6e49babc0ab1bed1ce6e752aea27aaadce37081dee615892f62c4f5ff4cccd3ae00bf32de1ea4e7b001beb848ca08f6d022428a91a1d44

data/.editorconfig

@@ -0,0 +1,23 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+tab_width = 2
+
+[**.rb]
+max_line_length = 80
+
+[**.js, **.coffee]
+max_line_length = 120
+
+[*.md]
+trim_trailing_whitespace = false

data/app/assets/stylesheets/alchemy/frame.scss

@@ -275,6 +275,10 @@ div#user_info {
     > a {
       padding: 0px 8px;
     }
+
+    .inline.icon {
+      vertical-align: text-bottom;
+    }
   }
 }
 

data/app/assets/stylesheets/alchemy/icons.scss

@@ -302,6 +302,8 @@
 
   &.warning, &.warn, &.alert {
     background-position: 0 -168px;
+
+    &.inline { vertical-align: baseline; }
   }
 
   &.word {

data/app/controllers/alchemy/admin/languages_controller.rb

@@ -1,18 +1,17 @@
 module Alchemy
   module Admin
-    class LanguagesController < Alchemy::Admin::ResourcesController
+    class LanguagesController < ResourcesController
 
       def new
-        @language = Alchemy::Language.new
-        @language.page_layout = (configured_page_layout or @language.page_layout)
+        @language = Language.new
+        @language.page_layout = configured_page_layout || @language.page_layout
       end
 
-    protected
+      private
 
       def configured_page_layout
-        Alchemy::Config.get(:default_language).try('[]', 'page_layout')
+        Config.get(:default_language).try('[]', 'page_layout')
       end
-
     end
   end
 end

data/app/controllers/alchemy/api/base_controller.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  class API::BaseController < Alchemy::BaseController
+  class Api::BaseController < Alchemy::BaseController
     layout false
     respond_to :json
 

data/app/controllers/alchemy/api/contents_controller.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  class API::ContentsController < API::BaseController
+  class Api::ContentsController < Api::BaseController
 
     # Returns all contents as json object
     #

data/app/controllers/alchemy/api/elements_controller.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  class API::ElementsController < API::BaseController
+  class Api::ElementsController < Api::BaseController
 
     # Returns all elements as json object
     #

data/app/controllers/alchemy/api/pages_controller.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  class API::PagesController < API::BaseController
+  class Api::PagesController < Api::BaseController
     before_action :load_page, only: [:show]
 
     # Returns all pages as json object

data/app/models/alchemy/page.rb

@@ -36,6 +36,7 @@
 module Alchemy
   class Page < ActiveRecord::Base
     include Alchemy::Hints
+    include Alchemy::Logger
     include Alchemy::Touching
 
     DEFAULT_ATTRIBUTES_FOR_COPY = {

data/app/models/alchemy/page/page_natures.rb

@@ -67,10 +67,10 @@ module Alchemy
       return {} if self.systempage?
       description = PageLayout.get(self.page_layout)
       if description.nil?
-        raise PageLayoutDefinitionError, "Description could not be found for page layout named #{self.page_layout}. Please check page_layouts.yml file."
-      else
-        description
+        log_warning "Page layout description for `#{self.page_layout}` not found. Please check `page_layouts.yml` file."
+        return {}
       end
+      description
     end
     alias_method :definition, :layout_description
 

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -1,7 +1,11 @@
 <li class="page_level_<%= layoutpage.level %>" id="page_<%= layoutpage.id %>">
   <div class="sitemap_page<%= layoutpage.locked ? ' locked' : '' %>">
     <div class="sitemap_left_images">
+    <% if layoutpage.layout_description.blank? %>
+      <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+    <% else %>
       <%= render_icon(:page) %>
+    <% end %>
     </div>
     <div class="sitemap_right_tools">
       <%- if can?(:configure, layoutpage) -%>

data/app/views/alchemy/admin/layoutpages/edit.html.erb

@@ -1,5 +1,9 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
-  <%= f.input :page_layout, collection: @page_layouts, label: _t(:page_type), include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <%= f.input :page_layout,
+    collection: @page_layouts,
+    label: @page.layout_description.blank? ? (%(<span class="inline warning icon" title="#{ _t(:page_layout_description_missing) }"></span>&nbsp;) + _t(:page_type)).html_safe : _t(:page_type),
+    include_blank: false,
+    input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name, autofocus: true %>
   <% if @page.taggable? %>
     <div class="input string">

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -1,5 +1,9 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
-  <%= f.input :page_layout, collection: @page_layouts, label: _t(:page_type), include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <%= f.input :page_layout,
+    collection: @page_layouts,
+    label: @page.layout_description.blank? ? (%(<span class="inline warning icon" title="#{ _t(:page_layout_description_missing) }"></span>&nbsp;) + _t(:page_type)).html_safe : _t(:page_type),
+    include_blank: false,
+    input_html: {class: 'alchemy_selectbox'} %>
   <div class="input check_boxes">
     <label class="control-label"><%= _t(:page_status) %></label>
     <div class="control_group">

data/app/views/alchemy/admin/pages/_locked_page.html.erb

@@ -3,6 +3,9 @@
 <% else %>
   <div class="subnavi_tab wide" id="locked_page_<%= locked_page.id %>">
     <%= link_to alchemy.edit_admin_page_path(locked_page) do %>
+      <% if locked_page.layout_description.blank? %>
+        <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+      <% end %>
       <span class="page_name" title="<%= locked_page.name %>">
         <%= truncate locked_page.name, length: 15 %>
       </span>

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -2,7 +2,11 @@
   <div class="sitemap_page<%= page.locked ? ' locked' : '' %>" name="<%= page.name %>">
     <div class="sitemap_left_images">
       <%= sitemap_folder_link(page) unless page.level == 1 || page.children.blank? || @sorting %>
-      <div class="page icon <%= @sorting && page.level > 1 ? 'handle' : nil %>"></div>
+      <% if page.layout_description.blank? %>
+        <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+      <% else %>
+        <div class="page icon <%= @sorting && page.level > 1 ? 'handle' : nil %>"></div>
+      <% end %>
     </div>
     <div class="sitemap_right_tools">
     <%- unless @sorting -%>

data/app/views/alchemy/admin/pages/_page_status.html.erb

@@ -1,4 +1,7 @@
 <div class="page_status_and_name" id="page_<%= @page.id %>_status">
+  <% if @page.layout_description.blank? %>
+    <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+  <% end %>
   <span class="page_name"><%= @page.name %></span>
   <%- if multi_language? -%>
     <span class="page_language" title="<%= @page.language.name %>">

data/app/views/alchemy/admin/pages/info.html.erb

@@ -5,7 +5,12 @@
   <% end %>
   <% end %>
   <div class="value">
-    <label><%= Alchemy::Page.human_attribute_name(:page_layout) %></label>
+    <label>
+      <% if @page.layout_description.blank? %>
+        <span class="inline warning icon" title="<%= _t(:page_layout_description_missing) %>"></span>
+      <% end %>
+      <%= Alchemy::Page.human_attribute_name(:page_layout) %>
+    </label>
     <p><%= @page.layout_display_name %></p>
   </div>
   <div class="value">

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -1,5 +1,5 @@
 <%= alchemy_form_for resource_instance_variable, url: resource_path(resource_instance_variable) do |f| %>
-  <% resource_handler.attributes.each do |attribute| %>
+  <% resource_handler.editable_attributes.each do |attribute| %>
     <% if relation = attribute[:relation] %>
       <%= f.association relation[:name].to_sym,
         label_method: relation[:attr_method],

data/config/locales/alchemy.de.yml

@@ -287,6 +287,7 @@ de:
     "Warning!": "Achtung!"
     content_description_missing: "Warnung: Für diesen Content konnte die Vorlage nicht gefunden werden. Bitte überprüfen Sie die elements.yml Datei."
     element_description_missing: "Warnung! Für dieses Element konnte die Vorlage nicht gefunden werden. Bitte überprüfen Sie die elements.yml Datei."
+    page_layout_description_missing: "Warnung! Für diese Seite konnte die Vorlage nicht gefunden werden. Bitte überprüfen Sie die page_layouts.yml Datei."
     "Welcome to Alchemy": "Willkommen in Alchemy"
     "Who else is online": "Wer ist noch online"
     "Yes": "Ja"

data/config/locales/alchemy.en.yml

@@ -286,7 +286,8 @@ en:
     "Visit page": "Visit page"
     "Warning!": "Warning!"
     content_description_missing: "Warning: Content is missing its description. Please check the elements.yml"
-    element_description_missing: "WARNING! Missing description. Please check your elements.yml file."
+    element_description_missing: "WARNING! Missing element description. Please check your elements.yml file."
+    page_layout_description_missing: "WARNING! Missing page layout description. Please check your page_layouts.yml file."
     "Welcome to Alchemy": "Welcome to Alchemy"
     "Who else is online": "Who else is online"
     "Yes": "Yes"

data/config/routes.rb

@@ -4,10 +4,7 @@ Alchemy::Engine.routes.draw do
 
   get '/sitemap.xml' => 'pages#sitemap', format: 'xml'
 
-  get '/admin' => redirect(
-    "#{Alchemy::MountPoint.get}/admin/dashboard"
-  )
-
+  get '/admin' => redirect('admin/dashboard')
   get '/admin/dashboard' => 'admin/dashboard#index',
         :as => :admin_dashboard
   get '/admin/dashboard/info' => 'admin/dashboard#info',

data/lib/alchemy/capistrano.rb

@@ -1,9 +1,8 @@
-# This recipe contains Capistrano recipes for handling the uploads and picture cache files while deploying your application.
-#
+# This recipe contains Capistrano recipes for handling the uploads
+# and picture cache files while deploying your application.
+
 require 'fileutils'
 require 'alchemy/tasks/helpers'
-# Loading the current Rails app's env, so we can get the Alchemy mount point.
-require './config/environment.rb'
 require 'alchemy/mount_point'
 
 include Alchemy::Tasks::Helpers

data/lib/alchemy/errors.rb

@@ -32,10 +32,6 @@ module Alchemy
     # Raised if calling +image_file+ on a Picture object returns nil.
   end
 
-  class PageLayoutDefinitionError < StandardError
-    # Raised if page_layout definition can not be found.
-  end
-
   class PictureInUseError < StandardError
     # Raised if the picture is still in use and can not be deleted.
   end

data/lib/alchemy/mount_point.rb

@@ -1,41 +1,41 @@
 module Alchemy
-  # Utitlities for Alchemy's mount point in the host rails app.
+
+  # Utilities for Alchemy's mount point in the host rails app.
   #
   class MountPoint
+    MOUNT_POINT_REGEXP = /mount\sAlchemy::Engine\s=>\s['|"](\/\w*)['|"]/
+
+    class << self
 
-    # Returns the path of Alchemy's mount point in current rails app.
-    #
-    # @param [Boolean] remove_leading_slash_if_blank
-    #   Pass false to not return a leading slash on empty mount point.
-    #
-    def self.get(remove_leading_slash_if_blank = true)
-      if self.mount_point == "/" && remove_leading_slash_if_blank
-        self.mount_point.gsub(/\A\/\z/, '')
-      else
-        self.mount_point
+      # Returns the path of Alchemy's mount point in current rails app.
+      #
+      # @param [Boolean] remove_leading_slash_if_blank
+      #   Pass false to not return a leading slash on empty mount point.
+      #
+      def get(remove_leading_slash_if_blank = true)
+        if path == "/" && remove_leading_slash_if_blank
+          path.gsub(/\A\/\z/, '')
+        else
+          path
+        end
       end
-    end
 
-    # Returns the routes object from Alchemy in the host app.
-    #
-    def self.routes
-      ::Rails.application.routes.named_routes[:alchemy]
-    end
+      # Returns the mount point path from the Rails app routes.
+      #
+      def path
+        match = File.read(routes_file_path).match(MOUNT_POINT_REGEXP)
+        if match.nil?
+          raise "Alchemy mount point not found! Please run `bin/rake alchemy:mount'"
+        else
+          match[1]
+        end
+      end
+
+      private
 
-    # Returns the raw mount point path from the Rails app routes.
-    #
-    # If Alchemy is not mounted in the main app, it falls back to root path.
-    #
-    def self.mount_point
-      if self.routes.nil?
-        ::Rails.logger.warn <<-WARN
-Alchemy is not mounted! Falling back to root path (/).
-If you want to change Alchemy's mount point, please mount Alchemy::Engine in your config/routes.rb file.
-WARN
-        return '/'
+      def routes_file_path
+        Rails.root.join('config/routes.rb')
       end
-      routes.path.spec.to_s
     end
-
   end
 end

data/lib/alchemy/resource.rb

@@ -20,7 +20,7 @@ module Alchemy
   #
   # == Skip attributes
   #
-  # Usually you don't want your users to edit all attributes provided by a model. Hence some default attributes,
+  # Usually you don't want your users to see and edit all attributes provided by a model. Hence some default attributes,
   # namely id, updated_at, created_at, creator_id and updater_id are not returned by Resource#attributes.
   #
   # If you want to skip a different set of attributes just define a +skipped_alchemy_resource_attributes+ class method in your model class
@@ -32,6 +32,17 @@ module Alchemy
   #       %w(id updated_at secret_token remote_ip)
   #     end
   #
+  # == Restrict attributes
+  #
+  # Beside skipping certain attributes you can also restrict them. Restricted attributes can not be edited by the user but still be seen in the index view.
+  # No attributes are restricted by default.
+  #
+  # === Example
+  #
+  #     def self.restricted_alchemy_resource_attributes
+  #       %w(synced_at remote_record_id)
+  #     end
+  #
   # == Resource relations
   #
   # Alchemy::Resource can take care of ActiveRecord relations.
@@ -73,7 +84,7 @@ module Alchemy
   #     resource = Resource.new('/admin/tags', {"engine_name"=>"alchemy"}, ActsAsTaggableOn::Tag)
   #
   class Resource
-    attr_accessor :skipped_attributes, :resource_relations, :model_associations
+    attr_accessor :skipped_attributes, :restricted_attributes, :resource_relations, :model_associations
     attr_reader :model
 
     DEFAULT_SKIPPED_ATTRIBUTES = %w(id updated_at created_at creator_id updater_id)
@@ -84,6 +95,7 @@ module Alchemy
       @module_definition = module_definition
       @model = (custom_model or guess_model_from_controller_path)
       self.skipped_attributes = model.respond_to?(:skipped_alchemy_resource_attributes) ? model.skipped_alchemy_resource_attributes : DEFAULT_SKIPPED_ATTRIBUTES
+      self.restricted_attributes = model.respond_to?(:restricted_alchemy_resource_attributes) ? model.restricted_alchemy_resource_attributes : []
       if model.respond_to?(:alchemy_resource_relations)
         if not model.respond_to?(:reflect_on_all_associations)
           raise MissingActiveRecordAssociation
@@ -139,6 +151,10 @@ module Alchemy
       end.compact
     end
 
+    def editable_attributes
+      attributes.reject { |h| self.restricted_attributes.map(&:to_s).include?(h[:name].to_s) }
+    end
+
     # Returns all columns that are searchable
     #
     # For now it only uses string type columns

data/lib/alchemy/test_support/factories.rb

@@ -28,7 +28,7 @@ FactoryGirl.define do
     code 'de'
     default true
     frontpage_name 'Intro'
-    page_layout 'intro'
+    page_layout { Alchemy::Config.get(:default_language)['page_layout'] }
     public true
     site { Alchemy::Site.first }
 
@@ -59,7 +59,7 @@ FactoryGirl.define do
 
     factory :language_root_page do
       name 'Startseite'
-      page_layout 'intro'
+      page_layout { language.page_layout }
       language_root true
       public true
       parent_id { Alchemy::Page.root.id }

data/lib/alchemy/version.rb

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

data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb

@@ -5,13 +5,31 @@ module Alchemy
     class DeployScriptGenerator < ::Rails::Generators::Base
 
       desc "This generator generates a Capistrano receipt for deploying Alchemy CMS."
-      class_option :scm, :type => :string, :desc => "Set the type of scm you use for deployment.", :default => 'git'
-      class_option :db, :type => :string, :desc => "Set the type of database you use on your server.", :default => 'mysql'
+
+      class_option :scm,
+        type: 'string',
+        desc: "Set the type of scm you use for deployment.",
+        default: 'git'
+
+      class_option :db,
+        type: 'string',
+        desc: "Set the type of database you use on your server.",
+        default: 'mysql'
+
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
       def copy_script
         @scm = options[:scm]
         @database_type = options[:db]
+        ask_questions
+        template "deploy.rb.tt", Rails.root.join('config', 'deploy.rb')
+        setup_capistrano
+        show_read_me
+      end
+
+      private
+
+      def ask_questions
         @app_name = ask('Please enter a name for your application:')
         @server = ask('Please enter server ip or domain:')
         if @store_credentials = yes?('Do want to store the ssh credentials? (PLEASE DO NOT STORE THEM IF THE REPOSITORY IS PUBLIC) (y/N)')
@@ -27,13 +45,8 @@ module Alchemy
         if @scm == "svn" && yes?('Is your repository private? (y/N)')
           ask_for_repo_credentials
         end
-        template "deploy.rb.tt", Rails.root.join('config', 'deploy.rb')
-        setup_capistrano
-        show_read_me
       end
 
-    private
-
       def ask_for_credentials
         @ssh_user = ask('Please enter ssh username:')
         port = ask('Please enter ssh port (22):')
@@ -59,7 +72,11 @@ module Alchemy
 
       def setup_capistrano
         puts "\nSetting up Capistrano"
-        `capify .`
+        if system 'capify .'
+          gsub_file 'Capfile',
+            /\s{4}#\sload\s'deploy\/assets'/,
+            "load 'deploy/assets'"
+        end
       end
 
       def show_read_me
@@ -68,7 +85,6 @@ module Alchemy
         puts "\nIf you want to deploy Alchemy the first time type:\ncap deploy:cold"
         puts "\nAfter the first deploy you just need to type:\ncap deploy"
       end
-
     end
   end
 end

data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt

@@ -1,6 +1,5 @@
 require 'bundler/capistrano'
 require 'alchemy/capistrano'
-load 'deploy/assets'
 
 # application name
 set :application,               "<%= @app_name %>"

data/spec/controllers/admin/languages_controller_spec.rb

@@ -1,19 +1,14 @@
 require 'spec_helper'
 
-class Alchemy::Config;
-end
-
 describe Alchemy::Admin::LanguagesController do
 
   before do
     sign_in(admin_user)
   end
 
-  describe "new" do
-
+  describe "#new" do
     context "when default_language.page_layout is set" do
-      it "should use it as page_layout-default for the new language" do
-        # FML :/
+      before do
         allow(Alchemy::Config).to receive(:get) do |arg|
           if arg == :default_language
             {'page_layout' => "new_standard"}
@@ -21,17 +16,46 @@ describe Alchemy::Admin::LanguagesController do
             Alchemy::Config.show[arg.to_s]
           end
         end
+      end
+
+      it "uses it as page_layout-default for the new language" do
         get :new
-        expect(assigns(:language).page_layout).to eql("new_standard")
+        expect(assigns(:language).page_layout).to eq("new_standard")
       end
     end
 
-    context "when default_language or page_layout aren't configured" do
-      it "should fallback to one configured in config.yml" do
+    context "when default_language is not configured" do
+      before do
+        allow(Alchemy::Config).to receive(:get) do |arg|
+          if arg == :default_language
+            nil
+          else
+            Alchemy::Config.show[arg.to_s]
+          end
+        end
+      end
+
+      it "falls back to default database value." do
         get :new
-        expect(assigns(:language).page_layout).to eql("index")
+        expect(assigns(:language).page_layout).to eq("intro")
       end
     end
 
+    context "when default language page_layout is not configured" do
+      before do
+        allow(Alchemy::Config).to receive(:get) do |arg|
+          if arg == :default_language
+            {}
+          else
+            Alchemy::Config.show[arg.to_s]
+          end
+        end
+      end
+
+      it "falls back to default database value." do
+        get :new
+        expect(assigns(:language).page_layout).to eq("intro")
+      end
+    end
   end
 end

data/spec/controllers/alchemy/api/contents_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Alchemy
-  describe API::ContentsController do
+  describe Api::ContentsController do
     describe '#index' do
       let!(:page)    { create(:page) }
       let!(:element) { create(:element, page: page) }

data/spec/controllers/alchemy/api/elements_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Alchemy
-  describe API::ElementsController do
+  describe Api::ElementsController do
     describe '#index' do
       let!(:page)    { create(:public_page) }
       let!(:element) { create(:element, page: page) }

data/spec/controllers/alchemy/api/pages_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Alchemy
-  describe API::PagesController do
+  describe Api::PagesController do
 
     describe '#index' do
       let!(:page)    { create(:public_page) }

data/spec/dummy/config/alchemy/page_layouts.yml

@@ -1,4 +1,4 @@
-- name: intro
+- name: index
   unique: true
 
 - name: standard

data/spec/dummy/config/application.rb

@@ -18,7 +18,5 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    I18n.enforce_available_locales = true
   end
 end

data/spec/dummy/config/environments/test.rb

@@ -34,5 +34,5 @@ Dummy::Application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  I18n.enforce_available_locales = false
+  config.i18n.enforce_available_locales = false
 end

data/spec/libraries/mount_point_spec.rb

@@ -1,33 +1,34 @@
 require 'spec_helper'
-require 'ostruct'
 
 describe Alchemy::MountPoint do
-
   describe '.get' do
-
     it "returns the path of alchemy's mount point" do
-      allow(Alchemy::MountPoint).to receive(:mount_point).and_return('/cms')
+      allow(Alchemy::MountPoint).to receive(:path).and_return('/cms')
       expect(Alchemy::MountPoint.get).to eq('/cms')
     end
 
     it "removes the leading slash if root mount point" do
-      allow(Alchemy::MountPoint).to receive(:mount_point).and_return('/')
+      allow(Alchemy::MountPoint).to receive(:path).and_return('/')
       expect(Alchemy::MountPoint.get).to eq('')
     end
 
     context "with remove_leading_slash_if_blank set to false" do
-      before {
-        allow(Alchemy::MountPoint).to receive(:mount_point).and_return('/')
-      }
+      before do
+        allow(Alchemy::MountPoint)
+          .to receive(:path)
+          .and_return('/')
+      end
 
       it "does not remove the leading white slash of path" do
         expect(Alchemy::MountPoint.get(false)).to eq('/')
       end
 
       context "and with mount point not root" do
-        before {
-          allow(Alchemy::MountPoint).to receive(:mount_point).and_return('/cms')
-        }
+        before do
+          allow(Alchemy::MountPoint)
+            .to receive(:path)
+            .and_return('/cms')
+        end
 
         it "does not remove the leading white slash of path" do
           expect(Alchemy::MountPoint.get(false)).to eq('/cms')
@@ -36,27 +37,41 @@ describe Alchemy::MountPoint do
     end
   end
 
-  describe '.routes' do
-    it "returns the routes object from alchemy engine" do
-      expect(Alchemy::MountPoint.routes).to be_instance_of(ActionDispatch::Journey::Route)
+  describe '.path' do
+    before do
+      allow(File)
+        .to receive(:read)
+        .and_return("mount Alchemy::Engine => '/cms'")
     end
-  end
 
-  describe '.mount_point' do
-    it 'returns the raw mount point path from routes' do
-      allow(Alchemy::MountPoint).to receive(:routes).and_return(OpenStruct.new(path: OpenStruct.new(spec: '/cms')))
-      expect(Alchemy::MountPoint.mount_point).to eq('/cms')
+    it 'returns the mount point path from routes.' do
+      expect(Alchemy::MountPoint.path).to eq('/cms')
+    end
+
+    context "Alchemy mount point could not be found" do
+      before do
+        allow(File)
+        .to receive(:read)
+        .and_return("")
+      end
+
+      it "raises an exception" do
+        expect {
+          Alchemy::MountPoint.path
+        }.to raise_error
+      end
     end
 
-    context "Alchemy routes could not be found" do
-      before {
-        allow(Alchemy::MountPoint).to receive(:routes).and_return(nil)
-      }
+    context 'Mount point using double quotes string' do
+      before do
+        allow(File)
+          .to receive(:read)
+          .and_return('mount Alchemy::Engine => "/cms"')
+      end
 
-      it "falls back to root path" do
-        expect(Alchemy::MountPoint.mount_point).to eq('/')
+      it 'returns the mount point path from routes.' do
+        expect(Alchemy::MountPoint.path).to eq('/cms')
       end
     end
   end
-
 end

data/spec/libraries/page_layout_spec.rb

@@ -81,12 +81,18 @@ module Alchemy
 
       context "with sites layouts present" do
         let(:site) { Site.new }
-        let(:definitions) { [{'name' => 'default_site', 'page_layouts' => %w(intro)}] }
-        before { allow(Site).to receive(:layout_definitions).and_return(definitions) }
+
+        let(:definitions) do
+          [{'name' => 'default_site', 'page_layouts' => %w(index)}]
+        end
+
+        before do
+          allow(Site).to receive(:layout_definitions).and_return(definitions)
+        end
 
         it "should only return layouts for site" do
           expect(subject.length).to eq(1)
-          expect(subject.first['name']).to eq('intro')
+          expect(subject.first['name']).to eq('index')
         end
       end
     end

data/spec/libraries/resource_spec.rb

@@ -63,6 +63,11 @@ module Alchemy
         expect(resource.skipped_attributes).to eq(%w(id updated_at created_at creator_id updater_id))
       end
 
+      it "sets the restricted attributes accessor to an empty array by default" do
+        resource = Resource.new("admin/parties")
+        expect(resource.restricted_attributes).to eq([])
+      end
+
       it "sets an instance variable that holds the controller path" do
         resource = Resource.new("admin/parties")
         expect(resource.instance_variable_get(:@controller_path)).to eq("admin/parties")
@@ -269,6 +274,25 @@ module Alchemy
       end
     end
 
+    describe "#editable_attributes" do
+      subject { resource.editable_attributes }
+
+      let(:columns) do
+        [
+          double(:column, {name: 'name', type: :string}),
+          double(:column, {name: 'title', type: :string}),
+          double(:column, {name: 'synced_at', type: :datetime}),
+          double(:column, {name: 'remote_record_id', type: :string})
+        ]
+      end
+
+      before  { resource.restricted_attributes = [:synced_at, :remote_record_id] }
+
+      it "does not contain restricted attributes" do
+        is_expected.to eq([{name: "name", type: :string}, {name: "title", type: :string}])
+      end
+    end
+
     context "when alchemy_resource_relations defined as class method in the model" do
       let(:resource) { Resource.new("admin/events") }
 

data/spec/models/page_spec.rb

@@ -567,22 +567,6 @@ module Alchemy
       end
     end
 
-    describe '.layout_description' do
-      it "should raise Exception if the page_layout could not be found in the definition file" do
-        expect { page.layout_description }.to raise_error
-      end
-
-      context "for a language root page" do
-        it "should return the page layout description as hash" do
-          expect(language_root.layout_description['name']).to eq('intro')
-        end
-
-        it "should return an empty hash for root page" do
-          expect(rootpage.layout_description).to eq({})
-        end
-      end
-    end
-
     describe '.layoutpages' do
       it "should return 1 layoutpage" do
         FactoryGirl.create(:public_page, :layoutpage => true, :name => 'Layoutpage', :parent_id => rootpage.id, :language => language)
@@ -659,16 +643,6 @@ module Alchemy
         end
       end
 
-      context "for page_layout not existing" do
-        let(:page) { FactoryGirl.build_stubbed(:page, page_layout: 'not_existing_one') }
-
-        it "should raise error" do
-          expect {
-            page.available_element_definitions
-          }.to raise_error(Alchemy::PageLayoutDefinitionError)
-        end
-      end
-
       context 'limited amount' do
         let(:page) { FactoryGirl.build_stubbed(:page, page_layout: 'columns') }
         let(:unique_element) { FactoryGirl.build_stubbed(:unique_element, name: 'unique_headline') }
@@ -1026,6 +1000,31 @@ module Alchemy
       end
     end
 
+    describe '#layout_description' do
+      context 'if the page layout could not be found in the definition file' do
+        let(:page) { build_stubbed(:page, page_layout: 'notexisting') }
+
+        it "it loggs a warning." do
+          expect(Alchemy::Logger).to receive(:warn)
+          page.layout_description
+        end
+
+        it "it returns empty hash." do
+          expect(page.layout_description).to eq({})
+        end
+      end
+
+      context "for a language root page" do
+        it "it returns the page layout description as hash." do
+          expect(language_root.layout_description['name']).to eq('index')
+        end
+
+        it "it returns an empty hash for root page." do
+          expect(rootpage.layout_description).to eq({})
+        end
+      end
+    end
+
     describe '#lock_to!' do
       let(:page) { create(:page) }
       let(:user) { mock_model('DummyUser') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta5
+  version: 3.1.0.beta6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -446,6 +446,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -842,14 +843,12 @@ files:
 - app/views/kaminari/alchemy/_paginator.html.erb
 - app/views/kaminari/alchemy/_prev_page.html.erb
 - app/views/layouts/alchemy/admin.html.erb
-- app/views/layouts/alchemy/login.html.erb
 - app/views/layouts/alchemy/sitemap.xml.erb
 - bin/alchemy
 - bin/rails
 - config/alchemy/config.yml
 - config/alchemy/modules.yml
 - config/initializers/dragonfly.rb
-- config/initializers/inflections.rb
 - config/initializers/simple_form.rb
 - config/locales/alchemy.de.yml
 - config/locales/alchemy.en.yml

data/app/views/layouts/alchemy/login.html.erb

@@ -1,2 +0,0 @@
-<%# This file only exist for cases where one want to override the login view %>
-<%= render :template => 'layouts/alchemy/admin' %>

data/config/initializers/inflections.rb

@@ -1,3 +0,0 @@
-ActiveSupport::Inflector.inflections(:en) do |inflect|
-  inflect.acronym 'API'
-end