alchemy_cms 3.2.0.beta → 3.2.0.rc1

data/spec/spec_helper.rb

@@ -19,7 +19,6 @@ require 'database_cleaner'
 require 'rspec-activemodel-mocks'
 
 require 'alchemy/seeder'
-require 'alchemy/test_support/auth_helpers'
 require 'alchemy/test_support/controller_requests'
 require 'alchemy/test_support/essence_shared_examples'
 require 'alchemy/test_support/integration_helpers'
@@ -52,9 +51,10 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.include Alchemy::Engine.routes.url_helpers
-  config.include Alchemy::TestSupport::AuthHelpers
   config.include Alchemy::TestSupport::ControllerRequests, type: :controller
-  config.include Alchemy::TestSupport::IntegrationHelpers, type: :feature
+  [:controller, :feature].each do |type|
+    config.include Alchemy::TestSupport::IntegrationHelpers, type: type
+  end
   config.include FactoryGirl::Syntax::Methods
 
   config.use_transactional_fixtures = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta
+  version: 3.2.0.rc1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -623,6 +623,7 @@ files:
 - app/models/alchemy/element.rb
 - app/models/alchemy/element/definitions.rb
 - app/models/alchemy/element/presenters.rb
+- app/models/alchemy/element_to_page.rb
 - app/models/alchemy/essence_boolean.rb
 - app/models/alchemy/essence_date.rb
 - app/models/alchemy/essence_file.rb
@@ -814,7 +815,8 @@ files:
 - app/views/alchemy/base/redirect.js.erb
 - app/views/alchemy/base/update.js.erb
 - app/views/alchemy/breadcrumb/_page.html.erb
-- app/views/alchemy/breadcrumb/_spacer.html.erb
+- app/views/alchemy/breadcrumb/_separator.html.erb
+- app/views/alchemy/breadcrumb/_wrapper.html.erb
 - app/views/alchemy/elements/_editor_not_found.html.erb
 - app/views/alchemy/elements/_view_not_found.html.erb
 - app/views/alchemy/elements/show.html.erb
@@ -885,8 +887,8 @@ files:
 - db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb
 - lib/alchemy/auth_accessors.rb
 - lib/alchemy/cache_digests/template_tracker.rb
-- lib/alchemy/capistrano.rb
 - lib/alchemy/config.rb
+- lib/alchemy/configuration_methods.rb
 - lib/alchemy/controller_actions.rb
 - lib/alchemy/engine.rb
 - lib/alchemy/errors.rb
@@ -902,15 +904,17 @@ files:
 - lib/alchemy/modules.rb
 - lib/alchemy/mount_point.rb
 - lib/alchemy/name_conversions.rb
+- lib/alchemy/on_page_layout.rb
 - lib/alchemy/page_layout.rb
 - lib/alchemy/permissions.rb
 - lib/alchemy/picture_attributes.rb
 - lib/alchemy/resource.rb
 - lib/alchemy/resources_helper.rb
+- lib/alchemy/routing_constraints.rb
 - lib/alchemy/seeder.rb
 - lib/alchemy/shell.rb
+- lib/alchemy/ssl_protection.rb
 - lib/alchemy/tasks/helpers.rb
-- lib/alchemy/test_support/auth_helpers.rb
 - lib/alchemy/test_support/controller_requests.rb
 - lib/alchemy/test_support/essence_shared_examples.rb
 - lib/alchemy/test_support/factories.rb
@@ -925,8 +929,6 @@ files:
 - lib/alchemy/version.rb
 - lib/alchemy_cms.rb
 - lib/rails/generators/alchemy/base.rb
-- lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb
-- lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt
 - lib/rails/generators/alchemy/elements/elements_generator.rb
 - lib/rails/generators/alchemy/elements/templates/editor.html.erb
 - lib/rails/generators/alchemy/elements/templates/editor.html.haml
@@ -937,6 +939,17 @@ files:
 - lib/rails/generators/alchemy/essence/essence_generator.rb
 - lib/rails/generators/alchemy/essence/templates/editor.html.erb
 - lib/rails/generators/alchemy/essence/templates/view.html.erb
+- lib/rails/generators/alchemy/install/files/_article_editor.html.erb
+- lib/rails/generators/alchemy/install/files/_article_view.html.erb
+- lib/rails/generators/alchemy/install/files/_standard.html.erb
+- lib/rails/generators/alchemy/install/files/alchemy.de.yml
+- lib/rails/generators/alchemy/install/files/alchemy.elements.css.scss
+- lib/rails/generators/alchemy/install/files/alchemy.en.yml
+- lib/rails/generators/alchemy/install/files/alchemy.es.yml
+- lib/rails/generators/alchemy/install/files/application.html.erb
+- lib/rails/generators/alchemy/install/install_generator.rb
+- lib/rails/generators/alchemy/install/templates/elements.yml.tt
+- lib/rails/generators/alchemy/install/templates/page_layouts.yml.tt
 - lib/rails/generators/alchemy/module/module_generator.rb
 - lib/rails/generators/alchemy/module/templates/ability.rb.tt
 - lib/rails/generators/alchemy/module/templates/controller.rb.tt
