pageflow 12.6.0 → 13.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a9ec0648822851e7c4e0d555d8bd34e8976e85936ca5c59bdb065d055dc801
-  data.tar.gz: 536dbfb80537fbcf90c7d137fe4b02ade45952948314cf88d1a58e4ceb9d6bf1
+  metadata.gz: 5b6985a1f5f2effe4bda0411263b904e1b32520a788f76f9533b16f0d5ce5ce0
+  data.tar.gz: f6bb3eaa7927bb4504522cd55b0cd084e272ee662d3fe90490307b0df7d772a8
 SHA512:
-  metadata.gz: 0fa76e57beef1df910bdc0c602eb419aaf85dec2799987a8186b1d226d773a99407966ffdf4964e43a42adfbcfc7af50164abb5a814b74d29b84b3fc0eb56d30
-  data.tar.gz: db1e5b3d5be88c54dc47de4a34537db50aaaa115a7c1793bd06e7579727f427a3c5a9bb574cdf1247f3cac18ade4e7b04eb08b63cf966b2d46561ff30d1f619b
+  metadata.gz: 24145fa9c1179167a1f5c71ae979c1bd53f8efd96659e3a86df77ec5314cfbd176bed252124e51a5b4dc29cab0f3d43177c72a39475836ce83efcc87e6ae4bcd
+  data.tar.gz: 2224cb2c9bc7eb9a06b07bdfc57711207585633f6da242510b885dcd97e69c39d9e13bb6a9dd6ba7fecda398ebc687a8f969f8885e6ba432d8d6fcdbb6b2dff3

data/CHANGELOG.md

@@ -1,24 +1,86 @@
 # CHANGELOG
 
-### Version 12.6.0
+### Version 13.0.0.beta1
 
-2019-01-28
+2018-07-30
 
-[Compare changes](https://github.com/codevise/pageflow/compare/12-5-stable...v12.6.0)
+[Compare changes](https://github.com/codevise/pageflow/compare/12-x-stable...v13.0.0.beta1)
 
-- Do not use asset_host in entry stylesheet link tags
-  ([#1110](https://github.com/codevise/pageflow/pull/1110))
-- Add theme vars for phone typography of tagline and subtitle
-  ([#1109](https://github.com/codevise/pageflow/pull/1109))
-  
-##### Internal:
-- Also release pageflow-support when running release task
-  ([#1116](https://github.com/codevise/pageflow/pull/1116))
-- Run npm ci on Travis and release:prepare task
-  ([#1114](https://github.com/codevise/pageflow/pull/1114))
-- Add package-lock.json to version control
-  ([#1111](https://github.com/codevise/pageflow/pull/1111))
+#### Breaking Changes
+
+- All of the migrations of earlier versions have been consolidated
+  into a single migration to speed up setup of new applications.
+  ([#975](https://github.com/codevise/pageflow/pull/975))
+
+  Make sure to update your application to Pageflow 12.2 before
+  updating to 13.0 to make sure the host application contains all
+  migrations.
+
+- Upgraded to Rails 5.2 and Active Admin 1.3
+  ([#938](https://github.com/codevise/pageflow/pull/938))
+
+  Follow the Rails upgrade guide and review the Active Admin changelog
+  to update the host application.
+
+- Migrated from Resque to Active Job
+  ([#976](https://github.com/codevise/pageflow/pull/976))
+
+  Pageflow no longer depends on Resque, but can work with different
+  Active Job backends instead. The install generator still sets up
+  Resque as backend. To coninute using Resque in an existing
+  application, you need to add the following dependencies to the host
+  application's `Gemfile`:
+
+        gem 'resque', '~> 1.25'
+        gem 'resque-scheduler', '~> 2.5'
+        gem 'ar_after_transaction', '~> 0.4.0'
+        gem 'redis', '~> 3.0'
+        gem 'redis-namespace', '~> 1.5'
+
+  The `resque-logger` and `resque_mailer` gems are no longer
+  used. Their initializers need to be removed from the host
+  application:
+
+        $ rm config/initializers/resque_logger.rb
+        $ rm config/initializers/resque_mailer.rb
+
+  The following unused line has been removed from
+  `Pageflow::AbilityMixin`:
+
+        can(:manage, Resque) if user.admin?
+
+  If the host application depends on this permission, you need to add
+  it to the `Ability` yourself.
+
+- Upgraded to Devise 4.4.0
+  ([#932](https://github.com/codevise/pageflow/pull/932))
+
+  Consider re-running the Devise intall generator to update the Devise
+  initializer:
+
+        $ bin/rails generate devise:install
+
+- Devise Async has been removed
+  ([#932](https://github.com/codevise/pageflow/pull/932))
+
+  We now use Active Job to allow sending Devise mails in background
+  jobs. The Device Async initializer (which was originally created by
+  the `pageflow:install` generator) needs to be removed:
+
+        $ rm config/initializers/device_async.rb
+
+- The deprecated Factory Girl gem has been replaced with its successor
+  Factory Bot. To continue using factories defined by Pageflow, you
+  need to switch as well.
+  ([#943](https://github.com/codevise/pageflow/pull/943))
+
+#### Internals
+
+- Fix building of nested associations
+  ([#977](https://github.com/codevise/pageflow/pull/977))
+- Upgrade Rubocop and remove imported Hound config
+  ([#973](https://github.com/codevise/pageflow/pull/973))
 
 See
-[12-5-stable branch](https://github.com/codevise/pageflow/blob/12-5-stable/CHANGELOG.md)
+[12-x-stable branch](https://github.com/codevise/pageflow/blob/12-x-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -40,7 +40,7 @@ Pageflow assumes the following choice of libraries:
 * [Devise](https://github.com/plataformatec/devise) for authentication
 * [CanCanCan](https://github.com/CanCanCommunity/cancancan) for authorization
 * [ActiveAdmin](http://activeadmin.info/) for administration
-* [Resque](https://github.com/resque/resque) for background jobs
+* [Resque](https://github.com/resque/resque) for as default for background jobs
 * [FriendlyId](https://github.com/norman/friendly_id) for pretty URLs
 * [Paperclip](https://github.com/thoughtbot/paperclip) for attachment handling
 * [Backbone](http://backbonejs.org/) [Marionette](http://marionettejs.com/) for the editor
@@ -95,6 +95,13 @@ for details.
     # Required for Rails 4.2 compatibility
     gem 'state_machine', git: 'https://github.com/codevise/state_machine.git'
 
+    # The install generator sets up Resque as Active Job backend
+    gem 'resque', '~> 1.25'
+    gem 'resque-scheduler', '~> 2.5'
+    gem 'ar_after_transaction', '~> 0.4.0'
+    gem 'redis', '~> 3.0'
+    gem 'redis-namespace', '~> 1.5'
+
 Run bundler to install dependencies:
 
     $ bundle install

data/Rakefile

@@ -14,10 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-task 'release' do
-  Rake.application['pageflow:release:pageflow_support'].invoke
-end
-
 require 'semmy'
 Semmy::Tasks.install do |config|
   config.github_repository = 'codevise/pageflow'

data/admins/pageflow/accounts.rb

@@ -72,27 +72,26 @@ module Pageflow
 
     controller do
       helper Pageflow::Admin::FeaturesHelper
+      helper Pageflow::Admin::WidgetsHelper
       helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::LocalesHelper
       helper Pageflow::Admin::MembershipsHelper
-      helper Pageflow::Admin::WidgetsHelper
       helper ThemesHelper
 
       def new
         @account = Account.new
-        @account.build_default_theming(default_locale: current_user.locale)
+        @account.build_default_theming
       end
 
       def create
         @account = Account.new(permitted_params[:account])
-        @account.build_default_theming(permitted_params[:account][:default_theming_attributes])
+        @account.build_default_theming(permitted_params.fetch(:account, {})[:default_theming_attributes])
         super
         update_widgets
       end
 
       def update
         update! do |success, failure|
-          success.html { redirect_to(admin_account_path(resource, params.slice(:tab))) }
+          success.html { redirect_to(admin_account_path(resource, params.permit(:tab))) }
         end
         update_widgets
       end
@@ -102,7 +101,7 @@ module Pageflow
       end
 
       def widgets_params
-        params.fetch(:widgets, {}).map do |role, type_name|
+        (params[:widgets].try(:permit!).to_h || {}).map do |role, type_name|
           {role: role, type_name: type_name}
         end
       end
@@ -141,13 +140,11 @@ module Pageflow
           :imprint_link_label,
           :copyright_link_url,
           :copyright_link_label,
-          :privacy_link_url,
           :home_url,
           :home_button_enabled_by_default,
           :default_author,
           :default_publisher,
-          :default_keywords,
-          :default_locale
+          :default_keywords
         ] +
           permitted_attributes_for(:theming)
       end

data/admins/pageflow/entry.rb

@@ -221,7 +221,7 @@ module Pageflow
 
       def update
         update! do |success, _|
-          success.html { redirect_to(admin_entry_path(resource, params.slice(:tab))) }
+          success.html { redirect_to(admin_entry_path(resource, params.permit(:tab))) }
         end
       end
 

data/admins/pageflow/folder.rb

@@ -43,7 +43,7 @@ module Pageflow
       end
 
       def permitted_params
-        result = params.permit(folder: [:name, :account_id])
+        result = params.permit(folder: [:name, :account_id]).to_h
         restrict_attributes(result[:folder]) if result[:folder]
         result
       end

data/admins/pageflow/user.rb

@@ -132,7 +132,7 @@ module Pageflow
 
       if request.patch?
         if @user.update_with_password(user_profile_params)
-          sign_in @user, bypass: true
+          bypass_sign_in @user, scope: :user
           redirect_to admin_root_path, notice: I18n.t('pageflow.admin.users.me.updated')
         end
       end
@@ -152,21 +152,21 @@ module Pageflow
       user = InvitedUser.find(params[:id])
       authorize!(:read, user)
       user.send_invitation!
-      redirect_to :back, notice: I18n.t('pageflow.admin.users.resent_invitation')
+      redirect_back fallback_location: admin_user_path(user), notice: I18n.t('pageflow.admin.users.resent_invitation')
     end
 
     member_action :suspend, method: :post do
       user = User.find(params[:id])
       authorize!(:suspend, user)
       user.suspend!
-      redirect_to :back, notice: I18n.t('pageflow.admin.users.suspended')
+      redirect_back fallback_location: admin_user_path(user), notice: I18n.t('pageflow.admin.users.suspended')
     end
 
     member_action :unsuspend, method: :post do
       user = User.find(params[:id])
       authorize!(:suspend, user)
       user.unsuspend!
-      redirect_to :back, notice: I18n.t('pageflow.admin.users.unsuspended')
+      redirect_back fallback_location: admin_user_path(user), notice: I18n.t('pageflow.admin.users.unsuspended')
     end
 
     controller do

data/app/assets/javascripts/pageflow/asset_urls.js.erb

@@ -1,7 +1,7 @@
 pageflow.assetUrls = {
-  unmuteSound: '<%= asset_path("pageflow/unmute.mp3") %>',
   largeBandwidthProbe: '<%= Rails.env.test? ? asset_path("bandwidth_probe_large.png") : "//#{File.join(Pageflow.config.zencoder_options[:s3_host_alias], "bandwidth_probe_large.png")}" %>',
   smallBandwidthProbe: '<%= Rails.env.test? ? asset_path("bandwidth_probe_small.png") : "//#{File.join(Pageflow.config.zencoder_options[:s3_host_alias], "bandwidth_probe_small.png")}" %>',
+  audioSwf: '<%= asset_path "pageflow/audio5js.swf" %>',
   emptyMp4: '<%= asset_path "pageflow/empty.mp4" %>',
   emptyWebm: '<%= asset_path "pageflow/empty.webm" %>'
 };

data/app/assets/javascripts/pageflow/audio/multi_player.js

@@ -128,10 +128,6 @@ pageflow.Audio.MultiPlayer = function(pool, options) {
     that.listenTo(player, 'ended', function() {
       that.trigger('ended', {audioFileId: id});
     });
-
-    that.listenTo(player, 'playfailed', function() {
-      that.trigger('playfailed', {audioFileId: id});
-    });
   }
 
   function stopEventPropagation(player) {

data/app/assets/javascripts/pageflow/audio_player.js

@@ -40,7 +40,7 @@ pageflow.AudioPlayer = function(sources, options) {
     swf_path: pageflow.assetUrls.audioSwf,
     throw_errors: false,
     format_time: false,
-    codecs: options.codecs || ['vorbis', 'mp4', 'mp3'],
+    codecs: ['vorbis', 'mp4', 'mp3'],
     ready: ready.resolve,
     loop: options.loop
   });

data/app/assets/javascripts/pageflow/base.js

@@ -10,11 +10,9 @@
 //= require_self
 
 //= require ./object
-//= require ./background_media
 //= require ./entry_data
 //= require ./seed_entry_data
 //= require ./cookies
-//= require ./cookie_notice
 //= require ./events
 //= require ./page_type
 //= require ./page_transitions

data/app/assets/javascripts/pageflow/browser/agent.js

@@ -2,97 +2,83 @@
  * Detect browser via user agent. Use only if feature detection is not
  * an option.
  */
-pageflow.browser.Agent = function(userAgent) {
-  return {
-    matchesSilk: function() {
-      return matches(/\bSilk\b/);
-    },
-
-    matchesDesktopSafari9: function() {
-      return this.matchesSafari9() && !this.matchesMobilePlatform();
-    },
-
-    matchesDesktopSafari10: function() {
-      return this.matchesSafari10() && !this.matchesMobilePlatform();
-    },
-
-    matchesSafari9: function() {
-      return this.matchesSafari() &&
-             matches(/Version\/9/i);
-    },
-
-    matchesSafari10: function() {
-      return this.matchesSafari() &&
-             matches(/Version\/10/i);
-    },
-
-    matchesSafari11: function() {
-      return this.matchesSafari() &&
-             matches(/Version\/11/i);
-    },
-
-    matchesSafari11AndAbove: function() {
-      return this.matchesSafari() &&
-             captureGroupGreaterOrEqual(/Version\/(\d+)/i, 11);
-    },
-
-    matchesSafari: function() {
-      // - Chrome also reports to be a Safari
-      // - Safari does not report to be a Chrome
-      // - Edge also reports to be a Safari, but also reports to be Chrome
-      return matches(/Safari\//i) &&
-             !matches(/Chrome/i);
-    },
-
-    /**
-     * Returns true on iOS Safari.
-     * @return {boolean}
-     */
-    matchesMobileSafari: function() {
-      var matchers = [/iPod/i, /iPad/i, /iPhone/i];
-
-      return _.any(matchers, function(matcher) {
-        return userAgent.match(matcher);
-      });
-    },
-
-    /**
-     * Returns true on iOS or Android.
-     * @return {boolean}
-     */
-    matchesMobilePlatform: function() {
-      var matchers = [/iPod/i, /iPad/i, /iPhone/i, /Android/i, /Silk/i, /IEMobile/i];
-
-      return _.any(matchers, function(matcher) {
-        return userAgent.match(matcher);
-      });
-    },
-
-    /**
-     * Returns true on Internet Explorser version 9, 10 and 11.
-     * @return {boolean}
-     */
-    matchesIEUpTo11: function() {
-      return userAgent.match(/Trident\//);
-    },
-
-    /**
-     * Returns true in InApp browser of Facebook app.
-     * @return {boolean}
-     */
-    matchesFacebookInAppBrowser: function() {
-      return userAgent.match(/FBAN/) && userAgent.match(/FBAV/);
-    }
-  };
-
-  function matches(exp) {
-    return !!userAgent.match(exp);
-  }
-
-  function captureGroupGreaterOrEqual(exp, version) {
-    var match = userAgent.match(exp);
-    return match && match[1] && parseInt(match[1], 10) >= version;
+pageflow.browser.agent = {
+  matchesSilk: function() {
+    return navigator.userAgent.match(/\bSilk\b/);
+  },
+
+  matchesDesktopSafari9: function() {
+    return this.matchesSafari9() && !this.matchesMobilePlatform();
+  },
+
+  matchesDesktopSafari10: function() {
+    return this.matchesSafari10() && !this.matchesMobilePlatform();
+  },
+
+  matchesSafari9: function() {
+    return this.matchesSafari() &&
+      this._matches(/Version\/9/i);
+  },
+
+  matchesSafari10: function() {
+    return this.matchesSafari() &&
+      this._matches(/Version\/10/i);
+  },
+
+  matchesSafari11: function() {
+    return this.matchesSafari() &&
+      this._matches(/Version\/11/i);
+  },
+
+  matchesSafari: function() {
+    // - Chrome also reports to be a Safari
+    // - Safari does not report to be a Chrome
+    // - Edge also reports to be a Safari, but also reports to be Chrome
+    return this._matches(/Safari\//i) &&
+      !this._matches(/Chrome/i);
+  },
+
+  /**
+   * Returns true on iOS Safari.
+   * @return {boolean}
+   */
+  matchesMobileSafari: function() {
+    var matchers = [/iPod/i, /iPad/i, /iPhone/i];
+
+    return _.any(matchers, function(matcher) {
+      return navigator.userAgent.match(matcher);
+    });
+  },
+
+  /**
+   * Returns true on iOS or Android.
+   * @return {boolean}
+   */
+  matchesMobilePlatform: function() {
+    var matchers = [/iPod/i, /iPad/i, /iPhone/i, /Android/i, /Silk/i, /IEMobile/i];
+
+    return _.any(matchers, function(matcher) {
+      return navigator.userAgent.match(matcher);
+    });
+  },
+
+  /**
+   * Returns true on Internet Explorser version 9, 10 and 11.
+   * @return {boolean}
+   */
+  matchesIEUpTo11: function() {
+    return navigator.userAgent.match(/Trident\//);
+  },
+
+  /**
+   * Returns true in InApp browser of Facebook app.
+   * @return {boolean}
+   */
+  matchesFacebookInAppBrowser: function() {
+    return navigator.userAgent.match(/FBAN/) && navigator.userAgent.match(/FBAV/);
+  },
+
+  _matches: function(exp) {
+    return navigator.userAgent.match(exp);
   }
 };
-
-pageflow.browser.agent = new pageflow.browser.Agent(navigator.userAgent);