alchemy_cms 4.0.0.beta → 4.0.0.rc1

data/app/models/alchemy/element.rb

@@ -1,20 +1,23 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_elements
 #
-#  id              :integer          not null, primary key
-#  name            :string(255)
-#  position        :integer
-#  page_id         :integer
-#  public          :boolean          default(TRUE)
-#  folded          :boolean          default(FALSE)
-#  unique          :boolean          default(FALSE)
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  creator_id      :integer
-#  updater_id      :integer
-#  cell_id         :integer
-#  cached_tag_list :text
+#  id                :integer          not null, primary key
+#  name              :string
+#  position          :integer
+#  page_id           :integer          not null
+#  public            :boolean          default(TRUE)
+#  folded            :boolean          default(FALSE)
+#  unique            :boolean          default(FALSE)
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  creator_id        :integer
+#  updater_id        :integer
+#  cell_id           :integer
+#  cached_tag_list   :text
+#  parent_element_id :integer
 #
 
 module Alchemy
@@ -77,7 +80,7 @@ module Alchemy
       required: false,
       touch: true
 
-    has_and_belongs_to_many :touchable_pages, -> { uniq },
+    has_and_belongs_to_many :touchable_pages, -> { distinct },
       class_name: 'Alchemy::Page',
       join_table: ElementToPage.table_name
 
@@ -121,9 +124,7 @@ module Alchemy
       #   could be found
       #
       def new_from_scratch(attributes = {})
-        attributes = attributes.dup.symbolize_keys
         return new if attributes[:name].blank?
-
         new_element_from_definition_by(attributes) || raise(ElementDefinitionError, attributes)
       end
 
@@ -152,10 +153,7 @@ module Alchemy
       #   @copy.public? # => false
       #
       def copy(source_element, differences = {})
-        source_element.attributes.stringify_keys!
-        differences.stringify_keys!
-
-        attributes = source_element.attributes
+        attributes = source_element.attributes.with_indifferent_access
                        .except(*SKIPPED_ATTRIBUTES_ON_COPY)
                        .merge(differences)
                        .merge({
@@ -193,16 +191,11 @@ module Alchemy
       private
 
       def new_element_from_definition_by(attributes)
-        remove_cell_name_from_element_name!(attributes)
-
-        element_definition = Element.definition_by_name(attributes[:name])
+        element_attributes = attributes.to_h.merge(name: attributes[:name].split('#').first)
+        element_definition = Element.definition_by_name(element_attributes[:name])
         return if element_definition.nil?
 
-        new(element_definition.merge(attributes).except(*FORBIDDEN_DEFINITION_ATTRIBUTES))
-      end
-
-      def remove_cell_name_from_element_name!(attributes)
-        attributes[:name] = attributes[:name].split('#').first
+        new(element_definition.merge(element_attributes).except(*FORBIDDEN_DEFINITION_ATTRIBUTES))
       end
     end
 

data/app/models/alchemy/element/definitions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Module concerning element definitions
   #
@@ -11,7 +13,7 @@ module Alchemy
       # your own set of elements
       #
       def definitions
-        @definitions ||= read_definitions_file
+        @definitions ||= read_definitions_file.map(&:with_indifferent_access)
       end
 
       # Returns one element definition by given name.
@@ -26,7 +28,7 @@ module Alchemy
       #
       def read_definitions_file
         if ::File.exist?(definitions_file_path)
-          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, [Regexp, Date], [], true) || []
+          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, [Date, Regexp, Symbol], [], true) || []
         else
           raise LoadError, "Could not find elements.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/app/models/alchemy/element/element_contents.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Methods concerning contents for elements
 #
 module Alchemy
@@ -138,7 +140,7 @@ module Alchemy
     # creates the contents for this element as described in the elements.yml
     def create_contents
       definition.fetch("contents", []).each do |content_hash|
-        Content.create_from_scratch(self, content_hash.symbolize_keys)
+        Content.create_from_scratch(self, content_hash)
       end
     end
   end

data/app/models/alchemy/element/element_essences.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Element::ElementEssences
     # Returns the contents essence value (aka. ingredient) for passed content name.

data/app/models/alchemy/element/presenters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Methods used for presenting an Alchemy Element.
   #

data/app/models/alchemy/element_to_page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class ElementToPage
     def self.table_name

data/app/models/alchemy/essence_boolean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_booleans

data/app/models/alchemy/essence_date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_dates

data/app/models/alchemy/essence_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_files

data/app/models/alchemy/essence_html.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_htmls

data/app/models/alchemy/essence_link.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_links
 #
 #  id              :integer          not null, primary key
-#  link            :string(255)
-#  link_title      :string(255)
-#  link_target     :string(255)
-#  link_class_name :string(255)
+#  link            :string
+#  link_title      :string
+#  link_target     :string
+#  link_class_name :string
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  creator_id      :integer

