futher clean up api

diff --git a/extra/site-watcher/site-watcher-tests.factor b/extra/site-watcher/site-watcher-tests.factor
index d51fa026050cbc6fddfc73f37faafcfa324c341a..405b6cbb1edf2e4ec898b4c8acfa29f5a22f2460 100644 (file)
--- a/extra/site-watcher/site-watcher-tests.factor
+++ b/extra/site-watcher/site-watcher-tests.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: db.tuples locals site-watcher site-watcher.db ;
+USING: db.tuples locals site-watcher site-watcher.db
+site-watcher.private kernel ;
 IN: site-watcher.tests
 
 :: fake-sites ( -- seq )
@@ -10,8 +11,8 @@ IN: site-watcher.tests
         watching-site ensure-table
 
         "erg@factorcode.org" insert-account
-        "http://asdfasdfasdfasdfqwerqqq.com" insert-site
-        "http://fark.com" insert-site
+        "http://asdfasdfasdfasdfqwerqqq.com" insert-site drop
+        "http://fark.com" insert-site drop
 
         "erg@factorcode.org" "http://asdfasdfasdfasdfqwerqqq.com" watch-site
         f <site> select-tuples

diff --git a/extra/site-watcher/site-watcher.factor b/extra/site-watcher/site-watcher.factor
index c0c740f17eadcae8e0d06a4a73cf4c12f4c2910d..aba2d122314e34d42e2d3b43d5bb31a0af7fe2ab 100644 (file)
--- a/extra/site-watcher/site-watcher.factor
+++ b/extra/site-watcher/site-watcher.factor
@@ -71,20 +71,20 @@ TUPLE: reporting-site email url up? changed? last-up? error last-error ;
         dup t >>up? insert-tuple
     ] unless ;
 
-PRIVATE>
+: insert-account ( email -- ) <account> insert-tuple ;
 
 : select-account/site ( email url -- account site )
     [ <account> select-tuple account-id>> ]
     [ insert-site site-id>> ] bi* ;
 
+PRIVATE>
+
 : watch-site ( email url -- )
     select-account/site <watching-site> insert-tuple ;
 
 : unwatch-site ( email url -- )
     select-account/site <watching-site> delete-tuples ;
 
-: insert-account ( email -- ) <account> insert-tuple ;
-
 : watch-sites ( -- alarm )
     [
         [