alchemy_cms 2.8.3 → 2.9.0

data/spec/models/picture_spec.rb

@@ -5,7 +5,7 @@ module Alchemy
   describe Picture do
 
     let :image_file do
-      File.new(File.expand_path('../../support/image.png', __FILE__))
+      File.new(File.expand_path('../../fixtures/image.png', __FILE__))
     end
 
     let(:picture) { Picture.new }
@@ -21,13 +21,13 @@ module Alchemy
     end
 
     it "is valid with capitalized image file extension" do
-      image_file = File.new(File.expand_path('../../support/image2.PNG', __FILE__))
+      image_file = File.new(File.expand_path('../../fixtures/image2.PNG', __FILE__))
       picture = Picture.new(:image_file => image_file)
       picture.should be_valid
     end
 
     it "is valid with jpeg image file extension" do
-      image_file = File.new(File.expand_path('../../support/image3.jpeg', __FILE__))
+      image_file = File.new(File.expand_path('../../fixtures/image3.jpeg', __FILE__))
       picture = Picture.new(:image_file => image_file)
       picture.should be_valid
     end
@@ -216,7 +216,7 @@ module Alchemy
       end
 
     end
-    
+
     describe "#cropped_thumbnail_size" do
 
       context "if given size is blank or 111x93" do
@@ -238,7 +238,7 @@ module Alchemy
         end
       end
     end
-    
+
     describe "#image_file_dimensions" do
       it "should return the width and height in the format of '1024x768'" do
         picture.image_file = image_file

data/spec/spec_helper.rb

@@ -17,10 +17,15 @@ require "rails/test_help"
 require "rspec/rails"
 require 'factory_girl'
 
+# Load authorization ruels from dummy app.
+Alchemy::Auth::Engine.get_instance.load(File.join(File.dirname(__FILE__), './dummy', 'config/authorization_rules.rb'))
+
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = "test.com"
 
+ActiveSupport::Deprecation.silenced = true
+
 Rails.backtrace_cleaner.remove_silencers!
 # Disable rails loggin for faster IO. Remove this if you want to have a test.log
 Rails.logger.level = 4
@@ -28,6 +33,10 @@ Rails.logger.level = 4
 # Configure capybara for integration testing
 require "capybara/rails"
 require 'capybara/poltergeist'
+require 'alchemy/test_support/auth_helpers'
+require 'alchemy/test_support/controller_requests'
+require 'alchemy/test_support/integration_helpers'
+require 'alchemy/test_support/factories'
 Capybara.default_driver = :rack_test
 Capybara.default_selector = :css
 Capybara.register_driver(:rack_test_translated_header) do |app|
@@ -39,6 +48,7 @@ if ENV['CI']
   end
 end
 Capybara.javascript_driver = :poltergeist
+Capybara.ignore_hidden_elements = false
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -50,11 +60,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 Devise::TestHelpers, :type => :controller
-  config.include Alchemy::Specs::ControllerHelpers, :type => :controller
-  config.include Alchemy::Specs::IntegrationHelpers, :type => :feature
+  config.include Alchemy::TestSupport::AuthHelpers
+  config.include Alchemy::TestSupport::IntegrationHelpers, type: :feature
   config.use_transactional_fixtures = false
-
+  # Make sure the database is clean and ready for test
   config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation)
     Alchemy::Seeder.seed!

data/spec/tasks/helpers_spec.rb

