alchemy_cms 3.2.1 → 3.3.0.rc1

data/lib/alchemy/test_support/factories.rb

@@ -1,147 +1,3 @@
-require 'factory_girl'
-
-FactoryGirl.define do
-
-  factory :alchemy_dummy_user, class: 'DummyUser' do
-    sequence(:email) { |n| "john.#{n}@doe.com" }
-    password 's3cr3t'
-    alchemy_roles ['member']
-
-    trait :as_admin do
-      alchemy_roles ['admin']
-    end
-
-    trait :as_author do
-      alchemy_roles ['author']
-    end
-
-    trait :as_editor do
-      alchemy_roles ['editor']
-    end
-  end
-
-  factory :language, :class => 'Alchemy::Language' do
-    name 'Deutsch'
-    code 'de'
-    default true
-    frontpage_name 'Intro'
-    page_layout { Alchemy::Config.get(:default_language)['page_layout'] }
-    public true
-    site { Alchemy::Site.first }
-
-    factory :klingonian do
-      name 'Klingonian'
-      code 'kl'
-      frontpage_name 'Tuq'
-      default false
-    end
-
-    factory :english do
-      name 'English'
-      code 'en'
-      frontpage_name 'Intro'
-      default false
-    end
-  end
-
-  factory :page, :class => 'Alchemy::Page' do
-
-    language { Alchemy::Language.default || FactoryGirl.create(:language) }
-    sequence(:name) { |n| "A Page #{n}" }
-    parent_id { (Alchemy::Page.find_by_language_root(true) || FactoryGirl.create(:language_root_page)).id }
-    page_layout "standard"
-
-    # This speeds up creating of pages dramatically. Pass :do_not_autogenerate => false to generate elements
-    do_not_autogenerate true
-
-    factory :language_root_page do
-      name 'Startseite'
-      page_layout { language.page_layout }
-      language_root true
-      public true
-      parent_id { Alchemy::Page.root.id }
-    end
-
-    factory :public_page do
-      sequence(:name) { |n| "A Public Page #{n}" }
-      public true
-    end
-
-    factory :systempage do
-      name "Systempage"
-      parent_id { Alchemy::Page.root.id }
-      language_root false
-      page_layout nil
-      language nil
-    end
-
-    factory :restricted_page do
-      name "Restricted page"
-      restricted true
-    end
-
-  end
-
-  factory :cell, :class => 'Alchemy::Cell' do
-    page { Alchemy::Page.find_by(language_root: true) || FactoryGirl.create(:language_root_page) }
-    name "a_cell"
-  end
-
-  factory :element, :class => 'Alchemy::Element' do
-    name 'article'
-    create_contents_after_create false
-
-    factory :unique_element do
-      unique true
-      name 'header'
-    end
-  end
-
-  factory :picture, :class => 'Alchemy::Picture' do
-    image_file File.new(File.expand_path('../../../../spec/fixtures/image.png', __FILE__))
-    name 'image'
-    image_file_name 'image.png'
-    upload_hash Time.now.hash
-  end
-
-  factory :content, :class => 'Alchemy::Content' do
-    name "text"
-    essence_type "Alchemy::EssenceText"
-    association :essence, :factory => :essence_text
-  end
-
-  factory :essence_text, :class => 'Alchemy::EssenceText' do
-    body ''
-  end
-
-  factory :essence_picture, :class => 'Alchemy::EssencePicture' do
-    picture
-  end
-
-  factory :essence_file, :class => 'Alchemy::EssenceFile' do
-    attachment
-  end
-
-  factory :attachment, :class => 'Alchemy::Attachment' do
-    file File.new(File.expand_path('../../../../spec/fixtures/image.png', __FILE__))
-    name 'image'
-    file_name 'image.png'
-  end
-
-  factory :event do
-    name 'My Event'
-    hidden_name 'not shown'
-    starts_at DateTime.new(2012, 03, 02, 8, 15)
-    ends_at DateTime.new(2012, 03, 02, 19, 30)
-    lunch_starts_at DateTime.new(2012, 03, 02, 12, 15)
-    lunch_ends_at DateTime.new(2012, 03, 02, 13, 45)
-    description "something\nfancy"
-    published false
-    entrance_fee 12.3
-  end
-
-  factory :site, class: 'Alchemy::Site' do
-    name 'A Site'
-    host 'domain.com'
-  end
+Dir[File.dirname(__FILE__) + '/factories/*.rb'].each do |file|
+  require file
 end

data/lib/alchemy/test_support/factories/attachment_factory.rb

