pageflow 0.7.2 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWMxMTdkMTM4ODAyOTZhM2VlYzMyZDM5MDU2Y2FiNGZhMWY3MjUwNg==
+    YjJkZGQ5MGI0MTRlZmYxZjM5ZTRmMGM0ZDc1MTNiMzRhMDIwZTc5Yg==
   data.tar.gz: !binary |-
-    NTY3MTBlMTY2YWYwY2NmZTg5MTZiYjc3M2FkZDI0ZWI1ODRkNTlkNQ==
+    MGRmMDdhMDFmYzAyNDI1Y2IwMGZlMmI2MWU4ODNkNmI2NjE1MzRjMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGE4MTg4MWRlNDBhOGM4NjBkYTcyMjc2Y2U2NjIxNmYxMTFjOGQyNTZlMWRh
-    ZWUyMWE4ZmE0OTRkM2RjM2UxNjFhZDE4MjkxNmY3NjAzMTE1ZmM5ZjcwY2Ux
-    ZWI4ZDNjMjkzNjY4ZjlkMWExNTJlNWNiNzIyZGM3YjYzNGJhMGY=
+    MzU1OGUzMWQyMGNjNzkxODgwNWFjYTc1N2ZiNmQyODRjZDJmNWNiMDlkMDVm
+    ZDc1YWQ0NWEyNzliNDVlMzljNjYzY2VkOTdiNDA1NGZlNDVmYjg1MTZlNjkw
+    OTQ3NTNlNmVlNGNlODg3MjliNWM2Njk3ZGY5MWVhMWE1ZGYzMjQ=
   data.tar.gz: !binary |-
-    Mjk2NGUxNTgxZjgyNTVlZTdlNjc2NjA1YzUxNzdmZjFiZTE5MGEyOTMzNGJj
-    YzY1NWZiMjkzMTA3M2M1ZGFhZTE0YTFhMjE0YTQ0NWU4N2Q0YTQ0ZThiYjU0
-    YzQ3YTgxNDJkN2I2ZjZiMzVlNWY4NWQ5MGY4MGY0OGZlZGY2Nzg=
+    MzgyNmIxY2I1MmI4NTMxMjJjYzVmYmY4ODZjMGU0MDlmNzJkYTFkNDAxZWEw
+    Njg5OGUxODQwZWU3NjdiYmIwYjhmMDMyMjQyYWNkM2NmNjUyY2UyYjUwNDll
+    ZDY1NzY0ZDgyMzU3MWI5NDEzMjZmOWU1NWRjMWJmNzAxMGI0ZmQ=

data/Rakefile

@@ -16,6 +16,8 @@ end
 
 require File.expand_path('spec/support/pageflow/rails_version', File.dirname(__FILE__))
 APP_RAKEFILE = File.expand_path("../spec/dummy/rails-#{Pageflow::RailsVersion.detect}/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+
+load 'rails/tasks/engine.rake' if File.exists?(APP_RAKEFILE)
+load File.expand_path('lib/tasks/pageflow_tasks.rake', File.dirname(__FILE__))
 
 Bundler::GemHelper.install_tasks

data/admins/pageflow/entry.rb

@@ -83,6 +83,7 @@ module Pageflow
 
       tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(:entry),
                 :i18n => 'pageflow.admin.resource_tabs',
+                :authorize => true,
                 :build_args => [entry])
     end
 

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

