alchemy_cms 2.8.3 → 2.9.0

data/config/locales/devise.de.yml

@@ -1,58 +0,0 @@
-de:
-  errors:
-    messages:
-      expired: "ist abgelaufen, bitte neu anfordern"
-      not_found: "nicht gefunden"
-      already_confirmed: "wurde bereits bestätigt"
-      not_locked: "ist nicht gesperrt"
-      not_saved:
-        one: "Es konnte nicht fortfahren werden:"
-        other: "Es konnte nicht fortfahren werden:"
-
-  devise:
-    failure:
-      already_authenticated: 'Sie sind bereits angemeldet.'
-      unauthenticated: 'Sie müssen sich anmelden oder registrieren, bevor Sie fortfahren können.'
-      unconfirmed: 'Sie müssen Ihren Account bestätigen, bevor Sie fortfahren können.'
-      locked: 'Ihr Account ist gesperrt.'
-      invalid: 'Ungültige Anmeldedaten.'
-      invalid_token: 'Der Anmelde-Token ist ungültig.'
-      timeout: 'Ihre Sitzung ist abgelaufen, bitte melden Sie sich erneut an.'
-      inactive: 'Ihr Account ist nicht aktiv.'
-      user:
-        not_found_in_database: 'Ungültige Anmeldedaten.'
-    sessions:
-      signed_in: 'Erfolgreich angemeldet.'
-      signed_out: 'Erfolgreich abgemeldet.'
-    passwords:
-      send_instructions: 'Sie erhalten in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie ihr Passwort zurücksetzen können.'
-      updated: 'Ihr Passwort wurde geändert. Sie sind jetzt angemeldet.'
-      updated_not_active: 'Ihr Passwort wurde geändert.'
-      send_paranoid_instructions: "Falls Ihre E-Mail-Adresse in unserer Datenbank existiert erhalten Sie in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie Ihr Passwort zurücksetzen können."
-      no_token: "Es wurde nicht alle benötigten Parameter übergeben. Bitte überprüfen Sie, ob die komplette URL aus der E-Mail benutzt wurde."
-    confirmations:
-      send_instructions: 'Sie erhalten in wenigen Minuten eine E-Mail, mit der Sie Ihre Registrierung bestätigen können.'
-      send_paranoid_instructions: 'Falls Ihre E-Mail-Adresse in unserer Datenbank existiert erhalten Sie in wenigen Minuten eine E-Mail mit der die Sie Ihre Registrierung bestätigen können.'
-      confirmed: 'Vielen Dank für Ihre Registrierung. Sie sind jetzt angemeldet.'
-    registrations:
-      signed_up: 'Sie haben sich erfolgreich registriert.'
-      signed_up_but_unconfirmed: 'Sie haben sich erfolgreich registriert. Wir konnten Sie noch nicht anmelden, da Ihr Account noch nicht bestätigt ist. Sie erhalten in Kürze eine E-Mail mit der Anleitung, wie Sie Ihren Account freischalten können.'
-      signed_up_but_inactive: 'Sie haben sich erfolgreich registriert. Wir konnten Sie noch nicht anmelden, da Ihr Account inaktiv ist.'
-      signed_up_but_locked: 'Sie haben sich erfolgreich registriert. Wir konnten Sie noch nicht anmelden, da Ihr Account gesperrt ist.'
-      updated: 'Ihre Daten wurden aktualisiert.'
-      update_needs_confirmation: "Ihre Daten wurden aktualisiert, aber Sie müssen Ihre neue E-Mail-Adresse bestätigen. Sie erhalten in wenigen Minuten eine E-Mail, mit der Sie die Änderung Ihrer E-Mail-Adresse abschließen können."
-      destroyed: 'Ihr Account wurde gelöscht.'
-    unlocks:
-      send_instructions: 'Sie erhalten in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie Ihren Account entsperren können.'
-      unlocked: 'Ihr Account wurde entsperrt. Sie sind jetzt angemeldet.'
-      send_paranoid_instructions: "Falls Ihre E-Mail-Adresse in unserer Datenbank existiert erhalten Sie in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie Ihren Account entsperren können."
-    omniauth_callbacks:
-      success: 'Die haben sich erfolgreich mit Ihrem %{kind}-Account angemeldet.'
-      failure: 'Sie konnten nicht mit Ihrem %{kind}-Account angemeldet werden, weil "%{reason}".'
-    mailer:
-      confirmation_instructions:
-        subject: 'Anleitung zur Bestätigung Ihres Accounts'
-      reset_password_instructions:
-        subject: 'Anleitung um Ihr Passwort zurückzusetzen'
-      unlock_instructions:
-        subject: 'Anleitung um Ihren Account freizuschalten'

