[Checkins] SVN: hurry.resource/trunk/src/hurry/resource/ Fixed the code generation parts to work with the new rootpath

[Martijn Faassen]

Log message for revision 114992:
  Fixed the code generation parts to work with the new rootpath
  arguments to Library.
  

Changed:
  U   hurry.resource/trunk/src/hurry/resource/README.txt
  U   hurry.resource/trunk/src/hurry/resource/core.py

-=-
Modified: hurry.resource/trunk/src/hurry/resource/README.txt
===================================================================
--- hurry.resource/trunk/src/hurry/resource/README.txt	2010-07-24 13:14:09 UTC (rev 114991)
+++ hurry.resource/trunk/src/hurry/resource/README.txt	2010-07-24 13:15:59 UTC (rev 114992)
@@ -1066,7 +1066,7 @@
   >>> print generate_code(i1=i1, i2=i2, i3=i3, i4=i4, i5=i5)
   from hurry.resource import Library, ResourceInclusion
   <BLANKLINE>
-  foo = Library('foo')
+  foo = Library('foo', 'dummy')
   <BLANKLINE>
   i1 = ResourceInclusion(foo, 'i1.js')
   i2 = ResourceInclusion(foo, 'i2.js', depends=[i1])
@@ -1084,7 +1084,7 @@
   >>> print generate_code(j1=j1, j2=j2, giantj=giantj)
   from hurry.resource import Library, ResourceInclusion
   <BLANKLINE>
-  foo = Library('foo')
+  foo = Library('foo', 'dummy')
   <BLANKLINE>
   j1 = ResourceInclusion(foo, 'j1.js', debug='j1-debug.js')
   j2 = ResourceInclusion(foo, 'j2.js', debug='j2-debug.js')
@@ -1096,14 +1096,14 @@
   >>> print generate_code(hoi=i1)
   from hurry.resource import Library, ResourceInclusion
   <BLANKLINE>
-  foo = Library('foo')
+  foo = Library('foo', 'dummy')
   <BLANKLINE>
   hoi = ResourceInclusion(foo, 'i1.js')
 
   >>> print generate_code(hoi=i1, i2=i2)
   from hurry.resource import Library, ResourceInclusion
   <BLANKLINE>
-  foo = Library('foo')
+  foo = Library('foo', 'dummy')
   <BLANKLINE>
   hoi = ResourceInclusion(foo, 'i1.js')
   i2 = ResourceInclusion(foo, 'i2.js', depends=[hoi])

Modified: hurry.resource/trunk/src/hurry/resource/core.py
===================================================================
--- hurry.resource/trunk/src/hurry/resource/core.py	2010-07-24 13:14:09 UTC (rev 114991)
+++ hurry.resource/trunk/src/hurry/resource/core.py	2010-07-24 13:15:59 UTC (rev 114992)
@@ -20,6 +20,7 @@
     
     def __init__(self, name, rootpath):
         self.name = name
+        self.rootpath = rootpath
         self.path = pkg_resources.resource_filename(__name__, rootpath)
 
 def libraries():
@@ -462,7 +463,8 @@
     result.append("")
     # define libraries
     for library in libraries:
-        result.append("%s = Library('%s')" % (library.name, library.name))
+        result.append("%s = Library('%s', '%s')" %
+                      (library.name, library.name, library.rootpath))
     result.append("")
 
     # sort inclusions in the order we want them to be