[Checkins] SVN: zope.fanstatic/trunk/ ResourceInclusion --> Resource, NeededInclusions --> NeededResource, get_current_needed_inclusions --> get_needed, init_current_needed_inclusions --> init_needed.

[Jan-Wijbrand Kolman]

Log message for revision 118795:
  ResourceInclusion --> Resource, NeededInclusions --> NeededResource, get_current_needed_inclusions --> get_needed, init_current_needed_inclusions --> init_needed.

Changed:
  U   zope.fanstatic/trunk/buildout.cfg
  U   zope.fanstatic/trunk/src/zope/fanstatic/tests/view.py
  U   zope.fanstatic/trunk/src/zope/fanstatic/zopesupport.py

-=-
Modified: zope.fanstatic/trunk/buildout.cfg
===================================================================
--- zope.fanstatic/trunk/buildout.cfg	2010-12-10 18:38:39 UTC (rev 118794)
+++ zope.fanstatic/trunk/buildout.cfg	2010-12-10 20:35:14 UTC (rev 118795)
@@ -1,6 +1,7 @@
 [buildout]
-extends = http://download.zope.org/zopetoolkit/index/1.0.1/ztk-versions.cfg
-          http://download.zope.org/zopetoolkit/index/1.0.1/zopeapp-versions.cfg
+extends =
+  http://download.zope.org/zopetoolkit/index/1.0.1/ztk-versions.cfg
+  http://download.zope.org/zopetoolkit/index/1.0.1/zopeapp-versions.cfg
 develop = .
 parts = test
 versions = versions

Modified: zope.fanstatic/trunk/src/zope/fanstatic/tests/view.py
===================================================================
--- zope.fanstatic/trunk/src/zope/fanstatic/tests/view.py	2010-12-10 18:38:39 UTC (rev 118794)
+++ zope.fanstatic/trunk/src/zope/fanstatic/tests/view.py	2010-12-10 20:35:14 UTC (rev 118795)
@@ -1,11 +1,11 @@
-from fanstatic import Library, ResourceInclusion
-from fanstatic import get_current_needed_inclusions
+from fanstatic import Library, Resource
+from fanstatic import get_needed
 
 foo = Library("foo", "foo_dir")
 
-a = ResourceInclusion(foo, "a.js")
+a = Resource(foo, "a.js")
 
-b = ResourceInclusion(foo, "b.js", depends=[a])
+b = Resource(foo, "b.js", depends=[a])
 
 class TestSingle(object):
     def widget(self):
@@ -23,8 +23,8 @@
         # XXX this does not use any official API and needs to be
         # reconsidered. Its done anyway now to make the tests pass,
         # instead of just removing the corresponding test.
-        get_current_needed_inclusions()._bottom = True
-        get_current_needed_inclusions()._force_bottom = True
+        get_needed()._bottom = True
+        get_needed()._force_bottom = True
         return "the widget HTML itself"
 
 class TestInlineResource(object):

Modified: zope.fanstatic/trunk/src/zope/fanstatic/zopesupport.py
===================================================================
--- zope.fanstatic/trunk/src/zope/fanstatic/zopesupport.py	2010-12-10 18:38:39 UTC (rev 118794)
+++ zope.fanstatic/trunk/src/zope/fanstatic/zopesupport.py	2010-12-10 20:35:14 UTC (rev 118795)
@@ -9,7 +9,7 @@
 
 @adapter(IEndRequestEvent)
 def set_base_url_on_needed_inclusions(event):
-    needed = fanstatic.get_current_needed_inclusions()
+    needed = fanstatic.get_needed()
     if needed.base_url is None:
         needed.base_url = absoluteURL(None, event.request)
 
@@ -33,7 +33,7 @@
         return ZopeFanstaticResource(self.request, self.library, name=name)
 
     def __str__(self):
-        needed = fanstatic.get_current_needed_inclusions()
+        needed = fanstatic.get_needed()
         if needed.base_url is None:
             needed.base_url = absoluteURL(None, self.request)
         return needed.library_url(self.library) + self.name