data/config/locales/devise.en.yml

@@ -1,60 +0,0 @@
-# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
-
-en:
-  errors:
-    messages:
-      expired: "has expired, please request a new one"
-      not_found: "not found"
-      already_confirmed: "was already confirmed, please try signing in"
-      not_locked: "was not locked"
-      not_saved:
-        one: "1 error prohibited this %{resource} from being saved:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
-
-  devise:
-    failure:
-      already_authenticated: 'You are already signed in.'
-      unauthenticated: 'You need to sign in or sign up before continuing.'
-      unconfirmed: 'You have to confirm your account before continuing.'
-      locked: 'Your account is locked.'
-      not_found_in_database: 'Invalid email or password.'
-      invalid: 'Invalid email or password.'
-      invalid_token: 'Invalid authentication token.'
-      timeout: 'Your session expired, please sign in again to continue.'
-      inactive: 'Your account was not activated yet.'
-    sessions:
-      signed_in: 'Signed in successfully.'
-      signed_out: 'Signed out successfully.'
-    passwords:
-      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
-      updated: 'Your password was changed successfully. You are now signed in.'
-      updated_not_active: 'Your password was changed successfully.'
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-    confirmations:
-      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
-      send_paranoid_instructions: 'If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
-      confirmed: 'Your account was successfully confirmed. You are now signed in.'
-    registrations:
-      signed_up: 'Welcome! You have signed up successfully.'
-      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
-      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
-      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
-      updated: 'You updated your account successfully.'
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
-      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
-    unlocks:
-      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
-      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
-      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
-    omniauth_callbacks:
-      success: 'Successfully authenticated from %{kind} account.'
-      failure: 'Could not authenticate you from %{kind} because "%{reason}".'
-    mailer:
-      confirmation_instructions:
-        subject: 'Confirmation instructions'
-      reset_password_instructions:
-        subject: 'Reset password instructions'
-      unlock_instructions:
-        subject: 'Unlock Instructions'

data/lib/rails/generators/alchemy/devise/devise_generator.rb

@@ -1,29 +0,0 @@
-require 'rails'
-
-module Alchemy
-  module Generators
-    class DeviseGenerator < ::Rails::Generators::Base
-      desc "This generator copies the Alchemy Devise configuration into your app."
-      source_root File.expand_path('../../../../../config/initializers', File.dirname(__FILE__))
-
-      def copy_devise_config
-        copy_file "devise.rb", "#{Rails.root}/config/initializers/devise.rb"
-        msg = <<-MSG
-If your are upgrading from Alchemy < 2.5.0:
-
-1. Add `gem 'devise-encryptable'` into your Gemfile
-2. Run `bundle install`
-3. Alter the encryptor and the stretches value in your devise config:
-
-  # config/initializers/devise.rb
-  ...
-    config.stretches = Rails.env.test? ? 1 : 20
-    config.encryptor = :authlogic_sha512
-
-MSG
-        puts msg
-      end
-
-    end
-  end
-end

data/spec/controllers/admin/users_controller_spec.rb

