Merge remote-tracking branch 'my/api-dojo-fix' into lens

This merge is necessary because I'm about to make a bunch of dojo
changes, and I need the restored dojo.
This commit is contained in:
Philip C Monk 2016-02-23 20:16:21 -05:00
commit 19465e4ed6
4 changed files with 30 additions and 26 deletions

View File

@ -1,13 +1,13 @@
:: :: ::
:::: /hoon/dojo/app :: ::::
:: :: ::
/? 310 :: arvo kelvin
/? 314 :: arvo kelvin
/- sole :: console structures
/+ sole :: console library
[. sole]
:: :: ::
:::: :: ::::
:: :: ::
!: :: ::
=> |% :: external structures
++ house :: all state
$: $4
@ -32,7 +32,7 @@
{$pill p/path} :: noun to unix pill
:: {$tree p/path} :: noun to unix tree
{$file p/beam} :: save to clay
{$http p/?($post $put) q/purl} :: http outbound
{$http p/?($post $put) q/iden r/purl} :: http outbound
{$poke p/goal} :: poke app
{$show p/?($0 $1 $2 $3)} :: print val+span+twig
{$verb p/term} :: store variable
@ -41,8 +41,8 @@
$: p/@ud :: assembly index
q/dojo-build :: general build
== ::
++ dojo-build :: one ford step
$% {$ur p/purl} :: http GET request
++ dojo-build :: one arvo step
$% {$ur p/iden q/purl} :: http GET request
{$ge p/dojo-model} :: generator
{$dv p/path} :: core from source
{$ex p/twig} :: hoon expression
@ -87,7 +87,7 @@
++ card :: general card
$% {$diff $sole-effect sole-effect} ::
{$send wire {ship term} clap} ::
{$hiss wire mark {$hiss hiss}} ::
{$hiss wire {$~ iden} mark {$hiss hiss}} ::
{$exec wire @p (unit {beak silk})} ::
{$deal wire sock term club} ::
{$info wire @p toro} ::
@ -167,8 +167,8 @@
;~(plug (cold %file tar) dp-beam)
;~(plug (cold %flat pat) (most fas qut))
;~(plug (cold %pill dot) (most fas sym))
;~(plug (cold %http lus) (easy %post) auri:epur)
;~(plug (cold %http hep) (easy %put) auri:epur)
;~(plug (cold %http lus) (easy %post) dp-iden-url)
;~(plug (cold %http hep) (easy %put) dp-iden-url)
(stag %show (cook $?($1 $2 $3) (cook lent (stun [1 3] wut))))
==
++ dp-hooves :: hoof list
@ -198,7 +198,7 @@
++ dp-build :: ++dojo-build
%+ knee *dojo-build |. ~+
;~ pose
;~(plug (cold %ur lus) auri:epur)
;~(plug (cold %ur lus) dp-iden-url)
;~(plug (cold %ge lus) dp-model)
;~(plug (cold %as pam) sym ;~(pfix ace dp-source))
;~(plug (cold %do cab) dp-twig ;~(pfix ace dp-source))
@ -220,6 +220,9 @@
=+ vez=(vang | dp-path)
(sear plex:vez (stag %conl poor:vez))
::
++ dp-iden-url
(cook |=({a/(unit iden) b/purl} [(fall a *iden) b]) auru:epur)
::
++ dp-model ;~(plug dp-server dp-config) :: ++dojo-model
++ dp-path (tope he-beam) :: ++path
++ dp-server (stag 0 (most fas sym)) :: ++dojo-server
@ -266,10 +269,10 @@
(he-card(poy `+>+<(pux `way)) %exec way our.hid `[he-beak kas])
::
++ dy-eyre :: send work to eyre
|= {way/wire req/hiss}
|= {way/wire usr/iden req/hiss}
^+ +>+>
?> ?=($~ pux)
(he-card(poy `+>+<(pux `way)) %hiss way %httr %hiss req)
(he-card(poy `+>+<(pux `way)) %hiss way `usr %httr %hiss req)
::
++ dy-stop :: stop work
^+ +>
@ -481,7 +484,7 @@
?> ?=($mime p.cay)
=+ mim=;;(mime q.q.cay)
=+ maf=(~(add ja *math) %content-span (moon p.mim))
(dy-eyre /show [q.p.mad p.p.mad maf ~ q.mim])
(dy-eyre /show q.p.mad [r.p.mad p.p.mad maf ~ q.mim])
::
$show
%+ dy-print cay
@ -506,7 +509,8 @@
:- "HTTP {<p.hit>}"
%+ weld
(turn q.hit |=({a/@t b/@t} "{(trip a)}: {(trip b)}"))
(turn `wain`?~(r.hit ~ (lore q.u.r.hit)) trip)
:- i=""
t=(turn `wain`?~(r.hit ~ (lore q.u.r.hit)) trip)
==
::
++ dy-show-span-noun
@ -533,7 +537,7 @@
++ dy-shown
$? twig
$^ {dy-shown dy-shown}
$% {$ur purl}
$% {$ur iden purl}
{$dv path}
{$as mark dy-shown}
{$do twig dy-shown}
@ -662,7 +666,7 @@
$|
=+ hiz=;;(hiss +<.q.vax)
=. ..dy (he-diff %tan leaf+"< {(earn p.hiz)}" ~)
(dy-eyre(pro `(slap (slot 7 vax) limb+%q)) /scar hiz)
(dy-eyre(pro `(slap (slot 7 vax) limb+%q)) /scar ~. hiz)
==
::
++ dy-sigh-scar :: scraper result
@ -681,7 +685,7 @@
?> ?=(^ cud)
=+ bil=q.u.cud :: XX =*
?: ?=($ur -.bil)
(dy-eyre /hand [p.bil %get ~ ~])
(dy-eyre /hand p.bil [q.bil %get ~ ~])
%- dy-ford
^- (pair path silk)
?- -.bil

View File

@ -15,7 +15,7 @@
:: for webhook-powered event notifications. For event list,
:: see https://developer.github.com/webhooks/.
::
:: See the %github app for example usage.
:: See the%github app for example usage.
::
/? 314
/- rfc, gmail-label

View File

@ -8,26 +8,26 @@
!:
[sole .]
:- %ask
|= $: [now=@da eny=@uvI bec=beak]
[arg=$|(~ [dom=path ~])]
~
|= $: {now/@da eny/@uvI bec/beak}
{arg/$@($~ {dom/path $~})}
$~
==
^- (sole-result ,[%write-sec-atom p=host q=@])
^- (sole-result {$write-sec-atom p/host q/@})
=- ?~ arg -
(fun.q.q [%& dom.arg])
%+ sole-lo
[%& %oauth-hostname "api hostname: https://"]
%+ sole-go thos:urlp
|= hot=host
?: ?=(%| -.hot)
|= hot/host
?: ?=($| -.hot)
~|(%ips-unsupported !!)
%+ sole-lo
[%& %oauth-client "client id: "]
%+ sole-go (boss 256 (star prn))
|= cid=@t
|= cid/@t
%+ sole-lo
[%& %oauth-secret "client secret: "]
%+ sole-go (boss 256 (star prn))
|= cis=@t
|= cis/@t
%+ sole-so %write-sec-atom :: XX typed pair
[hot (role cid cis ~)]

View File

@ -34,7 +34,7 @@
++ token ?(~ @t)
++ refresh {tok/token needed/@da pending/_`?`|}
++ keys cord:{cid/@t cis/@t}
++ core-move |*(a/* $&([sec-move _a] sec-move))
++ core-move |*(a/* $&({sec-move _a} sec-move)) ::here's a change
++ decode-keys :: XX from bale w/ typed %jael
|=(key/keys ((hard {cid/@t cis/@t $~}) (lore key)))
--