@@ -945,21 +958,11 @@ files:
 - lib/rails/generators/alchemy/page_layouts/templates/layout.html.erb
 - lib/rails/generators/alchemy/page_layouts/templates/layout.html.haml
 - lib/rails/generators/alchemy/page_layouts/templates/layout.html.slim
-- lib/rails/generators/alchemy/scaffold/files/_article_editor.html.erb
-- lib/rails/generators/alchemy/scaffold/files/_article_view.html.erb
-- lib/rails/generators/alchemy/scaffold/files/_standard.html.erb
-- lib/rails/generators/alchemy/scaffold/files/alchemy.de.yml
-- lib/rails/generators/alchemy/scaffold/files/alchemy.elements.css.scss
-- lib/rails/generators/alchemy/scaffold/files/alchemy.en.yml
-- lib/rails/generators/alchemy/scaffold/files/alchemy.es.yml
-- lib/rails/generators/alchemy/scaffold/files/application.html.erb
-- lib/rails/generators/alchemy/scaffold/files/elements.yml
-- lib/rails/generators/alchemy/scaffold/scaffold_generator.rb
-- lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml.tt
 - lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb
 - lib/rails/generators/alchemy/site_layouts/templates/layout.html.erb
 - lib/rails/generators/alchemy/site_layouts/templates/layout.html.haml
 - lib/rails/generators/alchemy/site_layouts/templates/layout.html.slim
+- lib/rails/generators/alchemy/views/views_generator.rb
 - lib/rails/templates/alchemy.rb
 - lib/tasks/alchemy/convert.rake
 - lib/tasks/alchemy/db.rake
@@ -995,10 +998,11 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/admin/events_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/errors_controller.rb
+- spec/dummy/app/controllers/login_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/ability.rb
+- spec/dummy/app/models/dummy_model.rb
 - spec/dummy/app/models/dummy_user.rb
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/location.rb
@@ -1047,6 +1051,7 @@ files:
 - spec/dummy/db/migrate/20150122213512_add_missing_unique_indices.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20150122213513_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20150122213514_add_missing_taggable_index.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20150412103152_create_dummy_model.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -1065,6 +1070,7 @@ files:
 - spec/features/admin/page_editing_feature_spec.rb
 - spec/features/admin/picture_library_integration_spec.rb
 - spec/features/admin/resources_integration_spec.rb
+- spec/features/admin/site_select_feature_spec.rb
 - spec/features/admin/tinymce_feature_spec.rb
 - spec/features/navigation_spec.rb
 - spec/features/page_feature_spec.rb
@@ -1107,6 +1113,7 @@ files:
 - spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb
 - spec/libraries/modules_spec.rb
 - spec/libraries/mount_point_spec.rb
+- spec/libraries/on_page_layout_spec.rb
 - spec/libraries/page_layout_spec.rb
 - spec/libraries/permissions_spec.rb
 - spec/libraries/resource_spec.rb
@@ -1119,7 +1126,9 @@ files:
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/content_spec.rb
+- spec/models/dummy_model_spec.rb
 - spec/models/element_spec.rb
+- spec/models/element_to_page_spec.rb
 - spec/models/essence_boolean_spec.rb
 - spec/models/essence_date_spec.rb
 - spec/models/essence_file_spec.rb
@@ -1235,7 +1244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4
@@ -1269,10 +1278,11 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/admin/events_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/errors_controller.rb
+- spec/dummy/app/controllers/login_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/ability.rb
+- spec/dummy/app/models/dummy_model.rb
 - spec/dummy/app/models/dummy_user.rb
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/location.rb
@@ -1321,6 +1331,7 @@ test_files:
 - spec/dummy/db/migrate/20150122213512_add_missing_unique_indices.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20150122213513_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20150122213514_add_missing_taggable_index.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20150412103152_create_dummy_model.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -1339,6 +1350,7 @@ test_files:
 - spec/features/admin/page_editing_feature_spec.rb
 - spec/features/admin/picture_library_integration_spec.rb
 - spec/features/admin/resources_integration_spec.rb
+- spec/features/admin/site_select_feature_spec.rb
 - spec/features/admin/tinymce_feature_spec.rb
 - spec/features/navigation_spec.rb
 - spec/features/page_feature_spec.rb
@@ -1381,6 +1393,7 @@ test_files:
 - spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb
 - spec/libraries/modules_spec.rb
 - spec/libraries/mount_point_spec.rb
+- spec/libraries/on_page_layout_spec.rb
 - spec/libraries/page_layout_spec.rb
 - spec/libraries/permissions_spec.rb
 - spec/libraries/resource_spec.rb
@@ -1393,7 +1406,9 @@ test_files:
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/content_spec.rb
+- spec/models/dummy_model_spec.rb
 - spec/models/element_spec.rb
+- spec/models/element_to_page_spec.rb
 - spec/models/essence_boolean_spec.rb
 - spec/models/essence_date_spec.rb
 - spec/models/essence_file_spec.rb

data/app/views/alchemy/breadcrumb/_spacer.html.erb

@@ -1 +0,0 @@
-<%= options[:separator].html_safe %>

data/lib/alchemy/capistrano.rb

@@ -1,230 +0,0 @@
-# This recipe contains Capistrano recipes for handling the uploads
-# and picture cache files while deploying your application.
-
-require 'fileutils'
-require 'alchemy/tasks/helpers'
-require 'alchemy/mount_point'
-
-include Alchemy::Tasks::Helpers
-
-::Capistrano::Configuration.instance(:must_exist).load do
-
-  after "deploy:setup", "alchemy:shared_folders:create"
-  after "deploy:finalize_update", "alchemy:shared_folders:symlink"
-  before "deploy:start", "alchemy:db:seed"
-
-  namespace :alchemy do
-
-    namespace :shared_folders do
-
-      # This task creates the shared folders for uploads, assets and picture cache while setting up your server.
-      desc "Creates the uploads and picture cache directory in the shared folder. Called after deploy:setup"
-      task :create, :roles => :app do
-        run "mkdir -p #{shared_path}/uploads/pictures"
-        run "mkdir -p #{shared_path}/uploads/attachments"
-        run "mkdir -p #{shared_picture_cache_path}"
-        run "mkdir -p #{shared_path}/cache"
-      end
-
-      # This task symlinks the uploads, picture and general cache folder to the new release.
-      desc "Sets the symlinks for uploads and picture cache folder. Called after deploy:finalize_update"
-      task :symlink, :roles => :app do
-        run "rm -rf #{release_path}/uploads"
-        run "ln -nfs #{shared_path}/uploads #{release_path}/"
-        run "mkdir -p #{public_path_with_mountpoint}"
-        run "ln -nfs #{shared_picture_cache_path} #{public_path_with_mountpoint('pictures')}"
-        run "ln -nfs #{shared_path}/cache #{release_path}/tmp/cache"
-      end
-
-      def shared_picture_cache_path
-        @shared_picture_cache_path ||= begin
-          File.join(shared_path, 'cache', Alchemy::MountPoint.get, 'pictures')
-        end
-      end
-
-      def public_path_with_mountpoint(suffix = '')
-        @release_picture_cache_path ||= begin
-          File.join(release_path, 'public', Alchemy::MountPoint.get, suffix)
-        end
-      end
-
-    end
-
-    desc "Upgrades production database to current Alchemy CMS version"
-    task :upgrade do
-      run "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:upgrade"
-    end
-
-    namespace :database_yml do
-
-      desc "Creates the database.yml file"
-      task :create do
-        environment      = Capistrano::CLI.ui.ask("\nPlease enter the environment (Default: #{fetch(:rails_env, 'production')})")
-        environment      = fetch(:rails_env, 'production') if environment.empty?
-        db_adapter       = Capistrano::CLI.ui.ask("Please enter database adapter (Options: mysql2, or postgresql. Default mysql2): ")
-        db_adapter       = db_adapter.empty? ? 'mysql2' : db_adapter.gsub(/\Amysql\z/, 'mysql2')
-        db_name          = Capistrano::CLI.ui.ask("Please enter database name: ")
-        db_username      = Capistrano::CLI.ui.ask("Please enter database username: ")
-        db_password      = Capistrano::CLI.password_prompt("Please enter database password: ")
-        default_db_host  = db_adapter == 'mysql2' ? 'localhost' : '127.0.0.1'
-        db_host          = Capistrano::CLI.ui.ask("Please enter database host (Default: #{default_db_host}): ")
-        db_host          = db_host.empty? ? default_db_host : db_host
-        db_config        = ERB.new <<-EOF
-#{environment}:
-  adapter: #{ db_adapter }
-  encoding: utf8
-  reconnect: false
-  pool: 5
-  database: #{ db_name }
-  username: #{ db_username }
-  password: #{ db_password }
-  host: #{ db_host }
-EOF
-        run "mkdir -p #{shared_path}/config"
-        put db_config.result, "#{shared_path}/config/database.yml"
-      end
-
-      desc "[internal] Symlinks the database.yml file from shared folder into config folder"
-      task :symlink, :except => {:no_release => true} do
-        run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
-      end
-
-    end
-
-    namespace :db do
-
-      desc "Seeds the database with essential data."
-      task :seed, :roles => :db do
-        run "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:seed"
-      end
-
-      desc "Dumps the database into 'db/dumps' on the server."
-      task :dump, :roles => :db do
-        timestamp = Time.now.strftime('%Y-%m-%d-%H-%M')
-        run "cd #{current_path} && mkdir -p db/dumps && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} DUMP_FILENAME=db/dumps/#{timestamp}.sql alchemy:db:dump"
-      end
-
-    end
-
-    namespace :import do
-
-      desc "Imports all data (Pictures, attachments and the database) into your local development machine."
-      task :all, :roles => [:app, :db] do
-        pictures
-        attachments
-        database
-      end
-
-      desc "Imports the server database into your local development machine."
-      task :database, :roles => [:db], :only => {:primary => true} do
-        require 'spinner'
-        server = find_servers_for_task(current_task).first
-        spinner = Spinner.new
-        print "\n"
-        spinner.task("Importing the database. Please wait...") do
-          system db_import_cmd(server)
-        end
-        spinner.spin!
-      end
-
-      desc "Imports attachments into your local machine using rsync."
-      task :attachments, :roles => [:app] do
-        get_files :attachments
-      end
-
-      desc "Imports pictures into your local machine using rsync."
-      task :pictures, :roles => [:app] do
-        get_files :pictures
-      end
-
-      def get_files(type)
-        FileUtils.mkdir_p "./uploads"
-        server = find_servers_for_task(current_task).first
-        if server
-          system "rsync --progress -rue 'ssh -p #{fetch(:port, 22)}' #{user}@#{server}:#{shared_path}/uploads/#{type} ./uploads/"
-        else
-          raise "No server found"
-        end
-      end
-
-      def db_import_cmd(server)
-        dump_cmd = "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:dump"
-        sql_stream = "ssh -p #{fetch(:port, 22)} #{user}@#{server} '#{dump_cmd}'"
-        "#{sql_stream} | #{database_import_command(database_config['adapter'])} 1>/dev/null 2>&1"
-      end
-    end
-
-    namespace :export do
-      desc "Sends all data (Pictures, attachments and the database) to your remote machine."
-      task :all, :roles => [:app, :db] do
-        pictures
-        attachments
-        database
-      end
-
-      desc "Imports the server database into your local development machine."
-      task :database, :roles => [:db], :only => {:primary => true} do
-        if Capistrano::CLI.ui.agree('WARNING: This task will override your remote database. Do you want me to make a backup? (y/n)')
-          backup_database
-          export_database
-        else
-          if Capistrano::CLI.ui.agree('Are you sure? (y/n)')
-            export_database
-          else
-            backup_database
-            export_database
-          end
-        end
-      end
-
-      desc "Sends attachments to your remote machine using rsync."
-      task :attachments, :roles => [:app] do
-        send_files :attachments
-      end
-
-      desc "Sends pictures to your remote machine using rsync."
-      task :pictures, :roles => [:app] do
-        send_files :pictures
-      end
-
-      # Makes a backup of the remote database and stores it in db/ folder
-      def backup_database
-        Capistrano::CLI.ui.say('Backing up database')
-        timestamp = Time.now.strftime('%Y-%m-%d-%H-%M')
-        run "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:dump DUMP_FILENAME=db/dump-#{timestamp}.sql"
-      end
-
-      # Sends the database via ssh to the server
-      def export_database
-        require 'spinner'
-        server = find_servers_for_task(current_task).first
-        spinner = Spinner.new
-        print "\n"
-        spinner.task("Exporting the database. Please wait...") do
-          system db_export_cmd(server)
-        end
-        spinner.spin!
-      end
-
-      # The actual export command that sends the data
-      def db_export_cmd(server)
-        import_cmd = "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:import"
-        ssh_cmd = "ssh -p #{fetch(:port, 22)} #{user}@#{server} '#{import_cmd}'"
-        "#{database_dump_command(database_config['adapter'])} | #{ssh_cmd}"
-      end
-
-      # Sends files of given type via rsync to server
-      def send_files(type)
-        FileUtils.mkdir_p "./uploads/#{type}"
-        server = find_servers_for_task(current_task).first
-        if server
-          system "rsync --progress -rue 'ssh -p #{fetch(:port, 22)}' uploads/#{type} #{user}@#{server}:#{shared_path}/uploads/"
-        else
-          raise "No server found"
-        end
-      end
-    end
-
-  end
-
-end