@@ -0,0 +1,9 @@
+require 'factory_girl'
+
+FactoryGirl.define do
+  factory :alchemy_attachment, class: 'Alchemy::Attachment' do
+    file File.new(File.expand_path('../../../../../spec/fixtures/image.png', __FILE__))
+    name 'image'
+    file_name 'image.png'
+  end
+end

data/lib/alchemy/test_support/factories/cell_factory.rb

@@ -0,0 +1,9 @@
+require 'factory_girl'
+require 'alchemy/test_support/factories/page_factory'
+
+FactoryGirl.define do
+  factory :alchemy_cell, class: 'Alchemy::Cell' do
+    page { Alchemy::Page.find_by(language_root: true) || FactoryGirl.create(:alchemy_page, :language_root) }
+    name "a_cell"
+  end
+end

data/lib/alchemy/test_support/factories/content_factory.rb

@@ -0,0 +1,10 @@
+require 'factory_girl'
+require 'alchemy/test_support/factories/essence_text_factory'
+
+FactoryGirl.define do
+  factory :alchemy_content, class: 'Alchemy::Content' do
+    name "text"
+    essence_type "Alchemy::EssenceText"
+    association :essence, factory: :alchemy_essence_text
+  end
+end

data/lib/alchemy/test_support/factories/dummy_user_factory.rb

@@ -0,0 +1,21 @@
+require 'factory_girl'
+
+FactoryGirl.define do
+  factory :alchemy_dummy_user, class: 'DummyUser' do
+    sequence(:email) { |n| "john.#{n}@doe.com" }
+    password 's3cr3t'
+    alchemy_roles ['member']
+
+    trait :as_admin do
+      alchemy_roles ['admin']
+    end
+
+    trait :as_author do
+      alchemy_roles ['author']
+    end
+
+    trait :as_editor do
+      alchemy_roles ['editor']
+    end
+  end
+end

data/lib/alchemy/test_support/factories/element_factory.rb

@@ -0,0 +1,21 @@
+require 'factory_girl'
+
+FactoryGirl.define do
+  factory :alchemy_element, class: 'Alchemy::Element' do
+    name 'article'
+    create_contents_after_create false
+
+    trait :unique do
+      unique true
+      name 'header'
+    end
+
+    trait :with_nestable_elements do
+      name 'slider'
+    end
+
+    trait :with_contents do
+      create_contents_after_create true
+    end
+  end
+end

data/lib/alchemy/test_support/factories/essence_file_factory.rb

@@ -0,0 +1,8 @@
+require 'factory_girl'
+require 'alchemy/test_support/factories/attachment_factory'
+
+FactoryGirl.define do
+  factory :alchemy_essence_file, class: 'Alchemy::EssenceFile' do
+    attachment factory: :alchemy_attachment
+  end
+end

data/lib/alchemy/test_support/factories/essence_picture_factory.rb

@@ -0,0 +1,8 @@
+require 'factory_girl'
+require 'alchemy/test_support/factories/picture_factory'
+
+FactoryGirl.define do
+  factory :alchemy_essence_picture, class: 'Alchemy::EssencePicture' do
+    picture factory: :alchemy_picture
+  end
+end

data/lib/alchemy/test_support/factories/essence_text_factory.rb

@@ -0,0 +1,7 @@
+require 'factory_girl'
+
+FactoryGirl.define do
+  factory :alchemy_essence_text, class: 'Alchemy::EssenceText' do
+    body 'This is a headline'
+  end
+end

data/lib/alchemy/test_support/factories/language_factory.rb

@@ -0,0 +1,28 @@
+require 'factory_girl'
+require 'alchemy/test_support/factories/site_factory'
+
+FactoryGirl.define do
+  factory :alchemy_language, class: 'Alchemy::Language' do
+    name 'Deutsch'
+    code 'de'
+    default true
+    frontpage_name 'Intro'
+    page_layout { Alchemy::Config.get(:default_language)['page_layout'] }
+    public true
+    site { Alchemy::Site.first || FactoryGirl.create(:site) }
+
+    trait :klingon do
+      name 'Klingon'
+      code 'kl'
+      frontpage_name 'Tuq'
+      default false
+    end
+
+    trait :english do
+      name 'English'
+      code 'en'
+      frontpage_name 'Intro'
+      default false
+    end
+  end
+end

data/lib/alchemy/test_support/factories/page_factory.rb