data/app/models/alchemy/essence_picture.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_pictures
 #
 #  id              :integer          not null, primary key
 #  picture_id      :integer
-#  caption         :string(255)
-#  title           :string(255)
-#  alt_tag         :string(255)
-#  link            :string(255)
-#  link_class_name :string(255)
-#  link_title      :string(255)
-#  css_class       :string(255)
-#  link_target     :string(255)
+#  caption         :string
+#  title           :string
+#  alt_tag         :string
+#  link            :string
+#  link_class_name :string
+#  link_title      :string
+#  css_class       :string
+#  link_target     :string
 #  creator_id      :integer
 #  updater_id      :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
-#  crop_from       :string(255)
-#  crop_size       :string(255)
-#  render_size     :string(255)
+#  crop_from       :string
+#  crop_size       :string
+#  render_size     :string
 #
 
 module Alchemy

data/app/models/alchemy/essence_picture_view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Renders an essence picture view
   class EssencePictureView

data/app/models/alchemy/essence_richtext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_richtexts

data/app/models/alchemy/essence_select.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_selects
 #
 #  id         :integer          not null, primary key
-#  value      :string(255)
+#  value      :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  creator_id :integer

data/app/models/alchemy/essence_text.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_essence_texts
 #
 #  id              :integer          not null, primary key
 #  body            :text
-#  link            :string(255)
-#  link_title      :string(255)
-#  link_class_name :string(255)
+#  link            :string
+#  link_title      :string
+#  link_class_name :string
 #  public          :boolean          default(FALSE)
-#  link_target     :string(255)
+#  link_target     :string
 #  creator_id      :integer
 #  updater_id      :integer
 #  created_at      :datetime         not null

data/app/models/alchemy/folded_page.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_folded_pages
 #
 #  id      :integer          not null, primary key
-#  page_id :integer
-#  user_id :integer
+#  page_id :integer          not null
+#  user_id :integer          not null
 #  folded  :boolean          default(FALSE)
 #
 

data/app/models/alchemy/language.rb

@@ -1,20 +1,23 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_languages
 #
 #  id             :integer          not null, primary key
-#  name           :string(255)
-#  language_code  :string(255)
-#  frontpage_name :string(255)
-#  page_layout    :string(255)      default("intro")
+#  name           :string
+#  language_code  :string
+#  frontpage_name :string
+#  page_layout    :string           default("intro")
 #  public         :boolean          default(FALSE)
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  creator_id     :integer
 #  updater_id     :integer
 #  default        :boolean          default(FALSE)
-#  country_code   :string(255)      default(""), not null
-#  site_id        :integer
+#  country_code   :string           default(""), not null
+#  site_id        :integer          not null
+#  locale         :string
 #
 
 module Alchemy

data/app/models/alchemy/language/code.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy::Language::Code
   extend ActiveSupport::Concern
 

data/app/models/alchemy/legacy_page_url.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_legacy_page_urls
 #
 #  id         :integer          not null, primary key
-#  urlname    :string(255)      not null
+#  urlname    :string           not null
 #  page_id    :integer          not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null

data/app/models/alchemy/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This is a tableless model used for contact forms.
 #
 # You can specify the fields for your contact form in

data/app/models/alchemy/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_pages
@@ -16,8 +18,6 @@
 #  parent_id        :integer
 #  depth            :integer
 #  visible          :boolean          default(FALSE)
-#  public           :boolean          default(FALSE)
-#  locked_at        :datetime
 #  locked_by        :integer
 #  restricted       :boolean          default(FALSE)
 #  robot_index      :boolean          default(TRUE)
@@ -33,6 +33,7 @@
 #  published_at     :datetime
 #  public_on        :datetime
 #  public_until     :datetime
+#  locked_at        :datetime
 #
 
 module Alchemy

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # = Fixed page attributes
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Page::PageCells
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Page::PageElements
     extend ActiveSupport::Concern
@@ -17,7 +19,7 @@ module Alchemy
         through: :descendent_elements,
         class_name: 'Alchemy::Content',
         source: :contents
-      has_and_belongs_to_many :to_be_swept_elements, -> { uniq },
+      has_and_belongs_to_many :to_be_swept_elements, -> { distinct },
         class_name: 'Alchemy::Element',
         join_table: ElementToPage.table_name
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Page::PageNaming
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Page::PageNatures
     extend ActiveSupport::Concern
@@ -96,7 +98,6 @@ module Alchemy
 
     # Returns the self#page_layout definition from config/alchemy/page_layouts.yml file.
     def definition
-      return {} if systempage?
       definition = PageLayout.get(page_layout)
       if definition.nil?
         log_warning "Page definition for `#{page_layout}` not found. Please check `page_layouts.yml` file."

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # ActiveRecord scopes for Alchemy::Page
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Page::PageUsers
     extend ActiveSupport::Concern

data/app/models/alchemy/picture.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_pictures