pageflow 16.1.0 → 16.2.0

data/entry_types/scrolled/package/widgets/iconInlineFileRights.js

@@ -0,0 +1,49 @@
+import { ThemeIcon, frontend } from 'pageflow-scrolled/frontend';
+import React from 'react';
+import classNames from 'classnames';
+
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+var styles = {"standAlone":"IconInlineFileRights-module_standAlone__15788","button":"IconInlineFileRights-module_button__o5ZmR","tooltip":"IconInlineFileRights-module_tooltip__2e1u8","transparent":"IconInlineFileRights-module_transparent__2dVaA","wrapper":"IconInlineFileRights-module_wrapper__2kQK_","scroller":"IconInlineFileRights-module_scroller__1hT8t"};
+
+function IconInlineFileRights(_ref) {
+  var _classNames;
+
+  var context = _ref.context,
+      playerControlsStandAlone = _ref.playerControlsStandAlone,
+      playerControlsTransparent = _ref.playerControlsTransparent,
+      children = _ref.children;
+
+  if (context === 'afterElement') {
+    return null;
+  }
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames(styles.wrapper, (_classNames = {}, _defineProperty(_classNames, styles.transparent, context !== 'playerControls' || playerControlsTransparent), _defineProperty(_classNames, styles.standAlone, context !== 'playerControls'), _classNames))
+  }, /*#__PURE__*/React.createElement("button", {
+    className: styles.button
+  }, /*#__PURE__*/React.createElement(ThemeIcon, {
+    name: "copyright"
+  })), /*#__PURE__*/React.createElement("div", {
+    className: styles.tooltip
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.scroller
+  }, children)));
+}
+
+frontend.widgetTypes.register('iconInlineFileRights', {
+  component: IconInlineFileRights
+});

data/entry_types/scrolled/package/widgets/textInlineFileRights.css

@@ -0,0 +1 @@
+.TextInlineFileRights-module_text__1tT0W{font-size:14px;position:relative;z-index:1;color:var(--content-text-color)}.TextInlineFileRights-module_text__1tT0W li{text-align:right;padding-top:.2em}.TextInlineFileRights-module_forSection__22xHD{position:absolute;bottom:0;right:0}.TextInlineFileRights-module_forSection__22xHD li{padding:0 .4em .2em 0}.TextInlineFileRights-module_text__1tT0W a{color:inherit;-webkit-text-decoration-color:color-mix(in srgb,currentColor,transparent);text-decoration-color:color-mix(in srgb,currentColor,transparent)}.TextInlineFileRights-module_text__1tT0W span{opacity:.7}

data/entry_types/scrolled/package/widgets/textInlineFileRights.js

@@ -0,0 +1,37 @@
+import { frontend } from 'pageflow-scrolled/frontend';
+import React from 'react';
+import classNames from 'classnames';
+
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+var styles = {"text":"TextInlineFileRights-module_text__1tT0W","forSection":"TextInlineFileRights-module_forSection__22xHD"};
+
+function TextInlineFileRights(_ref) {
+  var context = _ref.context,
+      children = _ref.children;
+
+  if (context === 'insideElement' || context === 'playerControls') {
+    return null;
+  }
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames(styles.text, _defineProperty({}, styles.forSection, context === 'section'))
+  }, /*#__PURE__*/React.createElement("div", null, children));
+}
+
+frontend.widgetTypes.register('textInlineFileRights', {
+  component: TextInlineFileRights
+});

data/lib/generators/pageflow/resque/templates/resque.rake

@@ -1,5 +1,5 @@
 require 'resque/tasks'
-require 'resque_scheduler/tasks'
+require 'resque/scheduler/tasks'
 
 namespace :resque do
   # Tell resque to initialize the rails app in worker processes

data/lib/generators/pageflow/resque/templates/resque.rb

@@ -1,5 +1,5 @@
 require 'resque'
-require 'resque_scheduler'
+require 'resque-scheduler'
 
 # Change to use your favorite method of configuration. Consider the
 # dotenv gem to setup your environment with a .env file.

data/lib/generators/pageflow/routes/routes_generator.rb

@@ -18,7 +18,7 @@ module Pageflow
       end
 
       def require_resque_server
-        prepend_to_file 'config/routes.rb', "require 'resque/server'\nrequire 'resque_scheduler/server'\n\n"
+        prepend_to_file 'config/routes.rb', "require 'resque/server'\nrequire 'resque/scheduler/server'\n\n"
       end
     end
   end

data/lib/pageflow/configuration.rb

@@ -349,9 +349,12 @@ module Pageflow
     # @since 0.11
     attr_accessor :authorize_user_deletion
 
+    # Array of values that the `license` attribute on files can take.
+    attr_accessor :available_file_licenses
+
     # Array of values that the `kind` attribute on text tracks can
     # take. Defaults to `[:captions, :subtitles, :descriptions]`.
-    attr_reader :available_text_track_kinds
+    attr_accessor :available_text_track_kinds
 
     # Allow one user to be member of multiple accounts. Defaults to
     # true.
@@ -451,6 +454,10 @@ module Pageflow
 
       @authorize_user_deletion = lambda { |_user| true }
 
+      @available_file_licenses = [
+        :cc_by_4, :cc_by_sa_4, :cc_by_nc_4, :cc_by_nc_sa_4, :cc_by_nd_4, :cc_by_nc_nd_4
+      ]
+
       @available_text_track_kinds = [:captions, :subtitles, :descriptions]
 
       @allow_multiaccount_users = true

data/lib/pageflow/engine.rb

@@ -43,64 +43,21 @@ module Pageflow
   class Engine < ::Rails::Engine
     isolate_namespace Pageflow
 