@@ -0,0 +1,213 @@
+require 'spec_helper'
+require 'alchemy/tasks/helpers'
+
+module Alchemy
+
+  class Foo
+    extend Tasks::Helpers
+  end
+
+  describe "Tasks:Helpers" do
+
+    let(:config) do
+      {
+        'test' => {
+          'adapter'  => 'mysql2',
+          'username' => 'testuser',
+          'password' => '123456',
+          'host'     => 'localhost'
+        }
+      }
+    end
+
+    before do
+      File.stub(exists?: true)
+      YAML.stub(load_file: config)
+    end
+
+    describe "#database_dump_command" do
+      subject { Foo.database_dump_command(adapter) }
+
+      context "when config for RAILS_ENV not found" do
+        let(:adapter) { 'mysql2' }
+
+        before { Foo.stub(environment: 'huh?') }
+
+        it "should raise an error" do
+          expect { subject }.to raise_error(RuntimeError)
+        end
+      end
+
+      context "when given a not supported database adapter" do
+        let(:adapter) { 'oracle' }
+
+        it "should raise an error" do
+          expect { subject }.to raise_error(ArgumentError)
+        end
+      end
+
+      context "for mysql adapter" do
+        let(:adapter) { 'mysql2' }
+
+        it "uses the mysqldump command" do
+          should include('mysqldump ')
+        end
+
+        context "when a username is set in the config file" do
+          it { should include("--user='testuser'") }
+        end
+
+        context "when a password is set in the config file" do
+          it { should include("--password='123456'") }
+        end
+
+        context "when a host is set in the config file" do
+          context "and the host is localhost" do
+            it { should_not include("--host=") }
+          end
+
+          context "and the host is anything but not localhost" do
+            before do
+              YAML.stub(load_file: {'test' => {'host' => 'mydomain.com'}})
+            end
+            it { should include("--host='mydomain.com'") }
+          end
+        end
+      end
+
+      context "for postgresql adapter" do
+        let(:adapter) { 'postgresql' }
+
+        it "uses the pg_dump command with clean option" do
+          should include('pg_dump --clean')
+        end
+
+        context "when a username is set in the config file" do
+          it { should include("--username='testuser'") }
+        end
+
+        context "when a password is set in the config file" do
+          it { should include("PGPASSWORD='123456'") }
+        end
+
+        context "when a host is set in the config file" do
+          context "and the host is localhost" do
+            it { should_not include("--host=") }
+          end
+
+          context "and the host is anything but not localhost" do
+            before do
+              YAML.stub(load_file: {'test' => {'host' => 'mydomain.com'}})
+            end
+            it { should include("--host='mydomain.com'") }
+          end
+        end
+      end
+
+      after do
+        Foo.instance_variable_set("@database_config", nil) # resets the memoization
+      end
+    end
+
+    describe "#database_import_command" do
+      subject { Foo.database_import_command(adapter) }
+
+      context "when config for RAILS_ENV not found" do
+        let(:adapter) { 'mysql' }
+
+        before { Foo.stub(environment: 'huh?') }
+
+        it "should raise an error" do
+          expect { subject }.to raise_error(RuntimeError)
+        end
+      end
+
+      context "when given a not supported database adapter" do
+        let(:adapter) { 'oracle' }
+
+        it "should raise an error" do
+          expect { subject }.to raise_error(ArgumentError)
+        end
+      end
+
+      context "for mysql adapter" do
+        let(:adapter) { 'mysql' }
+
+        it "uses the mysql command" do
+          should include('mysql ')
+        end
+
+        context "when a username is set in the config file" do
+          it { should include("--user='testuser'") }
+        end
+
+        context "when a password is set in the config file" do
+          it { should include("--password='123456'") }
+        end
+
+        context "when a host is set in the config file" do
+          context "and the host is localhost" do
+            it { should_not include("--host=") }
+          end
+
+          context "and the host is anything but not localhost" do
+            before do
+              YAML.stub(load_file: {'test' => {'host' => 'mydomain.com'}})
+            end
+            it { should include("--host='mydomain.com'") }
+          end
+        end
+      end
+
+      context "for postgresql adapter" do
+        let(:adapter) { 'postgresql' }
+
+        it "uses the psql command" do
+          should include('psql ')
+        end
+
+        context "when a username is set in the config file" do
+          it { should include("--username='testuser'") }
+        end
+
+        context "when a password is set in the config file" do
+          it { should include("PGPASSWORD='123456'") }
+        end
+
+        context "when a host is set in the config file" do
+          context "and the host is localhost" do
+            it { should_not include("--host=") }
+          end
+
+          context "and the host is anything but not localhost" do
+            before do
+              YAML.stub(load_file: {'test' => {'host' => 'mydomain.com'}})
+            end
+            it { should include("--host='mydomain.com'") }
+          end
+        end
+      end
+
+      after do
+        Foo.instance_variable_set("@database_config", nil) # resets the memoization
+      end
+    end
+
+    describe "#database_config" do
+      it "should memoize the results" do
+        expect(Foo.database_config).to eq(config['test'])
+        config['username'] = 'newuser'
+        expect(Foo.database_config).to eq(config['test'])
+      end
+
+      context 'for missing database config file' do
+        before { File.stub(exists?: false) }
+
+        it "raises error" do
+          expect { Foo.database_config }.to raise_error(RuntimeError)
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.9.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,20 +28,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -496,10 +482,7 @@ files:
 - app/controllers/alchemy/elements_controller.rb
 - app/controllers/alchemy/messages_controller.rb
 - app/controllers/alchemy/pages_controller.rb
