[Checkins] SVN: hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/ to make the signature() method useful by itself, it should include the publisher_signature as well.

[Jan-Wijbrand Kolman]

Log message for revision 118526:
  to make the signature() method useful by itself, it should include the publisher_signature as well.

Changed:
  U   hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/README.txt
  U   hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/core.py

-=-
Modified: hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/README.txt
===================================================================
--- hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/README.txt	2010-11-22 22:37:17 UTC (rev 118525)
+++ hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/README.txt	2010-11-23 10:28:14 UTC (rev 118526)
@@ -849,10 +849,10 @@
   >>> before_hash = foo.signature()
   >>> open(os.path.join(foo_sub_dir, 'test2'), 'w').write('test2')
   >>> # The hash is not newly computed.
-  >>> foo.signature() is before_hash
+  >>> foo.signature() == before_hash
   True
   >>> hurry.resource.configure_devmode(True)
-  >>> foo.signature() is before_hash
+  >>> foo.signature() == before_hash
   False
 
 

Modified: hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/core.py
===================================================================
--- hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/core.py	2010-11-22 22:37:17 UTC (rev 118525)
+++ hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/core.py	2010-11-23 10:28:14 UTC (rev 118526)
@@ -32,12 +32,10 @@
         # before or (2) we are in development mode.
         if self._signature is None or hurry.resource.devmode:
             self._signature = hurry.resource.hash.checksum(self.path)
-        return self._signature
+        return hurry.resource.publisher_signature + str(self._signature)
 
     def url(self, base_url):
-        return '%s%s%s/%s/' % (
-            base_url, hurry.resource.publisher_signature,
-            self.signature(), self.name)
+        return '%s%s/%s/' % (base_url, self.signature(), self.name)
 
 # total hack to be able to get the dir the resources will be in
 def caller_dir():