From 3f904b4f90d1ada5ab0c16a14af47b03205ea292 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 23 Nov 2016 16:34:10 -0800 Subject: [PATCH] remove ++epur:url:eyre convenience interface --- app/curl.hoon | 2 +- app/dojo.hoon | 2 +- app/gh.hoon | 2 +- app/gmail.hoon | 2 +- arvo/eyre.hoon | 6 +++--- arvo/zuse.hoon | 3 --- gen/curl.hoon | 2 +- gen/curl/url.hoon | 2 +- lib/connector.hoon | 2 +- lib/interpolate.hoon | 2 +- lib/twitter.hoon | 2 +- mar/gh/issue-comment.hoon | 4 ++-- mar/gh/issues.hoon | 4 ++-- 13 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/curl.hoon b/app/curl.hoon index 9641af6177..35b30cbaa0 100644 --- a/app/curl.hoon +++ b/app/curl.hoon @@ -6,7 +6,7 @@ |_ {{^ ^ ost/@ ^} $~} ++ poke |*(a/{mark *} :_(+> [ost %hiss / `~ %wain a]~)) ::++ poke-purl |=(a/purl :_(+> [ost %hiss / %wain %purl a]~)) -++ poke-tape |=(a/tape (poke %purl (scan a auri:epur))) +++ poke-tape |=(a/tape (poke %purl (scan a auri:urlp))) ++ poke-hiss |=(a/hiss (poke %hiss a)) ++ poke-noun poke-hiss ++ sigh-wain |=({* a/wain} ~&(a `+>)) diff --git a/app/dojo.hoon b/app/dojo.hoon index f4cd860e2b..c0019bf207 100644 --- a/app/dojo.hoon +++ b/app/dojo.hoon @@ -233,7 +233,7 @@ ++ dp-iden-url %+ cook |=({a/(unit knot) b/purl:^eyre} [`(fall a *knot) b]) - auru:epur:url:eyre + auru:urlp:url:eyre :: ++ dp-model ;~(plug dp-server dp-config) :: ++dojo-model ++ dp-path (tope he-beam) :: ++path diff --git a/app/gh.hoon b/app/gh.hoon index 464b06635d..59151e39f1 100644 --- a/app/gh.hoon +++ b/app/gh.hoon @@ -276,7 +276,7 @@ :* %+ scan =+ [(trip i.pax) (trip i.t.pax)] "https://api.github.com/repos/{-<}/{->}/hooks" - auri:epur + auri:urlp %post ~ ~ %- taco %- crip %- pojo %- jobe :~ name+s+%web diff --git a/app/gmail.hoon b/app/gmail.hoon index f2f1a5c80c..b8024d09c5 100644 --- a/app/gmail.hoon +++ b/app/gmail.hoon @@ -252,7 +252,7 @@ ^- purl %+ scan "https://www.googleapis.com/gmail/v1/users/me{<`path`endpoint>}" - auri:epur + auri:urlp :: Send an HTTP req ++ send-http |= hiz/hiss diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index e9596c8408..f7884ed007 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -223,7 +223,7 @@ ++ from-cookies |= {maf/math fil/$-({@t @t} ?)} =+ `cot/(list @t)`(~(get ju maf) 'cookie') - =+ `cok/quay`(zing `(list quay)`(murn cot (curr rush cock:epur))) + =+ `cok/quay`(zing `(list quay)`(murn cot (curr rush cock:urlp))) |- ^- (unit cord) ?~ cok ~ ?:((fil i.cok) [~ q.i.cok] $(cok t.cok)) @@ -803,14 +803,14 @@ %- emule |. ^+ ..apex =* sec p.kyz :: ? :: https bit =* heq r.kyz :: httq :: request content - =+ ryp=`quri`(rash q.heq zest:epur) + =+ ryp=`quri`(rash q.heq zest:urlp) =+ maf=(eat-headers r.heq) =+ ^= pul ^- purl ?- -.ryp $& ?>(=(sec p.p.p.ryp) p.ryp) $| =+ hot=(~(get ja maf) %host) ?> ?=({@ $~} hot) - [[sec (rash i.hot thor:epur)] p.ryp q.ryp] + [[sec (rash i.hot thor:urlp)] p.ryp q.ryp] == =. p.p.pul |(p.p.pul ?=(hoke r.p.pul)) ?: ?=($chis -.kyz) :: IPC escape hatch diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index e0eb67ea14..8729ec3b21 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -4040,9 +4040,6 @@ == -- :: :: :: ++epur:url:eyre - ++ epur :: url+header parser - =>(urlp |=(a/cord `(unit purl)`(rush a auri))) - :: :: ++fuel:url:eyre ++ fuel :: parse urbit fcgi |= {bem/beam ced/noun:cred quy/|-($@($~ {p/@t q/@t t/$}))} ^- epic diff --git a/gen/curl.hoon b/gen/curl.hoon index ec3dd1b9da..68fc79c0ee 100644 --- a/gen/curl.hoon +++ b/gen/curl.hoon @@ -7,6 +7,6 @@ =, sole :- %get |= {^ {a/tape $~} $~} ^- (sole-request (cask httr)) -%+ sole-at (scan a auri:epur) +%+ sole-at (scan a auri:urlp) |= hit/httr (sole-so %httr hit) diff --git a/gen/curl/url.hoon b/gen/curl/url.hoon index feb1f37d71..efb5335b59 100644 --- a/gen/curl/url.hoon +++ b/gen/curl/url.hoon @@ -8,4 +8,4 @@ :: :- %say |= {^ {arg/tape $~} $~} -purl+(scan arg auri:epur) +purl+(scan arg auri:urlp) diff --git a/lib/connector.hoon b/lib/connector.hoon index 52c8e60714..dee1a08cf1 100644 --- a/lib/connector.hoon +++ b/lib/connector.hoon @@ -87,7 +87,7 @@ :: ++ endpoint-to-purl |= endpoint/path - (scan (weld api-url <`path`endpoint>) auri:epur) + (scan (weld api-url <`path`endpoint>) auri:urlp) :: :: Return error. Used when no http response is expected. :: diff --git a/lib/interpolate.hoon b/lib/interpolate.hoon index 6425caf58d..a2a2bd73c2 100644 --- a/lib/interpolate.hoon +++ b/lib/interpolate.hoon @@ -13,7 +13,7 @@ |= a/$@(cord:purl purl) ^- purl ?^ a a ~| bad-url+a - (rash a auri:epur) + (rash a auri:urlp) :: ++ add-query |= {a/$@(@t purl) b/quay} ^- purl diff --git a/lib/twitter.hoon b/lib/twitter.hoon index ea685a90ac..b88113e50a 100644 --- a/lib/twitter.hoon +++ b/lib/twitter.hoon @@ -24,7 +24,7 @@ ++ valve :: produce request |= {med/?($get $post) pax/path quy/quay} ^- hiss - =+ url=(scan "https://api.twitter.com/1.1/.json" auri:epur) :: base path + =+ url=(scan "https://api.twitter.com/1.1/.json" auri:urlp) :: base path =. q.q.url (welp q.q.url pax) =. r.url quy ^- hiss diff --git a/mar/gh/issue-comment.hoon b/mar/gh/issue-comment.hoon index 80c66031c7..2b2f71acc5 100644 --- a/mar/gh/issue-comment.hoon +++ b/mar/gh/issue-comment.hoon @@ -16,10 +16,10 @@ == :* %api %github login.sender.issue-comment - (rash html-url.sender.issue-comment aurf:epur) + (rash html-url.sender.issue-comment aurf:urlp) txt txt - (rash html-url.comment.issue-comment aurf:epur) + (rash html-url.comment.issue-comment aurf:urlp) %- jobe :~ repository+s+name.repository.issue-comment number+(jone number.issue.issue-comment) diff --git a/mar/gh/issues.hoon b/mar/gh/issues.hoon index a85d3c5f45..b3d441939c 100644 --- a/mar/gh/issues.hoon +++ b/mar/gh/issues.hoon @@ -80,9 +80,9 @@ ^- speech:talk :* %api %github login.sender.issues - (rash html-url.sender.issues aurf:epur) + (rash html-url.sender.issues aurf:urlp) txt txt - (rash html-url.issue.issues aurf:epur) + (rash html-url.issue.issues aurf:urlp) %- jobe %+ welp :~ repository+s+name.repository.issues