pageflow 0.1.0 → 0.2.0

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

@@ -35,6 +35,7 @@
 //= require_tree ./views/configuration_editors
 //= require_tree ./views
 
+//= require ./initializers/setup_config
 //= require ./initializers/setup_collections
 //= require ./initializers/setup_page_types
 //= require ./initializers/edit_lock

data/app/assets/javascripts/pageflow/editor/collections/mixins/files_collection.js

@@ -18,6 +18,17 @@ pageflow.filesCollection = {
     return this.entry || pageflow.entry;
   },
 
+  confirmable: function() {
+    return new pageflow.SubsetCollection({
+      parent: this,
+      watchAttribute: 'state',
+
+      filter: function(item) {
+        return item.get('state') === 'waiting_for_confirmation';
+      },
+    });
+  },
+
   fileType: function() {
     var plural = _.map(this.name.split('_'), upperCaseFirst).join('');
 

data/app/assets/javascripts/pageflow/editor/collections/subset_collection.js

@@ -28,6 +28,17 @@ pageflow.SubsetCollection = Backbone.Collection.extend({
       adding = false;
     });
 
+    if (options.watchAttribute) {
+      this.listenTo(this.parent, 'change:' + options.watchAttribute, function(model) {
+        if (this.filter(model)) {
+          this.add(model);
+        }
+        else {
+          this.remove(model);
+        }
+      });
+    }
+
     this.listenTo(this, 'sort', function() {
       this.parent.sort();
     });

data/app/assets/javascripts/pageflow/editor/controllers/sidebar_controller.js

@@ -31,6 +31,12 @@ pageflow.SidebarController = Backbone.Marionette.Controller.extend({
     }));
   },
 
