FEATURE: Add next & previous track actions

Also refactor the code to get rid of separate action functions & tag
classes. Now there's only action classes.

See also #13

README.rst

@@ -62,9 +62,12 @@ Connecting the buttons (optional)
 You can connect two buttons to the RPi:
 
 - ``RPi pin 5`` - Power button: Shutdown the Raspberry Pi into halt state & wake it up again from halt state
-- ``RPi pin 7`` - Playback button: Pause and resume the playback
+- ``RPi pin 29`` - Playback button: Pause and resume the playback
+- ``RPi pin 31`` - Stop button: Stops the playback
+- ``RPi pin 33`` - Previous button: Changes to the previous track in the playlist
+- ``RPi pin 35`` - Next button: Changes to the next track in the playlist
 
-The buttons must shortcut their corresponding pins against ``GND`` (e.g. pin ``6``) when pressed. This means you want to connect one pin of the button (i.e. ``C``) to RPI's ``GND``, and the other one (i.e. ``NO``) to RPi's pin ``5`` or ``7``.
+The buttons must shortcut their corresponding pins against ``GND`` (e.g. pin ``6``) when pressed. This means you want to connect one pin of the button (i.e. ``C``) to RPI's ``GND``, and the other one (i.e. ``NO``) to RPi's pin ``5``, ``29``, ``31``, ``33`` or ``35``.
 
 Connecting the status LED (optional)
 ------------------------------------

mopidy_pummeluff/__init__.py

@@ -7,7 +7,7 @@ import os
 import mopidy
 
 from .frontend import PummeluffFrontend
-from .web import LatestHandler, RegistryHandler, RegisterHandler, TagClassesHandler
+from .web import LatestHandler, RegistryHandler, RegisterHandler, ActionClassesHandler
 
 
 def app_factory(config, core):  # pylint: disable=unused-argument
@@ -24,7 +24,7 @@ def app_factory(config, core):  # pylint: disable=unused-argument
         ('/latest/', LatestHandler, {'core': core}),
         ('/registry/', RegistryHandler, {'core': core}),
         ('/register/', RegisterHandler, {'core': core}),
-        ('/tag-classes/', TagClassesHandler, {'core': core}),
+        ('/action-classes/', ActionClassesHandler, {'core': core}),
     ]
 
 

mopidy_pummeluff/actions.py

@@ -1,88 +0,0 @@
-'''
-Python module for Mopidy Pummeluff actions.
-'''
-
-__all__ = (
-    'replace_tracklist',
-    'set_volume',
-    'play_pause',
-    'stop',
-    'shutdown',
-)
-
-from logging import getLogger
-from os import system
-
-LOGGER = getLogger(__name__)
-
-
-def replace_tracklist(core, uri):
-    '''
-    Replace tracklist and play.
-
-    :param mopidy.core.Core core: The mopidy core instance
-    :param str uri: An URI for the tracklist replacement
-    '''
-    LOGGER.info('Replacing tracklist with URI "%s"', uri)
-
-    playlists = [playlist.uri for playlist in core.playlists.as_list().get()]
-
-    if uri in playlists:
-        uris = [item.uri for item in core.playlists.get_items(uri).get()]
-    else:
-        uris = [uri]
-
-    core.tracklist.clear()
-    core.tracklist.add(uris=uris)
-    core.playback.play()
-
-
-def set_volume(core, volume):
-    '''
-    Set volume of the mixer.
-
-    :param mopidy.core.Core core: The mopidy core instance
-    :param volume: The new (percentage) volume
-    :type volume: int|str
-    '''
-    LOGGER.info('Setting volume to %s', volume)
-    try:
-        core.mixer.set_volume(int(volume))
-    except ValueError as ex:
-        LOGGER.error(str(ex))
-
-
-def play_pause(core):
-    '''
-    Pause or resume the playback.
-
-    :param mopidy.core.Core core: The mopidy core instance
-    '''
-    playback = core.playback
-
-    if playback.get_state().get() == 'playing':
-        LOGGER.info('Pausing the playback')
-        playback.pause()
-    else:
-        LOGGER.info('Resuming the playback')
-        playback.resume()
-
-
-def stop(core):
-    '''
-    Stop playback.
-
-    :param mopidy.core.Core core: The mopidy core instance
-    '''
-    LOGGER.info('Stopping playback')
-    core.playback.stop()
-
-
-def shutdown(core):  # pylint: disable=unused-argument
-    '''
-    Shutdown.
-
-    :param mopidy.core.Core core: The mopidy core instance
-    '''
-    LOGGER.info('Shutting down')
-    system('sudo /sbin/shutdown -h now')

