alchemy_cms 3.3.3 → 3.4.0.rc1

data/config/locales/alchemy.nl.yml

@@ -107,8 +107,11 @@ nl:
     translations:
       de: 'DE'
       en: 'EN'
-      nl: 'NL'
+      es: 'ES'
+      it: 'IT'
       fr: 'FR'
+      nl: 'NL'
+      ru: 'RU'
 
     # == User roles translations
     user_roles:
@@ -162,7 +165,6 @@ nl:
     locked_pages: "Actieve pagina's"
     "Add global page": "Nieuwe globale pagina"
     "Add page link": "Voeg pagina link toe"
-    "Adobe Website": "Adobe Website"
     "Alchemy is open software and itself uses open software and free resources:": "Alchemy is open software en maakt zelf ook gebruik van open software en gratis bronnen"
     "Alchemy is up to date": "Alchemy is up to date"
     "An error happened": "Er is een fout opgetreden!"
@@ -609,6 +611,8 @@ nl:
       page_status: "%m.%d.%Y %H:%M"
       date: "%Y-%m-%d"
       datepicker: "%Y-%m-%d"
+      timepicker: "%H:%M"
+      datetimepicker: "%Y-%m-%d %H:%M"
       time: "%H:%M"
     am: "am"
     pm: "pm"

data/config/locales/alchemy.ru.yml

@@ -107,8 +107,10 @@ ru:
     translations:
       de: 'DE'
       en: 'EN'
-      nl: 'NL'
+      es: 'ES'
+      it: 'IT'
       fr: 'FR'
+      nl: 'NL'
       ru: 'RU'
 
     # == User roles translations
@@ -163,7 +165,6 @@ ru:
     locked_pages: "Активные страницы"
     "Add global page": "Добавить часть макета"
     "Add page link": "Добавить ссылку на страницу"
-    "Adobe Website": "Adobe Website"
     "Alchemy is open software and itself uses open software and free resources:": "Alchemy is open software and itself uses open software and free resources:"
     "Alchemy is up to date": 'Alchemy последней версии'
     'An error happened': 'Произошла ошибка'

data/config/locales/simple_form.it.yml

@@ -0,0 +1,25 @@
+it:
+  simple_form:
+    "yes": 'Sì'
+    "no": 'No'
+    required:
+      text: 'obbligatorio'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Correggi gli errori sottostanti:"
+    # Labels and hints examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'

data/db/migrate/20160108174834_add_timebased_publishing_columns_to_pages.rb

@@ -0,0 +1,32 @@
+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/db/migrate/20160422195310_add_image_file_format_to_alchemy_pictures.rb

@@ -0,0 +1,21 @@
+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/db/migrate/20160617224938_change_alchemy_pages_locked_to_locked_at.rb

@@ -0,0 +1,22 @@
+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

data/lib/alchemy/ability_helper.rb

@@ -0,0 +1,23 @@
+module Alchemy::AbilityHelper
+  # Ensures usage of Alchemy's permissions class.
+  #
+  # == Register custom Abilities
+  #
+  # If your app has a CanCan Ability class with rules you want to be aviable in an Alchemy context
+  # you need to register it. Or if you have an engine with it's own CanCan abilities you want to
+  # add to Alchemy you must register them first.
+  #
+  #     Alchemy.register_ability MyCustom::Permisson
+  #
+  def current_ability
+    @current_ability ||= begin
+      alchemy_permissions = Alchemy::Permissions.new(current_alchemy_user)
+      Alchemy.registered_abilities.each do |klass|
+        # Ensure to avoid issues with Rails constant lookup.
+        klass = "::#{klass}".constantize
+        alchemy_permissions.merge(klass.new(current_alchemy_user))
+      end
+      alchemy_permissions
+    end
+  end
+end

data/lib/alchemy/configuration_methods.rb

@@ -14,10 +14,10 @@ module Alchemy
       Config.get(name)
     end
 
-    # Returns true if more than one language is published.
+    # Returns true if more than one language is published on current site.
     #
     def multi_language?
-      Language.published.count > 1
+      Language.on_current_site.published.count > 1
     end
 
     # Decides if the locale should be prefixed to urls

data/lib/alchemy/controller_actions.rb

@@ -49,32 +49,6 @@ module Alchemy
       @current_alchemy_site ||= Site.find_for_host(request.host)
     end
 
