diff --git a/ansible/vars/environment-specific/build.yml b/ansible/vars/environment-specific/build.yml index 258a243d8..e32d6ace1 100644 --- a/ansible/vars/environment-specific/build.yml +++ b/ansible/vars/environment-specific/build.yml @@ -89,7 +89,6 @@ wordpress_users: email: admin@localhost.localdomain ckan_extensions: - - ckanext-sixodp_routes - ckanext-sixodp_scheming - ckanext-sixodp - ckanext-sixodp_showcase @@ -136,7 +135,6 @@ enabled_ckan_extensions: #- report - publisher_activity_report #- rating - - sixodp_routes - qa - archiver - hierarchy_display diff --git a/ansible/vars/environment-specific/generic-qa.yml b/ansible/vars/environment-specific/generic-qa.yml index 4bc68df79..5c2885a43 100755 --- a/ansible/vars/environment-specific/generic-qa.yml +++ b/ansible/vars/environment-specific/generic-qa.yml @@ -101,7 +101,6 @@ ckan_admins: - "{{ ckan_users.harvest.username }}" ckan_extensions: - - ckanext-sixodp_routes - ckanext-sixodp_scheming - ckanext-sixodp - ckanext-sixodp_showcase @@ -153,7 +152,6 @@ enabled_ckan_extensions: - report - publisher_activity_report #- rating - - sixodp_routes - hierarchy_display - hierarchy_form - reminder diff --git a/ansible/vars/environment-specific/vagrant.yml b/ansible/vars/environment-specific/vagrant.yml index db37bfba9..61e113ada 100644 --- a/ansible/vars/environment-specific/vagrant.yml +++ b/ansible/vars/environment-specific/vagrant.yml @@ -87,7 +87,6 @@ ckan_admins: - "{{ ckan_users.harvest.username }}" ckan_extensions: - - ckanext-sixodp_routes - ckanext-sixodp_scheming - ckanext-sixodp - ckanext-sixodp_showcase @@ -139,7 +138,6 @@ enabled_ckan_extensions: #- report - publisher_activity_report #- rating - - sixodp_routes - hierarchy_display - hierarchy_form - reminder diff --git a/ckanext/ckanext-sixodp/ckanext/sixodp/plugin.py b/ckanext/ckanext-sixodp/ckanext/sixodp/plugin.py index 6a9f9ca97..6d58b494c 100644 --- a/ckanext/ckanext-sixodp/ckanext/sixodp/plugin.py +++ b/ckanext/ckanext-sixodp/ckanext/sixodp/plugin.py @@ -13,8 +13,10 @@ from ckanext.sixodp.logic import action from ckan.lib.plugins import DefaultTranslation +from .views import sixodp + get_action = logic.get_action -config= toolkit.config +config = toolkit.config unicode_safe = toolkit.get_validator('unicode_safe') @@ -168,6 +170,9 @@ def get_qa_openness(dataset): extra_vars=extra_vars)) +def admin_only(context, data_dict=None): + return {'success': False, 'msg': 'Access restricted to system administrators'} + class SixodpPlugin(plugins.SingletonPlugin, DefaultTranslation): plugins.implements(plugins.IConfigurer) plugins.implements(plugins.IConfigurable) @@ -177,6 +182,8 @@ class SixodpPlugin(plugins.SingletonPlugin, DefaultTranslation): plugins.implements(plugins.ITranslation, inherit=True) plugins.implements(plugins.IPackageController, inherit=True) plugins.implements(plugins.IActions, inherit=True) + plugins.implements(plugins.IAuthFunctions) + plugins.implements(plugins.IBlueprint) # IConfigurer @@ -308,4 +315,27 @@ def after_search(self, search_results, search_params): def get_actions(self): return { 'package_autocomplete': action.package_autocomplete, - } \ No newline at end of file + } + + # IAuthFunctions + + def get_auth_functions(self): + return {'user_list': admin_only, + 'revision_list': admin_only, + 'revision_diff': admin_only, + 'package_revision_list': admin_only + } + + # IBlueprint + def get_blueprints(self): + return [sixodp] + + +#TODO: add sorting +# if q and not sort_by: +# sort_by = 'score desc, metadata_modified desc' +# elif not sort_by: +# sort_by = 'metadata_created desc' +@toolkit.chained_action +def package_search(original_action, context, data_dict): + return original_action(context, data_dict) \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/views.py b/ckanext/ckanext-sixodp/ckanext/sixodp/views.py similarity index 100% rename from ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/views.py rename to ckanext/ckanext-sixodp/ckanext/sixodp/views.py diff --git a/ckanext/ckanext-sixodp_routes/.coveragerc b/ckanext/ckanext-sixodp_routes/.coveragerc deleted file mode 100644 index 3138593c5..000000000 --- a/ckanext/ckanext-sixodp_routes/.coveragerc +++ /dev/null @@ -1,5 +0,0 @@ -[report] -omit = - */site-packages/* - */python?.?/* - ckan/* \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/.gitignore b/ckanext/ckanext-sixodp_routes/.gitignore deleted file mode 100644 index e9876d100..000000000 --- a/ckanext/ckanext-sixodp_routes/.gitignore +++ /dev/null @@ -1,42 +0,0 @@ -.ropeproject -node_modules -bower_components - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -build/ -develop-eggs/ -dist/ -sdist/ -*.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.cache -nosetests.xml -coverage.xml - -# Sphinx documentation -docs/_build/ \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/.travis.yml b/ckanext/ckanext-sixodp_routes/.travis.yml deleted file mode 100644 index 6e52d425a..000000000 --- a/ckanext/ckanext-sixodp_routes/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: python -python: - - "2.6" - - "2.7" -env: PGVERSION=9.1 -install: - - bash bin/travis-build.bash - - pip install coveralls -script: sh bin/travis-run.sh -after_success: - - coveralls diff --git a/ckanext/ckanext-sixodp_routes/LICENSE b/ckanext/ckanext-sixodp_routes/LICENSE deleted file mode 100644 index 3ffc56789..000000000 --- a/ckanext/ckanext-sixodp_routes/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ -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 -. \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/MANIFEST.in b/ckanext/ckanext-sixodp_routes/MANIFEST.in deleted file mode 100644 index f74d6bb60..000000000 --- a/ckanext/ckanext-sixodp_routes/MANIFEST.in +++ /dev/null @@ -1,2 +0,0 @@ -include README.rst -recursive-include ckanext/sixodp_routes *.html *.json *.js *.less *.css \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/README.rst b/ckanext/ckanext-sixodp_routes/README.rst deleted file mode 100644 index 25f6b023f..000000000 --- a/ckanext/ckanext-sixodp_routes/README.rst +++ /dev/null @@ -1,3 +0,0 @@ -============= -ckanext-sixodp_routes -============= \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/bin/travis-build.bash b/ckanext/ckanext-sixodp_routes/bin/travis-build.bash deleted file mode 100644 index fc6d7c911..000000000 --- a/ckanext/ckanext-sixodp_routes/bin/travis-build.bash +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -set -e - -echo "This is travis-build.bash..." - -echo "Installing the packages that CKAN requires..." -sudo apt-get update -qq -sudo apt-get install postgresql-$PGVERSION solr-jetty libcommons-fileupload-java:amd64=1.2.2-1 - -echo "Installing CKAN and its Python dependencies..." -git clone https://github.com/ckan/ckan -cd ckan -git checkout release-v2.2 -python setup.py develop -pip install -r requirements.txt --allow-all-external -pip install -r dev-requirements.txt --allow-all-external -cd - - -echo "Creating the PostgreSQL user and database..." -sudo -u postgres psql -c "CREATE USER ckan_default WITH PASSWORD 'pass';" -sudo -u postgres psql -c 'CREATE DATABASE ckan_test WITH OWNER ckan_default;' - -echo "Initialising the database..." -cd ckan -paster db init -c test-core.ini -cd - - -echo "Installing ckanext-sixodp_routes and its requirements..." -python setup.py develop -pip install -r dev-requirements.txt - -echo "Moving test.ini into a subdir..." -mkdir subdir -mv test.ini subdir - -echo "travis-build.bash is done." \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/bin/travis-run.sh b/ckanext/ckanext-sixodp_routes/bin/travis-run.sh deleted file mode 100644 index 3ea0d6541..000000000 --- a/ckanext/ckanext-sixodp_routes/bin/travis-run.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty -sudo cp ckan/ckan/config/solr/schema.xml /etc/solr/conf/schema.xml -sudo service jetty restart -nosetests --nologcapture --with-pylons=subdir/test.ini --with-coverage --cover-package=ckanext.sixodp_routes --cover-inclusive --cover-erase --cover-tests \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/ckanext/__init__.py b/ckanext/ckanext-sixodp_routes/ckanext/__init__.py deleted file mode 100644 index 2e2033b3c..000000000 --- a/ckanext/ckanext-sixodp_routes/ckanext/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# this is a namespace package -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/__init__.py b/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/controller.py b/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/controller.py deleted file mode 100644 index 35ba6ddf3..000000000 --- a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/controller.py +++ /dev/null @@ -1,44 +0,0 @@ -from ckan.plugins import toolkit -from ckan.common import request, c -import urllib -import ckan.model as model -from ckan.controllers.api import ApiController - -import logging - -log = logging.getLogger(__name__) - -from ckan.logic import NotFound - -from ckanext.sixodp_scheming.plugin import create_vocabulary - -class Sixodp_RoutesController(ApiController): - - # Modification to tag_autocomplete to support tag vocabularies, - # based on original from ytp - def tag_autocomplete(self): - - vocabulary_id = request.params.get('vocabulary_id', None) - if vocabulary_id: - create_vocabulary(vocabulary_id) - - q = request.str_params.get('incomplete', '') - q = unicode(urllib.unquote(q), 'utf-8') - limit = request.params.get('limit', 10) - tag_names = [] - if q: - context = {'model': model, 'session': model.Session, - 'user': c.user, 'auth_user_obj': c.userobj} - - data_dict = {'q': q, 'limit': limit} - if vocabulary_id: - data_dict['vocabulary_id'] = vocabulary_id - - tag_names = toolkit.get_action('tag_autocomplete')(context, data_dict) - - resultSet = { - 'ResultSet': { - 'Result': [{'Name': tag} for tag in tag_names] - } - } - return self._finish_ok(resultSet) \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/fanstatic/.gitignore b/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/fanstatic/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/plugin.py b/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/plugin.py deleted file mode 100644 index c5e1a9f7d..000000000 --- a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/plugin.py +++ /dev/null @@ -1,67 +0,0 @@ -import ckan -from ckan.common import c, _, request, g -import ckan.model as model -import ckan.lib.navl.dictization_functions as dictization_functions -import ckan.logic as logic -import ckan.lib.base as base -from ckan.plugins import toolkit -from .views import sixodp - -abort = base.abort -render = base.render -check_access = ckan.logic.check_access -NotAuthorized = ckan.logic.NotAuthorized -NotFound = ckan.logic.NotFound -get_action = ckan.logic.get_action -config = toolkit.config - -unflatten = dictization_functions.unflatten -DataError = dictization_functions.DataError - -UsernamePasswordError = logic.UsernamePasswordError -ValidationError = logic.ValidationError - -lookup_group_controller = ckan.lib.plugins.lookup_group_controller - -import logging - -log = logging.getLogger(__name__) - - -def admin_only(context, data_dict=None): - return {'success': False, 'msg': 'Access restricted to system administrators'} - - -class Sixodp_RoutesPlugin(ckan.plugins.SingletonPlugin): - ckan.plugins.implements(ckan.plugins.IAuthFunctions) - ckan.plugins.implements(ckan.plugins.IBlueprint) - - - # IAuthFunctions - - def get_auth_functions(self): - return {'user_list': admin_only, - 'revision_list': admin_only, - 'revision_diff': admin_only, - 'package_revision_list': admin_only - } - - # IBlueprint - def get_blueprints(self): - return [sixodp] - - -def auth_context(): - return {'model': ckan.model, - 'user': c.user or c.author, - 'auth_user_obj': c.userobj} - - -#TODO: add sorting -# if q and not sort_by: -# sort_by = 'score desc, metadata_modified desc' -# elif not sort_by: -# sort_by = 'metadata_created desc' -@toolkit.chained_action -def package_search(original_action, context, data_dict): - return original_action(context, data_dict) \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/public/.gitignore b/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/public/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/templates/.gitignore b/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/templates/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/tests/__init__.py b/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/tests/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/tests/test_plugin.py b/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/tests/test_plugin.py deleted file mode 100644 index 1ba6fbb9a..000000000 --- a/ckanext/ckanext-sixodp_routes/ckanext/sixodp_routes/tests/test_plugin.py +++ /dev/null @@ -1,5 +0,0 @@ -"""Tests for plugin.py.""" -import ckanext.sixodp_routes.plugin as plugin - -def test_plugin(): - pass \ No newline at end of file diff --git a/ckanext/ckanext-sixodp_routes/dev-requirements.txt b/ckanext/ckanext-sixodp_routes/dev-requirements.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/ckanext/ckanext-sixodp_routes/setup.py b/ckanext/ckanext-sixodp_routes/setup.py deleted file mode 100644 index a2cf8f523..000000000 --- a/ckanext/ckanext-sixodp_routes/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -from setuptools import setup, find_packages # Always prefer setuptools over distutils -from codecs import open # To use a consistent encoding -from os import path - -here = path.abspath(path.dirname(__file__)) - -# Get the long description from the relevant file -with open(path.join(here, 'README.rst'), encoding='utf-8') as f: - long_description = f.read() - -setup( - name='''ckanext-sixodp_routes''', - - # Versions should comply with PEP440. For a discussion on single-sourcing - # the version across setup.py and the project code, see - # http://packaging.python.org/en/latest/tutorial.html#version - version='0.0.1', - - description='''SixODP specific routes''', - long_description=long_description, - - # The project's main homepage. - url='https://github.com/6aika/sixodp', - - # Author details - author='''6aika''', - author_email='''''', - - # Choose your license - license='AGPL', - - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - # How mature is this project? Common values are - # 3 - Alpha - # 4 - Beta - # 5 - Production/Stable - 'Development Status :: 4 - Beta', - - # Pick your license as you wish (should match "license" above) - 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', - - # Specify the Python versions you support here. In particular, ensure - # that you indicate whether you support Python 2, Python 3 or both. - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', - ], - - - # What does your project relate to? - keywords='''CKAN sixodp routes''', - - # You can just specify the packages manually here if your project is - # simple. Or you can use find_packages(). - packages=find_packages(exclude=['contrib', 'docs', 'tests*']), - - # List run-time dependencies here. These will be installed by pip when your - # project is installed. For an analysis of "install_requires" vs pip's - # requirements files see: - # https://packaging.python.org/en/latest/technical.html#install-requires-vs-requirements-files - install_requires=[], - - # If there are data files included in your packages that need to be - # installed, specify them here. If using Python 2.6 or less, then these - # have to be included in MANIFEST.in as well. - include_package_data=True, - package_data={ - }, - - # Although 'package_data' is the preferred approach, in some case you may - # need to place data files outside of your packages. - # see http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files - # In this case, 'data_file' will be installed into '/my_data' - data_files=[], - - # To provide executable scripts, use entry points in preference to the - # "scripts" keyword. Entry points provide cross-platform support and allow - # pip to create the appropriate form of executable for the target platform. - entry_points=''' - [ckan.plugins] - sixodp_routes=ckanext.sixodp_routes.plugin:Sixodp_RoutesPlugin - ''', -) diff --git a/ckanext/ckanext-sixodp_routes/test.ini b/ckanext/ckanext-sixodp_routes/test.ini deleted file mode 100644 index c7c70e785..000000000 --- a/ckanext/ckanext-sixodp_routes/test.ini +++ /dev/null @@ -1,49 +0,0 @@ -[DEFAULT] -debug = false -smtp_server = localhost -error_email_from = paste@localhost - -[server:main] -use = egg:Paste#http -host = 0.0.0.0 -port = 5000 - -[app:main] -use = config:../ckan/test-core.ini - -# Insert any custom config settings to be used when running your extension's -# tests here. - - -# Logging configuration -[loggers] -keys = root, ckan, sqlalchemy - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = WARN -handlers = console - -[logger_ckan] -qualname = ckan -handlers = -level = INFO - -[logger_sqlalchemy] -handlers = -qualname = sqlalchemy.engine -level = WARN - -[handler_console] -class = StreamHandler -args = (sys.stdout,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s \ No newline at end of file