alchemy-devise 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70cd6cf39642ecbbf9e1953fca564ccaf4e8629e
-  data.tar.gz: 67e1644b5ca72983ea1d0f488e010ae4117ad216
+  metadata.gz: f2cfa67a1854589262f75d93aeb54966e1a9ab4c
+  data.tar.gz: 11ba3a397885051b7403c5dbd7cabc85830d3174
 SHA512:
-  metadata.gz: af6f7cedc49457b75c940faacfd4618d08ea0bc8606ae0e3944f664d327adcfa79261d59d674d06c822e322c1571de6df4f9d6acdc62496a49c3d614fa350ae2
-  data.tar.gz: 93f7e904be1520f70d9d8f347b1e43e37efb34ffa736e101f8244858355986fa97993622c6e72e84e300b28c0ba6eda00c512a04a3e1ff0ac5748fae9f3ab7bd
+  metadata.gz: eeb3578c614caaf3f29b18ee13177b10b6b6493cfe50150befa40f7ecf65131ca6efcd5cc641a345b7d0601acf25f6db4d6c795d50587df352a21d50fd86d960
+  data.tar.gz: 6653e1543ff6514885330ddf1e3dabd9a167d6640f8416a69864ca3c20f4ae79d279858311e24a131937f2de757ddb3cbb3bef50d301141705a485ea9d772939

data/README.md

@@ -1,8 +1,8 @@
-## Devise based authentication for Alchemy 3.3
+## Devise based authentication for Alchemy 3.4
 
-[![Build Status](https://secure.travis-ci.org/AlchemyCMS/alchemy-devise.svg?branch=3.3-stable)](http://travis-ci.org/AlchemyCMS/alchemy-devise)
+[![Build Status](https://secure.travis-ci.org/AlchemyCMS/alchemy-devise.svg?branch=3.4-stable)](http://travis-ci.org/AlchemyCMS/alchemy-devise)
 
-[![Gem Version](https://badge.fury.io/rb/alchemy-devise.svg)](http://badge.fury.io/rb/alchemy-devise) [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/coverage) [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/gpa.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise) [![security](https://hakiri.io/github/AlchemyCMS/alchemy-devise/3.3-stable.svg)](https://hakiri.io/github/AlchemyCMS/alchemy-devise/3.3-stable) [![Dependency Status](https://gemnasium.com/AlchemyCMS/alchemy-devise.svg)](https://gemnasium.com/AlchemyCMS/alchemy-devise)
+[![Gem Version](https://badge.fury.io/rb/alchemy-devise.svg)](http://badge.fury.io/rb/alchemy-devise) [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/coverage) [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/gpa.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise) [![security](https://hakiri.io/github/AlchemyCMS/alchemy-devise/3.4-stable.svg)](https://hakiri.io/github/AlchemyCMS/alchemy-devise/master) [![Dependency Status](https://gemnasium.com/AlchemyCMS/alchemy-devise.svg)](https://gemnasium.com/AlchemyCMS/alchemy-devise)
 
 AlchemyCMS has no authentication in its core. So it is possibly to bring your own authentication and use it to authorize users in AlchemyCMS. If you don't have your own authentication, you can use this gem.
 
@@ -12,7 +12,7 @@ Just put the gem into your projects `Gemfile`.
 
 ```ruby
 # Gemfile
-gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '3.3-stable'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '3.4-stable'
 ```
 
 and run `bundle install`.

data/app/assets/stylesheets/alchemy/admin/alchemy-devise.css

@@ -0,0 +1,3 @@
+/*
+ *= require alchemy-devise
+ */

data/app/controllers/alchemy/passwords_controller.rb

@@ -1,12 +1,12 @@
 module Alchemy
   class PasswordsController < ::Devise::PasswordsController
-    include Alchemy::Locale
+    include Alchemy::Admin::Locale
 
     before_action { enforce_ssl if ssl_required? && !request.ssl? }
 
     helper 'Alchemy::Admin::Base'
 
-    layout 'alchemy/login'
+    layout 'alchemy/admin'
 
     private
 

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -1,6 +1,6 @@
 module Alchemy
   class UserSessionsController < ::Devise::SessionsController
-    include Alchemy::Locale
+    include Alchemy::Admin::Locale
 
     before_action except: 'destroy' do
       enforce_ssl if ssl_required? && !request.ssl?
@@ -10,7 +10,7 @@ module Alchemy
 
     helper 'Alchemy::Admin::Base'
 
-    layout 'alchemy/login'
+    layout 'alchemy/admin'
 
     def new
       super

data/app/models/alchemy/user.rb

@@ -124,7 +124,7 @@ module Alchemy
     # A page gets locked, if the user requests to edit the page.
     #
     def pages_locked_by_me
-      Page.where(:locked => true).where(:locked_by => self.id).order(:updated_at)
+      Page.locked_by(self).order(:updated_at)
     end
     alias_method :locked_pages, :pages_locked_by_me
 

data/config/routes.rb

@@ -6,28 +6,30 @@ Alchemy::Engine.routes.draw do
     },
     skip: [:sessions, :passwords]
 
-  devise_scope :user do
-    get '/admin/dashboard' => 'admin/dashboard#index',
-      :as => :user_root
-    get '/admin/signup' => 'admin/users#signup',
-      :as => :admin_signup
-    get '/admin/login' => 'user_sessions#new',
-      :as => :login
-    post '/admin/login' => 'user_sessions#create'
-    delete '/admin/logout' => 'user_sessions#destroy',
-      :as => :logout
+  scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do
+    devise_scope :user do
+      get '/dashboard' => 'admin/dashboard#index',
+        :as => :user_root
+      get '/signup' => 'admin/users#signup',
+        :as => :admin_signup
+      get '/login' => 'user_sessions#new',
+        :as => :login
+      post '/login' => 'user_sessions#create'
+      delete '/logout' => 'user_sessions#destroy',
+        :as => :logout
 
-    get '/admin/passwords' => 'passwords#new',
-      :as => :new_password
-    get '/admin/passwords/:id/edit/:reset_password_token' => 'passwords#edit',
-      :as => :edit_password
-    post '/admin/passwords' => 'passwords#create',
-      :as => :reset_password
-    patch '/admin/passwords' => 'passwords#update',
-      :as => :update_password
+      get '/passwords' => 'passwords#new',
+        :as => :new_password
+      get '/passwords/:id/edit/:reset_password_token' => 'passwords#edit',
+        :as => :edit_password
+      post '/passwords' => 'passwords#create',
+        :as => :reset_password
+      patch '/passwords' => 'passwords#update',
+        :as => :update_password
+    end
   end
 
-  namespace :admin do
+  namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
     resources :users
   end
 end

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "3.3.0"
+    VERSION = "3.4.0"
   end
 end

data/lib/generators/alchemy/devise/install/install_generator.rb

@@ -16,6 +16,12 @@ module Alchemy
         def run_migrations
           run 'bundle exec rake db:migrate'
         end
+
+        def append_assets
+          insert_into_file "vendor/assets/stylesheets/alchemy/admin/all.css",
+            "\n *= require alchemy/admin/alchemy-devise",
+            after: " *= require alchemy/admin"
+        end
       end
     end
   end

data/spec/dummy/config/alchemy/config.yml.defaults

@@ -0,0 +1,194 @@
+# encoding: UTF-8
+#
+# == This is the global Alchemy configuration file
+#
+
+# === Require SSL for login form and all admin modules
+#
+# NOTE: You have to create a SSL certificate on your server to make this work
+#
+require_ssl: false
+
+# === Auto Log Out Time
+#
+# The amount of time of inactivity in minutes after which the user is kicked out of his current session.
+#
+# NOTE: This is only active in production environments
+#
+auto_logout_time: 30
+
+# === Redirect Options
+#
+#   redirect_to_public_child  [Boolean]   # Alchemy redirects to the first public child page found, if a page is not visible.
+#
+redirect_to_public_child: true
+
+# === Page caching
+#
+# Enable/Disable page caching globally.
+#
+# NOTE: You can enable/disable page caching for single Alchemy::PageLayouts in the page_layout.yml file.
+#
+cache_pages: true
+
+# === Sitemap
+#
+# Alchemy creates a XML, Google compatible, sitemap for you.
+#
+# The url is: http://your-domain.tld/sitemap.xml
+#
+# ==== Config Options:
+#
+#   show_root [Boolean] # Show language root page in sitemap?
+#   show_flag [Boolean] # Enables the Checkbox in Page#update overlay. So your customer can set the visibility of pages in the sitemap.
+#
+sitemap:
+  show_root: true
+  show_flag: false
+
+# === URL nesting
+#
+# Since Alchemy 2.6.0, page urls are nested, respectively to their tree position.
+#
+# Disable +url_nesting+ to get slug only urls.
+#
+# NOTE: After changing the url_nesting, you should run one of these convert rake tasks:
+#
+#   rake alchemy:convert:urlnames:to_nested
+#   rake alchemy:convert:urlnames:to_slug
+#
+url_nesting: true
+
+# === Picture rendering settings
+#
+# Alchemy uses Dragonfly to render images. Use {:image_size => "XXXxYYY", :crop => BOOLEAN [true]} to resize images.
+#
+# See http://markevans.github.com/dragonfly for further infos.
+#
+# ==== Options:
+#
+#   output_image_jpg_quality  [Integer]       # If image gets rendered as JPG this is the quality setting for it. (Default 85)
+#   preprocess_image_resize   [String]        # Use this option to resize images to that value. Downsizing example: '1000x1000>' (Default nil)
+#   image_output_format       [String]        # The global image output format setting. (Default +original+)
+#
+# NOTE: You can always override the output format in the options of your Essence. I.E. {format: 'gif'}
+#
+output_image_jpg_quality: 85
+preprocess_image_resize:
+image_output_format: original
+
+# This is used by the seeder to create the default site.
+default_site:
+  name: Default Site
+  host: '*'
+
+# This is the default language when a new site gets created.
+default_language:
+  code: en
+  name: English
+  page_layout: index
+  frontpage_name: Index
+
+# === Mailer Settings:
+#
+# To send emails via contact forms, you can create your form fields here and set which fields are to be validated.
+#
+# === Validating fields:
+#
+# Pass the field name as a symbol and a message_id (will be translated) to :validate_fields:
+#
+# ==== Options:
+#
+#   page_layout_name:           [String] # A +Alchemy::PageLayout+ name. Used to render the contactform on a page with this layout.
+#   fields:                     [Array]  # An Array of fieldnames.
+#   validate_fields:            [Array]  # An Array of fieldnames to be validated on presence.
+#
+# ==== Translating validation messages:
+#
+# The validation messages are passed through ::I18n.t so you can translate it in your language yml file.
+#
+# ==== Example:
+#
+#   de:
+#     activemodel:
+#       attributes:
+#         alchemy/message:
+#           firstname: Vorname
+#
+mailer:
+  page_layout_name: contact
+  forward_to_page: false
+  mail_success_page: thanks
+  mail_from: your.mail@your-domain.com
+  mail_to: your.mail@your-domain.com
+  subject: A new contact form message
+  fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
+  validate_fields: [lastname, email]
+
+# === User roles
+#
+# You can add own user roles.
+#
+# Further documentation for the auth system used please visit:
+#
+# https://github.com/ryanb/cancan/wiki
+#
+# ==== Translating User roles
+#
+# Userroles can be translated inside your the language yml file under:
+#
+#   alchemy:
+#     user_roles:
+#       rolename: Name of the role
+#
+user_roles: [member, author, editor, admin]
+
+# === Uploader Settings
+#
+#   upload_limit       [Integer]    # Set an amount of files upload limit of files which can be uploaded at once. Set 0 for unlimited.
+#   file_size_limit*   [Integer]    # Set a file size limit in mega bytes for a per file limit.
+#
+# *) Allow filetypes to upload. Pass * to allow all kind of files.
+#
+uploader:
+  upload_limit: 50
+  file_size_limit: 100
+  allowed_filetypes:
+    alchemy/attachments:
+    - '*'
+    alchemy/pictures:
+    - jpg
+    - jpeg
+    - gif
+    - png
+    - svg
+
+# === Link Target Options
+#
+# Values for the link target selectbox inside the page link overlay.
+# The value gets attached as a data-link-target attribute to the link.
+#
+# == Example:
+#
+# Open all links set to overlay inside an jQuery UI Dialog Window.
+#
+#   jQuery(a[data-link-target="overlay"]).dialog();
+#
+link_target_options: [blank]
+
+# Should pages that redirect to an external url open the link in a new tab/window?
+open_external_links_in_new_tab: true
+
+# === Format matchers
+#
+# Named aliases for regular expressions that can be used in various places.
+# The most common use case is the format validation of essences, or attribute validations of your individual models.
+#
+# == Example:
+#
+#   validates_format_of :url, with: Alchemy::Config.get('format_matchers')['url']
+#
+format_matchers:
+  email: !ruby/regexp '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'
+  url: !ruby/regexp '/\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix'
+  link_url: !ruby/regexp '/^(mailto:|\/|[a-z]+:\/\/)/'

data/spec/dummy/config/initializers/devise.rb

@@ -8,7 +8,7 @@ Devise.setup do |config|
   # By default, Devise will use your Application's secret_key_base as its
   # secret_key. You can override it here by uncommenting the following
   # line. Remember to keep this file out of source control if you do that.
-  # config.secret_key = "7dddde8793e01882b50c8d8cc9079aaf474a4ee57cd572525031954d5eba9b02a159d19c67583a1a7ed929f7c28055ce1c1b"
+  # config.secret_key = "908a4531a5541e3120619f54e126df28d570eaf25e7dbf6657242294360f395d48a97ae000d54331ff46e4f0b7e5327894d6"
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
@@ -103,7 +103,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = "1ce526f4b27274313f315cdd37d131d2de0154ff675140327d9874f5ec236df6d88287e38c2cc85f5a84a9a50a3323b7e1ba"
+  # config.pepper = "b488e47803695bbbf63c58bfaf8aa7aa7f2e6b05970c3f15be5fef4ca041223d12aaac892e0ff9c07102b685ef376307fc91"
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without

data/spec/dummy/db/migrate/20131015124700_create_alchemy_users.rb

@@ -1 +1 @@
-../../../../db/migrate/20131015124700_create_alchemy_users.rb
+spec/dummy/db/migrate/../../../../db/migrate/20131015124700_create_alchemy_users.rb

data/spec/dummy/db/migrate/20131225232042_add_alchemy_roles_to_alchemy_users.rb

@@ -1 +1 @@
-../../../../db/migrate/20131225232042_add_alchemy_roles_to_alchemy_users.rb
+spec/dummy/db/migrate/../../../../db/migrate/20131225232042_add_alchemy_roles_to_alchemy_users.rb

data/spec/dummy/db/migrate/20141209144532_add_indexes_to_alchemy_users.rb

@@ -1 +1 @@
-../../../../db/migrate/20141209144532_add_indexes_to_alchemy_users.rb
+spec/dummy/db/migrate/../../../../db/migrate/20141209144532_add_indexes_to_alchemy_users.rb

data/spec/dummy/db/migrate/20160614164602_add_timebased_publishing_columns_to_pages.alchemy.rb

@@ -0,0 +1,33 @@
+# This migration comes from alchemy (originally 20160108174834)
+class AddTimebasedPublishingColumnsToPages < ActiveRecord::Migration
+  def up
+    add_column :alchemy_pages, :public_on, :datetime
+    add_column :alchemy_pages, :public_until, :datetime
+    add_index :alchemy_pages, [:public_on, :public_until]
+
+    update <<-SQL.strip_heredoc
+      UPDATE alchemy_pages
+      SET public_on = published_at
+      WHERE published_at IS NOT NULL AND public=#{ActiveRecord::Base.connection.quoted_true}
+    SQL
+
+    remove_column :alchemy_pages, :public
+  end
+
+  def down
+    add_column :alchemy_pages, :public, :boolean, default: false
+    current_time = ActiveRecord::Base.connection.quoted_date(Time.current)
+
+    update <<-SQL.strip_heredoc
+      UPDATE alchemy_pages
+      SET public = (
+        public_on IS NOT NULL AND public_on < '#{current_time}'
+        AND (public_until > '#{current_time}' OR public_until IS NULL)
+      )
+    SQL
+
+    remove_index :alchemy_pages, [:public_on, :public_until]
+    remove_column :alchemy_pages, :public_on
+    remove_column :alchemy_pages, :public_until
+  end
+end

data/spec/dummy/db/migrate/20160614164603_add_image_file_format_to_alchemy_pictures.alchemy.rb

@@ -0,0 +1,22 @@
+# This migration comes from alchemy (originally 20160422195310)
+class AddImageFileFormatToAlchemyPictures < ActiveRecord::Migration
+  def up
+    add_column :alchemy_pictures, :image_file_format, :string
+
+    say_with_time "Storing file format of existing pictures" do
+      Alchemy::Picture.all.each do |pic|
+        begin
+          format = pic.image_file.identify('-ping -format "%m"')
+          pic.update_column('image_file_format', format.to_s.downcase)
+        rescue Dragonfly::Job::Fetch::NotFound => e
+          say(e.message, true)
+        end
+      end
+      Alchemy::Picture.count
+    end
+  end
+
+  def down
+    remove_column :alchemy_pictures, :image_file_format
+  end
+end

data/spec/dummy/db/migrate/20160627081901_change_alchemy_pages_locked_to_locked_at.alchemy.rb

@@ -0,0 +1,23 @@
+# This migration comes from alchemy (originally 20160617224938)
+class ChangeAlchemyPagesLockedToLockedAt < ActiveRecord::Migration
+  def up
+    add_column :alchemy_pages, :locked_at, :datetime
+    update <<-SQL.strip_heredoc
+      UPDATE alchemy_pages
+      SET locked_at = updated_at
+      WHERE locked=#{ActiveRecord::Base.connection.quoted_true}
+    SQL
+    remove_column :alchemy_pages, :locked
+    add_index :alchemy_pages, [:locked_at, :locked_by]
+  end
+
+  def down
+    add_column :alchemy_pages, :locked, :boolean
+    update <<-SQL.strip_heredoc
+      UPDATE alchemy_pages
+      SET locked=#{ActiveRecord::Base.connection.quoted_true}
+      WHERE locked_at IS NOT NULL
+    SQL
+    remove_column :alchemy_pages, :locked_at
+  end
+end