@@ -0,0 +1,45 @@
+require 'factory_girl'
+require 'alchemy/test_support/factories/language_factory'
+
+FactoryGirl.define do
+  factory :alchemy_page, class: 'Alchemy::Page' do
+    language { Alchemy::Language.default || FactoryGirl.create(:alchemy_language) }
+    sequence(:name) { |n| "A Page #{n}" }
+    page_layout "standard"
+
+    parent_id do
+      (Alchemy::Page.find_by(language_root: true) ||
+        FactoryGirl.create(:alchemy_page, :language_root)).id
+    end
+
+    # This speeds up creating of pages dramatically.
+    # Pass do_not_autogenerate: false to generate elements
+    do_not_autogenerate true
+
+    trait :language_root do
+      name 'Startseite'
+      page_layout { language.page_layout }
+      language_root true
+      public true
+      parent_id { Alchemy::Page.root.id }
+    end
+
+    trait :public do
+      sequence(:name) { |n| "A Public Page #{n}" }
+      public true
+    end
+
+    trait :system do
+      name "Systempage"
+      parent_id { Alchemy::Page.root.id }
+      language_root false
+      page_layout nil
+      language nil
+    end
+
+    trait :restricted do
+      name "Restricted page"
+      restricted true
+    end
+  end
+end

data/lib/alchemy/test_support/factories/picture_factory.rb

@@ -0,0 +1,10 @@
+require 'factory_girl'
+
+FactoryGirl.define do
+  factory :alchemy_picture, class: 'Alchemy::Picture' do
+    image_file File.new(File.expand_path('../../../../../spec/fixtures/image.png', __FILE__))
+    name 'image'
+    image_file_name 'image.png'
+    upload_hash Time.current.hash
+  end
+end

data/lib/alchemy/test_support/factories/site_factory.rb

@@ -0,0 +1,12 @@
+require 'factory_girl'
+
+FactoryGirl.define do
+  factory :alchemy_site, class: 'Alchemy::Site' do
+    name 'A Site'
+    host 'domain.com'
+
+    trait :public do
+      public true
+    end
+  end
+end

data/lib/alchemy/test_support/integration_helpers.rb

@@ -1,12 +1,10 @@
 module Alchemy
   module TestSupport
-
     # Helpers for integration specs
     #
     # This file is included in spec_helper.rb
     #
     module IntegrationHelpers
-
       # Used to stub the current_alchemy_user
       #
       # Pass either a user object or a symbol in the format of ':as_admin'.
@@ -28,6 +26,5 @@ module Alchemy
         end
       end
     end
-
   end
 end

data/lib/alchemy/tinymce.rb

@@ -23,46 +23,35 @@ module Alchemy
       element_format: 'html'
     }
 
-    def self.init=(settings)
-      if contains_old_tinymce_toolbar_config?('tinymce' => settings.stringify_keys)
-        warn_about_deprecation!
+    class << self
+      def init=(settings)
+        @@init.merge!(settings)
       end
-      @@init.merge!(settings)
-    end
-
-    def self.init
-      @@init
-    end
 
-    def self.custom_config_contents(page = nil)
-      if page
-        definitions = content_definitions_from_elements(page.element_definitions)
-      else
-        definitions = content_definitions_from_elements(Element.definitions)
+      def init
+        @@init
       end
-      if definitions.any? { |d| contains_old_tinymce_toolbar_config?(d['settings']) }
-        warn_about_deprecation!
-      end
-      definitions
-    end
-
-    private
 
-    def self.content_definitions_from_elements(definitions)
-      definitions.collect do |el|
-        next if el['contents'].blank?
-        contents = el['contents'].select { |c| c['settings'] && c['settings']['tinymce'].present? }
-        next if contents.blank?
-        contents.map { |c| c.merge('element' => el['name']) }
-      end.flatten.compact
-    end
-
-    def self.contains_old_tinymce_toolbar_config?(settings)
-      settings['tinymce'] && settings['tinymce'].keys.any? { |k| k.match(/toolbar[0-9]/) }
-    end
+      def custom_config_contents(page = nil)
+        if page
+          content_definitions_from_elements(page.element_definitions)
+        else
+          content_definitions_from_elements(Element.definitions)
+        end
+      end
 
-    def self.warn_about_deprecation!
-      ActiveSupport::Deprecation.warn("You use old TinyMCE 4.0 based toolbar config! Please consider to upgrade it to 4.1 compatible syntax. I.e. don't use 'toolbarN', use 'toolbar' with array instead. Visit http://www.tinymce.com/wiki.php/Configuration:toolbar for more information.")
+      private
+
+      def content_definitions_from_elements(definitions)
+        definitions.collect do |el|
+          next if el['contents'].blank?
+          contents = el['contents'].select do |c|
+            c['settings'] && c['settings']['tinymce'].is_a?(Hash)
+          end
+          next if contents.blank?
+          contents.map { |c| c.merge('element' => el['name']) }
+        end.flatten.compact
+      end
     end
   end
 end