mopidy_pummeluff/actions/__init__.py

@@ -3,19 +3,20 @@ Python module for Mopidy Pummeluff tags.
 '''
 
 __all__ = (
-    'Tracklist',
-    'Volume',
     'PlayPause',
     'Stop',
+    'PreviousTrack',
+    'NextTrack',
     'Shutdown',
+    'Tracklist',
+    'Volume',
 )
 
+from .playback import PlayPause, Stop, PreviousTrack, NextTrack
+from .shutdown import Shutdown
 from .tracklist import Tracklist
 from .volume import Volume
-from .play_pause import PlayPause
-from .stop import Stop
-from .shutdown import Shutdown
 
-TAGS = {}
-for tag in __all__:
-    TAGS[tag] = globals()[tag].__doc__.strip()
+ACTIONS = {}
+for action in __all__:
+    ACTIONS[action] = globals()[action].__doc__.strip()

mopidy_pummeluff/actions/base.py

@@ -1,22 +1,36 @@
 '''
-Python module for Mopidy Pummeluff base tag.
+Python module for Mopidy Pummeluff base action.
 '''
 
 __all__ = (
-    'Tag',
+    'Action',
 )
 
 from logging import getLogger
+from inspect import getfullargspec
 
 LOGGER = getLogger(__name__)
 
 
-class Tag:
+class Action:
     '''
     Base RFID tag class, which will implement the factory pattern in Python's
     own :py:meth:`__new__` method.
     '''
-    parameterised = True
+
+    @classmethod
+    def execute(cls, core):
+        '''
+        Execute the action.
+
+        :param mopidy.core.Core core: The mopidy core instance
+
+        :raises NotImplementedError: When class method is not implemented
+        '''
+        name  = cls.__name__
+        error = 'Missing execute class method in the %s class'
+        LOGGER.error(error, name)
+        raise NotImplementedError(error % name)
 
     def __init__(self, uid, alias=None, parameter=None):
         '''
@@ -56,21 +70,7 @@ class Tag:
         args = [core]
         if self.parameter:
             args.append(self.parameter)
-        self.action.__func__(*args)
-
-    @property
-    def action(self):
-        '''
-        Return an action function defined in the
-        :py:mod:`mopidy_pummeluff.actions` Python module.
-
-        :return: An action
-        :raises NotImplementedError: When action property isn't defined
-        '''
-        cls   = self.__class__.__name__
-        error = 'Missing action property in the %s class'
-        LOGGER.error(error, cls)
-        raise NotImplementedError(error % cls)
+        self.execute(*args)
 
     def as_dict(self, include_scanned=False):
         '''
@@ -99,8 +99,10 @@ class Tag:
 
         :raises ValueError: When parameter is not allowed but defined
         '''
-        if self.parameterised and not self.parameter:
+        parameterised = len(getfullargspec(self.execute).args) > 2
+
+        if parameterised and not self.parameter:
             raise ValueError('Parameter required for this tag')
 
-        if not self.parameterised and self.parameter:
+        if not parameterised and self.parameter:
             raise ValueError('No parameter allowed for this tag')

mopidy_pummeluff/actions/playback.py

@@ -0,0 +1,86 @@
+'''
+Python module for Mopidy Pummeluff playback actions.
+'''
+
+__all__ = (
+    'PlayPause',
+    'Stop',
+    'PreviousTrack',
+    'NextTrack',
+)
+
+from logging import getLogger
+
+from .base import Action
+
+LOGGER = getLogger(__name__)
+
+
+class PlayPause(Action):
+    '''
+    Pauses or resumes the playback, based on the current state.
+    '''
+
+    @classmethod
+    def execute(cls, core):
+        '''
+        Pause or resume the playback.
+
+        :param mopidy.core.Core core: The mopidy core instance
+        '''
+        playback = core.playback
+
+        if playback.get_state().get() == 'playing':
+            LOGGER.info('Pausing the playback')
+            playback.pause()
+        else:
+            LOGGER.info('Resuming the playback')
+            playback.resume()
+
+
+class Stop(Action):
+    '''
+    Stops the playback.
+    '''
+
+    @classmethod
+    def execute(cls, core):
+        '''
+        Stop playback.
+
+        :param mopidy.core.Core core: The mopidy core instance
+        '''
+        LOGGER.info('Stopping playback')
+        core.playback.stop()
+
+
+class PreviousTrack(Action):
+    '''
+    Changes to the previous track.
+    '''
+
+    @classmethod
+    def execute(cls, core):
+        '''
+        Change to previous track.
+
+        :param mopidy.core.Core core: The mopidy core instance
+        '''
+        LOGGER.info('Changing to previous track')
+        core.playback.previous()
+
+
+class NextTrack(Action):
+    '''
+    Changes to the next track.
+    '''
+
+    @classmethod
+    def execute(cls, core):
+        '''
+        Change to next track.
+
+        :param mopidy.core.Core core: The mopidy core instance
+        '''
+        LOGGER.info('Changing to next track')
+        core.playback.next()

mopidy_pummeluff/actions/shutdown.py

@@ -0,0 +1,30 @@
+'''
+Python module for Mopidy Pummeluff shutdown tag.
+'''
+
+__all__ = (
+    'Shutdown',
+)
+
+from logging import getLogger
+from os import system
+
+from .base import Action
+
+LOGGER = getLogger(__name__)
+
+
+class Shutdown(Action):
+    '''
+    Shutting down the system.
+    '''
+
+    @classmethod
+    def execute(cls, core):
+        '''
+        Shutdown.
+
+        :param mopidy.core.Core core: The mopidy core instance
+        '''
+        LOGGER.info('Shutting down')
+        system('sudo /sbin/shutdown -h now')

mopidy_pummeluff/actions/tracklist.py

@@ -0,0 +1,41 @@
+'''
+Python module for Mopidy Pummeluff tracklist tag.
+'''
+
+__all__ = (
+    'Tracklist',
+)
+
+from logging import getLogger
+
+from .base import Action
+
+LOGGER = getLogger(__name__)
+
+
+class Tracklist(Action):
+    '''
+    Replaces the current tracklist with the URI retreived from the tag's
+    parameter.
+    '''
+
+    @classmethod
+    def execute(cls, core, uri):  # pylint: disable=arguments-differ
+        '''
+        Replace tracklist and play.
+
+        :param mopidy.core.Core core: The mopidy core instance
+        :param str uri: An URI for the tracklist replacement
+        '''
+        LOGGER.info('Replacing tracklist with URI "%s"', uri)
+
+        playlists = [playlist.uri for playlist in core.playlists.as_list().get()]
+
+        if uri in playlists:
+            uris = [item.uri for item in core.playlists.get_items(uri).get()]
+        else:
+            uris = [uri]
+
+        core.tracklist.clear()
+        core.tracklist.add(uris=uris)
+        core.playback.play()

mopidy_pummeluff/actions/volume.py

@@ -6,16 +6,32 @@ __all__ = (
     'Volume',
 )
 
-from mopidy_pummeluff.actions import set_volume
-from .base import Tag
+from logging import getLogger
+
+from .base import Action
+
+LOGGER = getLogger(__name__)
 
 
-class Volume(Tag):
+class Volume(Action):
     '''
     Sets the volume to the percentage value retreived from the tag's parameter.
     '''
 
-    action = set_volume
+    @classmethod
+    def execute(cls, core, volume):  # pylint: disable=arguments-differ
+        '''
+        Set volume of the mixer.
+
+        :param mopidy.core.Core core: The mopidy core instance
+        :param volume: The new (percentage) volume
+        :type volume: int|str
+        '''
+        LOGGER.info('Setting volume to %s', volume)
+        try:
+            core.mixer.set_volume(int(volume))
+        except ValueError as ex:
+            LOGGER.error(str(ex))
 
     def validate(self):
         '''

mopidy_pummeluff/frontend.py

@@ -25,7 +25,7 @@ class PummeluffFrontend(pykka.ThreadingActor, mopidy_core.CoreListener):
     '''
 
     def __init__(self, config, core):  # pylint: disable=unused-argument
-        super(PummeluffFrontend, self).__init__()
+        super().__init__()
         self.core         = core
         self.stop_event   = Event()
         self.gpio_handler = GPIOHandler(core=core, stop_event=self.stop_event)

