Merge lp:~johnsca/charm-helpers/hyphen-relations into lp:charm-helpers

[Cory Johns]

Quick Services Framework fix to allow templates to access data for relations that have a hyphen in their name. (Having them at the top level means they can't be accessed directly, so they're now nested under a ctx object. The top-level is also maintained for backwards compatibility.)

[Michał Sawicz (saviq)]

Does the job :)

Docs could use an update?

[Stuart Bishop (stub)]

Shawn and landed.

review: Approve

=== modified file 'charmhelpers/core/services/helpers.py'
--- charmhelpers/core/services/helpers.py	2015-03-19 15:00:13 +0000
+++ charmhelpers/core/services/helpers.py	2015-05-21 19:23:17 +0000
@@ -256,9 +256,10 @@
 
     def __call__(self, manager, service_name, event_name):
         service = manager.get_service(service_name)
-        context = {}
+        context = {'ctx': {}}
         for ctx in service.get('required_data', []):
             context.update(ctx)
+            context['ctx'].update(ctx)
         templating.render(self.source, self.target, context,
                           self.owner, self.group, self.perms)
 
 
=== modified file 'tests/core/test_services.py'
--- tests/core/test_services.py	2015-05-20 14:31:33 +0000
+++ tests/core/test_services.py	2015-05-21 19:23:17 +0000
@@ -728,7 +728,7 @@
         assert not mtemplating.render.called
         callback(manager, 'test', 'event')
         mtemplating.render.assert_called_once_with(
-            'foo.yml', 'bar.yml', {'foo': 'bar'},
+            'foo.yml', 'bar.yml', {'foo': 'bar', 'ctx': {'foo': 'bar'}},
             'root', 'root', 0o444)
 
     @mock.patch.object(services.helpers, 'templating')
@@ -743,7 +743,7 @@
         assert not mtemplating.render.called
         callback(manager, 'test', 'event')
         mtemplating.render.assert_called_once_with(
-            'foo.yml', 'bar.yml', {'foo': 'bar'},
+            'foo.yml', 'bar.yml', {'foo': 'bar', 'ctx': {'foo': 'bar'}},
             'user', 'group', 0o555)