@@ -1,132 +0,0 @@
-require 'spec_helper'
-
-module Alchemy
-  describe Admin::UsersController do
-
-      let(:admin) { FactoryGirl.build_stubbed(:admin_user) }
-
-      before do
-        controller.stub!(:store_user_request_time)
-        User.stub!(:find).and_return(admin)
-        admin.stub!(:update_without_password).and_return(true)
-        admin.stub!(:update_attributes).and_return(true)
-        sign_in(admin)
-      end
-
-      describe '#new' do
-        render_views
-
-        it "has send_credentials checkbox activated" do
-          get :new
-          response.body.should match /<input checked="checked" id="user_send_credentials" name="user\[send_credentials\]" type="checkbox"/
-        end
-      end
-
-      describe '#edit' do
-        render_views
-
-        it "has send_credentials checkbox deactivated" do
-          get :edit, id: admin.id
-          response.body.should match /<input id="user_send_credentials" name="user\[send_credentials\]" type="checkbox"/
-        end
-      end
-
-      describe '#create' do
-        before { ActionMailer::Base.deliveries = [] }
-
-        it "creates an user record" do
-          post :create, user: FactoryGirl.attributes_for(:user).merge(send_credentials: '1')
-          Alchemy::User.count.should == 1
-        end
-
-        context "with send_credentials set to '1'" do
-          it "should send an email notification" do
-            post :create, user: FactoryGirl.attributes_for(:user).merge(send_credentials: '1')
-            ActionMailer::Base.deliveries.should_not be_empty
-          end
-        end
-
-        context "with send_credentials set to true" do
-          it "should not send an email notification" do
-            post :create, user: FactoryGirl.attributes_for(:user).merge(send_credentials: true)
-            ActionMailer::Base.deliveries.should be_empty
-          end
-        end
-
-        context "with send_credentials left blank" do
-          it "should not send an email notification" do
-            post :create, user: FactoryGirl.attributes_for(:user)
-            ActionMailer::Base.deliveries.should be_empty
-          end
-        end
-      end
-
-      describe '#update' do
-        before do
-          ActionMailer::Base.deliveries = []
-        end
-
-        it "assigns user to @user" do
-          post :update, id: admin.id, user: {}, format: :js
-          assigns(:user).should eq(admin)
-        end
-
-        context "with empty password passed" do
-          it "should update the user" do
-            params_hash = {'firstname' => 'Johnny', 'password' => '', 'password_confirmation' => ''}
-            admin.should_receive(:update_without_password).with(params_hash).and_return(true)
-            post :update, id: admin.id, user: params_hash, format: :js
-          end
-        end
-
-        context "with new password passed" do
-          it "should update the user" do
-            params_hash = {'firstname' => 'Johnny', 'password' => 'newpassword', 'password_confirmation' => 'newpassword'}
-            admin.should_receive(:update_attributes).with(params_hash)
-            post :update, id: admin.id, user: params_hash, format: :js
-          end
-        end
-
-        context "with send_credentials set to '1'" do
-          let(:user) { FactoryGirl.build(:user) }
-          before { User.stub!(:find).and_return(user) }
-
-          it "should send an email notification" do
-            post :update, id: user.id, user: {send_credentials: '1'}
-            ActionMailer::Base.deliveries.should_not be_empty
-          end
-        end
-
-        context "with send_credentials left blank" do
-          it "should not send an email notification" do
-            post :update, id: admin.id, user: {}, format: :js
-            ActionMailer::Base.deliveries.should be_empty
-          end
-        end
-
-        context "if user is permitted to update roles" do
-          before do
-            controller.stub!(:permitted_to?).with(:update_roles).and_return(true)
-          end
-
-          it "updates the user including role" do
-            admin.should_receive(:update_without_password).with({'roles' => ['Administrator']})
-            post :update, id: admin.id, user: {roles: ['Administrator']}, format: :js
-          end
-        end
-
-        context "if the user is not permitted to update roles" do
-          before do
-            controller.stub!(:permitted_to?).with(:update_roles).and_return(false)
-          end
-
-          it "updates user without role" do
-            admin.should_receive(:update_without_password).with({})
-            post :update, id: admin.id, user: {'roles' => ['Administrator']}, format: :js
-          end
-        end
-
-      end
-
-  end
-end

data/spec/controllers/passwords_controller_spec.rb

@@ -1,16 +0,0 @@
-require "spec_helper"
-
-module Alchemy
-  describe PasswordsController do
-    let(:user) { FactoryGirl.create(:admin_user) }
-
-    describe '#post' do
-      it "should send email with reset password instructions" do
-        ActionMailer::Base.deliveries = []
-        @request.env["devise.mapping"] = Devise.mappings[:user]
-        post :create, :user => {:email => user.email}
-        ActionMailer::Base.deliveries.should_not be_empty
-      end
-    end
-  end
-end