mopidy_pummeluff/registry.py

@@ -11,7 +11,7 @@ import os
 import json
 from logging import getLogger
 
-from mopidy_pummeluff import tags
+from mopidy_pummeluff import actions
 
 
 LOGGER = getLogger(__name__)
@@ -41,32 +41,32 @@ class RegistryDict(dict):
     def unserialize_item(cls, item):
         '''
         Unserialize an item from the persistent storage on filesystem to a
-        native tag.
+        native action.
 
         :param tuple item: The item
 
-        :return: The tag
-        :rtype: tags.tag
+        :return: The action
+        :rtype: actions.Action
         '''
-        return item['uid'], cls.init_tag(**item)
+        return item['uid'], cls.init_action(**item)
 
     @classmethod
-    def init_tag(cls, tag_class, uid, alias=None, parameter=None):
+    def init_action(cls, action_class, uid, alias=None, parameter=None):
         '''
-        Initialise a new tag instance.
+        Initialise a new action instance.
 
-        :param str tag_class: The tag class
+        :param str action_class: The action class
         :param str uid: The RFID UID
         :param str alias: The alias
         :param str parameter: The parameter
 
-        :return: The tag instance
-        :rtype: tags.Tag
+        :return: The action instance
+        :rtype: actions.Action
         '''
-        uid       = str(uid).strip()
-        tag_class = getattr(tags, tag_class)
+        uid          = str(uid).strip()
+        action_class = getattr(actions, action_class)
 
-        return tag_class(uid, alias, parameter)
+        return action_class(uid, alias, parameter)
 
     def read(self):
         '''
@@ -94,35 +94,35 @@ class RegistryDict(dict):
             os.makedirs(directory)
 
         with open(config, 'w') as f:
-            json.dump([tag.as_dict() for tag in self.values()], f, indent=4)
+            json.dump([action.as_dict() for action in self.values()], f, indent=4)
 
-    def register(self, tag_class, uid, alias=None, parameter=None):
+    def register(self, action_class, uid, alias=None, parameter=None):
         '''
         Register a new tag in the registry.
 
-        :param str tag_class: The tag class
+        :param str action_class: The action class
         :param str uid: The UID
         :param str alias: The alias
         :param str parameter: The parameter (optional)
 
-        :return: The tag
-        :rtype: tags.Tag
+        :return: The action
+        :rtype: actions.Action
         '''
-        LOGGER.info('Registering %s tag %s with parameter "%s"', tag_class, uid, parameter)
+        LOGGER.info('Registering %s tag %s with parameter "%s"', action_class, uid, parameter)
 
-        tag = self.init_tag(
-            tag_class=tag_class,
+        action = self.init_action(
+            action_class=action_class,
             uid=uid,
             alias=alias,
             parameter=parameter
         )
 
-        tag.validate()
+        action.validate()
 
-        self[uid] = tag
+        self[uid] = action
         self.write()
 
-        return tag
+        return action
 
 
 REGISTRY = RegistryDict()

mopidy_pummeluff/tags/play_pause.py

@@ -1,18 +0,0 @@
-'''
-Python module for Mopidy Pummeluff play pause tag.
-'''
-
-__all__ = (
-    'PlayPause',
-)
-
-from mopidy_pummeluff.actions import play_pause
-from .base import Tag
-
-
-class PlayPause(Tag):
-    '''
-    Pauses or resumes the playback, based on the current state.
-    '''
-    action        = play_pause
-    parameterised = False

mopidy_pummeluff/tags/shutdown.py

@@ -1,18 +0,0 @@
-'''
-Python module for Mopidy Pummeluff shutdown tag.
-'''
-
-__all__ = (
-    'Shutdown',
-)
-
-from mopidy_pummeluff.actions import shutdown
-from .base import Tag
-
-
-class Shutdown(Tag):
-    '''
-    Shutting down the system.
-    '''
-    action        = shutdown
-    parameterised = False

mopidy_pummeluff/tags/stop.py

@@ -1,18 +0,0 @@
-'''
-Python module for Mopidy Pummeluff stop tag.
-'''
-
-__all__ = (
-    'Stop',
-)
-
-from mopidy_pummeluff.actions import stop
-from .base import Tag
-
-
-class Stop(Tag):
-    '''
-    Stops the playback.
-    '''
-    action        = stop
-    parameterised = False

mopidy_pummeluff/tags/tracklist.py

@@ -1,19 +0,0 @@
-'''
-Python module for Mopidy Pummeluff tracklist tag.
-'''
-
-__all__ = (
-    'Tracklist',
-)
-
-from mopidy_pummeluff.actions import replace_tracklist
-from .base import Tag
-
-
-class Tracklist(Tag):
-    '''
-    Replaces the current tracklist with the URI retreived from the tag's
-    parameter.
-    '''
-
-    action = replace_tracklist

mopidy_pummeluff/threads/gpio_handler.py

@@ -12,7 +12,7 @@ from time import time
 
 import RPi.GPIO as GPIO
 
-from mopidy_pummeluff.actions import shutdown, play_pause
+from mopidy_pummeluff.actions import Shutdown, PlayPause, Stop, PreviousTrack, NextTrack
 from mopidy_pummeluff.sound import play_sound
 
 LOGGER = getLogger(__name__)
@@ -24,8 +24,11 @@ class GPIOHandler(Thread):
     LED when it's started and then reacting to button presses.
     '''
     button_pins = {
-        5: shutdown,
-        7: play_pause,
+        5: Shutdown,
+        29: PlayPause,
+        31: Stop,
+        33: PreviousTrack,
+        35: NextTrack,
     }
 
     led_pin = 8
@@ -76,5 +79,5 @@ class GPIOHandler(Thread):
         if (GPIO.input(pin) == GPIO.LOW) and (now - before > 0.25):
             LOGGER.debug('Button at pin %s was pushed', pin)
             play_sound('success.wav')
-            self.button_pins[pin](self.core)
+            self.button_pins[pin].execute(self.core)
             self.timestamps[pin] = now

mopidy_pummeluff/threads/tag_reader.py

@@ -14,7 +14,7 @@ import RPi.GPIO as GPIO
 from pirc522 import RFID
 
 from mopidy_pummeluff.registry import REGISTRY
-from mopidy_pummeluff.tags.base import Tag
+from mopidy_pummeluff.actions.base import Action
 from mopidy_pummeluff.sound import play_sound
 
 LOGGER = getLogger(__name__)
@@ -104,15 +104,15 @@ class TagReader(Thread):
         :param str uid: The UID
         '''
         try:
-            tag = REGISTRY[str(uid)]
+            action = REGISTRY[str(uid)]
             LOGGER.info('Triggering action of registered tag')
             play_sound('success.wav')
-            tag(self.core)
+            action(self.core)
 
         except KeyError:
             LOGGER.info('Tag is not registered, thus doing nothing')
             play_sound('fail.wav')
-            tag = Tag(uid=uid)
+            action = Action(uid=uid)
 
-        tag.scanned      = time()
-        TagReader.latest = tag
+        action.scanned   = time()
+        TagReader.latest = action

mopidy_pummeluff/web.py

@@ -6,7 +6,7 @@ __all__ = (
     'LatestHandler',
     'RegistryHandler',
     'RegisterHandler',
-    'TagClassesHandler',
+    'ActionClassesHandler',
 )
 
 from json import dumps
@@ -15,7 +15,7 @@ from logging import getLogger
 from tornado.web import RequestHandler
 
 from mopidy_pummeluff.registry import REGISTRY
-from mopidy_pummeluff.tags import TAGS
+from mopidy_pummeluff.actions import ACTIONS
 from mopidy_pummeluff.threads import TagReader
 
 LOGGER = getLogger(__name__)
@@ -111,7 +111,7 @@ class RegisterHandler(RequestHandler):  # pylint: disable=abstract-method
         '''
         try:
             tag = REGISTRY.register(
-                tag_class=self.get_argument('tag-class'),
+                action_class=self.get_argument('action-class'),
                 uid=self.get_argument('uid'),
                 alias=self.get_argument('alias', None),
                 parameter=self.get_argument('parameter', None),
@@ -141,9 +141,9 @@ class RegisterHandler(RequestHandler):  # pylint: disable=abstract-method
         self.post()
 
 
-class TagClassesHandler(RequestHandler):  # pylint: disable=abstract-method
+class ActionClassesHandler(RequestHandler):  # pylint: disable=abstract-method
     '''
-    Request handler which returns all tag classes.
+    Request handler which returns all action classes.
     '''
 
     def initialize(self, core):  # pylint: disable=arguments-differ
@@ -160,8 +160,8 @@ class TagClassesHandler(RequestHandler):  # pylint: disable=abstract-method
         '''
         data = {
             'success': True,
-            'message': 'Tag classes successfully retreived',
-            'tag_classes': TAGS
+            'message': 'Action classes successfully retreived',
+            'action_classes': ACTIONS
         }
 
         self.set_header('Content-type', 'application/json')

mopidy_pummeluff/webui/index.html

@@ -21,8 +21,8 @@
                         <a id="read-rfid-tag" href="#">Read UID from RFID tag…</a>
                         <label for="alias">Alias</label>
                         <input id="alias" name="alias" type="text" placeholder="Your personal alias / identifier">
-                        <label for="tag-class">Class</label>
-                        <select id="tag-class" name="tag-class">
+                        <label for="action-class">Class</label>
+                        <select id="action-class" name="action-class">
                         </select>
                         <label for="parameter">Parameter</label>
                         <input id="parameter" name="parameter" type="text" placeholder="A type-specific parameter">

mopidy_pummeluff/webui/script.js

@@ -40,7 +40,7 @@ class API {
                 let tagElement = document.createElement('div')
                 tagElement.setAttribute('class', 'tag')
 
-                let args = new Array('alias', 'uid', 'tag_class', 'parameter')
+                let args = new Array('alias', 'uid', 'action_class', 'parameter')
                 for(let arg of args)
                 {
                     let spanElement = document.createElement('span')
@@ -61,24 +61,24 @@ class API {
      * Refresh the tags.
      */
 
-    refreshTagClasses()
+    refreshActionClasses()
     {
         let callback = function(response)
         {
-            let select = document.getElementById('tag-class');
+            let select = document.getElementById('action-class');
             while(select.firstChild)
                 select.removeChild(select.firstChild)
 
-            for(let tag_class in response.tag_classes)
+            for(let action_class in response.action_classes)
             {
                 let option = document.createElement('option')
-                option.setAttribute('value', tag_class)
-                option.innerHTML = tag_class + ' (' + response.tag_classes[tag_class] + ')'
+                option.setAttribute('value', action_class)
+                option.innerHTML = action_class + ' (' + response.action_classes[action_class] + ')'
                 select.appendChild(option)
             }
         }
 
-        this.request('/pummeluff/tag-classes/', false, callback)
+        this.request('/pummeluff/action-classes/', false, callback)
     }
 
     /*
@@ -98,7 +98,7 @@ class API {
                 document.getElementById('uid').value             = ''
                 document.getElementById('alias').value           = ''
                 document.getElementById('parameter').value       = ''
-                document.getElementById('tag-class').selectIndex = 0
+                document.getElementById('action-class').selectIndex = 0
             }
             else
             {
@@ -120,12 +120,12 @@ class API {
         let uid_field        = document.getElementById('uid')
         let alias_field      = document.getElementById('alias')
         let parameter_field  = document.getElementById('parameter')
-        let tag_class_select = document.getElementById('tag-class')
+        let action_class_select = document.getElementById('action-class')
 
         uid_field.value              = ''
         alias_field.value            = ''
         parameter_field.value        = ''
-        tag_class_select.selectIndex = 0
+        action_class_select.selectIndex = 0
 
         let link            = document.getElementById('read-rfid-tag')
         link.classList.add('reading')
@@ -144,8 +144,8 @@ class API {
                     if(response.parameter)
                         parameter_field.value = response.parameter
 
-                    if(response.tag_class)
-                        tag_class_select.value = response.tag_class
+                    if(response.action_class)
+                        action_class_select.value = response.action_class
 
                     link.classList.remove('reading')
                 }
@@ -168,7 +168,7 @@ class API {
 api = new API()
 
 api.refreshRegistry();
-api.refreshTagClasses();
+api.refreshActionClasses();
 
 document.addEventListener('click', function(event)
 {

mopidy_pummeluff/webui/style.css

@@ -145,13 +145,13 @@ div.tag
 }
 
 div.tag span.uid,
-div.tag span.tag-class,
+div.tag span.action-class,
 div.tag span.parameter
 {
     font-family: Courier New, monospace;
 }
 
-div.tag span.tag-class
+div.tag span.action-class
 {
     display         : inline-block;
     background-color: #888;