@@ -29,7 +29,7 @@ pageflow.AudioPlayer = function(sources, options) {
   audio.on('load', loaded.resolve);
 
   if (options.mediaEvents) {
-    pageflow.AudioPlayer.mediaEvents(audio);
+    pageflow.AudioPlayer.mediaEvents(audio, options.context);
   }
 
   audio.src = function(sources) {

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

@@ -1,7 +1,8 @@
-pageflow.AudioPlayer.mediaEvents = function(player) {
+pageflow.AudioPlayer.mediaEvents = function(player, context) {
   function triggerMediaEvent(name) {
     pageflow.events.trigger('media:' + name, {
       fileName: player.currentSrc,
+      context: context,
       currentTime: player.position,
       duration: player.duration,
       volume: player.volume(),

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

@@ -112,8 +112,12 @@ pageflow.pageType.register('audio', _.extend({
 
   _ensureAudioPlayer: function(pageElement) {
     this.audioPlayer = this.audioPlayer ||
-      pageflow.AudioPlayer.fromScriptTag(pageElement.find('script[data-audio]'),
-                                         {mediaEvents: true});
+      pageflow.AudioPlayer.fromScriptTag(pageElement.find('script[data-audio]'), {
+        mediaEvents: true,
+        context: {
+          page: pageElement.page('instance')
+        }
+      });
 
     pageElement.find('.vjs-controls').playerControls({
       player: this.audioPlayer

data/app/assets/javascripts/pageflow/page_types/video.js

@@ -116,9 +116,14 @@ pageflow.pageType.register('video', _.extend({
   _initVideoPlayer: function(pageElement) {
     var videoPlayer = new pageflow.VideoPlayer.Lazy(pageElement.find('[data-template=video]'), {
       bufferUnderrunWaiting: true,
-      mediaEvents: true,
       controls: true,
       customControlsOnMobile: true,
+
+      mediaEvents: true,
+      context: {
+        page: pageElement.page('instance')
+      },
+
       width: '100%',
       height: '100%'
     });

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

@@ -4,18 +4,20 @@ pageflow.Settings = Backbone.Model.extend({
   },
 
   initialize: function() {
-    if (localStorage['pageflow.settings']) {
-      try {
-        this.set(JSON.parse(localStorage['pageflow.settings']));
+    if (window.localStorage) {
+      if (localStorage['pageflow.settings']) {
+        try {
+          this.set(JSON.parse(localStorage['pageflow.settings']));
+        }
+        catch(e) {
+          pageflow.log(e);
+        }
       }
-      catch(e) {
-        pageflow.log(e);
-      }
-    }
 
-    this.on('change', function() {
-      localStorage['pageflow.settings'] = JSON.stringify(this);
-    });
+      this.on('change', function() {
+        localStorage['pageflow.settings'] = JSON.stringify(this);
+      });
+    }
   }
 });
 

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

@@ -18,7 +18,7 @@ pageflow.VideoPlayer = function(element, options) {
   pageflow.VideoPlayer.srcFromOptionsMethod(player);
 
   if (options.mediaEvents) {
-    pageflow.VideoPlayer.mediaEvents(player);
+    pageflow.VideoPlayer.mediaEvents(player, options.context);
   }
 
   if (options.bufferUnderrunWaiting) {

data/app/assets/javascripts/pageflow/video_player/media_events.js

@@ -1,7 +1,8 @@
-pageflow.VideoPlayer.mediaEvents = function(player) {
+pageflow.VideoPlayer.mediaEvents = function(player, context) {
   function triggerMediaEvent(name) {
     pageflow.events.trigger('media:' + name, {
       fileName: player.currentSrc(),
+      context: context,
       currentTime: player.currentTime(),
       duration: player.duration(),
       volume: player.volume(),

data/app/assets/javascripts/pageflow/widgets/multimedia_alert.js

@@ -15,7 +15,10 @@
         widget.element.find('.close').on('click', function() {
           widget.element.hide();
           toggleContent(true);
+
+          pageflow.events.trigger('button:close_multimedia_alert');
           start();
+
           return false;
         });
       });

data/app/assets/stylesheets/pageflow/page_types/audio.css.scss

@@ -21,10 +21,6 @@
 .js .audioPage {
   .contentText {
     margin-bottom: 200px;
-
-    @include phone {
-      margin-bottom: 100px;
-    }
   }
 
   .non_js_audio {

data/app/assets/stylesheets/pageflow/page_types/audio_loop.css.scss

@@ -0,0 +1,18 @@
+.js .audioLoopPage {
+  .non_js_audio {
+    display: none;
+  }
+}
+
+.non_js .text_position_right .audioLoopPage {
+  .page_header {
+    margin-left: 0;
+    max-width: initial;
+
+    > * {
+      max-width: 500px;
+      width: 60%;
+      margin-left: auto;
+    }
+  }
+}

data/app/controllers/pageflow/application_controller.rb

@@ -6,7 +6,7 @@ module Pageflow
     layout 'pageflow/application'
 
     before_filter do
-      I18n.locale = current_user.try(:locale) || I18n.default_locale
+      I18n.locale = current_user.try(:locale) || locale_from_accept_language_header || I18n.default_locale
     end
 
     # Prevent CSRF attacks by raising an exception.
@@ -59,5 +59,9 @@ module Pageflow
         redirect_to("http://#{request.host}#{request.fullpath}", :status => :moved_permanently)
       end
     end
+
+    def locale_from_accept_language_header
+      http_accept_language.compatible_language_from(I18n.available_locales)
+    end
   end
 end

data/app/controllers/pageflow/revisions_controller.rb

@@ -13,6 +13,7 @@ module Pageflow
       @entry = PublishedEntry.new(revision.entry, revision)
       I18n.locale = @entry.locale
 
+      @widget_scope = :preview
       render :template => 'pageflow/entries/show'
     end
 

data/app/helpers/pageflow/social_share_helper.rb

@@ -23,23 +23,34 @@ module Pageflow
       title.join(' ')
     end
 
-    def social_share_page_description(page)
-      return page.configuration['text'] if page.configuration['text'].present?
-      return page.configuration['description'] if page.configuration['description'].present?
+    def social_share_page_description(page, entry)
+      return social_share_sanitize(page.configuration['text']) if page.configuration['text'].present?
+      return social_share_sanitize(page.configuration['description']) if page.configuration['description'].present?
+      social_share_entry_description(entry)
+    end
+
+    def social_share_entry_description(entry)
+      return social_share_sanitize(entry.summary) if entry.summary.present?
+
+      entry.pages.each do |page|
+        return social_share_sanitize(page.configuration['text']) if page.configuration['text'].present?
+      end
       ''
     end
 
     def social_share_entry_image_tags(entry)
       image_urls = []
 
-      image_urls << ImageFile.find(entry.share_image_id).thumbnail_url(:medium) if entry.share_image_id.present?
-
-      entry.pages.each do |page|
-        if image_urls.size >= 4
-          break
-        else
-          image_urls << page.thumbnail_url(:medium)
-          image_urls.uniq!
+      if entry.share_image_id.present?
+        image_urls << ImageFile.find(entry.share_image_id).thumbnail_url(:medium)
+      else
+        entry.pages.each do |page|
+          if image_urls.size >= 4
+            break
+          else
+            image_urls << page.thumbnail_url(:medium)
+            image_urls.uniq!
+          end
         end
       end
 
@@ -50,5 +61,10 @@ module Pageflow
       url.gsub(/^(\/\/|https:\/\/)/, 'http://')
     end
 
+    private
+
+    def social_share_sanitize(text)
+      strip_tags(text.gsub(/<br ?\/?>/, ' ').squish)
+    end
   end
-end
+end

data/app/models/concerns/pageflow/hosted_file.rb

@@ -7,6 +7,9 @@ module Pageflow
       has_attached_file(:attachment_on_filesystem, Pageflow.config.paperclip_filesystem_default_options)
       has_attached_file(:attachment_on_s3, Pageflow.config.paperclip_s3_default_options)
 
+      do_not_validate_attachment_file_type(:attachment_on_filesystem)
+      do_not_validate_attachment_file_type(:attachment_on_s3)
+
       state_machine initial: 'not_uploaded_to_s3' do
         extend StateMachineJob::Macro
 

data/app/models/pageflow/image_file.rb

@@ -17,6 +17,9 @@ module Pageflow
                                  :large => "-quality 70 -interlace Plane"
                                }))
 
+    do_not_validate_attachment_file_type(:unprocessed_attachment)
+    do_not_validate_attachment_file_type(:processed_attachment)
+
     after_unprocessed_attachment_post_process :save_image_dimensions
 
     def attachment

data/app/models/pageflow/video_file.rb

@@ -28,6 +28,10 @@ module Pageflow
                                  :large => "-quality 60 -interlace Plane"
                                }))
 
+
+    do_not_validate_attachment_file_type(:poster)
+    do_not_validate_attachment_file_type(:thumbnail)
+
     def thumbnail_url(*args)
       poster.url(*args)
     end

data/app/models/pageflow/widget.rb

@@ -11,7 +11,13 @@ module Pageflow
     end
 
     def enabled?(options)
-      options[:only] != :editor || widget_type.enabled_in_editor?
+      if options[:scope] == :editor
+        widget_type.enabled_in_editor?
+      elsif options[:scope] == :preview
+        widget_type.enabled_in_preview?
+      else
+        true
+      end
     end
 
     def widget_type

data/app/views/components/pageflow/admin/tabs_view.rb

@@ -8,8 +8,8 @@ module Pageflow
       def build(tabs, options = {})
         super(class: 'admin_tabs_view')
 
-        @tabs = tabs
         @options = options
+        @tabs = filter_tabs(tabs)
 
         build_tab_list
         build_tab_containers
@@ -17,6 +17,14 @@ module Pageflow
 
       private
 
+      def filter_tabs(tabs)
+        return tabs unless options[:authorize]
+
+        tabs.select do |tab_options|
+          authorized?(:view, tab_options[:component])
+        end
+      end
+
       def build_tab_list
         ul(class: 'tabs') do
           tabs.each do |tab_options|

data/app/views/pageflow/entries/_entry.html.erb

@@ -16,5 +16,5 @@
 
   <%= render 'pageflow/entries/header', :entry => entry %>
   <%= render 'pageflow/entries/overview', :entry => entry %>
-  <%= render_widgets(entry) %>
+  <%= render_widgets(entry, :scope => widget_scope) %>
 <% end %>

data/app/views/pageflow/entries/partials.html.erb

@@ -1,3 +1,3 @@
 <%= render 'pageflow/entries/header', :entry => @entry %>
 <%= render 'pageflow/entries/overview', :entry => @entry %>
-<%= render_widgets(@entry, only: :editor) %>
+<%= render_widgets(@entry, scope: :editor) %>

data/app/views/pageflow/entries/show.html.erb

@@ -13,12 +13,12 @@
   <% end %>
 <% end %>
 
-<%= cache @entry do %>
+<%= cache [@entry, :body, @widget_scope] do %>
 
   <%= render 'pageflow/entries/ie8_hint' %>
   <%= render 'pageflow/entries/loading_spinner' %>
   <%= render 'pageflow/entries/multimedia_alert' %>
-  <%= render @entry %>
+  <%= render @entry, :widget_scope => @widget_scope %>
 
   <script>
     pageflow.manualStart.enabled = <%= @entry.manual_start ? 'true' : 'false' %>;

data/app/views/pageflow/entries/show.json.jbuilder

@@ -1,8 +1,10 @@
 Pageflow.config.file_types.each do |file_type|
-  json.set!(file_type.collection_name) do
-    json.partial!(collection: @entry.files(file_type.model),
-                  partial: 'pageflow/editor/files/file',
-                  locals: {file_type: file_type},
-                  as: :file)
+  json.set!(file_type.collection_name, @entry.files(file_type.model)) do |file|
+    json.cache!(file) do
+      json.partial!(object: file,
+                    partial: 'pageflow/editor/files/file',
+                    locals: {file_type: file_type},
+                    as: :file)
+    end
   end
 end

data/app/views/pageflow/pages/templates/_audio_loop.html.erb

@@ -1,5 +1,5 @@
 <div class="blackLayer"></div>
-<div class="content_and_background audioPage">
+<div class="content_and_background audioLoopPage">
 
   <div class="backgroundArea">
     <%= background_image_div(configuration, 'background_image') %>
@@ -19,7 +19,7 @@
     <div class="scroller">
       <div>
         <div class="contentWrapper">
-          <div class="contentText audioPage">
+          <div class="contentText audioLoopPage">
             <p class="non_js_audio">
               <%= audio_file_non_js_link(configuration['audio_file_id']) %>
             </p>

data/app/views/pageflow/social_share/_entry_meta_tags.html.erb

@@ -3,10 +3,10 @@
 <%= social_share_entry_image_tags(entry) %>
 
 <%= tag :meta, :property => "og:title", :content => "#{entry.title} - #{entry.theming.cname_domain}" %>
-<%= tag :meta, :property => "og:description", :name => "description", :content => entry_summary(entry) %>
+<%= tag :meta, :property => "og:description", :name => "description", :content => social_share_entry_description(entry) %>
 <%= tag :meta, :property => "og:url", :content => pretty_entry_url(entry) %>
 <%= tag :meta, :property => "og:site_name", :content => entry.theming.cname_domain %>
 <%= tag :meta, :property => "og:type", :content => "website" %>
 
 <%= tag :meta, :name => "twitter:card", :content => "summary_large_image" %>
-<%= tag :meta, :name => "twitter:description", :content => entry_summary(entry) %>
+<%= tag :meta, :name => "twitter:description", :content => social_share_entry_description(entry) %>

data/app/views/pageflow/social_share/_page_meta_tags.html.erb

@@ -3,10 +3,10 @@
 <%= tag :meta, :property => "og:image", :content => social_share_normalize_protocol(page.thumbnail_url(:medium)) %>
 
 <%= tag :meta, :property => "og:title", :content => social_share_page_title(page) %>
-<%= tag :meta, :property => "og:description", :name => "description", :content => social_share_page_description(page) %>
+<%= tag :meta, :property => "og:description", :name => "description", :content => social_share_page_description(page, entry) %>
 <%= tag :meta, :property => "og:url", :content => social_share_page_url(page) %>
 <%= tag :meta, :property => "og:site_name", :content => entry.theming.cname_domain %>
 <%= tag :meta, :property => "og:type", :content => "website" %>
 
 <%= tag :meta, :name => "twitter:card", :content => "summary_large_image" %>
-<%= tag :meta, :name => "twitter:description", :content => social_share_page_description(page) %>
+<%= tag :meta, :name => "twitter:description", :content => social_share_page_description(page, entry) %>

data/config/initializers/paperclip.rb

@@ -5,12 +5,12 @@ Pageflow.configure do |config|
   config.paperclip_filesystem_root = Rails.root.join('tmp/attachments/production/')
 
   if Rails.env.test?
-    config.paperclip_s3_default_options = {
+    config.paperclip_s3_default_options.merge!({
       :storage => :filesystem,
       :path => ':rails_root/tmp/attachments/test/s3/:class/:attachment/:id_partition/:style/:filename'
-    }
+    })
   else
-    config.paperclip_s3_default_options = {
+    config.paperclip_s3_default_options.merge!({
       :storage => :s3,
       :s3_headers => {'Expires' => 1.year.from_now.httpdate},
       :s3_options => {:max_retries => 10},
@@ -24,14 +24,14 @@ Pageflow.configure do |config|
       # master, but for us not deleting old files is good enough. They
       # might be in the CDN anyway.
       :keep_old_files => true
-    }
+    })
   end
 
-  config.paperclip_filesystem_default_options = {
+  config.paperclip_filesystem_default_options.merge!({
     :storage => :filesystem,
     :path => ':pageflow_filesystem_root/:class/:attachment/:id_partition/:style/:filename',
     :url => 'not_uploaded_yet'
-  }
+  })
 
   config.thumbnail_styles = {
     thumbnail: {

data/config/locales/en.yml

@@ -1443,7 +1443,7 @@ en:
 
           Under „Title and Options“ you can set up basic appearance
 
-          parameters as well as the title, language and lega
+          parameters as well as the title, language and legal
 
           notice. You can also decide which content should be
 
@@ -1478,9 +1478,7 @@ en:
           and chapters any time.
 
 
-          For more details see: [Chapter and Pages](#pageflow.help_entries.outline)
-
-'
+          For more details see: [Chapter and Pages](#pageflow.help_entries.outline)'
       page_options:
         menu_item: General Page Options
         text: ! '# General Page Options

data/lib/pageflow.rb

@@ -17,6 +17,10 @@ module Pageflow
     @configure_blocks << block
   end
 
+  def self.configured?
+    !!@config
+  end
+
   def self.configure!
     return unless @finalized
 
@@ -62,7 +66,7 @@ module Pageflow
 
   def self.active_admin_settings(config)
     config.before_filter do
-      I18n.locale = current_user.try(:locale) || I18n.default_locale
+      I18n.locale = current_user.try(:locale) || http_accept_language.compatible_language_from(I18n.available_locales) || I18n.default_locale
     end
   end
 end

data/lib/pageflow/ability_mixin.rb

@@ -29,6 +29,8 @@ module Pageflow
         can_edit_entry?(user, revision.entry)
       end
 
+      can :view, [Admin::MembersTab, Admin::RevisionsTab]
+
       if user.admin?
         can [:read, :create, :update], Account
         can :destroy, Account do |account|

data/lib/pageflow/admin/tabs.rb

@@ -5,11 +5,14 @@ module Pageflow
         @tabs = {}
       end
 
-      def register(resource_name, view_component)
+      # @param [Symbol] resource_name  A resource name like `:entry` or `:account`
+      # @param [Hash] tab_options
+      def register(resource_name, tab_options)
         @tabs[resource_name] ||= []
-        @tabs[resource_name] << view_component
+        @tabs[resource_name] << tab_options
       end
 
+      # @api private
       def find_by_resource(name)
         @tabs.fetch(name, [])
       end

data/lib/pageflow/configuration.rb

@@ -168,8 +168,8 @@ module Pageflow
     attr_accessor :available_locales
 
     def initialize
-      @paperclip_filesystem_default_options = {}
-      @paperclip_s3_default_options = {}
+      @paperclip_filesystem_default_options = {validate_media_type: false}
+      @paperclip_s3_default_options = {validate_media_type: false}
 
       @zencoder_options = {}
 

data/lib/pageflow/engine.rb

@@ -23,6 +23,7 @@ require 'marionette-rails'
 require 'jquery-fileupload-rails'
 require 'wysihtml5x/rails'
 require 'i18n-js'
+require 'http_accept_language'
 
 module Pageflow
   # Rails integration
@@ -72,9 +73,10 @@ module Pageflow
       Pageflow.configure!
     end
 
-    # Make pageflow factories available to main app specs
     initializer "pageflow.factories", :after => "factory_girl.set_factory_paths" do
-      FactoryGirl.definition_file_paths.unshift(Engine.root.join('spec', 'factories')) if defined?(FactoryGirl)
+      if Pageflow.configured? && defined?(FactoryGirl)
+        FactoryGirl.definition_file_paths.unshift(Engine.root.join('spec', 'factories'))
+      end
     end
   end
 end

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = "0.7.2"
+  VERSION = '0.8.0'
 end

data/lib/pageflow/widget_type.rb

@@ -20,6 +20,11 @@ module Pageflow
       true
     end
 
+    # Override to return false to hide widget in entry preview.
+    def enabled_in_preview?
+      true
+    end
+
     # Override to return html as string.
     def render(template, entry)
       template.render(File.join('pageflow', name, 'widget'), entry: entry)

data/lib/tasks/pageflow_tasks.rake

@@ -1,4 +1,7 @@
-# desc "Explaining what the task does"
-# task :pageflow do
-#   # Task goes here
-# end
+namespace :pageflow do
+  desc 'Generate dummy app for current Rails version.'
+  task :dummy do
+    require 'pageflow/support'
+    Pageflow::Dummy.setup
+  end
+end

data/spec/factories/image_files.rb

@@ -19,6 +19,10 @@ module Pageflow
         create(:file_usage, :file => file, :revision => evaluator.used_in) if evaluator.used_in
       end
 
+      trait :processed do
+        processed_attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
+      end
+
       trait :unprocessed do
         unprocessed_attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
         processed_attachment nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -232,14 +232,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: zencoder
   requirement: !ruby/object:Gem::Requirement
@@ -484,6 +484,20 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: http_accept_language
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -630,14 +644,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement