Merge pull request #28 from dmnd/error-deluge

Fix error deluge

Author: alexcorre

lib/controllers/blameViewController.js

@@ -1,6 +1,8 @@
 const $ = require('atom').$;
 const React = require('atom').React;
 const BlameListView = require('../views/blame-list-view');
+const RemoteRevision = require('../util/RemoteRevision');
+const errorController = require('./errorController');
 
 
 /**
@@ -14,15 +16,27 @@ const BlameListView = require('../views/blame-list-view');
 function toggleBlame(projectBlamer) {
   var editorView = atom.workspaceView.getActiveView();
   var editor = editorView.getEditor();
+  var filePath = editor.getPath();
 
   if (!editorView.blameView) {
+    var remoteUrl = projectBlamer.repo.getOriginUrl(filePath);
+    var remoteRevision;
+    try {
+      remoteRevision = RemoteRevision.create(remoteUrl);
+    } catch (e) {
+      // the only exception possible occurs when the template string is invalid
+      errorController.showError('error-no-custom-url-specified');
+      return;
+    }
+
     // insert the BlameListView after the gutter div
     var mountPoint = $('<div>', {'class': 'git-blame-mount'});
     editorView.find('.gutter').after(mountPoint);
 
     editorView.blameView = React.renderComponent(new BlameListView({
       projectBlamer: projectBlamer,
-      filePath: editor.getPath(),
+      remoteRevision: remoteRevision,
+      filePath: filePath,
       lineCount: editor.getLineCount(),
       scrollbar: editorView.find('.vertical-scrollbar')
     }), mountPoint[0]);

lib/util/RemoteRevision.js

@@ -4,18 +4,21 @@ const loophole = require('loophole');
 
 const errorController = require('../controllers/errorController');
 
-function RemoteRevision(hash, remote) {
-  this.hash = hash;
+function RemoteRevision(remote) {
   this.remote = remote;
 }
 
 // ================
 // Class Methods
 // ================
 
-RemoteRevision.create = function(hash, remoteUrl) {
-  return new RemoteRevision(hash, remoteUrl);
-}
+RemoteRevision.create = function(remoteUrl) {
+  var rr = new RemoteRevision(remoteUrl);
+  if (!rr.getTemplate()) {
+    throw "Cannot create RemoteRevision with invalid template";
+  }
+  return rr;
+};
 
 // ================
 // Instance Methods
@@ -34,20 +37,20 @@ _.extend(RemoteRevision.prototype, {
     }
   },
 
-  url: function() {
+  url: function(revision) {
     var template = this.getTemplate();
-
     if (!template) {
-      errorController.showError('error-no-custom-url-specified');
-      return;
+      // this should be impossible, so throw
+      throw "No template present in RemoteRevision";
     }
 
     // create data object used to render template string
     var data = this.parseProjectAndRepo();
-    data.revision = this.hash;
+    data.revision = revision;
 
     // ensure we have all the correct vars in the template data
     if (!this.verifyTemplateData(data)) {
+      // TODO: validate this upon creation
       errorController.showError('error-problem-parsing-data-from-remote');
       return;
     }
@@ -95,10 +98,8 @@ _.extend(RemoteRevision.prototype, {
     if (atom.config.get('git-blame.useCustomUrlTemplateIfStandardRemotesFail')) {
       var customUrlTemplate = atom.config.get('git-blame.customCommitUrlTemplateString');
 
-      // if the user hasnt entered a template string...inform them
+      // if the user hasnt entered a template string, return nothing
       if (/^Example/.test(customUrlTemplate)) {
-        // TODO inform user
-        errorController.showError('error-no-custom-url-specified');
         return;
       }
 

lib/views/blame-line-view.coffee

@@ -1,7 +1,6 @@
 {$, React, Reactionary} = require 'atom'
 RP = React.PropTypes
 {div, span, a} = Reactionary
-RemoteRevision = require '../util/RemoteRevision'
 
 HASH_LENGTH = 7  # github uses this length
 BLANK_HASH = '-'.repeat(HASH_LENGTH)
@@ -18,7 +17,7 @@ BlameLineComponent = React.createClass
   propTypes:
     date: RP.string.isRequired
     hash: RP.string.isRequired
-    url: RP.string.isRequired
+    remoteRevision: RP.object.isRequired
     committer: RP.string.isRequired
     backgroundClass: RP.string
     noCommit: RP.bool
@@ -30,7 +29,7 @@ BlameLineComponent = React.createClass
         span className: 'date', @props.date
         span className: 'committer', 'Nobody'
     else
-      url = RemoteRevision.create(@props.hash, @props.url).url()
+      url = @props.remoteRevision.url @props.hash
       div className: 'blame-line ' + @props.backgroundClass,
         a className: 'hash', href: url,
           @props.hash.substring(0, HASH_LENGTH)

lib/views/blame-list-view.coffee

@@ -11,6 +11,7 @@ BlameListLinesComponent = React.createClass
     loading: RP.bool.isRequired
     filePath: RP.string.isRequired
     lineCount: RP.number.isRequired
+    remoteRevision: RP.object.isRequired
 
   renderLoading: ->
     lines = [0...@props.lineCount].map renderLoading
@@ -38,9 +39,7 @@ BlameListLinesComponent = React.createClass
     lines = _.clone @props.annotations
 
     # add url to open diff
-    filePath = atom.workspace.activePaneItem.getPath()
-    remoteUrl = atom.project.getRepo()?.getOriginUrl(filePath)
-    l['url'] = remoteUrl for l in lines
+    l.remoteRevision = @props.remoteRevision for l in lines
     @_addAlternatingBackgroundColor lines
     div null, lines.map BlameLineComponent
 
@@ -57,6 +56,7 @@ BlameListLinesComponent = React.createClass
 BlameListView = React.createClass
   propTypes:
     projectBlamer: RP.object.isRequired
+    remoteRevision: RP.object.isRequired
     filePath: RP.string.isRequired
     lineCount: RP.number.isRequired
     scrollbar: RP.object.isRequired
@@ -87,6 +87,7 @@ BlameListView = React.createClass
             loading: @state.loading
             filePath: @props.filePath
             lineCount: @props.lineCount
+            remoteRevision: @props.remoteRevision
 
     div
       className: 'git-blame'