-    # Ensures usage of Alchemy's permissions class.
-    #
-    # Merges existing CanCan abilities from host Rails app with Alchemy's own CanCan abilities.
-    #
-    # == Register Abilities
-    #
-    # If your app's CanCan ability class is not named +Ability+ you have to register it.
-    # Or if you have a engine with own CanCan abilities you want to add to Alchemy you must register them first.
-    #
-    #     Alchemy.register_ability MyCustom::Permisson
-    #
-    def current_ability
-      @current_ability ||= begin
-        alchemy_permissions = Alchemy::Permissions.new(current_alchemy_user)
-        Alchemy.registered_abilities.each do |klass|
-          # Ensure to avoid issues with Rails constant lookup.
-          klass = "::#{klass}".constantize
-          alchemy_permissions.merge(klass.new(current_alchemy_user))
-        end
-        if host_app_ability_present?
-          alchemy_permissions.merge(::Ability.new(current_alchemy_user))
-        end
-        alchemy_permissions
-      end
-    end
-
     # Sets the current site in a cvar so the Language model
     # can be scoped against it.
     #
@@ -102,9 +76,11 @@ module Alchemy
       end
     end
 
+    # Load language from session if it's present on current site.
+    # Otherwise return nil so we can load the default language from current site.
     def load_alchemy_language_from_session
       if session[:alchemy_language_id].present?
-        Language.find_by(id: session[:alchemy_language_id])
+        Site.current.languages.find_by(id: session[:alchemy_language_id])
       end
     end
 
@@ -113,6 +89,7 @@ module Alchemy
         Language.find_by_code(id_or_code)
     end
 
+    # Load the default language from current site.
     def load_default_alchemy_language
       Language.default || raise(DefaultLanguageNotFoundError)
     end
@@ -127,11 +104,5 @@ module Alchemy
         Language.current = language
       end
     end
-
-    def host_app_ability_present?
-      Object.const_get('::Ability')
-    rescue
-      false
-    end
   end
 end

data/lib/alchemy/engine.rb

@@ -23,6 +23,7 @@ require 'turbolinks'
 require 'userstamp'
 
 # Require globally used Alchemy mixins
+require_relative './ability_helper'
 require_relative './admin/locale'
 require_relative './auth_accessors'
 require_relative './cache_digests/template_tracker'

data/lib/alchemy/resource.rb

@@ -44,6 +44,17 @@ module Alchemy
   #       %w(synced_at remote_record_id)
   #     end
   #
+  # == Searchable attributes
+  #
+  # By default all :text and :string based attributes are searchable in the admin interface.
+  # You can overwrite this behaviour by providing a set of attribute names that should be searchable instead.
+  #
+  # === Example
+  #
+  #    def self.searchable_alchemy_resource_attributes
+  #      %w(remote_record_id firstname lastname age)
+  #    end
+  #
   # == Resource relations
   #
   # Alchemy::Resource can take care of ActiveRecord relations.
@@ -90,6 +101,7 @@ module Alchemy
 
     DEFAULT_SKIPPED_ATTRIBUTES = %w(id updated_at created_at creator_id updater_id)
     DEFAULT_SKIPPED_ASSOCIATIONS = %w(creator updater)
+    SEARCHABLE_COLUMN_TYPES = [:string, :text]
 
     def initialize(controller_path, module_definition = nil, custom_model = nil)
       @controller_path = controller_path
@@ -158,20 +170,24 @@ module Alchemy
       attributes.reject { |h| restricted_attributes.map(&:to_s).include?(h[:name].to_s) }
     end
 
-    # Returns all columns that are searchable
-    #
-    # For now it only uses string type columns
+    # Returns all attribute names that are searchable in the admin interface
     #
-    def searchable_attributes
-      attributes.select { |a| string_attribute?(a) } + searchable_relation_attributes?(attributes)
+    def searchable_attribute_names
+      if model.respond_to?(:searchable_alchemy_resource_attributes)
+        model.searchable_alchemy_resource_attributes
+      else
+        attributes.select { |a| searchable_attribute?(a) }
+          .concat(searchable_relation_attributes(attributes))
+          .collect { |h| h[:name] }
+      end
     end
 
     # Search field input name
     #
-    # Joins all searchable attributes into a Ransack compatible search query
+    # Joins all searchable attribute names into a Ransack compatible search query
     #
     def search_field_name
-      searchable_attributes.collect { |a| a[:name] }.join("_or_") + "_cont"
+      searchable_attribute_names.join("_or_") + "_cont"
     end
 
     def in_engine?
@@ -220,16 +236,17 @@ module Alchemy
 
     private
 
-    def string_attribute?(a)
-      a[:type].to_sym == :string && !a.key?(:relation)
+    def searchable_attribute?(a)
+      SEARCHABLE_COLUMN_TYPES.include?(a[:type].to_sym) && !a.key?(:relation)
     end
 
-    def string_attribute_on_relation?(a)
-      a.key?(:relation) && a[:relation][:attr_type].to_sym == :string
+    def searchable_attribute_on_relation?(a)
+      a.key?(:relation) &&
+        SEARCHABLE_COLUMN_TYPES.include?(a[:relation][:attr_type].to_sym)
     end
 
-    def searchable_relation_attributes?(attrs)
-      attrs.select { |a| string_attribute_on_relation?(a) }.map { |a| searchable_relation_attribute(a) }
+    def searchable_relation_attributes(attrs)
+      attrs.select { |a| searchable_attribute_on_relation?(a) }.map { |a| searchable_relation_attribute(a) }
     end
 
     def searchable_relation_attribute(a)

data/lib/alchemy/resources_helper.rb

@@ -168,5 +168,22 @@ module Alchemy
         page: params[:page]
       }
     end
+
+    def resource_has_tags
+      resource_model.respond_to?(:tag_counts) && resource_model.tag_counts.any?
+    end
+
+    def resource_has_filters
+      resource_model.respond_to?(:alchemy_resource_filters)
+    end
+
+    def resource_filter_select
+      resource_model.alchemy_resource_filters.map do |filter_scope|
+        [
+          Alchemy.t(filter_scope.to_sym, scope: ['resources', resource_name, 'filters']),
+          filter_scope
+        ]
+      end
+    end
   end
 end

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

@@ -20,13 +20,13 @@ FactoryGirl.define do
       name 'Startseite'
       page_layout { language.page_layout }
       language_root true
-      public true
+      public_on { Time.current }
       parent_id { Alchemy::Page.root.id }
     end
 
     trait :public do
       sequence(:name) { |n| "A Public Page #{n}" }
-      public true
+      public_on { Time.current }
     end
 
     trait :system do
@@ -47,5 +47,10 @@ FactoryGirl.define do
       name "Restricted page"
       restricted true
     end
+
+    trait :locked do
+      locked_at { Time.current }
+      locked_by { SecureRandom.random_number(1_000_000_000) }
+    end
   end
 end

data/lib/alchemy/upgrader.rb

@@ -4,6 +4,7 @@ module Alchemy
   class Upgrader < Alchemy::Seeder
     Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].each { |f| require f }
 
+    extend Alchemy::Upgrader::ThreePointFour
     extend Alchemy::Upgrader::ThreePointThree
     extend Alchemy::Upgrader::ThreePointTwo
     extend Alchemy::Upgrader::ThreePointOne

data/lib/alchemy/upgrader/tasks/install_asset_manifests.rb

@@ -0,0 +1,15 @@
+module Alchemy::Upgrader::Tasks
+  class InstallAssetManifests < Thor
+    include Thor::Actions
+
+    source_root File.expand_path('../../../rails/generators/alchemy/install/files',
+      File.dirname(__FILE__))
+
+    no_tasks do
+      def install
+        copy_file "all.js", "vendor/assets/javascripts/alchemy/admin/all.js"
+        copy_file "all.css", "vendor/assets/stylesheets/alchemy/admin/all.css"
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader/three_point_four.rb

@@ -0,0 +1,16 @@
+require_relative 'tasks/install_asset_manifests'
+
+module Alchemy
+  module Upgrader::ThreePointFour
+    private
+
+    def install_asset_manifests
+      desc 'Install asset manifests into `vendor/assets`'
+      Alchemy::Upgrader::Tasks::InstallAssetManifests.new.install
+    end
+
+    def alchemy_3_4_todos
+      todo "Nothing todo for Alchemy 3.4 |o/", 'Alchemy v3.4 changes'
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.3.3"
+  VERSION = "3.4.0.rc1"
 
   def self.version
     VERSION