diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8966b04 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/*.gem diff --git a/.yardoc/checksums b/.yardoc/checksums index 4cc44b3..55daed0 100644 --- a/.yardoc/checksums +++ b/.yardoc/checksums @@ -1,29 +1,30 @@ lib/hyde.rb 632d043ed6e7484bca963c37e1629e1d88c89b69 -lib/hyde/node.rb 93d92492390abb2b55649c6d027fa3a2cb8f2014 +lib/hyde/node.rb 6f1292fd88ba86988aaae75fb3d94c473b667654 lib/hyde/path.rb 42c04e42ea879ad73f639f2086b3ab5ca40489dc lib/hyde/probe.rb 673b55e9aa8c8286a770bd23ae00bff1ac2047fe lib/hyde/server.rb b68b932a689a2f8dbebebc2dc7eef5972c13d974 lib/hyde/request.rb 792427908273455eb694e13d3517cdae43af3454 lib/hyde/response.rb a82971ec8f86201de804e61b4dd277b48d28e8b2 lib/hyde/template.rb 69e46f8095e5e06dd69129ed975a5ce1e6d3de1f -lib/hyde/util/html.rb a29b85ecfdcbd294efff67a12c509262ac9c49be -lib/hyde/util/query.rb 212e9bd776eac429c2b2a821586ccce97f996df9 -lib/hyde/util/cookie.rb d36b33ae00c2ae8eb7c007bdf40a232c46bda24f -lib/hyde/util/header.rb 3af726c08bdf54a348238e76279e82d75bbaacc1 +lib/hyde/util/html.rb 258126a18f9e73068f2becc09a29bd8461941400 +lib/hyde/util/query.rb b1e7b6da88a5d29198fba7188660a13ad47ac499 +lib/hyde/util/cookie.rb 9a2eb0fdf1f716380c5314cf8fd21df2a60c8237 +lib/hyde/util/errors.rb c275348668ee17c6478e60f3ecfb0c3b9d614480 lib/hyde/util/lookup.rb 5b8e28a8471bb786f4e0a0d616885d238c806661 lib/hyde/template/erb.rb d8c808a1fafaa65b400780204063bae6046e2f54 -lib/hyde/util/sorting.rb af30f01ce32880f7e3e2b0ad6c2324c2fded9431 lib/hyde/probe/handler.rb 9b3eb4ce702c40920c04ed0cb3b93984683de447 lib/hyde/template/erubi.rb 74793cda58f79d6be3ce4ca25dc231296485bd4c -lib/hyde/util/multipart.rb 37abad9fbe044855d02d36185be645f07cb417c0 -lib/hyde/dsl/methods_path.rb 57411e500d5ac565164a1f7250a7141f0f206e60 +lib/hyde/util/multipart.rb 4c29eea87eb2093bad9cea228032121021aa38b9 +lib/hyde/util/parseutils.rb 14376e92c85209d4ba46f4659652bb87a28e3a82 +lib/hyde/dsl/methods_path.rb a695d61027389799893e15db5ae29de2a7511992 lib/hyde/pattern_matching.rb fe86f6529a2d22c128d9d3a74217862e9fa59c15 -lib/hyde/dsl/methods_probe.rb c18bb7f712f14e4d08416f77969eb0af07a4f3a7 +lib/hyde/dsl/methods_probe.rb c9fa8a2f095f6c99d356851f65786d70a288f690 lib/hyde/probe/http_method.rb 26ba5c9dabff5508dbd6efcba1711d6417cf957b +lib/hyde/util/parsesorting.rb a5eb853e443944ff678d70652fce86998c6b02c6 lib/hyde/dsl/methods_common.rb ea06161f4324127fbbacd51918eadc4e059e4fcf lib/hyde/probe/serve_handler.rb 6c1d2a7b949700468342ced4c23c7fe60df4d3f0 lib/hyde/dsl/methods_template.rb 5ea0be9ad7411ed0d5bd50435edf2b7be9bd0b6f -lib/hyde/dsl/constructors_path.rb d9fafcfae4d6aab9bd85a7de955eb74f8d4d5937 +lib/hyde/dsl/constructors_path.rb 9609d3470a1b0f3c30b83a15ef7683ab8c751960 lib/hyde/pattern_matching/glob.rb 16595083bc8d6f7b98f4adda502a05bd411bc1ca lib/hyde/pattern_matching/util.rb 188dc7d5d9a9a6538a01943a83eb132c385dc092 lib/hyde/dsl/constructors_probe.rb c447b87b77ddb476584a3d77c5bf58f8122492ee diff --git a/.yardoc/object_types b/.yardoc/object_types index 2e75a58..79149b8 100644 Binary files a/.yardoc/object_types and b/.yardoc/object_types differ diff --git a/.yardoc/objects/root.dat b/.yardoc/objects/root.dat index 9ea0128..8289913 100644 Binary files a/.yardoc/objects/root.dat and b/.yardoc/objects/root.dat differ diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..c6f01c6 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,660 @@ +# GNU AFFERO GENERAL PUBLIC LICENSE + +Version 3, 19 November 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +## Preamble + +The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains +free software for all its users. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + +Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + +A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + +The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + +An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing +under this license. + +The precise terms and conditions for copying, distribution and +modification follow. + +## TERMS AND CONDITIONS + +### 0. Definitions. + +"This License" refers to version 3 of the GNU Affero General Public +License. + +"Copyright" also means copyright-like laws that apply to other kinds +of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of +an exact copy. The resulting work is called a "modified version" of +the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based +on the Program. + +To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user +through a computer network, with no transfer of a copy, is not +conveying. + +An interactive user interface displays "Appropriate Legal Notices" to +the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + +### 1. Source Code. + +The "source code" for a work means the preferred form of the work for +making modifications to it. "Object code" means any non-source form of +a work. + +A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can +regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same +work. + +### 2. Basic Permissions. + +All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, +without conditions so long as your license otherwise remains in force. +You may convey covered works to others for the sole purpose of having +them make modifications exclusively for you, or provide you with +facilities for running those works, provided that you comply with the +terms of this License in conveying all material for which you do not +control copyright. Those thus making or running the covered works for +you must do so exclusively on your behalf, under your direction and +control, on terms that prohibit them from making any copies of your +copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the +conditions stated below. Sublicensing is not allowed; section 10 makes +it unnecessary. + +### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such +circumvention is effected by exercising rights under this License with +respect to the covered work, and you disclaim any intention to limit +operation or modification of the work as a means of enforcing, against +the work's users, your or third parties' legal rights to forbid +circumvention of technological measures. + +### 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + +### 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these +conditions: + +- a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. +- b) The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in section 4 + to "keep intact all notices". +- c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. +- d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + +A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + +### 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these +ways: + +- a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. +- b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the Corresponding + Source from a network server at no charge. +- c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. +- d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. +- e) Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the general + public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, +family, or household purposes, or (2) anything designed or sold for +incorporation into a dwelling. In determining whether a product is a +consumer product, doubtful cases shall be resolved in favor of +coverage. For a particular product received by a particular user, +"normally used" refers to a typical or common use of that class of +product, regardless of the status of the particular user or of the way +in which the particular user actually uses, or expects or is expected +to use, the product. A product is a consumer product regardless of +whether the product has substantial commercial, industrial or +non-consumer uses, unless such uses represent the only significant +mode of use of the product. + +"Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to +install and execute modified versions of a covered work in that User +Product from a modified version of its Corresponding Source. The +information must suffice to ensure that the continued functioning of +the modified object code is in no case prevented or interfered with +solely because modification has been made. + +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or +updates for a work that has been modified or installed by the +recipient, or for the User Product in which it has been modified or +installed. Access to a network may be denied when the modification +itself materially and adversely affects the operation of the network +or violates the rules and protocols for communication across the +network. + +Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + +### 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders +of that material) supplement the terms of this License with terms: + +- a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or +- b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or +- c) Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or +- d) Limiting the use for publicity purposes of names of licensors + or authors of the material; or +- e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or +- f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions + of it) with contractual assumptions of liability to the recipient, + for any liability that these contractual assumptions directly + impose on those licensors and authors. + +All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way. + +### 8. Termination. + +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + +### 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run +a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + +### 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + +### 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned +or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + +If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + +A patent license is "discriminatory" if it does not include within the +scope of its coverage, prohibits the exercise of, or is conditioned on +the non-exercise of one or more of the rights that are specifically +granted under this License. You may not convey a covered work if you +are a party to an arrangement with a third party that is in the +business of distributing software, under which you make payment to the +third party based on the extent of your activity of conveying the +work, and under which the third party grants, to any of the parties +who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by +you (or copies made from those copies), or (b) primarily for and in +connection with specific products or compilations that contain the +covered work, unless you entered into that arrangement, or that patent +license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + +### 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under +this License and any other pertinent obligations, then as a +consequence you may not convey it at all. For example, if you agree to +terms that obligate you to collect a royalty for further conveying +from those to whom you convey the Program, the only way you could +satisfy both those terms and this License would be to refrain entirely +from conveying the Program. + +### 13. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your +version supports such interaction) an opportunity to receive the +Corresponding Source of your version by providing access to the +Corresponding Source from a network server at no charge, through some +standard or customary means of facilitating copying of software. This +Corresponding Source shall include the Corresponding Source for any +work covered by version 3 of the GNU General Public License that is +incorporated pursuant to the following paragraph. + +Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + +### 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU Affero General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever +published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions +of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +### 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +### 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +### 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +## How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + +To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively state +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper +mail. + +If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for +the specific requirements. + +You should also get your employer (if you work as a programmer) or +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. For more information on this, and how to apply and follow +the GNU AGPL, see . diff --git a/doc/Hyde.html b/doc/Hyde.html index 120d380..ad6dd8e 100644 --- a/doc/Hyde.html +++ b/doc/Hyde.html @@ -79,7 +79,7 @@
Defined in:
lib/hyde.rb,
- lib/hyde/node.rb,
lib/hyde/path.rb,
lib/hyde/probe.rb,
lib/hyde/server.rb,
lib/hyde/request.rb,
lib/hyde/response.rb,
lib/hyde/template.rb,
lib/hyde/util/html.rb,
lib/hyde/util/query.rb,
lib/hyde/util/cookie.rb,
lib/hyde/util/header.rb,
lib/hyde/util/lookup.rb,
lib/hyde/template/erb.rb,
lib/hyde/util/sorting.rb,
lib/hyde/probe/handler.rb,
lib/hyde/template/erubi.rb,
lib/hyde/util/multipart.rb,
lib/hyde/dsl/methods_path.rb,
lib/hyde/pattern_matching.rb,
lib/hyde/dsl/methods_probe.rb,
lib/hyde/probe/http_method.rb,
lib/hyde/dsl/methods_common.rb,
lib/hyde/probe/serve_handler.rb,
lib/hyde/dsl/methods_template.rb,
lib/hyde/dsl/constructors_path.rb,
lib/hyde/pattern_matching/glob.rb,
lib/hyde/pattern_matching/util.rb,
lib/hyde/dsl/constructors_probe.rb,
lib/hyde/pattern_matching/rematch.rb
+ lib/hyde/node.rb,
lib/hyde/path.rb,
lib/hyde/probe.rb,
lib/hyde/server.rb,
lib/hyde/request.rb,
lib/hyde/response.rb,
lib/hyde/template.rb,
lib/hyde/util/html.rb,
lib/hyde/util/query.rb,
lib/hyde/util/cookie.rb,
lib/hyde/util/errors.rb,
lib/hyde/util/lookup.rb,
lib/hyde/template/erb.rb,
lib/hyde/probe/handler.rb,
lib/hyde/template/erubi.rb,
lib/hyde/util/multipart.rb,
lib/hyde/util/parseutils.rb,
lib/hyde/dsl/methods_path.rb,
lib/hyde/pattern_matching.rb,
lib/hyde/dsl/methods_probe.rb,
lib/hyde/probe/http_method.rb,
lib/hyde/util/parsesorting.rb,
lib/hyde/dsl/methods_common.rb,
lib/hyde/probe/serve_handler.rb,
lib/hyde/dsl/methods_template.rb,
lib/hyde/dsl/constructors_path.rb,
lib/hyde/pattern_matching/glob.rb,
lib/hyde/pattern_matching/util.rb,
lib/hyde/dsl/constructors_probe.rb,
lib/hyde/pattern_matching/rematch.rb
@@ -103,7 +103,7 @@ - Classes: Cookie, Node, Path, PathContext, Pattern, Probe, ProbeContext, ProcessorContext, Request, Response, Server, ServerContext, Template, TemplateContext + Classes: Cookie, Error, Node, ParsingError, Path, PathContext, Pattern, Probe, ProbeContext, ProcessorContext, Request, Response, Server, ServerContext, Template, TemplateContext

@@ -175,7 +175,7 @@ diff --git a/doc/Hyde/Cookie.html b/doc/Hyde/Cookie.html index 26c28c7..717cf83 100644 --- a/doc/Hyde/Cookie.html +++ b/doc/Hyde/Cookie.html @@ -385,16 +385,32 @@
 
 
-9
 10
 11
 12
-13
+13 +14 +15 +16 +17 +18 +19 +20 +21 +22 -
# File 'lib/hyde/util/cookie.rb', line 9
+      
# File 'lib/hyde/util/cookie.rb', line 10
 
 def initialize(key, value, params = {})
+  unless key.match? Hyde::Util::HeaderRegexp::COOKIE_KEY
+    raise Hyde::ParsingError, "invalid cookie key: #{key}"
+  end
+
+  unless value.match? Hyde::Util::HeaderRegexp::COOKIE_VALUE
+    raise Hyde::ParsingError, "invalid cookie value: #{value}"
+  end
+
   @key = key
   @value = value
   @params = params
@@ -436,12 +452,12 @@
       
 
 
-26
-27
-28
+35 +36 +37
-
# File 'lib/hyde/util/cookie.rb', line 26
+      
# File 'lib/hyde/util/cookie.rb', line 35
 
 def key
   @key
@@ -478,12 +494,12 @@
       
 
 
-27
-28
-29
+36 +37 +38
-
# File 'lib/hyde/util/cookie.rb', line 27
+      
# File 'lib/hyde/util/cookie.rb', line 36
 
 def params
   @params
@@ -520,12 +536,12 @@
       
 
 
-26
-27
-28
+35 +36 +37
-
# File 'lib/hyde/util/cookie.rb', line 26
+      
# File 'lib/hyde/util/cookie.rb', line 35
 
 def value
   @value
@@ -599,14 +615,14 @@
       
 
 
-41
-42
-43
-44
-45
+53 +54 +55 +56 +57
-
# File 'lib/hyde/util/cookie.rb', line 41
+      
# File 'lib/hyde/util/cookie.rb', line 53
 
 def self.from_cookie_string(data)
   data.split(";").map do |cookiestr|
@@ -675,17 +691,23 @@
       
 
 
-32
-33
-34
-35
-36
+41 +42 +43 +44 +45 +46 +47 +48
-
# File 'lib/hyde/util/cookie.rb', line 32
+      
# File 'lib/hyde/util/cookie.rb', line 41
 
 def self.from_setcookie_string(data)
-  kvpair, params = Hyde::Util.parse_value(data)
+  kvpair, params = Hyde::Util::ParserCommon.parse_value(
+    data,
+    regexp: Hyde::Util::HeaderRegexp::COOKIE_PARAM
+  )
   key, value = kvpair.split("=").map(&:strip)
   Cookie.new(key, value, params)
 end
@@ -738,15 +760,15 @@
 
 
-17
-18
-19
+26 +27 +28
-
# File 'lib/hyde/util/cookie.rb', line 17
+      
# File 'lib/hyde/util/cookie.rb', line 26
 
 def to_s
-  Hyde::Util.make_value(to_short, @params)
+  Hyde::Util.make_value(to_short, @params)
 end
@@ -778,12 +800,12 @@
 
 
-22
-23
-24
+31 +32 +33
-
# File 'lib/hyde/util/cookie.rb', line 22
+      
# File 'lib/hyde/util/cookie.rb', line 31
 
 def to_short
   "#{key.to_s.strip}=#{value.to_s.strip}"
@@ -798,7 +820,7 @@
 
 
       
diff --git a/doc/Hyde/DSL.html b/doc/Hyde/DSL.html
index 84165ad..b8ed01d 100644
--- a/doc/Hyde/DSL.html
+++ b/doc/Hyde/DSL.html
@@ -117,7 +117,7 @@
 
 
       
diff --git a/doc/Hyde/DSL/CommonMethods.html b/doc/Hyde/DSL/CommonMethods.html
index 1435c78..506563a 100644
--- a/doc/Hyde/DSL/CommonMethods.html
+++ b/doc/Hyde/DSL/CommonMethods.html
@@ -327,7 +327,7 @@
 
 
       
diff --git a/doc/Hyde/DSL/PathConstructors.html b/doc/Hyde/DSL/PathConstructors.html
index dda3a22..85beb8b 100644
--- a/doc/Hyde/DSL/PathConstructors.html
+++ b/doc/Hyde/DSL/PathConstructors.html
@@ -859,7 +859,7 @@
 
 def register(obj)
   unless obj.is_a? Hyde::Node
-    raise StandardError, "register accepts node children only"
+    raise ArgumentError, "register accepts node children only"
   end
 
   @origin.children.append(obj)
@@ -954,7 +954,7 @@
 
 
       
diff --git a/doc/Hyde/DSL/PathMethods.html b/doc/Hyde/DSL/PathMethods.html
index 8899da7..ab46ee9 100644
--- a/doc/Hyde/DSL/PathMethods.html
+++ b/doc/Hyde/DSL/PathMethods.html
@@ -417,7 +417,7 @@ Blocks path access if a filter returns false.

when String @origin.properties['index'] = [index] else - raise StandardError, "index should be an Array or a String" + raise ArgumentError, "index should be an Array or a String" end end
@@ -483,7 +483,7 @@ Blocks path access if a filter returns false.

def plugin(filename) self.define_singleton_method(:run) do |object| unless object.is_a? Hyde::Node - raise StandardError, "not a node instance or subclass instance" + raise ArgumentError, "not a node instance or subclass instance" end object @@ -681,10 +681,6 @@ Does not modify path execution.

- — -

ath [String

-
- @@ -740,10 +736,6 @@ Does not modify path execution.

- — -

ath [String

-
- @@ -775,7 +767,7 @@ Does not modify path execution.

diff --git a/doc/Hyde/DSL/ProbeConstructors.html b/doc/Hyde/DSL/ProbeConstructors.html index bf51d60..d0da29a 100644 --- a/doc/Hyde/DSL/ProbeConstructors.html +++ b/doc/Hyde/DSL/ProbeConstructors.html @@ -317,7 +317,7 @@ diff --git a/doc/Hyde/DSL/ProbeMethods.html b/doc/Hyde/DSL/ProbeMethods.html index db97c8d..b6447e4 100644 --- a/doc/Hyde/DSL/ProbeMethods.html +++ b/doc/Hyde/DSL/ProbeMethods.html @@ -116,6 +116,29 @@
  • + #escape_html(text) ⇒ Object + + + + + + + + + + + + + +

    Escape HTML entities.

    +
    + +
  • + + +
  • + + #file(path, mode = "r", *all, &block) ⇒ Object @@ -273,6 +296,29 @@

    Set response status (generate response if one doesn't exist yet).

    +
  • + + +
  • + + + #unescape_html(text) ⇒ Object + + + + + + + + + + + + + +

    Unescape HTML entities.

    +
    +
  • @@ -286,7 +332,54 @@
    -

    +

    + + #escape_html(text) ⇒ Object + + + + + +

    +
    +

    Escape HTML entities

    + + +
    +
    +
    + + +

    See Also:

    + + +
    + + + + +
    +
    +
    +
    +99
    +100
    +101
    +
    +
    # File 'lib/hyde/dsl/methods_probe.rb', line 99
    +
    +def escape_html(text)
    +  Hyde::Util.escape_html(text)
    +end
    +
    +
    + +
    +

    #file(path, mode = "r", *all, &block) ⇒ Object @@ -307,7 +400,7 @@

    See Also:

      -
    • File#open
    • +
    • File.open
    @@ -317,12 +410,12 @@
     
     
    -88
    -89
    -90
    +93 +94 +95

    -
    # File 'lib/hyde/dsl/methods_probe.rb', line 88
    +      
    # File 'lib/hyde/dsl/methods_probe.rb', line 93
     
     def file(path, mode = "r", *all, &block)
       File.open("#{request.filepath}/#{path}", mode, *all, &block)
    @@ -370,18 +463,22 @@
           
     
     
    -79
    -80
    -81
     82
     83
    -84
    +84 +85 +86 +87 +88 +89
    -
    # File 'lib/hyde/dsl/methods_probe.rb', line 79
    +      
    # File 'lib/hyde/dsl/methods_probe.rb', line 82
     
     def form
    -  _, opts = Hyde::Util.parse_value(request.headers["content-type"])
    +  _, opts = Hyde::Util::ParserCommon.parse_value(
    +    request.headers["content-type"]
    +  )
       Hyde::Util::MultipartParser.new(
         request.input, opts["boundary"]
       ).to_h
    @@ -429,7 +526,6 @@
           
     
     
    -67
     68
     69
     70
    @@ -437,13 +533,18 @@
     72
     73
     74
    -75
    +75 +76 +77 +78
    -
    # File 'lib/hyde/dsl/methods_probe.rb', line 67
    +      
    # File 'lib/hyde/dsl/methods_probe.rb', line 68
     
     def form?
    -  value, opts = Hyde::Util.parse_value(request.headers["content-type"])
    +  value, opts = Hyde::Util::ParserCommon.parse_value(
    +    request.headers["content-type"]
    +  )
       if value == "multipart/form-data" and
          opts["boundary"]
         true
    @@ -515,7 +616,6 @@
           
     
     
    -29
     30
     31
     32
    @@ -529,20 +629,21 @@
     40
     41
     42
    -43
    +43 +44
    -
    # File 'lib/hyde/dsl/methods_probe.rb', line 29
    +      
    # File 'lib/hyde/dsl/methods_probe.rb', line 30
     
     def header(key, value)
       return status(value) if key.downcase == "status"
     
    -  if key.match(/(?:[(),\/:;<=>?@\[\]{}"]|[^ -~])/)
    -    raise StandardError, "header key has invalid characters"
    +  if key.match(Hyde::Util::HeaderRegexp::TOKEN)
    +    raise ArgumentError, "header key has invalid characters"
       end
     
    -  if value.match(/[^ -~]/)
    -    raise StandardError, "value key has invalid characters"
    +  if value&.match(Hyde::Util::HeaderRegexp::PRINTABLE)
    +    raise ArgumentError, "value key has invalid characters"
       end
     
       @origin.response = (@origin.response or Hyde::Response.new)
    @@ -616,7 +717,6 @@ If no value is provided, deletes all key entries

     
     
    -49
     50
     51
     52
    @@ -630,22 +730,23 @@ If no value is provided, deletes all key entries

    60 61 62 -63
    +63 +64
    -
    # File 'lib/hyde/dsl/methods_probe.rb', line 49
    +      
    # File 'lib/hyde/dsl/methods_probe.rb', line 50
     
     def remove_header(key, value = nil)
       return unless @origin.response
     
       return if key.downcase == "status"
     
    -  if key.match(/(?:[(),\/:;<=>?@\[\]{}"]|[^ -~])/)
    -    raise StandardError, "header key has invalid characters"
    +  if key.match(Hyde::Util::HeaderRegexp::TOKEN)
    +    raise ArgumentError, "header key has invalid characters"
       end
     
    -  if value&.match(/[^ -~]/)
    -    raise StandardError, "value key has invalid characters"
    +  if value&.match(Hyde::Util::HeaderRegexp::PRINTABLE)
    +    raise ArgumentError, "value key has invalid characters"
       end
     
       @origin.response.delete_header(key, value)
    @@ -693,12 +794,12 @@ If no value is provided, deletes all key entries

     
     
    -13
     14
    -15
    +15 +16
    -
    # File 'lib/hyde/dsl/methods_probe.rb', line 13
    +      
    # File 'lib/hyde/dsl/methods_probe.rb', line 14
     
     def request
       @origin.request
    @@ -756,13 +857,13 @@ If no value is provided, deletes all key entries

     
     
    -19
     20
     21
    -22
    +22 +23
    -
    # File 'lib/hyde/dsl/methods_probe.rb', line 19
    +      
    # File 'lib/hyde/dsl/methods_probe.rb', line 20
     
     def status(status)
       @origin.response = (@origin.response or Hyde::Response.new)
    @@ -771,6 +872,53 @@ If no value is provided, deletes all key entries

    + + +
    +

    + + #unescape_html(text) ⇒ Object + + + + + +

    +
    +

    Unescape HTML entities

    + + +
    +
    +
    + + +

    See Also:

    + + +
    + + + + +
    +
    +
    +
    +105
    +106
    +107
    +
    +
    # File 'lib/hyde/dsl/methods_probe.rb', line 105
    +
    +def unescape_html(text)
    +  Hyde::Util.unescape_html(text)
    +end
    +
    @@ -778,7 +926,7 @@ If no value is provided, deletes all key entries

    diff --git a/doc/Hyde/DSL/TemplateMethods.html b/doc/Hyde/DSL/TemplateMethods.html index 3b42a87..ee6e23f 100644 --- a/doc/Hyde/DSL/TemplateMethods.html +++ b/doc/Hyde/DSL/TemplateMethods.html @@ -190,7 +190,7 @@ diff --git a/doc/Hyde/Error.html b/doc/Hyde/Error.html new file mode 100644 index 0000000..1c6964a --- /dev/null +++ b/doc/Hyde/Error.html @@ -0,0 +1,138 @@ + + + + + + + Exception: Hyde::Error + + — Documentation by YARD 0.9.34 + + + + + + + + + + + + + + + + + + + +
    + + +

    Exception: Hyde::Error + + + +

    +
    + +
    +
    Inherits:
    +
    + StandardError + +
      +
    • Object
    • + + + + + +
    + show all + +
    +
    + + + + + + + + + + + +
    +
    Defined in:
    +
    lib/hyde/util/errors.rb
    +
    + +
    + +

    Overview

    +
    +

    Generic error class, as recommended by Ruby documentation.

    + + +
    +
    +
    + + +
    +

    Direct Known Subclasses

    +

    ParsingError

    +
    + + + + + + + + + + +
    + + + +
    + + \ No newline at end of file diff --git a/doc/Hyde/Handlers.html b/doc/Hyde/Handlers.html index 454c598..83d1c61 100644 --- a/doc/Hyde/Handlers.html +++ b/doc/Hyde/Handlers.html @@ -117,7 +117,7 @@ diff --git a/doc/Hyde/Handlers/CONNECT.html b/doc/Hyde/Handlers/CONNECT.html index 39b54b3..cb7913c 100644 --- a/doc/Hyde/Handlers/CONNECT.html +++ b/doc/Hyde/Handlers/CONNECT.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/DELETE.html b/doc/Hyde/Handlers/DELETE.html index 4c76647..1cd40c1 100644 --- a/doc/Hyde/Handlers/DELETE.html +++ b/doc/Hyde/Handlers/DELETE.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/GET.html b/doc/Hyde/Handlers/GET.html index a727d53..e8ad466 100644 --- a/doc/Hyde/Handlers/GET.html +++ b/doc/Hyde/Handlers/GET.html @@ -350,7 +350,7 @@ Request's #splat and #param are passed to block.

    diff --git a/doc/Hyde/Handlers/HEAD.html b/doc/Hyde/Handlers/HEAD.html index 9f50cb1..91a32be 100644 --- a/doc/Hyde/Handlers/HEAD.html +++ b/doc/Hyde/Handlers/HEAD.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/Handler.html b/doc/Hyde/Handlers/Handler.html index 53722e7..b023bcf 100644 --- a/doc/Hyde/Handlers/Handler.html +++ b/doc/Hyde/Handlers/Handler.html @@ -587,7 +587,7 @@ Request's #splat and #param are passed to block.

    diff --git a/doc/Hyde/Handlers/OPTIONS.html b/doc/Hyde/Handlers/OPTIONS.html index a560b8a..18161bd 100644 --- a/doc/Hyde/Handlers/OPTIONS.html +++ b/doc/Hyde/Handlers/OPTIONS.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/PATCH.html b/doc/Hyde/Handlers/PATCH.html index 7f848f4..b92c5b3 100644 --- a/doc/Hyde/Handlers/PATCH.html +++ b/doc/Hyde/Handlers/PATCH.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/POST.html b/doc/Hyde/Handlers/POST.html index 8793c37..5aaf444 100644 --- a/doc/Hyde/Handlers/POST.html +++ b/doc/Hyde/Handlers/POST.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/PUT.html b/doc/Hyde/Handlers/PUT.html index 8d25ec2..2aeb100 100644 --- a/doc/Hyde/Handlers/PUT.html +++ b/doc/Hyde/Handlers/PUT.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/Serve.html b/doc/Hyde/Handlers/Serve.html index 3442688..6adbff5 100644 --- a/doc/Hyde/Handlers/Serve.html +++ b/doc/Hyde/Handlers/Serve.html @@ -459,7 +459,7 @@ Tries to serve files matched by handler

    diff --git a/doc/Hyde/Handlers/TRACE.html b/doc/Hyde/Handlers/TRACE.html index 5d1c505..c319859 100644 --- a/doc/Hyde/Handlers/TRACE.html +++ b/doc/Hyde/Handlers/TRACE.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Node.html b/doc/Hyde/Node.html index 1dc0019..8d5957b 100644 --- a/doc/Hyde/Node.html +++ b/doc/Hyde/Node.html @@ -692,7 +692,7 @@ Does nothing by default, behaviour should be overriden through

    diff --git a/doc/Hyde/ParsingError.html b/doc/Hyde/ParsingError.html new file mode 100644 index 0000000..b2e3c0a --- /dev/null +++ b/doc/Hyde/ParsingError.html @@ -0,0 +1,142 @@ + + + + + + + Exception: Hyde::ParsingError + + — Documentation by YARD 0.9.34 + + + + + + + + + + + + + + + + + + + +
    + + +

    Exception: Hyde::ParsingError + + + +

    +
    + +
    +
    Inherits:
    +
    + Error + +
      +
    • Object
    • + + + + + + + +
    + show all + +
    +
    + + + + + + + + + + + +
    +
    Defined in:
    +
    lib/hyde/util/errors.rb
    +
    + +
    + +

    Overview

    +
    +

    Error class raised by hyde/util/parseutils module.

    + + +
    +
    +
    + + +
    + + + + + + + + + + + + + + + +
    + + + +
    + + \ No newline at end of file diff --git a/doc/Hyde/Path.html b/doc/Hyde/Path.html index 7252e27..17e3c53 100644 --- a/doc/Hyde/Path.html +++ b/doc/Hyde/Path.html @@ -887,7 +887,7 @@ Finds the next appropriate path to go to.

    diff --git a/doc/Hyde/PathContext.html b/doc/Hyde/PathContext.html index c0cb6ba..f2ce1b0 100644 --- a/doc/Hyde/PathContext.html +++ b/doc/Hyde/PathContext.html @@ -232,7 +232,7 @@ diff --git a/doc/Hyde/Pattern.html b/doc/Hyde/Pattern.html index 0d7df14..b48ad74 100644 --- a/doc/Hyde/Pattern.html +++ b/doc/Hyde/Pattern.html @@ -542,7 +542,7 @@ Lighter version of match that doesn't assign any variables.

    diff --git a/doc/Hyde/PatternMatching.html b/doc/Hyde/PatternMatching.html index 72352ce..f7b9650 100644 --- a/doc/Hyde/PatternMatching.html +++ b/doc/Hyde/PatternMatching.html @@ -231,7 +231,7 @@ Used primarily to create patterns for path definitions.

    diff --git a/doc/Hyde/PatternMatching/Glob.html b/doc/Hyde/PatternMatching/Glob.html index 97b33fa..a86db66 100644 --- a/doc/Hyde/PatternMatching/Glob.html +++ b/doc/Hyde/PatternMatching/Glob.html @@ -638,7 +638,7 @@ Lighter version of match that doesn't assign any variables.

    diff --git a/doc/Hyde/PatternMatching/ReMatch.html b/doc/Hyde/PatternMatching/ReMatch.html index 2a12d0d..4d33f18 100644 --- a/doc/Hyde/PatternMatching/ReMatch.html +++ b/doc/Hyde/PatternMatching/ReMatch.html @@ -547,7 +547,7 @@ Lighter version of match that doesn't assign any variables.

    diff --git a/doc/Hyde/Probe.html b/doc/Hyde/Probe.html index 8a0c092..5c58e55 100644 --- a/doc/Hyde/Probe.html +++ b/doc/Hyde/Probe.html @@ -455,7 +455,7 @@ This behaviour should only be used internally.

    diff --git a/doc/Hyde/ProbeContext.html b/doc/Hyde/ProbeContext.html index 1a56156..314a636 100644 --- a/doc/Hyde/ProbeContext.html +++ b/doc/Hyde/ProbeContext.html @@ -178,7 +178,7 @@

    Methods included from DSL::ProbeMethods

    -

    #file, #form, #form?, #header, #remove_header, #request, #status

    +

    #escape_html, #file, #form, #form?, #header, #remove_header, #request, #status, #unescape_html

    @@ -239,7 +239,7 @@ diff --git a/doc/Hyde/ProcessorContext.html b/doc/Hyde/ProcessorContext.html index c4bc452..d600ae6 100644 --- a/doc/Hyde/ProcessorContext.html +++ b/doc/Hyde/ProcessorContext.html @@ -217,7 +217,7 @@ diff --git a/doc/Hyde/Request.html b/doc/Hyde/Request.html index 853a74a..cd4f3bb 100644 --- a/doc/Hyde/Request.html +++ b/doc/Hyde/Request.html @@ -1538,7 +1538,7 @@ diff --git a/doc/Hyde/Response.html b/doc/Hyde/Response.html index eb300b3..42a8eba 100644 --- a/doc/Hyde/Response.html +++ b/doc/Hyde/Response.html @@ -1140,7 +1140,7 @@ If no value is provided, deletes all key entries

    diff --git a/doc/Hyde/Server.html b/doc/Hyde/Server.html index 2a00424..a64c5a4 100644 --- a/doc/Hyde/Server.html +++ b/doc/Hyde/Server.html @@ -432,7 +432,7 @@ although server nesting for the purpose of creating virtual hosts is allowed.

    diff --git a/doc/Hyde/ServerContext.html b/doc/Hyde/ServerContext.html index 4b1aff6..da1c964 100644 --- a/doc/Hyde/ServerContext.html +++ b/doc/Hyde/ServerContext.html @@ -152,7 +152,7 @@ diff --git a/doc/Hyde/Template.html b/doc/Hyde/Template.html index 254ce83..5f044f8 100644 --- a/doc/Hyde/Template.html +++ b/doc/Hyde/Template.html @@ -756,7 +756,7 @@ diff --git a/doc/Hyde/TemplateContext.html b/doc/Hyde/TemplateContext.html index 4e16373..331ffa9 100644 --- a/doc/Hyde/TemplateContext.html +++ b/doc/Hyde/TemplateContext.html @@ -211,7 +211,7 @@

    Methods included from DSL::ProbeMethods

    -

    #file, #form, #form?, #header, #remove_header, #request, #status

    +

    #escape_html, #file, #form, #form?, #header, #remove_header, #request, #status, #unescape_html

    @@ -332,7 +332,7 @@ diff --git a/doc/Hyde/Templates.html b/doc/Hyde/Templates.html index a528448..94d6577 100644 --- a/doc/Hyde/Templates.html +++ b/doc/Hyde/Templates.html @@ -117,7 +117,7 @@ diff --git a/doc/Hyde/Templates/ERB.html b/doc/Hyde/Templates/ERB.html index 72bc568..8707eb5 100644 --- a/doc/Hyde/Templates/ERB.html +++ b/doc/Hyde/Templates/ERB.html @@ -302,7 +302,7 @@ diff --git a/doc/Hyde/Templates/Erubi.html b/doc/Hyde/Templates/Erubi.html index b507718..7abb91b 100644 --- a/doc/Hyde/Templates/Erubi.html +++ b/doc/Hyde/Templates/Erubi.html @@ -320,7 +320,7 @@ diff --git a/doc/Hyde/Util.html b/doc/Hyde/Util.html index 49287e0..db4cb24 100644 --- a/doc/Hyde/Util.html +++ b/doc/Hyde/Util.html @@ -79,7 +79,7 @@
    Defined in:
    lib/hyde/util/lookup.rb,
    - lib/hyde/util/html.rb,
    lib/hyde/util/query.rb,
    lib/hyde/util/header.rb,
    lib/hyde/util/sorting.rb,
    lib/hyde/util/multipart.rb
    + lib/hyde/util/html.rb,
    lib/hyde/util/query.rb,
    lib/hyde/util/multipart.rb,
    lib/hyde/util/parseutils.rb,
    lib/hyde/util/parsesorting.rb
    @@ -99,7 +99,7 @@

    - Modules: ParserCommon + Modules: HeaderRegexp, ParserCommon, ParserSorting @@ -245,52 +245,6 @@ Taken from WEBrick

    - - - -
  • - - - .make_value(input, opts, sep = ";") ⇒ String - - - - - - - - - - - - - -

    Construct a parametrized header value.

    -
    - -
  • - - -
  • - - - .parse_value(input, sep = ";") ⇒ Array(String, Hash) - - - - - - - - - - - - - -

    Parse parametrized header values.

    -
    -
  • @@ -398,8 +352,6 @@ Taken from WEBrick -87 -88 89 90 91 @@ -425,10 +377,12 @@ Taken from WEBrick # File 'lib/hyde/util/html.rb', line 87 +
    # File 'lib/hyde/util/html.rb', line 89
     
     def self.default_error_page(code, backtrace)
       backtrace ||= []
    @@ -477,12 +431,11 @@ Taken from WEBrick 
         Note:
    -    

    Do not use this to inject untrusted input into JavaScript code

    +

    Do not use this to inject untrusted input into JavaScript code or CSS style of the page.

    Return string with escaped HTML entities. -or CSS style of the page. This function is not adequate to prevent string interpolation.

    @@ -525,221 +478,21 @@ This function is not adequate to prevent string interpolation.

     
     
    +69
     70
     71
    -72
    +72 +73 +74
    -
    # File 'lib/hyde/util/html.rb', line 70
    +      
    # File 'lib/hyde/util/html.rb', line 69
     
     def self.escape_html(str)
    -  CGI.escapeHTML(str)
    -end
    - - - - - -
    -

    - - .make_value(input, opts, sep = ";") ⇒ String - - - - - -

    -
    -

    Construct a parametrized header value

    - - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - input - - - (String) - - - -
    • - -
    • - - opts - - - (Hash) - - - -
    • - -
    - -

    Returns:

    -
      - -
    • - - - (String) - - - -
    • - -
    - -
    - - - - -
    -
    -
    -
    -30
    -31
    -32
    -33
    -34
    -35
    -36
    -37
    -38
    -39
    -40
    -41
    -42
    -43
    -44
    -
    -
    # File 'lib/hyde/util/header.rb', line 30
    -
    -def self.make_value(input, opts, sep = ";")
    -  unless input.match?(/^[\w!#$%&'*+-.^_`|~]*=?[^[:cntrl:]\\",;]+$/)
    -    raise StandardError, "input format is invalid"
    +  str = CGI.escapeHTML(str)
    +  str.gsub(/[^\x1-\x7E]/) do |match|
    +    "&##{match.ord};"
       end
    -
    -  output = input
    -  opts.each do |key, value|
    -    output += if value.is_a? String
    -                "#{sep} #{key}=#{value}"
    -              else
    -                "#{sep} #{key}"
    -              end
    -  end
    -  output
    -end
    -
    -
    - -
    -

    - - .parse_value(input, sep = ";") ⇒ Array(String, Hash) - - - - - -

    -
    -

    Parse parametrized header values

    - - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - input - - - (String) - - - -
    • - -
    • - - sep - - - (String, Regexp) - - - (defaults to: ";") - - -
    • - -
    - -

    Returns:

    -
      - -
    • - - - (Array(String, Hash)) - - - -
    • - -
    - -
    - - - @@ -799,12 +552,12 @@ This function is not adequate to prevent string interpolation.

     
     
    -77
    -78
    -79
    +79 +80 +81 @@ -440,8 +479,6 @@
     
     
    -17
    -18
     19
     20
     21
    @@ -453,10 +490,20 @@
     27
     28
     29
    -30
    +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 @@ -504,8 +559,6 @@
     
     
    -17
    -18
     19
     20
     21
    @@ -517,10 +570,20 @@
     27
     28
     29
    -30
    +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 @@ -568,8 +639,6 @@
     
     
    -17
    -18
     19
     20
     21
    @@ -581,10 +650,20 @@
     27
     28
     29
    -30
    +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 @@ -613,7 +700,53 @@
    -

    +

    + + #decode(data) ⇒ Object + + + + + +

    +
    +

    Decode charset parameter

    + + +
    +
    +
    + + +
    -
    -
    -
    -11
    -12
    -13
    -14
    -15
    -16
    -17
    -18
    -19
    -20
    -21
    -22
    -23
    -24
    -
    -
    # File 'lib/hyde/util/header.rb', line 11
    -
    -def self.parse_value(input, sep = ";")
    -  parts = input.split(sep).map { |x| URI.decode_uri_component(x).strip }
    -  base = parts.shift
    -  opts = parts.map do |raw|
    -    key, value = raw.match(/
    -        \A                    # beginning of string
    -        ([!-~&&[^=;,]]+)      # key
    -        (?:=([\s!-~&&[^;,]]*)|) # optional value
    -        \Z                    # end of sting
    -    /x).to_a[1..]
    -    [key, ((value&.match?(/^".*"$/) ? value[1..-2] : value) or true)]
    -  end.to_h
    -  [base, opts]
     end
    -
    # File 'lib/hyde/util/html.rb', line 77
    +      
    # File 'lib/hyde/util/html.rb', line 79
     
     def self.unescape_html(str)
       CGI.unescapeHTML(str)
    @@ -819,7 +572,7 @@ This function is not adequate to prevent string interpolation.

    diff --git a/doc/Hyde/Util/FormPart.html b/doc/Hyde/Util/FormPart.html index fe45777..c533f40 100644 --- a/doc/Hyde/Util/FormPart.html +++ b/doc/Hyde/Util/FormPart.html @@ -246,6 +246,29 @@
  • + #decode(data) ⇒ Object + + + + + + + + + + + + + +

    Decode charset parameter.

    +
    + +
  • + + +
  • + + #file? ⇒ Boolean @@ -376,8 +399,6 @@
     
     
    -17
    -18
     19
     20
     21
    @@ -389,10 +410,20 @@
     27
     28
     29
    -30
    +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40
  • -
    # File 'lib/hyde/util/multipart.rb', line 17
    +      
    # File 'lib/hyde/util/multipart.rb', line 19
     
     FormPart = Struct.new(:data, :name, :filename,
                           :filetype, :tempfile, :headers) do
    @@ -402,10 +433,18 @@
         !tempfile.nil?
       end
     
    +  # Decode charset parameter
    +  def decode(data)
    +    data = Hyde::Util.unescape_html(data)
    +    return data unless self.headers['charset']
    +
    +    data.force_encoding(self.headers['charset']).encode("UTF-8")
    +  end
    +
       # If FormPart is not a file, simplify to string.
       # @return [FormPart, String]
       def simplify
    -    file? ? self : self.data
    +    file? ? self : decode(self.data)
       end
     end
    -
    # File 'lib/hyde/util/multipart.rb', line 17
    +      
    # File 'lib/hyde/util/multipart.rb', line 19
     
     FormPart = Struct.new(:data, :name, :filename,
                           :filetype, :tempfile, :headers) do
    @@ -466,10 +513,18 @@
         !tempfile.nil?
       end
     
    +  # Decode charset parameter
    +  def decode(data)
    +    data = Hyde::Util.unescape_html(data)
    +    return data unless self.headers['charset']
    +
    +    data.force_encoding(self.headers['charset']).encode("UTF-8")
    +  end
    +
       # If FormPart is not a file, simplify to string.
       # @return [FormPart, String]
       def simplify
    -    file? ? self : self.data
    +    file? ? self : decode(self.data)
       end
     end
    -
    # File 'lib/hyde/util/multipart.rb', line 17
    +      
    # File 'lib/hyde/util/multipart.rb', line 19
     
     FormPart = Struct.new(:data, :name, :filename,
                           :filetype, :tempfile, :headers) do
    @@ -530,10 +593,18 @@
         !tempfile.nil?
       end
     
    +  # Decode charset parameter
    +  def decode(data)
    +    data = Hyde::Util.unescape_html(data)
    +    return data unless self.headers['charset']
    +
    +    data.force_encoding(self.headers['charset']).encode("UTF-8")
    +  end
    +
       # If FormPart is not a file, simplify to string.
       # @return [FormPart, String]
       def simplify
    -    file? ? self : self.data
    +    file? ? self : decode(self.data)
       end
     end
    -
    # File 'lib/hyde/util/multipart.rb', line 17
    +      
    # File 'lib/hyde/util/multipart.rb', line 19
     
     FormPart = Struct.new(:data, :name, :filename,
                           :filetype, :tempfile, :headers) do
    @@ -594,10 +673,18 @@
         !tempfile.nil?
       end
     
    +  # Decode charset parameter
    +  def decode(data)
    +    data = Hyde::Util.unescape_html(data)
    +    return data unless self.headers['charset']
    +
    +    data.force_encoding(self.headers['charset']).encode("UTF-8")
    +  end
    +
       # If FormPart is not a file, simplify to string.
       # @return [FormPart, String]
       def simplify
    -    file? ? self : self.data
    +    file? ? self : decode(self.data)
       end
     end
    + + + + +
    +
    +
    +
    +28
    +29
    +30
    +31
    +32
    +33
    +
    +
    # File 'lib/hyde/util/multipart.rb', line 28
    +
    +def decode(data)
    +  data = Hyde::Util.unescape_html(data)
    +  return data unless self.headers['charset']
    +
    +  data.force_encoding(self.headers['charset']).encode("UTF-8")
    +end
    +
    +
    + +
    +

    #file?Boolean @@ -650,12 +783,12 @@
     
     
    -21
    -22
    -23
    +23 +24 +25

    -
    # File 'lib/hyde/util/multipart.rb', line 21
    +      
    # File 'lib/hyde/util/multipart.rb', line 23
     
     def file?
       !tempfile.nil?
    @@ -690,8 +823,6 @@
           
     
     
    -17
    -18
     19
     20
     21
    @@ -703,10 +834,20 @@
     27
     28
     29
    -30
    +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40
    -
    # File 'lib/hyde/util/multipart.rb', line 17
    +      
    # File 'lib/hyde/util/multipart.rb', line 19
     
     FormPart = Struct.new(:data, :name, :filename,
                           :filetype, :tempfile, :headers) do
    @@ -716,10 +857,18 @@
         !tempfile.nil?
       end
     
    +  # Decode charset parameter
    +  def decode(data)
    +    data = Hyde::Util.unescape_html(data)
    +    return data unless self.headers['charset']
    +
    +    data.force_encoding(self.headers['charset']).encode("UTF-8")
    +  end
    +
       # If FormPart is not a file, simplify to string.
       # @return [FormPart, String]
       def simplify
    -    file? ? self : self.data
    +    file? ? self : decode(self.data)
       end
     end
    @@ -765,15 +914,15 @@
     
     
    -27
    -28
    -29
    +37 +38 +39
    -
    # File 'lib/hyde/util/multipart.rb', line 27
    +      
    # File 'lib/hyde/util/multipart.rb', line 37
     
     def simplify
    -  file? ? self : self.data
    +  file? ? self : decode(self.data)
     end
    @@ -805,8 +954,6 @@
     
     
    -17
    -18
     19
     20
     21
    @@ -818,10 +965,20 @@
     27
     28
     29
    -30
    +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40
    -
    # File 'lib/hyde/util/multipart.rb', line 17
    +      
    # File 'lib/hyde/util/multipart.rb', line 19
     
     FormPart = Struct.new(:data, :name, :filename,
                           :filetype, :tempfile, :headers) do
    @@ -831,10 +988,18 @@
         !tempfile.nil?
       end
     
    +  # Decode charset parameter
    +  def decode(data)
    +    data = Hyde::Util.unescape_html(data)
    +    return data unless self.headers['charset']
    +
    +    data.force_encoding(self.headers['charset']).encode("UTF-8")
    +  end
    +
       # If FormPart is not a file, simplify to string.
       # @return [FormPart, String]
       def simplify
    -    file? ? self : self.data
    +    file? ? self : decode(self.data)
       end
     end
    @@ -847,7 +1012,7 @@ diff --git a/doc/Hyde/Util/HeaderRegexp.html b/doc/Hyde/Util/HeaderRegexp.html new file mode 100644 index 0000000..b98f8f4 --- /dev/null +++ b/doc/Hyde/Util/HeaderRegexp.html @@ -0,0 +1,274 @@ + + + + + + + Module: Hyde::Util::HeaderRegexp + + — Documentation by YARD 0.9.34 + + + + + + + + + + + + + + + + + + + +
    + + +

    Module: Hyde::Util::HeaderRegexp + + + +

    +
    + + + + + + + + + + + +
    +
    Defined in:
    +
    lib/hyde/util/parseutils.rb
    +
    + +
    + +

    Overview

    +
    +

    (not exactly precise) Regular expressions for some RFC definitions

    + + +
    +
    +
    + + +
    + +

    + Constant Summary + collapse +

    + +
    + +
    TOKEN = +
    +
    +

    Matches the RFC2616 definiton of token

    + + +
    +
    +
    + + +
    +
    +
    /[!-~&&[^()<>@,;:\\"\/\[\]?={}\t]]+/.freeze
    + +
    QUOTED = +
    +
    +

    Matches the RFC2616 definition of quoted-string

    + + +
    +
    +
    + + +
    +
    +
    /"[\x0-\x7E&&[^\x1-\x8\xb-\x1f]]*(?<!\\)"/.freeze
    + +
    PRINTCHAR = +
    +
    +

    Matches any CHAR except CTLs

    + + +
    +
    +
    + + +
    +
    +
    /[\x2-\x7E]/.freeze
    + +
    PRINTABLE = +
    +
    +

    Matches 1 or more CHARs excluding CTLs

    + + +
    +
    +
    + + +
    +
    +
    /#{PRINTCHAR}+/o.freeze
    + + +
    /[\x21-\x7E&&[^",;\\]]*/.freeze
    + + +
    /(?:#{QUOTED}|#{COOKIE_OCTET})/o.freeze
    + + +
    TOKEN
    + + +
    /\A(#{COOKIE_NAME})=(#{COOKIE_VALUE})\Z/o.freeze
    + +
    PARAM_QUOTED = +
    +
    +

    Matches a very abstract definition of a quoted header paramter. +Captures name (1) and value (2).

    + + +
    +
    +
    + + +
    +
    +
    /\A(#{TOKEN})=?(#{QUOTED}|#{PRINTCHAR}*)\Z/o.freeze
    + +
    PARAM = +
    +
    +

    Matches a very abstract definition of a header parameter. +Captures name (1) and value (2).

    + + +
    +
    +
    + + +
    +
    +
    /\A(#{TOKEN})=?(#{PRINTCHAR}*)\Z/o.freeze
    + + +
    /\A(#{TOKEN})=?(#{QUOTED}|#{COOKIE_OCTET})\Z/o.freeze
    + +
    + + + + + + + + + + +
    + + + +
    + + \ No newline at end of file diff --git a/doc/Hyde/Util/Lookup.html b/doc/Hyde/Util/Lookup.html index 777d470..ec5a18f 100644 --- a/doc/Hyde/Util/Lookup.html +++ b/doc/Hyde/Util/Lookup.html @@ -589,7 +589,7 @@ diff --git a/doc/Hyde/Util/MultipartParser.html b/doc/Hyde/Util/MultipartParser.html index 92a54bb..5953275 100644 --- a/doc/Hyde/Util/MultipartParser.html +++ b/doc/Hyde/Util/MultipartParser.html @@ -89,7 +89,7 @@
    Includes:
    -
    ParserCommon
    +
    ParserSorting
    @@ -237,15 +237,15 @@
     
     
    -35
    -36
    -37
    -38
    -39
    -40
    +45 +46 +47 +48 +49 +50
    -
    # File 'lib/hyde/util/multipart.rb', line 35
    +      
    # File 'lib/hyde/util/multipart.rb', line 45
     
     def initialize(io, boundary)
       @input = io.is_a?(String) ? StringIO.new(io) : io
    @@ -303,16 +303,6 @@
           
     
     
    -48
    -49
    -50
    -51
    -52
    -53
    -54
    -55
    -56
    -57
     58
     59
     60
    @@ -355,10 +345,20 @@
     97
     98
     99
    -100
    +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110
    -
    # File 'lib/hyde/util/multipart.rb', line 48
    +      
    # File 'lib/hyde/util/multipart.rb', line 58
     
     def parse
       return @data unless @data.empty?
    @@ -457,12 +457,12 @@
           
     
     
    -106
    -107
    -108
    +116 +117 +118
    -
    # File 'lib/hyde/util/multipart.rb', line 106
    +      
    # File 'lib/hyde/util/multipart.rb', line 116
     
     def to_h
       flatten(sort(gen_hash(parse)))
    @@ -477,7 +477,7 @@
     
     
           
    diff --git a/doc/Hyde/Util/ParserCommon.html b/doc/Hyde/Util/ParserCommon.html
    index 2e255e0..eef0692 100644
    --- a/doc/Hyde/Util/ParserCommon.html
    +++ b/doc/Hyde/Util/ParserCommon.html
    @@ -74,23 +74,18 @@
       
     
       
    -  
    -
    Included in:
    -
    MultipartParser, Query
    -
    -
    Defined in:
    -
    lib/hyde/util/sorting.rb
    +
    lib/hyde/util/parseutils.rb

    Overview

    -

    Internal library for generating form hashes

    +

    Module for all things related to parsing HTTP and related syntax.

    @@ -99,6 +94,31 @@
    + +

    + Constant Summary + collapse +

    + +
    + +
    RFC1123_DATE = +
    +
    +

    strftime parameter to return a correct RFC 1123 date.

    + + +
    +
    +
    + + +
    +
    +
    "%a, %d %b %Y %H:%M:%S GMT"
    + +
    + @@ -106,11 +126,347 @@ + +

    + Class Method Summary + collapse +

    + + + + + + +
    +

    Class Method Details

    + + +
    +

    + + .make_value(input, opts, sep = ";") ⇒ String + + + + + +

    +
    +

    Construct a parametrized header value. +Does some input sanitization during construction

    + + +
    +
    +
    +

    Parameters:

    +
      + +
    • + + input + + + (String) + + + +
    • + +
    • + + opts + + + (Hash) + + + +
    • + +
    + +

    Returns:

    +
      + +
    • + + + (String) + + + +
    • + +
    +

    Raises:

    + + +
    + + + + +
    +
    +
    +
    +80
    +81
    +82
    +83
    +84
    +85
    +86
    +87
    +88
    +89
    +90
    +91
    +92
    +93
    +94
    +95
    +96
    +
    +
    # File 'lib/hyde/util/parseutils.rb', line 80
    +
    +def self.make_value(input, opts, sep = ";")
    +  output = input
    +  unless input.match? HeaderRegexp::PRINTABLE
    +    raise Hyde::ParsingError, "input is not ascii printable"
    +  end
    +
    +  opts.each do |key, value|
    +    check_param(key, value)
    +    newparam = if value.is_a? String
    +                 "#{sep} #{key}=#{value}"
    +               else
    +                 "#{sep} #{key}"
    +               end
    +    output += newparam
    +  end
    +  output
    +end
    +
    +
    + +
    +

    + + .parse_value(input, sep: ";", unquote: false, regexp: nil) ⇒ Array(String, Hash) + + + + + +

    +
    +

    Parse parametrized header values. +This method will try the best attempt at decoding parameters. +However, it does no decoding on the first argument.

    + + +
    +
    +
    +

    Parameters:

    +
      + +
    • + + input + + + (String) + + + +
    • + +
    • + + sep + + + (String, Regexp) + + + (defaults to: ";") + + +
    • + +
    • + + unquote + + + (Boolean) + + + (defaults to: false) + + + — +

      interpret params as possibly quoted

      +
      + +
    • + +
    • + + regexp + + + (Regexp, nil) + + + (defaults to: nil) + + + — +

      override param matching regexp

      +
      + +
    • + +
    + +

    Returns:

    +
      + +
    • + + + (Array(String, Hash)) + + + +
    • + +
    + +
    + + + + +
    +
    +
    +
    +51
    +52
    +53
    +54
    +55
    +56
    +57
    +58
    +59
    +60
    +61
    +62
    +63
    +64
    +65
    +66
    +67
    +68
    +69
    +70
    +
    +
    # File 'lib/hyde/util/parseutils.rb', line 51
    +
    +def self.parse_value(input, sep: ";", unquote: false, regexp: nil)
    +  parts = input.split(sep).map { |x| URI.decode_uri_component(x).strip }
    +  base = parts.shift
    +  opts = parts.map do |raw|
    +    key, value = raw.match(if regexp
    +                             regexp
    +                           elsif unquote
    +                             HeaderRegexp::PARAM_QUOTED
    +                           else
    +                             HeaderRegexp::PARAM
    +                           end).to_a[1..]
    +    value = case value
    +            when "" then true
    +            when /\A".*"\z/ then value.undump
    +            else value
    +            end
    +    [key, value]
    +  end.to_h
    +  [base, opts]
    +end
    +
    +
    + +
    diff --git a/doc/Hyde/Util/ParserSorting.html b/doc/Hyde/Util/ParserSorting.html new file mode 100644 index 0000000..60216a8 --- /dev/null +++ b/doc/Hyde/Util/ParserSorting.html @@ -0,0 +1,120 @@ + + + + + + + Module: Hyde::Util::ParserSorting + + — Documentation by YARD 0.9.34 + + + + + + + + + + + + + + + + + + + +
    + + +

    Module: Hyde::Util::ParserSorting + + + +

    +
    + + + + + + + + + +
    +
    Included in:
    +
    MultipartParser, Query
    +
    + + + +
    +
    Defined in:
    +
    lib/hyde/util/parsesorting.rb
    +
    + +
    + +

    Overview

    +
    +

    Internal library for generating form hashes

    + + +
    +
    +
    + + +
    + + + + + + + + +
    + + + +
    + + \ No newline at end of file diff --git a/doc/Hyde/Util/Query.html b/doc/Hyde/Util/Query.html index f376b4a..c123411 100644 --- a/doc/Hyde/Util/Query.html +++ b/doc/Hyde/Util/Query.html @@ -89,7 +89,7 @@
    Includes:
    -
    ParserCommon
    +
    ParserSorting
    @@ -106,8 +106,7 @@

    Overview

    -

    TODO: encoding support???? -Query string parser

    +

    Query string parser

    @@ -276,12 +275,12 @@ Query string parser

     
     
    +12
     13
    -14
    -15
    +14
    -
    # File 'lib/hyde/util/query.rb', line 13
    +      
    # File 'lib/hyde/util/query.rb', line 12
     
     def initialize(query)
       @query = query
    @@ -351,12 +350,12 @@ Query string parser

     
     
    +39
     40
    -41
    -42
    +41
    -
    # File 'lib/hyde/util/query.rb', line 40
    +      
    # File 'lib/hyde/util/query.rb', line 39
     
     def [](key)
       (@cache ||= parse)[key]
    @@ -412,12 +411,12 @@ Key semantics:

     
     
    +32
     33
    -34
    -35
    +34
    -
    # File 'lib/hyde/util/query.rb', line 33
    +      
    # File 'lib/hyde/util/query.rb', line 32
     
     def parse
       construct_deep_hash(URI.decode_www_form(@query))
    @@ -465,14 +464,14 @@ Key semantics:

     
     
    +18
     19
     20
     21
    -22
    -23
    +22
    -
    # File 'lib/hyde/util/query.rb', line 19
    +      
    # File 'lib/hyde/util/query.rb', line 18
     
     def parse_shallow
       URI.decode_www_form(@query)
    @@ -489,7 +488,7 @@ Key semantics:

    diff --git a/doc/_index.html b/doc/_index.html index ba43b1b..384037e 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -138,6 +138,13 @@ +
  • + Error + + (Hyde) + +
  • +
  • Erubi @@ -211,6 +218,13 @@
  • +
  • + HeaderRegexp + + (Hyde::Util) + +
  • +
  • Hyde @@ -315,6 +329,20 @@
  • +
  • + ParserSorting + + (Hyde::Util) + +
  • + +
  • + ParsingError + + (Hyde) + +
  • +
  • Path @@ -538,7 +566,7 @@ diff --git a/doc/class_list.html b/doc/class_list.html index cd336bd..1c1c893 100644 --- a/doc/class_list.html +++ b/doc/class_list.html @@ -43,7 +43,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index fa6cac2..5c9acd8 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -190,7 +190,7 @@ diff --git a/doc/index.html b/doc/index.html index d908c0a..1a9a115 100644 --- a/doc/index.html +++ b/doc/index.html @@ -190,7 +190,7 @@ diff --git a/doc/method_list.html b/doc/method_list.html index 3f95571..a95cd27 100644 --- a/doc/method_list.html +++ b/doc/method_list.html @@ -197,6 +197,14 @@
  • +
    + #decode + Hyde::Util::FormPart +
    +
  • + + +
  • default_error_page Hyde::Util @@ -204,7 +212,7 @@
  • -
  • +
  • #delete Hyde::DSL::PathConstructors @@ -212,7 +220,7 @@
  • -
  • +
  • #delete_header Hyde::Response @@ -220,7 +228,7 @@
  • -
  • +
  • #die Hyde::DSL::CommonMethods @@ -228,7 +236,7 @@
  • -
  • +
  • #erb Hyde::DSL::ProbeConstructors @@ -236,7 +244,7 @@
  • -
  • +
  • #erubi Hyde::DSL::ProbeConstructors @@ -244,7 +252,7 @@
  • -
  • +
  • escape_html Hyde::Util @@ -252,6 +260,14 @@
  • +
  • +
    + #escape_html + Hyde::DSL::ProbeMethods +
    +
  • + +
  • #file @@ -646,8 +662,8 @@
  • - make_value - Hyde::Util + make_value + Hyde::Util::ParserCommon
  • @@ -774,8 +790,8 @@
  • - parse_value - Hyde::Util + parse_value + Hyde::Util::ParserCommon
  • @@ -1229,6 +1245,14 @@
  • +
    + #unescape_html + Hyde::DSL::ProbeMethods +
    +
  • + + +
  • #validate Hyde::Response @@ -1236,7 +1260,7 @@
  • -
  • +
  • #value Hyde::Cookie diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 2c8f5b6..92fa839 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -100,7 +100,7 @@
    diff --git a/examples/cookies/cookie.ru b/examples/cookies/cookie.ru new file mode 100644 index 0000000..228870c --- /dev/null +++ b/examples/cookies/cookie.ru @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/lib") +require 'hyde' +require 'hyde/util/cookie' + +app = Hyde::Server.new do + get "/set-cookie" do + header "set-cookie", Hyde::Cookie.new("test", (rand * 500).floor.to_s).to_s + header "content-type", "text/plain" + "Cookie set! Visit /get-cookie to view it" + end + get "/get-cookie" do + header "content-type", "text/plain" + request.headers["cookie"]&.pretty_inspect + end +end + +run app diff --git a/examples/cookies/lib b/examples/cookies/lib new file mode 120000 index 0000000..58677dd --- /dev/null +++ b/examples/cookies/lib @@ -0,0 +1 @@ +../../lib \ No newline at end of file diff --git a/examples/cookies/readme.txt b/examples/cookies/readme.txt new file mode 100644 index 0000000..a8501aa --- /dev/null +++ b/examples/cookies/readme.txt @@ -0,0 +1,3 @@ +shows basic usage of unsigned cookies + +please note that this does not sign cookies. diff --git a/examples/form2/index.rhtml b/examples/form2/index.rhtml index fd77c5b..b2cb90a 100644 --- a/examples/form2/index.rhtml +++ b/examples/form2/index.rhtml @@ -25,7 +25,7 @@
      <% formdata.each do |key, part| %> -
    • <%= key %>: <%= part.is_a?(String) ? part : "File: #{part.map do |x| x.filename end.join(',')}" %>
    • +
    • <%= key %>: <%= escape_html(part.is_a?(String) ? part : "File: #{part.map do |x| x.filename end.join(',')}") %>
    • <% end %>
    <% end %> diff --git a/hyde-0.9.gem b/hyde-0.9.gem new file mode 100644 index 0000000..6c486a9 Binary files /dev/null and b/hyde-0.9.gem differ diff --git a/hyde.gemspec b/hyde.gemspec new file mode 100644 index 0000000..8c3165b --- /dev/null +++ b/hyde.gemspec @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +Gem::Specification.new do |spec| + spec.name = "hyde" + spec.version = "0.9" + spec.summary = "A hideously simple web app framework" + spec.description = <<~DESC + Hyde is a web framework that was made entirely for fun. + It is usable for many menial tasks, and as long as it continues to be fun, it will keep growing. + DESC + spec.authors = ["Yessiest"] + spec.license = "AGPL-3.0" + spec.email = "yessiest@text.512mb.org" + spec.homepage = "https://adastra7.net/git/Yessiest/hyde" + spec.files = Dir["lib/**/*"] + spec.extra_rdoc_files = Dir["*.md"] +end diff --git a/lib/hyde.rb b/lib/hyde.rb index a62dd4a..32cd9e5 100644 --- a/lib/hyde.rb +++ b/lib/hyde.rb @@ -10,7 +10,7 @@ require_relative 'hyde/template' # Hyde is a hideously simple ruby web framework module Hyde # Hyde version - VERSION = '0.8 (beta/rewrite)' + VERSION = '0.9 "Moonsong" (beta/rewrite)' # Hyde branding and version VLINE = "Hyde/#{Hyde::VERSION} (Ruby/#{RUBY_VERSION}/#{RUBY_RELEASE_DATE})\n" diff --git a/lib/hyde/dsl/constructors_path.rb b/lib/hyde/dsl/constructors_path.rb index ac919b1..3d48418 100644 --- a/lib/hyde/dsl/constructors_path.rb +++ b/lib/hyde/dsl/constructors_path.rb @@ -8,7 +8,7 @@ module Hyde # Append a Node child object to the list of children def register(obj) unless obj.is_a? Hyde::Node - raise StandardError, "register accepts node children only" + raise ArgumentError, "register accepts node children only" end @origin.children.append(obj) diff --git a/lib/hyde/dsl/methods_path.rb b/lib/hyde/dsl/methods_path.rb index 279d3c3..cd1023a 100644 --- a/lib/hyde/dsl/methods_path.rb +++ b/lib/hyde/dsl/methods_path.rb @@ -14,18 +14,18 @@ module Hyde when String @origin.properties['index'] = [index] else - raise StandardError, "index should be an Array or a String" + raise ArgumentError, "index should be an Array or a String" end end # Set root path (appends matched part of the path). - # @param path [String + # @param path [String] def root(path) @origin.root = path end # Set root path (without appending matched part). - # @param path [String + # @param path [String] def remap(path) @origin.remap = path end @@ -62,7 +62,7 @@ module Hyde def plugin(filename) self.define_singleton_method(:run) do |object| unless object.is_a? Hyde::Node - raise StandardError, "not a node instance or subclass instance" + raise ArgumentError, "not a node instance or subclass instance" end object diff --git a/lib/hyde/dsl/methods_probe.rb b/lib/hyde/dsl/methods_probe.rb index 2dadfe7..965ed41 100644 --- a/lib/hyde/dsl/methods_probe.rb +++ b/lib/hyde/dsl/methods_probe.rb @@ -2,7 +2,8 @@ require_relative '../response' require_relative '../util/multipart' -require_relative '../util/header' +require_relative '../util/parseutils' +require_relative '../util/html' module Hyde module DSL @@ -29,12 +30,12 @@ module Hyde def header(key, value) return status(value) if key.downcase == "status" - if key.match(/(?:[(),\/:;<=>?@\[\]{}"]|[^ -~])/) - raise StandardError, "header key has invalid characters" + unless key.match(Hyde::Util::HeaderRegexp::TOKEN) + raise ArgumentError, "header key has invalid characters" end - if value.match(/[^ -~]/) - raise StandardError, "value key has invalid characters" + unless value&.match(Hyde::Util::HeaderRegexp::PRINTABLE) + raise ArgumentError, "value key has invalid characters" end @origin.response = (@origin.response or Hyde::Response.new) @@ -51,12 +52,12 @@ module Hyde return if key.downcase == "status" - if key.match(/(?:[(),\/:;<=>?@\[\]{}"]|[^ -~])/) - raise StandardError, "header key has invalid characters" + unless key.match(Hyde::Util::HeaderRegexp::TOKEN) + raise ArgumentError, "header key has invalid characters" end - if value&.match(/[^ -~]/) - raise StandardError, "value key has invalid characters" + unless value&.match(Hyde::Util::HeaderRegexp::PRINTABLE) + raise ArgumentError, "value key has invalid characters" end @origin.response.delete_header(key, value) @@ -65,7 +66,9 @@ module Hyde # Checks if current request has multipart/form-data associated with it # @return [Boolean] def form? - value, opts = Hyde::Util.parse_value(request.headers["content-type"]) + value, opts = Hyde::Util::ParserCommon.parse_value( + request.headers["content-type"] + ) if value == "multipart/form-data" and opts["boundary"] true @@ -77,17 +80,31 @@ module Hyde # Returns formdata # @return [Hash{String=>(String,Hyde::Util::FormPart)}] def form - _, opts = Hyde::Util.parse_value(request.headers["content-type"]) + _, opts = Hyde::Util::ParserCommon.parse_value( + request.headers["content-type"] + ) Hyde::Util::MultipartParser.new( request.input, opts["boundary"] ).to_h end # Open a file relative to current filepath - # @see File#open + # @see File.open def file(path, mode = "r", *all, &block) File.open("#{request.filepath}/#{path}", mode, *all, &block) end + + # Escape HTML entities + # @see Hyde::Util.escape_html + def escape_html(text) + Hyde::Util.escape_html(text) + end + + # Unescape HTML entities + # @see Hyde::Util.escape_html + def unescape_html(text) + Hyde::Util.unescape_html(text) + end end end end diff --git a/lib/hyde/node.rb b/lib/hyde/node.rb index 1434de8..1613862 100644 --- a/lib/hyde/node.rb +++ b/lib/hyde/node.rb @@ -19,7 +19,7 @@ module Hyde # Set Node file root (like root in Nginx) # @param path [String] def root=(path) - raise StandardError, "path should be a String" unless path.is_a? String + raise ArgumentError, "path should be a String" unless path.is_a? String @properties["path"] = File.expand_path(path) @root = File.expand_path(path) diff --git a/lib/hyde/util/cookie.rb b/lib/hyde/util/cookie.rb index b7ece50..7f4b997 100644 --- a/lib/hyde/util/cookie.rb +++ b/lib/hyde/util/cookie.rb @@ -1,12 +1,24 @@ # frozen_string_literal: true -require_relative 'header' +require_relative 'parseutils' +require_relative 'errors' module Hyde # Utility class for handling cookies class Cookie - # @param data [String] raw cookie data + # @param key [String] cookie name + # @param value [String] cookie value + # @param params [Hash] cookie parameters + # @raise Hyde::ParsingError invalid cookie parameters def initialize(key, value, params = {}) + unless key.match? Hyde::Util::HeaderRegexp::COOKIE_NAME + raise Hyde::ParsingError, "invalid cookie key: #{key}" + end + + unless value.match? Hyde::Util::HeaderRegexp::COOKIE_VALUE + raise Hyde::ParsingError, "invalid cookie value: #{value}" + end + @key = key @value = value @params = params @@ -15,7 +27,7 @@ module Hyde # Convert cookie to "Set-Cookie: " string representation. # @return [String] def to_s - Hyde::Util.make_value(to_short, @params) + Hyde::Util::ParserCommon.make_value(to_short, @params) end # Convert cookie to "Cookie: " string representation (no params) @@ -30,7 +42,10 @@ module Hyde # @param data [String] value part of "Set-Cookie: " header # @return [Cookie] def self.from_setcookie_string(data) - kvpair, params = Hyde::Util.parse_value(data) + kvpair, params = Hyde::Util::ParserCommon.parse_value( + data, + regexp: Hyde::Util::HeaderRegexp::COOKIE_PARAM + ) key, value = kvpair.split("=").map(&:strip) Cookie.new(key, value, params) end diff --git a/lib/hyde/util/errors.rb b/lib/hyde/util/errors.rb new file mode 100644 index 0000000..fa6dc97 --- /dev/null +++ b/lib/hyde/util/errors.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Hyde + # Generic error class, as recommended by Ruby documentation. + class Error < ::StandardError + end + + # Error class raised by hyde/util/parseutils module. + class ParsingError < Error + end +end diff --git a/lib/hyde/util/header.rb b/lib/hyde/util/header.rb deleted file mode 100644 index 1e1a56c..0000000 --- a/lib/hyde/util/header.rb +++ /dev/null @@ -1,46 +0,0 @@ -# frozen_string_literal: true - -require 'uri' - -module Hyde - module Util - # Parse parametrized header values - # @param input [String] - # @param sep [String, Regexp] - # @return [Array(String, Hash)] - def self.parse_value(input, sep = ";") - parts = input.split(sep).map { |x| URI.decode_uri_component(x).strip } - base = parts.shift - opts = parts.map do |raw| - key, value = raw.match(/ - \A # beginning of string - ([!-~&&[^=;,]]+) # key - (?:=([\s!-~&&[^;,]]*)|) # optional value - \Z # end of sting - /x).to_a[1..] - [key, ((value&.match?(/^".*"$/) ? value[1..-2] : value) or true)] - end.to_h - [base, opts] - end - - # Construct a parametrized header value - # @param input [String] - # @param opts [Hash] - # @return [String] - def self.make_value(input, opts, sep = ";") - unless input.match?(/^[\w!#$%&'*+-.^_`|~]*=?[^[:cntrl:]\\",;]+$/) - raise StandardError, "input format is invalid" - end - - output = input - opts.each do |key, value| - output += if value.is_a? String - "#{sep} #{key}=#{value}" - else - "#{sep} #{key}" - end - end - output - end - end -end diff --git a/lib/hyde/util/html.rb b/lib/hyde/util/html.rb index c7449a1..6a4d7d3 100644 --- a/lib/hyde/util/html.rb +++ b/lib/hyde/util/html.rb @@ -62,13 +62,15 @@ module Hyde }.freeze # Return string with escaped HTML entities. - # @note Do **not** use this to inject untrusted input into JavaScript code - # or CSS style of the page. + # @note Do **not** use this to inject untrusted input into JavaScript code or CSS style of the page. # This function is not adequate to prevent string interpolation. # @param str [String] # @return [String] def self.escape_html(str) - CGI.escapeHTML(str) + str = CGI.escapeHTML(str) + str.gsub(/[^\x1-\x7E]/) do |match| + "&##{match.ord};" + end end # Return string with unescaped HTML entities. diff --git a/lib/hyde/util/multipart.rb b/lib/hyde/util/multipart.rb index 8b589ad..9dab275 100644 --- a/lib/hyde/util/multipart.rb +++ b/lib/hyde/util/multipart.rb @@ -3,7 +3,9 @@ require 'uri' require 'stringio' require 'tempfile' -require_relative 'header' +require_relative 'parseutils' +require_relative 'parsesorting' +require_relative 'html' module Hyde module Util @@ -22,16 +24,24 @@ module Hyde !tempfile.nil? end + # Decode charset parameter + def decode(data) + data = Hyde::Util.unescape_html(data) + return data unless self.headers['charset'] + + data.force_encoding(self.headers['charset']).encode("UTF-8") + end + # If FormPart is not a file, simplify to string. # @return [FormPart, String] def simplify - file? ? self : self.data + file? ? self : decode(self.data) end end # A very naive implementation of a Multipart form parser. class MultipartParser - include Hyde::Util::ParserCommon + include Hyde::Util::ParserSorting def initialize(io, boundary) @input = io.is_a?(String) ? StringIO.new(io) : io @boundary = boundary @@ -158,7 +168,7 @@ module Hyde return unless line.match(/^[\w!#$%&'*+-.^_`|~]+:.*\r\n$/) k, v = line.match(/^([\w!#$%&'*+-.^_`|~]+):(.*)\r\n$/).to_a[1..] - headers_hash[k.downcase] = Hyde::Util.parse_value(v) + headers_hash[k.downcase] = Hyde::Util::ParserCommon.parse_value(v) end end end diff --git a/lib/hyde/util/sorting.rb b/lib/hyde/util/parsesorting.rb similarity index 97% rename from lib/hyde/util/sorting.rb rename to lib/hyde/util/parsesorting.rb index a9a1af4..4746639 100644 --- a/lib/hyde/util/sorting.rb +++ b/lib/hyde/util/parsesorting.rb @@ -3,7 +3,7 @@ module Hyde module Util # Internal library for generating form hashes - module ParserCommon + module ParserSorting private # Sort key-value pair arrays diff --git a/lib/hyde/util/parseutils.rb b/lib/hyde/util/parseutils.rb new file mode 100644 index 0000000..6f56b94 --- /dev/null +++ b/lib/hyde/util/parseutils.rb @@ -0,0 +1,113 @@ +# frozen_string_literal: true + +require 'uri' +require 'date' +require_relative 'errors' + +module Hyde + module Util + # (not exactly precise) Regular expressions for some RFC definitions + module HeaderRegexp + # Matches the RFC2616 definiton of token + TOKEN = /[!-~&&[^()<>@,;:\\"\/\[\]?={}\t]]+/.freeze + # Matches the RFC2616 definition of quoted-string + QUOTED = /"[\x0-\x7E&&[^\x1-\x8\xb-\x1f]]*(?