Merge branch 'dev' of github.com:atom-minimap/atom-minimap into dev

Author: fundon

lib/mixins/plugin-management.coffee

@@ -22,14 +22,20 @@ class PluginManagement extends Mixin
   #        settings name as well as the key to unregister the module.
   # plugin - The plugin {Object} to register.
   registerPlugin: (name, plugin) ->
+    settingsKey = "minimap.plugins.#{name}"
+
     @configDefaults.plugins[name] = true
-    unless atom.config.get("minimap.plugins.#{name}")?
-      atom.config.set "minimap.plugins.#{name}", true
+    atom.config.set(settingsKey, true) unless atom.config.get(settingsKey)?
 
     @plugins[name] = plugin
 
     @emit('plugin:added', {name, plugin})
-    atom.config.observe "minimap.plugins.#{name}", =>
+
+    atom.config.observe settingsKey, =>
+      @updatesPluginActivationState(name)
+
+    atom.workspaceView.command "minimap:toggle-#{name}", =>
+      atom.config.set settingsKey, not atom.config.get(settingsKey)
       @updatesPluginActivationState(name)
 
     @updatesPluginActivationState(name)
@@ -39,6 +45,7 @@ class PluginManagement extends Mixin
   # name - The identifying name of the plugin to unregister.
   unregisterPlugin: (name) ->
     atom.config.unobserve "minimap.plugins.#{name}"
+    atom.workspaceView.off "minimap:toggle-#{name}"
     plugin = @plugins[name]
     delete @configDefaults.plugins[name]
     delete @plugins[name]
@@ -49,9 +56,12 @@ class PluginManagement extends Mixin
   updatesPluginActivationState: (name) ->
     plugin = @plugins[name]
 
-    if atom.config.get("minimap.plugins.#{name}")
+    pluginActive = plugin.isActive()
+    settingActive = atom.config.get("minimap.plugins.#{name}")
+
+    if settingActive and not pluginActive
       plugin.activatePlugin()
       @emit('plugin:activated', {name, plugin})
-    else
+    else if pluginActive and not settingActive
       plugin.deactivatePlugin()
       @emit('plugin:deactivated', {name, plugin})

spec/minimap-plugins-spec.coffee

@@ -11,27 +11,45 @@ describe "Minimap Plugins", ->
       atom.workspaceView.attachToDom()
       editorView = atom.workspaceView.getActiveView()
 
+    atom.config.set 'minimap.plugins.dummy', undefined
+
     @plugin =
-      activatePlugin: ->
-      deactivatePlugin: ->
+      active: false
+      activatePlugin: -> @active = true
+      deactivatePlugin: -> @active = false
+      isActive: -> @active
+
+    spyOn(@plugin, 'activatePlugin').andCallThrough()
+    spyOn(@plugin, 'deactivatePlugin').andCallThrough()
 
-    spyOn @plugin, 'activatePlugin'
-    spyOn @plugin, 'deactivatePlugin'
+    @registerHandler = jasmine.createSpy('register handler')
+    @unregisterHandler = jasmine.createSpy('unregister handler')
 
   describe 'registered before activation', ->
 
     beforeEach ->
+      Minimap.on 'plugin:added', @registerHandler
       Minimap.registerPlugin 'dummy', @plugin
 
     it 'should be available in the minimap', ->
       expect(Minimap.plugins['dummy']).toBe(@plugin)
 
+    it 'should have emit an event', ->
+      expect(@registerHandler).toHaveBeenCalled()
+
     it 'should have created a default config for the plugin', ->
       expect(Minimap.configDefaults.plugins.dummy).toBeDefined()
 
     it 'should have set the corresponding config', ->
       expect(atom.config.get 'minimap.plugins.dummy').toBeDefined()
 
+    describe 'triggering the corresponding plugin command', ->
+      beforeEach ->
+        atom.workspaceView.trigger 'minimap:toggle-dummy'
+
+      it 'should have received a deactivation call', ->
+        expect(@plugin.deactivatePlugin).toHaveBeenCalled()
+
     describe 'and then unregistered', ->
       beforeEach ->
         Minimap.unregisterPlugin 'dummy'
@@ -46,31 +64,31 @@ describe "Minimap Plugins", ->
         it 'should not receive an activation call', ->
           expect(@plugin.deactivatePlugin).not.toHaveBeenCalled()
 
-    describe 'the registered plugin', ->
-      it 'should have received an activation call', ->
-        Minimap.registerPlugin 'dummy', @plugin
-        expect(@plugin.activatePlugin).toHaveBeenCalled()
+  describe 'the registered plugin', ->
+    it 'should have received an activation call', ->
+      Minimap.registerPlugin 'dummy', @plugin
+      expect(@plugin.activatePlugin).toHaveBeenCalled()
 
-      describe 'when the config for it is false', ->
-        beforeEach ->
-          atom.config.set 'minimap.plugins.dummy', false
-          Minimap.registerPlugin 'dummy', @plugin
+    describe 'when the config for it is false', ->
+      beforeEach ->
+        atom.config.set 'minimap.plugins.dummy', false
+        Minimap.registerPlugin 'dummy', @plugin
 
-        it 'should have received a deactivation call', ->
-          expect(@plugin.deactivatePlugin).toHaveBeenCalled()
+      it 'should not have received an activation call', ->
+        expect(@plugin.activatePlugin).not.toHaveBeenCalled()
 
-      describe 'when the config is modified after registration', ->
-        beforeEach ->
-          Minimap.registerPlugin 'dummy', @plugin
-          atom.config.set 'minimap.plugins.dummy', false
+    describe 'when the config is modified after registration', ->
+      beforeEach ->
+        Minimap.registerPlugin 'dummy', @plugin
+        atom.config.set 'minimap.plugins.dummy', false
 
-        it 'should have received a deactivation call', ->
+      it 'should have received a deactivation call', ->
           expect(@plugin.deactivatePlugin).toHaveBeenCalled()
 
-    describe 'on minimap activation', ->
-      beforeEach ->
-        waitsForPromise ->
-          promise = atom.packages.activatePackage('minimap')
-          expect(atom.workspaceView.find('.minimap')).not.toExist()
-          atom.workspaceView.trigger 'minimap:toggle'
-          promise
+  describe 'on minimap activation', ->
+    beforeEach ->
+      waitsForPromise ->
+        promise = atom.packages.activatePackage('minimap')
+        expect(atom.workspaceView.find('.minimap')).not.toExist()
+        atom.workspaceView.trigger 'minimap:toggle'
+        promise