\r
: revalidate-url ( -- url/f )\r
revalidate-url-key param\r
- dup [ >url [ same-host? ] keep and ] when ;\r
+ dup [ >url ensure-port [ same-host? ] keep and ] when ;\r
\r
: validation-failed ( -- * )\r
post-request? revalidate-url and [\r
HELP: ::
{ $syntax ":: word ( bindings... -- outputs... ) body... ;" }
-{ $description "Defines a word with named inputs; it reads stack values into bindings from left to right, then executes the body with those bindings in lexical scope. Any " { $link POSTPONE: [| } ", " { $link POSTPONE: [let } " or " { $link POSTPONE: [wlet } " forms used in the body of the word definition are automatically closure-converted." }
+{ $description "Defines a word with named inputs; it reads stack values into bindings from left to right, then executes the body with those bindings in lexical scope." }
{ $notes "The output names do not affect the word's behavior, however the compiler attempts to check the stack effect as with other definitions." }
{ $examples "See " { $link POSTPONE: [| } ", " { $link POSTPONE: [let } " and " { $link POSTPONE: [wlet } "." } ;
{ $notes "This word is used by the implementation of " { $link "urls" } ". It is also used by the HTTP client to encode POST requests." }
{ $examples
{ $example
- "USING: io urls ;"
+ "USING: io urls.encoding ;"
"{ { \"from\" \"Lead\" } { \"to\" \"Gold, please\" } }"
"assoc>query print"
- "from=Lead&to=Gold%2c+please"
+ "from=Lead&to=Gold%2c%20please"
}
} ;
{ $notes "This word is used by the implementation of " { $link "urls" } ". It is also used by the HTTP server to parse POST requests." }
{ $examples
{ $unchecked-example
- "USING: prettyprint urls ;"
+ "USING: prettyprint urls.encoding ;"
"\"gender=female&agefrom=22&ageto=28&location=Omaha+NE\""
"query>assoc ."
<" H{
! See http://factorcode.org/license.txt for BSD license.
USING: kernel ascii combinators combinators.short-circuit
sequences splitting fry namespaces make assocs arrays strings
-io.sockets io.sockets.secure io.encodings.string
-io.encodings.utf8 math math.parser accessors hashtables present ;
+io.encodings.string io.encodings.utf8 math math.parser accessors
+hashtables present ;
IN: urls.encoding
: url-quotable? ( ch -- ? )
{ host "www.apple.com" }
{ port 1234 }
{ path "/a/path" }
- { raw-query "a=b" }
{ query H{ { "a" "b" } } }
{ anchor "foo" }
}
{ protocol "http" }
{ host "www.apple.com" }
{ path "/a/path" }
- { raw-query "a=b" }
{ query H{ { "a" "b" } } }
{ anchor "foo" }
}
{
T{ url
{ path "bar" }
- { raw-query "a=b" }
{ query H{ { "a" "b" } } }
}
"bar?a=b"
T{ url
{ protocol "http" }
{ host "localhost" }
- { raw-query "foo=bar" }
{ query H{ { "foo" "bar" } } }
{ path "/" }
}
T{ url
{ protocol "http" }
{ host "localhost" }
- { raw-query "foo=bar" }
{ query H{ { "foo" "bar" } } }
{ path "/" }
}
peg.ebnf urls.encoding ;
IN: urls
-TUPLE: url protocol username password host port path raw-query query anchor ;
+TUPLE: url protocol username password host port path query anchor ;
: <url> ( -- url ) url new ;
username = [^/:@#?]+ => [[ url-decode ]]
password = [^/:@#?]+ => [[ url-decode ]]
pathname = [^#?]+ => [[ url-decode ]]
-query = [^#]+ => [[ >string ]]
+query = [^#]+ => [[ query>assoc ]]
anchor = .+ => [[ url-decode ]]
hostname = [^/#?]+ => [[ url-decode ]]
] [ f f f f f ] if*
]
[ second ] ! pathname
- [ third dup query>assoc ] ! query
+ [ third ] ! query
[ fourth ] ! anchor
} cleave url boa
dup host>> [ [ "/" or ] change-path ] when ;
: derive-url ( base url -- url' )
[ clone ] dip over {
- [ [ protocol>> ] either? >>protocol ]
- [ [ username>> ] either? >>username ]
- [ [ password>> ] either? >>password ]
- [ [ host>> ] either? >>host ]
- [ [ port>> ] either? >>port ]
- [ [ path>> ] bi@ swap url-append-path >>path ]
- [ [ query>> ] either? >>query ]
- [ [ anchor>> ] either? >>anchor ]
+ [ [ protocol>> ] either? >>protocol ]
+ [ [ username>> ] either? >>username ]
+ [ [ password>> ] either? >>password ]
+ [ [ host>> ] either? >>host ]
+ [ [ port>> ] either? >>port ]
+ [ [ path>> ] bi@ swap url-append-path >>path ]
+ [ [ query>> ] either? >>query ]
+ [ [ anchor>> ] either? >>anchor ]
} 2cleave ;
: relative-url ( url -- url' )
} ;
HELP: initial:
-{ $syntax "TUPLE: ... { \"slot\" initial: value } ... ;" }
+{ $syntax "TUPLE: ... { slot initial: value } ... ;" }
{ $values { "slot" "a slot name" } { "value" "any literal" } }
{ $description "Specifies an initial value for a tuple slot." } ;
HELP: read-only
-{ $syntax "TUPLE: ... { \"slot\" read-only } ... ;" }
+{ $syntax "TUPLE: ... { slot read-only } ... ;" }
{ $values { "slot" "a slot name" } }
{ $description "Defines a tuple slot to be read-only. If a tuple has read-only slots, instances of the tuple should only be created by calling " { $link boa } ", instead of " { $link new } ". Using " { $link boa } " is the only way to set the value of a read-only slot." } ;
[
{
- { "search" [ 2 v-min-length 50 v-max-length v-one-line ] }
+ { "search" [ 1 v-min-length 50 v-max-length v-one-line ] }
} validate-params
help-dir set-current-directory
<p>This is the <a href="http://factorcode.org" target="_top">Factor</a>
documentation, generated offline from a
- <code>load-everything</code> image. The Factor UI also
- includes a documentation browser tool.</p>
+ <code>load-everything</code> image. If you want, you can also browse the
+ documentation from within the <a href="http://factorcode.org" target="_top">Factor</a> UI.</p>
- <p>You may search article titles below.</p>
+ <p>You may search article titles below; for example, try searching for "HTTP".</p>
<t:form t:action="$help-webapp/search">
<t:field t:name="search" />
"password" key-password set-global
common-configuration
<factor-website>
- <pastebin> "pastebin" add-responder
- <planet> "planet" add-responder
+ <pastebin> <factor-boilerplate> "pastebin" add-responder
+ <planet> <factor-boilerplate> "planet" add-responder
"/tmp/docs/" <help-webapp> "docs" add-responder
- <factor-boilerplate>
<configuration>
main-responder set-global ;
projects / factor.git / commitdiff