data/spec/controllers/user_sessions_controller_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-module Alchemy
-  describe UserSessionsController do
-
-    let(:user) { FactoryGirl.build_stubbed(:admin_user) }
-
-    before do
-      controller.stub!(:store_user_request_time)
-      sign_in(user)
-    end
-
-    describe "#destroy" do
-      it "should unlock all pages" do
-        @request.env["devise.mapping"] = Devise.mappings[:user]
-        user.should_receive(:unlock_pages!)
-        delete :destroy
-      end
-    end
-
-  end
-end

data/spec/controllers/users_controller_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-module Alchemy
-  describe UsersController do
-
-    context "with users present" do
-      before { FactoryGirl.create(:admin_user) }
-
-      it "should redirect to admin dashboard" do
-        get :new
-        response.should redirect_to(admin_dashboard_path)
-      end
-    end
-
-    describe '#new' do
-      render_views
-
-      before { get :new }
-
-      it "should not render tag list input" do
-        response.body.should_not have_selector('.autocomplete_tag_list')
-      end
-
-      it "should render hidden field for role" do
-        response.body.should have_selector('input[type="hidden"]#user_roles')
-      end
-
-      it "should set the role to admin" do
-        assigns(:user).roles.should include("admin")
-      end
-    end
-
-    describe '#create' do
-      before { ActionMailer::Base.deliveries = [] }
-
-      context "with send_credentials set to '1'" do
-        it "should send an email notification" do
-          post :create, {
-            :user => FactoryGirl.attributes_for(:admin_user).merge(send_credentials: '1')
-          }
-          ActionMailer::Base.deliveries.should_not be_empty
-        end
-      end
-
-      context "with send_credentials left blank" do
-        it "should not send an email notification" do
-          post :create, {
-            :user => FactoryGirl.attributes_for(:admin_user)
-          }
-          ActionMailer::Base.deliveries.should be_empty
-        end
-      end
-
-      context "with valid params" do
-        it "should sign in the user" do
-          post :create, {
-            :user => FactoryGirl.attributes_for(:admin_user)
-          }
-          controller.send(:user_signed_in?).should be_true
-        end
-      end
-
-    end
-
-  end
-end

data/spec/mailers/notifications_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-module Alchemy
-  describe Notifications do
-
-    context "when a registered user was created" do
-      let(:user) { FactoryGirl.build_stubbed(:user) }
-      let(:mail) { Notifications.registered_user_created(user) }
-
-      it "delivers a mail to user" do
-        mail.to.should == [user.email]
-        mail.subject.should == 'Your user credentials'
-      end
-
-      it "mail body includes users name" do
-        mail.body.should match /#{user.name}/
-      end
-
-      it "mail body includes users login" do
-        mail.body.should match /#{user.login}/
-      end
-
-      it "mail body includes password instructions" do
-        mail.body.should match /#{Regexp.escape(new_password_url(email: user.email, use_route: 'alchemy', only_path: true))}/
-      end
-    end
-
-    context "when an admin user was created" do
-      let(:user) { FactoryGirl.build_stubbed(:admin_user) }
-      let(:mail) { Notifications.admin_user_created(user) }
-
-      it "delivers a mail to user" do
-        mail.to.should == [user.email]
-        mail.subject.should == 'Your Alchemy Login'
-      end
-
-      it "mail body includes users login" do
-        mail.body.should match /#{user.login}/
-      end
-
-      it "mail body includes password instructions" do
-        mail.body.should match /#{Regexp.escape(new_password_url(use_route: 'alchemy', only_path: true))}/
-      end
-    end
-
-    describe '#reset_password_instructions' do
-      let(:user) { FactoryGirl.build_stubbed(:user) }
-      let(:mail) { Notifications.reset_password_instructions(user) }
-
-      before { user.stub!(:reset_password_token).and_return('123') }
-
-      it "delivers a mail to user" do
-        mail.to.should == [user.email]
-        mail.subject.should == 'Reset password instructions'
-      end
-
-      it "mail body includes users name" do
-        mail.body.should match /#{user.name}/
-      end
-
-      it "mail body includes reset instructions" do
-        mail.body.should match /#{Regexp.escape(edit_password_url(user, reset_password_token: user.reset_password_token, use_route: 'alchemy', only_path: true))}/
-      end
-    end
-
-  end
-end