-- app/controllers/alchemy/passwords_controller.rb
 - app/controllers/alchemy/pictures_controller.rb
-- app/controllers/alchemy/user_sessions_controller.rb
-- app/controllers/alchemy/users_controller.rb
 - app/helpers/alchemy/admin/attachments_helper.rb
 - app/helpers/alchemy/admin/base_helper.rb
 - app/helpers/alchemy/admin/contents_helper.rb
@@ -516,7 +499,6 @@ files:
 - app/helpers/alchemy/pages_helper.rb
 - app/helpers/alchemy/url_helper.rb
 - app/mailers/alchemy/messages.rb
-- app/mailers/alchemy/notifications.rb
 - app/models/alchemy.rb
 - app/models/alchemy/attachment.rb
 - app/models/alchemy/cell.rb
@@ -541,18 +523,17 @@ files:
 - app/models/alchemy/legacy_page_url.rb
 - app/models/alchemy/message.rb
 - app/models/alchemy/page.rb
-- app/models/alchemy/page/cells.rb
-- app/models/alchemy/page/elements.rb
-- app/models/alchemy/page/naming.rb
-- app/models/alchemy/page/natures.rb
-- app/models/alchemy/page/scopes.rb
-- app/models/alchemy/page/users.rb
+- app/models/alchemy/page/page_cells.rb
+- app/models/alchemy/page/page_elements.rb
+- app/models/alchemy/page/page_naming.rb
+- app/models/alchemy/page/page_natures.rb
+- app/models/alchemy/page/page_scopes.rb
+- app/models/alchemy/page/page_users.rb
 - app/models/alchemy/picture.rb
 - app/models/alchemy/site.rb
 - app/models/alchemy/site/layout.rb
 - app/models/alchemy/tag.rb
 - app/models/alchemy/tree_node.rb
-- app/models/alchemy/user.rb
 - app/sweepers/alchemy/content_sweeper.rb
 - app/sweepers/alchemy/pages_sweeper.rb
 - app/sweepers/alchemy/pictures_sweeper.rb
@@ -690,15 +671,11 @@ files:
 - app/views/alchemy/admin/tags/new.html.erb
 - app/views/alchemy/admin/trash/clear.js.coffee
 - app/views/alchemy/admin/trash/index.html.erb
-- app/views/alchemy/admin/users/_table.html.erb
-- app/views/alchemy/admin/users/_user.html.erb
-- app/views/alchemy/admin/users/edit.html.erb
-- app/views/alchemy/admin/users/index.html.erb
-- app/views/alchemy/admin/users/new.html.erb
 - app/views/alchemy/attachments/show.html.erb
 - 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/remote_errors.js.erb
@@ -737,23 +714,12 @@ files:
 - app/views/alchemy/navigation/_image_link.html.erb
 - app/views/alchemy/navigation/_link.html.erb
 - app/views/alchemy/navigation/_renderer.html.erb
-- app/views/alchemy/notifications/admin_user_created.de.text.erb
-- app/views/alchemy/notifications/admin_user_created.en.text.erb
-- app/views/alchemy/notifications/registered_user_created.de.text.erb
-- app/views/alchemy/notifications/registered_user_created.en.text.erb
-- app/views/alchemy/notifications/reset_password_instructions.de.text.erb
-- app/views/alchemy/notifications/reset_password_instructions.en.text.erb
 - app/views/alchemy/pages/show.html.erb
 - app/views/alchemy/pages/show.rss.builder
 - app/views/alchemy/pages/sitemap.xml.erb