-    if Pageflow::RailsVersion.experimental?
-      config.autoload_paths << root.join('app/views/components')
-      config.eager_load_paths << root.join('app/views/components')
-
-      lib = root.join('lib')
-
-      config.autoload_paths << lib
-      config.eager_load_paths << lib
-
-      initializer 'pageflow.autoloading' do
-        Rails.autoloaders.main.ignore(
-          lib.join('generators'),
-          lib.join('tasks'),
-          lib.join('pageflow/paperclip_processors'),
-          lib.join('pageflow/version.rb')
-        )
-      end
-    else
-      config.paths.add('app/views/components', autoload: true)
-      config.paths.add('lib', autoload: true)
-
-      def eager_load!
-        # Manually eager load `lib/pageflow` as the least bad option:
-        #
-        # - Autoload paths are not eager loaded in production.
-        #
-        # - `lib` cannot be an eager load path since otherwise templates
-        #   in `lib/generators` are also executed.
-        #
-        # - `lib/pageflow` cannot be an eager load path since eager load
-        #   paths are automatically used as autoload paths. That way
-        #   `lib/pageflow/admin/something.rb` could be autoloaded via
-        #   `Admin::Something`.
-        #
-        # - Using `require` in `lib/pageflow.rb` disables code
-        #   reloading.
-        #
-        # - Using `require_dependency` in `lib/pageflow.rb` does not
-        #   activate code reloading either since it requires the
-        #   autoload path to be set up correctly, which only happens
-        #   during initialization.
-        super
-
-        lib_path = config.root.join('lib')
-        matcher = %r{\A#{Regexp.escape(lib_path.to_s)}/(.*)\.rb\Z}
-
-        already_required_files = [
-          'pageflow/engine',
-          'pageflow/global_config_api',
-          'pageflow/news_item_api',
-          'pageflow/version'
-        ]
-
-        Dir.glob("#{lib_path}/pageflow/**/*.rb").sort.each do |file|
-          logical_path = file.sub(matcher, '\1')
-          require_dependency(logical_path) unless already_required_files.include?(logical_path)
-        end
-      end
+    config.autoload_paths << root.join('app/views/components')
+    config.eager_load_paths << root.join('app/views/components')
+
+    lib = root.join('lib')
+
+    config.autoload_paths << lib
+    config.eager_load_paths << lib
+
+    initializer 'pageflow.autoloading' do
+      Rails.autoloaders.main.ignore(
+        lib.join('generators'),
+        lib.join('tasks'),
+        lib.join('pageflow/paperclip_processors'),
+        lib.join('pageflow/version.rb')
+      )
     end
 
     config.i18n.load_path += Dir[config.root.join('config', 'locales', '**', '*.yml').to_s]

data/lib/pageflow/page_type.rb

@@ -202,7 +202,7 @@ module Pageflow
     #       name 'rainbow'
     #
     #       def json_seed_template
-    #         'pageflow/rainbow/page_type.json.jbuilder'
+    #         'pageflow/rainbow/page_type'
     #       end
     #     end
     #

data/lib/pageflow/paperclip_processors/webp.rb

@@ -0,0 +1,63 @@
+require 'vips'
+
+module Pageflow
+  module PaperclipProcessors
+    # @api private
+    class Webp < Paperclip::Processor
+      ANIMATED_FORMATS = %w[.gif].freeze
+
+      def initialize(file, options = {}, attachment = nil)
+        super
+
+        geometry = options[:geometry].to_s
+        @should_crop = geometry[-1, 1] == '#'
+
+        @target_geometry = Paperclip::Geometry.parse(geometry)
+        @whiny = options.fetch(:whiny, true)
+
+        @current_format = File.extname(file.path)
+        @basename = File.basename(@file.path, @current_format)
+      end
+
+      def make
+        source = @file
+        filename = [@basename, '.webp'].join
+        destination = Paperclip::TempfileFactory.new.generate(filename)
+
+        begin
+          thumbnail = Vips::Image.thumbnail(
+            ANIMATED_FORMATS.include?(@current_format) ? "#{source.path}[n=-1]" : source.path,
+            width,
+            size: @should_crop ? :both : :down,
+            height: height,
+            crop: crop
+          )
+          thumbnail.webpsave(destination.path)
+        rescue Vips::Error => e
+          if @whiny
+            message = "There was an error processing the thumbnail for #{@basename}:\n" + e.message
+            raise Paperclip::Error, message
+          end
+        end
+
+        destination
+      end
+
+      private
+
+      def crop
+        return unless @should_crop
+
+        @options[:crop] || :centre
+      end
+
+      def width
+        @target_geometry.width
+      end
+
+      def height
+        @target_geometry.height
+      end
+    end
+  end
+end

data/lib/pageflow/rails_version.rb

@@ -3,11 +3,11 @@ module Pageflow
     extend self
 
     def detect
-      from_env || '5.2.0'
+      from_env || '~> 6.1.0'
     end
 
     def experimental?
-      detect != '5.2.0'
+      detect != '~> 6.1.0'
     end
 
     private

data/lib/pageflow/user_mixin.rb

@@ -71,7 +71,7 @@ module Pageflow
     end
 
     module ClassMethods
-      def ransackable_attributes(_auth_object)
+      def ransackable_attributes(_auth_object = nil)
         %w[first_name last_name email]
       end
     end

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '16.1.0'.freeze
+  VERSION = '16.2.0'.freeze
 end

data/package/config/jest/index.js

@@ -4,7 +4,9 @@ module.exports = {
   globals: {
     __webpack_public_path__: '',
     pageflow: {
-      config: {}
+      config: {
+        availableFileLicenses: []
+      }
     }
   },