+  confirmableFiles: function() {
+    this.region.show(pageflow.ConfirmEncodingView.create({
+      model: new pageflow.EncodingConfirmation()
+    }));
+  },
+
   metaData: function() {
     this.region.show(new pageflow.EditMetaDataView({
       model: this.entry
@@ -39,7 +45,8 @@ pageflow.SidebarController = Backbone.Marionette.Controller.extend({
 
   publish: function() {
     this.region.show(pageflow.PublishEntryView.create({
-      model: this.entry
+      model: this.entry,
+      entryPublication: new pageflow.EntryPublication()
     }));
   },
 

data/app/assets/javascripts/pageflow/editor/initializers/setup_config.js

@@ -0,0 +1,3 @@
+pageflow.app.addInitializer(function(options) {
+  pageflow.config = options.config;
+});

data/app/assets/javascripts/pageflow/editor/models/audio_file.js

@@ -1,6 +1,7 @@
 pageflow.AudioFile = Backbone.Model.extend({
   modelName: 'audio_file',
   paramRoot: 'audio_file',
+  i18nKey: 'pageflow/audio_file',
 
   mixins: [pageflow.file, pageflow.encodedFile, pageflow.stageProvider, pageflow.retryable],
 

data/app/assets/javascripts/pageflow/editor/models/chapter.js

@@ -1,6 +1,7 @@
 pageflow.Chapter = Backbone.Model.extend({
   modelName: 'chapter',
   paramRoot: 'chapter',
+  i18nKey: 'pageflow/chapter',
 
   mixins: [pageflow.failureTracking, pageflow.delayedDestroying],
 

data/app/assets/javascripts/pageflow/editor/models/configuration.js

@@ -1,5 +1,6 @@
 pageflow.Configuration = Backbone.Model.extend({
   modelName: 'page',
+  i18nKey: 'pageflow/page',
 
   mixins: [pageflow.transientReferences],
 

data/app/assets/javascripts/pageflow/editor/models/encoding_confirmation.js

@@ -0,0 +1,45 @@
+pageflow.EncodingConfirmation = Backbone.Model.extend({
+  paramRoot: 'encoding_confirmation',
+
+  initialize: function() {
+    this.videoFiles = new Backbone.Collection();
+    this.audioFiles = new Backbone.Collection();
+
+    this.watchCollections();
+  },
+
+  watchCollections: function() {
+    this.listenTo(this.videoFiles, 'add remove', this.check);
+    this.listenTo(this.audioFiles, 'add remove', this.check);
+
+    this.check();
+  },
+
+  check: function() {
+    var model = this;
+
+    this.set('empty', this.videoFiles.length === 0 && this.audioFiles.length === 0);
+    this.set('checking', true);
+
+    this.save({}, {
+      url: this.url() + '/check',
+      success: function() {
+        model.set('checking', false);
+      },
+      error: function() {
+        model.set('checking', false);
+      }
+    });
+  },
+
+  url: function() {
+    return '/editor/entries/' + pageflow.entry.get('id') + '/encoding_confirmations';
+  },
+
+  toJSON: function() {
+    return {
+      video_file_ids: this.videoFiles.pluck('id'),
+      audio_file_ids: this.audioFiles.pluck('id'),
+    };
+  }
+});

data/app/assets/javascripts/pageflow/editor/models/entry.js

@@ -2,6 +2,7 @@ pageflow.Entry = Backbone.Model.extend({
   paramRoot: 'entry',
   urlRoot: '/entries',
   modelName: 'entry',
+  i18nKey: 'pageflow/entry',
 
   mixins: [pageflow.filesCountWatcher, pageflow.polling, pageflow.failureTracking],
 
@@ -84,7 +85,11 @@ pageflow.Entry = Backbone.Model.extend({
   },
 
   getFileCollection: function(filetype) {
-    return this[lowerCaseFirst(filetype) + 's'];
+    return this[lowerCaseFirst(removeNamespace(filetype)) + 's'];
+
+    function removeNamespace(string) {
+      return string.split('::').pop();
+    }
 
     function lowerCaseFirst(string) {
       return string.charAt(0).toLowerCase() + string.slice(1);
@@ -99,19 +104,6 @@ pageflow.Entry = Backbone.Model.extend({
     this.togglePolling(this.get('pending_files_count') > 0);
   },
 
-  publish: function(attrs) {
-    var model = this;
-
-    return Backbone.sync('create', this, {
-      url: this.url() + '/revisions',
-      attrs: attrs,
-
-      success: function(response) {
-        model.parse(response);
-      }
-    });
-  },
-
   parse: function(response, options) {
     if (response) {
       this.set(_.pick(response, 'published', 'published_until'));

data/app/assets/javascripts/pageflow/editor/models/entry_publication.js

@@ -0,0 +1,40 @@
+pageflow.EntryPublication = Backbone.Model.extend({
+  paramRoot: 'entry_publication',
+
+  quota: function() {
+    return new Backbone.Model(this.get('quota') || {});
+  },
+
+  check: function() {
+    var model = this;
+    this.set('checking', true);
+
+    this.save({}, {
+      url: this.url() + '/check',
+      success: function() {
+        model.set('checking', false);
+      },
+      error: function() {
+        model.set('checking', false);
+      }
+    });
+  },
+
+  publish: function(attributes) {
+    var model = this;
+
+    return this.save(attributes, {
+      success: function(model) {
+        pageflow.entry.parse(model.get('entry'));
+      },
+
+      error: function(model, xhr) {
+        model.set(xhr.responseJSON);
+      }
+    });
+  },
+
+  url: function() {
+    return '/editor/entries/' + pageflow.entry.get('id') + '/entry_publications';
+  }
+});

data/app/assets/javascripts/pageflow/editor/models/file_stage.js

@@ -5,6 +5,7 @@ pageflow.FileStage = Backbone.Model.extend({
     this.activeStates = options.activeStates;
     this.finishedStates = options.finishedStates;
     this.failedStates = options.failedStates;
+    this.actionRequiredStates = options.actionRequiredStates || [];
 
     this.update();
     this.listenTo(this.file, 'change:state', this.update);
@@ -24,6 +25,7 @@ pageflow.FileStage = Backbone.Model.extend({
     this.set('active', this.activeStates.indexOf(state) >= 0);
     this.set('finished', this.finishedStates.indexOf(state) >= 0);
     this.set('failed', this.failedStates.indexOf(state) >= 0);
+    this.set('action_required', this.actionRequiredStates.indexOf(state) >= 0);
 
     if (this.get('active')) {
       this.set('state', 'active');
@@ -34,6 +36,9 @@ pageflow.FileStage = Backbone.Model.extend({
     else if (this.get('failed')) {
       this.set('state', 'failed');
     }
+    else if (this.get('action_required')) {
+      this.set('state', 'action_required');
+    }
     else {
       this.set('state', 'pending');
     }

data/app/assets/javascripts/pageflow/editor/models/image_file.js

@@ -1,6 +1,7 @@
 pageflow.ImageFile = Backbone.Model.extend({
   modelName: 'image_file',
   paramRoot: 'image_file',
+  i18nKey: 'pageflow/image_file',
 
   mixins: [pageflow.file, pageflow.stageProvider, pageflow.retryable],
 
@@ -33,6 +34,10 @@ pageflow.ImageFile = Backbone.Model.extend({
     return this.get('state') === 'processing_failed';
   },
 
+  isConfirmable: function() {
+    return false;
+  },
+
   isPositionable: function() {
     return this.isReady();
   }

data/app/assets/javascripts/pageflow/editor/models/mixins/encoded_file.js

@@ -1,25 +1,42 @@
 pageflow.encodedFile = {
-  stageMapping: {
-    uploading: {
-      activeStates: ['uploading'],
-      finishedStates: ['not_uploaded_to_s3', 'upload_to_s3', 'uploading_to_s3', 'upload_to_s3_failed', 'waiting_for_encoding', 'encoding', 'encoded', 'encoding_failed'],
-      failedStates: ['upload_failed']
-    },
-    uploading_to_s3: {
-      activeStates: ['uploading_to_s3'],
-      finishedStates: ['waiting_for_encoding', 'encoding', 'encoded', 'encoding_failed'],
-      failedStates: ['upload_to_s3_failed']},
-    encoding: {
-      activeStates: ['waiting_for_encoding', 'encoding'],
-      finishedStates: ['encoded'],
-      failedStates: ['encoding_failed']
+  stageMapping: function() {
+    var mapping = {
+      uploading: {
+        activeStates: ['uploading'],
+        finishedStates: ['not_uploaded_to_s3', 'upload_to_s3', 'uploading_to_s3', 'upload_to_s3_failed', 'waiting_for_meta_data', 'fetching_meta_data', 'fetching_meta_data_failed', 'waiting_for_confirmation', 'waiting_for_encoding', 'encoding', 'encoded', 'encoding_failed'],
+        failedStates: ['upload_failed']
+      },
+      uploading_to_s3: {
+        activeStates: ['uploading_to_s3'],
+        finishedStates: ['waiting_for_meta_data', 'fetching_meta_data', 'fetching_meta_data_failed', 'waiting_for_confirmation', 'waiting_for_encoding', 'encoding', 'encoded', 'encoding_failed'],
+        failedStates: ['upload_to_s3_failed']},
+      fetching_meta_data: {
+        activeStates: ['waiting_for_meta_data', 'fetching_meta_data'],
+        finishedStates: ['waiting_for_confirmation', 'waiting_for_encoding', 'encoding', 'encoded', 'encoding_failed'],
+        failedStates: ['fetching_meta_data_failed']},
+      encoding: {
+        actionRequiredStates: ['waiting_for_confirmation'],
+        activeStates: ['waiting_for_encoding', 'encoding'],
+        finishedStates: ['encoded'],
+        failedStates: ['fetching_meta_data_failed', 'encoding_failed']
+      }
+    };
+
+    if (!pageflow.config.confirmEncodingJobs) {
+      delete mapping.fetching_meta_data;
     }
+
+    return mapping;
   },
 
   isReady: function() {
     return this.get('state') === 'encoded';
   },
 
+  isConfirmable: function() {
+    return this.get('state') === 'waiting_for_confirmation';
+  },
+
   isFailed: function() {
     return this.get('state').match(/_failed$/);
   },

data/app/assets/javascripts/pageflow/editor/models/mixins/files_count_watcher.js

@@ -23,6 +23,10 @@ pageflow.filesCountWatcher = {
       return file.isUploading();
     });
 
+    this.updateFilesCount('confirmable', name, collection, function(file) {
+      return file.isConfirmable();
+    });
+
     this.updateFilesCount('pending', name, collection, function(file) {
       return file.isPending();
     });

data/app/assets/javascripts/pageflow/editor/models/mixins/stage_provider.js

@@ -1,6 +1,6 @@
 pageflow.stageProvider = {
   initialize: function() {
-    this.stages = new Backbone.Collection(_.chain(this.stageMapping).pairs().map(function (pair) {
+    this.stages = new Backbone.Collection(_.chain(this).result('stageMapping').pairs().map(function (pair) {
       var name = pair[0];
       var options = pair[1];
 
@@ -11,7 +11,7 @@ pageflow.stageProvider = {
 
   currentStage: function() {
     return this.stages.find(function(stage) {
-      return stage.get('active') || stage.get('failed');
+      return stage.get('active') || stage.get('action_required') || stage.get('failed');
     });
   }
 };

data/app/assets/javascripts/pageflow/editor/models/other_entry.js

@@ -2,6 +2,7 @@ pageflow.OtherEntry = Backbone.Model.extend({
   paramRoot: 'entry',
   urlRoot: '/entries',
   modelName: 'entry',
+  i18nKey: 'pageflow/entry',
 
   initialize: function() {
     this.imageFiles = new pageflow.ImageFilesCollection([], {entry: this});

data/app/assets/javascripts/pageflow/editor/models/page.js

@@ -1,6 +1,7 @@
 pageflow.Page = Backbone.Model.extend({
   modelName: 'page',
   paramRoot: 'page',
+  i18nKey: 'pageflow/page',
 
   defaults: {
     template: 'background_image',

data/app/assets/javascripts/pageflow/editor/models/video_file.js

@@ -1,6 +1,7 @@
 pageflow.VideoFile = Backbone.Model.extend({
   modelName: 'video_file',
   paramRoot: 'video_file',
+  i18nKey: 'pageflow/video_file',
 
   mixins: [pageflow.file, pageflow.encodedFile, pageflow.stageProvider, pageflow.retryable],
 

data/app/assets/javascripts/pageflow/editor/routers/sidebar_router.js

@@ -15,6 +15,8 @@ pageflow.SidebarRouter = Backbone.Marionette.AppRouter.extend({
     'files?page=:page_id&attribute=:attribute': 'files',
     'files': 'files',
 
+    'confirmable_files': 'confirmableFiles',
+
     'meta_data': 'metaData',
     'publish': 'publish',
 

data/app/assets/javascripts/pageflow/editor/templates/confirm_encoding.jst.ejs

@@ -0,0 +1,15 @@
+<div class="blank_slate">
+  Keine Dateien freizugeben.
+</div>
+
+<div class="video_files_panel">
+  <h2>Videos</h2>
+</div>
+
+<div class="audio_files_panel">
+  <h2>Audios</h2>
+</div>
+
+<div class="summary">
+</div>
+<button class="confirm_encoding">Ausgewählte Dateien transcodieren</button>

data/app/assets/javascripts/pageflow/editor/templates/confirmable_file_item.jst.ejs

@@ -0,0 +1,7 @@
+<input type="checkbox">
+<label class="file_name"></label>
+<span class="duration"></span>
+
+<div class="actions">
+  <a class="remove" title="Löschen"></a>
+</div>