-- app/views/alchemy/passwords/edit.html.erb
-- app/views/alchemy/passwords/new.html.erb
 - app/views/alchemy/search/_form.html.erb
 - app/views/alchemy/search/_result.html.erb
 - app/views/alchemy/search/_results.html.erb
-- app/views/alchemy/user_sessions/leave.html.erb
-- app/views/alchemy/user_sessions/new.html.erb
-- app/views/alchemy/users/new.html.erb
 - app/views/kaminari/_first_page.html.erb
 - app/views/kaminari/_gap.html.erb
 - app/views/kaminari/_last_page.html.erb
@@ -769,15 +735,13 @@ files:
 - config/alchemy/modules.yml
 - config/authorization_rules.rb
 - config/initializers/cache_storage.rb
-- config/initializers/devise.rb
 - config/initializers/dragonfly.rb
 - config/locales/alchemy.de.yml
 - config/locales/alchemy.en.yml
-- config/locales/devise.de.yml
-- config/locales/devise.en.yml
 - config/routes.rb
 - db/migrate/20130827094554_alchemy_two_point_six.rb
 - lib/alchemy/auth/engine.rb
+- lib/alchemy/auth_accessors.rb
 - lib/alchemy/capistrano.rb
 - lib/alchemy/config.rb
 - lib/alchemy/engine.rb
@@ -798,15 +762,22 @@ files:
 - lib/alchemy/resources_helper.rb
 - lib/alchemy/seeder.rb
 - lib/alchemy/shell.rb
+- lib/alchemy/tasks/helpers.rb
+- lib/alchemy/test_support/auth_helpers.rb
+- lib/alchemy/test_support/controller_requests.rb
+- lib/alchemy/test_support/factories.rb
+- lib/alchemy/test_support/integration_helpers.rb
 - lib/alchemy/tinymce.rb
 - lib/alchemy/upgrader.rb
 - lib/alchemy/upgrader/two_point_five.rb
 - lib/alchemy/upgrader/two_point_four.rb
+- lib/alchemy/upgrader/two_point_nine.rb
 - lib/alchemy/upgrader/two_point_one.rb
 - lib/alchemy/upgrader/two_point_six.rb
 - lib/alchemy/upgrader/two_point_three.rb
 - lib/alchemy/upgrader/two_point_two.rb
 - lib/alchemy/upgrader/two_point_zero.rb
+- lib/alchemy/userstamp.rb
 - lib/alchemy/version.rb
 - lib/alchemy_cms.rb
 - lib/extensions/action_view.rb
@@ -814,7 +785,6 @@ files:
 - 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/devise/devise_generator.rb
 - 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
@@ -861,16 +831,12 @@ files:
 - spec/controllers/admin/pictures_controller_spec.rb
 - spec/controllers/admin/resources_controller_spec.rb
 - spec/controllers/admin/trash_controller_spec.rb
-- spec/controllers/admin/users_controller_spec.rb
 - spec/controllers/attachments_controller_spec.rb
 - spec/controllers/base_controller_spec.rb
 - spec/controllers/elements_controller_spec.rb
 - spec/controllers/messages_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
-- spec/controllers/passwords_controller_spec.rb
 - spec/controllers/pictures_controller_spec.rb
-- spec/controllers/user_sessions_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -881,6 +847,7 @@ files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/location.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/views/alchemy/elements/_article_editor.html.erb
 - spec/dummy/app/views/alchemy/elements/_article_view.html.erb
 - spec/dummy/app/views/alchemy/elements/_headline_view.html.erb
@@ -921,6 +888,7 @@ files:
 - spec/fast_specs.rb
 - spec/features/admin/element_create_feature_spec.rb
 - spec/features/admin/element_trash_feature_spec.rb
+- spec/features/admin/language_tree_feature_spec.rb
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/pages_controller_spec.rb
@@ -931,6 +899,11 @@ files:
 - spec/features/picture_security_spec.rb
 - spec/features/security_spec.rb
 - spec/features/translation_integration_spec.rb
+- spec/fixtures/80x60.png
+- spec/fixtures/image with spaces.png
+- spec/fixtures/image.png
+- spec/fixtures/image2.PNG
+- spec/fixtures/image3.jpeg
 - spec/helpers/admin/base_helper_spec.rb
 - spec/helpers/admin/contents_helper_spec.rb
 - spec/helpers/admin/elements_helper_spec.rb
@@ -964,7 +937,6 @@ files:
 - spec/libraries/shell_spec.rb
 - spec/libraries/tinymce_spec.rb
 - spec/mailers/messages_spec.rb
-- spec/mailers/notifications_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/clipboard_spec.rb
@@ -985,19 +957,11 @@ files:
 - spec/models/resource_spec.rb
 - spec/models/site_spec.rb
 - spec/models/tag_spec.rb
-- spec/models/user_spec.rb
 - spec/routing/routing_spec.rb
 - spec/spec_helper.rb
-- spec/support/80x60.png
 - spec/support/alchemy/controller_hacks.rb
-- spec/support/alchemy/controller_helpers.rb
-- spec/support/alchemy/integration_helpers.rb
 - spec/support/ci/install_phantomjs
-- spec/support/factories.rb
-- spec/support/image with spaces.png
-- spec/support/image.png
-- spec/support/image2.PNG
-- spec/support/image3.jpeg
+- spec/tasks/helpers_spec.rb
 - spec/views/essences/essence_picture_view_spec.rb
 - vendor/assets/images/Jcrop.gif
 - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
@@ -1154,16 +1118,12 @@ test_files:
 - spec/controllers/admin/pictures_controller_spec.rb
 - spec/controllers/admin/resources_controller_spec.rb
 - spec/controllers/admin/trash_controller_spec.rb
-- spec/controllers/admin/users_controller_spec.rb
 - spec/controllers/attachments_controller_spec.rb
 - spec/controllers/base_controller_spec.rb
 - spec/controllers/elements_controller_spec.rb
 - spec/controllers/messages_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
-- spec/controllers/passwords_controller_spec.rb
 - spec/controllers/pictures_controller_spec.rb
-- spec/controllers/user_sessions_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -1174,6 +1134,7 @@ test_files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/location.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/views/alchemy/elements/_article_editor.html.erb
 - spec/dummy/app/views/alchemy/elements/_article_view.html.erb
 - spec/dummy/app/views/alchemy/elements/_headline_view.html.erb
@@ -1214,6 +1175,7 @@ test_files:
 - spec/fast_specs.rb
 - spec/features/admin/element_create_feature_spec.rb
 - spec/features/admin/element_trash_feature_spec.rb
+- spec/features/admin/language_tree_feature_spec.rb
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/pages_controller_spec.rb
@@ -1224,6 +1186,11 @@ test_files:
 - spec/features/picture_security_spec.rb
 - spec/features/security_spec.rb
 - spec/features/translation_integration_spec.rb
+- spec/fixtures/80x60.png
+- spec/fixtures/image with spaces.png
+- spec/fixtures/image.png
+- spec/fixtures/image2.PNG
+- spec/fixtures/image3.jpeg
 - spec/helpers/admin/base_helper_spec.rb
 - spec/helpers/admin/contents_helper_spec.rb
 - spec/helpers/admin/elements_helper_spec.rb
@@ -1257,7 +1224,6 @@ test_files:
 - spec/libraries/shell_spec.rb
 - spec/libraries/tinymce_spec.rb
 - spec/mailers/messages_spec.rb
-- spec/mailers/notifications_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/clipboard_spec.rb
@@ -1278,18 +1244,10 @@ test_files:
 - spec/models/resource_spec.rb
 - spec/models/site_spec.rb
 - spec/models/tag_spec.rb
-- spec/models/user_spec.rb
 - spec/routing/routing_spec.rb
 - spec/spec_helper.rb
-- spec/support/80x60.png
 - spec/support/alchemy/controller_hacks.rb
-- spec/support/alchemy/controller_helpers.rb
-- spec/support/alchemy/integration_helpers.rb
 - spec/support/ci/install_phantomjs
-- spec/support/factories.rb
-- spec/support/image with spaces.png
-- spec/support/image.png
-- spec/support/image2.PNG
-- spec/support/image3.jpeg
+- spec/tasks/helpers_spec.rb
 - spec/views/essences/essence_picture_view_spec.rb
 has_rdoc: