This is an automated email from the git hooks/post-receive script. dmn pushed a commit to branch master in repository libcatalyst-modules-perl.
commit 863681627fab7084d2b070f8e8aecb53915780a4 Author: Damyan Ivanov <d...@debian.org> Date: Wed May 14 09:35:08 2014 +0000 replace bundled CatalystX-Component-Traits with a dependency on libcatalystx-component-traits-perl --- bundle/01/CatalystX-Component-Traits | 1 - debian/control | 1 + debian/copyright | 5 - sources/CatalystX-Component-Traits/Changes | 61 ---- sources/CatalystX-Component-Traits/LICENSE | 379 --------------------- sources/CatalystX-Component-Traits/MANIFEST | 20 -- sources/CatalystX-Component-Traits/META.json | 80 ----- sources/CatalystX-Component-Traits/META.yml | 45 --- sources/CatalystX-Component-Traits/Makefile.PL | 87 ----- sources/CatalystX-Component-Traits/README | 113 ------ sources/CatalystX-Component-Traits/dist.ini | 22 -- .../lib/CatalystX/Component/Traits.pm | 267 --------------- sources/CatalystX-Component-Traits/t/00-compile.t | 50 --- sources/CatalystX-Component-Traits/t/01-basic.t | 79 ----- .../CatalystX-Component-Traits/t/02-trait_search.t | 20 -- .../t/03-cx_trait_search.t | 26 -- .../t/03-methodattributes.t | 37 -- sources/CatalystX-Component-Traits/t/04-no_merge.t | 63 ---- .../CatalystX-Component-Traits/t/05-app_named_cx.t | 20 -- .../t/06-app_root_component.t | 16 - .../CatalystX-Component-Traits/t/07-merge-single.t | 44 --- .../t/release-pod-syntax.t | 16 - 22 files changed, 1 insertion(+), 1451 deletions(-) diff --git a/bundle/01/CatalystX-Component-Traits b/bundle/01/CatalystX-Component-Traits deleted file mode 120000 index 6cb168f..0000000 --- a/bundle/01/CatalystX-Component-Traits +++ /dev/null @@ -1 +0,0 @@ -../../sources/CatalystX-Component-Traits \ No newline at end of file diff --git a/debian/control b/debian/control index 3ea21bd..5a234bc 100644 --- a/debian/control +++ b/debian/control @@ -109,6 +109,7 @@ Depends: ${misc:Depends}, libcatalyst-plugin-stacktrace-perl, libcatalyst-plugin-stactic-simple-perl, libcatalyst-view-tt-perl, + libcatalystx-component-traits-perl, libcgi-formbuilder-perl, libclass-c3-perl, libclass-throwable-perl, diff --git a/debian/copyright b/debian/copyright index 5870adf..1862933 100644 --- a/debian/copyright +++ b/debian/copyright @@ -17,11 +17,6 @@ Copyright: 2005-2009, Christian Hansen <c...@ngmedia.com> X-Upstream-Maintainers: Tomas Doran <bobtf...@bobtfish.net> License: Artistic or GPL-1+ -Files: sources/CatalystX-Component-Traits -Copyright: 2014, Rafael Kitover <rkito...@io.com> -X-Upstream-Maintainers: Rafael Kitover <rkito...@io.com> -License: Artistic or GPL-1+ - Files: sources/Catalyst-Component-InstancePerContext Copyright: 2007, Guillermo Roditi <grod...@cpan.org> X-Upstream-Maintainers: Guillermo Roditi <grod...@cpan.org> diff --git a/sources/CatalystX-Component-Traits/Changes b/sources/CatalystX-Component-Traits/Changes deleted file mode 100644 index 9427915..0000000 --- a/sources/CatalystX-Component-Traits/Changes +++ /dev/null @@ -1,61 +0,0 @@ -Revision history for CatalystX::Component::Traits - -0.19 2014-01-13 10:03:31 - - remove newline from ABSTRACT - -0.18 2014-01-11 15:54:11 - - convert to dzil - -0.17 2014-01-02 13:32:00 - - Fix RT#91014 - -0.16 2010-08-26 19:07:00 - - Neglected to bump the version in last release. - -0.15 2010-08-25 19:09:00 - - Change excludes to -excludes when using MooseX::Traits::Pluggable - to avoid the deprecation warning. - - Change primary repository URI in metadata - -0.14 2009-11-08 05:43:37 - - minor code cleanup - -0.13 2009-11-07 21:14:11 - - Fix merging singular traits rather than lists of traits. - -0.12 2009-10-30 16:47:15 - - add support for root-level components - -0.11 2009-10-30 14:25:56 - - fix bug with apps named CatalystX::<something> - -0.10 2009-08-27 10:47:08 - - bump dep on MooseX::Traits::Pluggable - -0.09 2009-08-26 12:50:44 - - fix trait merge bug (when not merging) - -0.08 2009-07-29 23:39:30 - - Require Module::Pluggable 3.9 to avoid test failures. - - More verbose error when traits cannot be found, including full search path. - -0.07 2009-07-26 15:11:55 - - fix incompatibility with perl 5.8 - -0.06 2009-07-20 21:44:13 - - configurable trait merging support - -0.05 2009-07-17 23:46:43 - - Correctly pass the application class into component constructors - -0.04 2009-07-16 13:01:02 - - updated algorithm to handle CatalystX:: namespaced things - -0.03 2009-06-15 16:11:11 - - changed trait search algorithm to the one agreed to on #catalyst-dev - -0.02 2009-06-14 17:08:55 - - fix for namespaced apps - -0.01 2009-06-13 22:30:38 - - first release diff --git a/sources/CatalystX-Component-Traits/LICENSE b/sources/CatalystX-Component-Traits/LICENSE deleted file mode 100644 index feda706..0000000 --- a/sources/CatalystX-Component-Traits/LICENSE +++ /dev/null @@ -1,379 +0,0 @@ -This software is copyright (c) 2014 by Rafael Kitover. - -This is free software; you can redistribute it and/or modify it under -the same terms as the Perl 5 programming language system itself. - -Terms of the Perl programming language system itself - -a) the GNU General Public License as published by the Free - Software Foundation; either version 1, or (at your option) any - later version, or -b) the "Artistic License" - ---- The GNU General Public License, Version 1, February 1989 --- - -This software is Copyright (c) 2014 by Rafael Kitover. - -This is free software, licensed under: - - The GNU General Public License, Version 1, February 1989 - - GNU GENERAL PUBLIC LICENSE - Version 1, February 1989 - - Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The license agreements of most software companies try to keep users -at the mercy of those companies. By contrast, our General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. The -General Public License applies to the Free Software Foundation's -software and to any other program whose authors commit to using it. -You can use it for your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Specifically, the General Public License is designed to make -sure that you have the freedom to give away or sell copies of free -software, 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. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of a such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must tell them their rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any program or other work which -contains a notice placed by the copyright holder saying it may be -distributed under the terms of this General Public License. The -"Program", below, refers to any such program or work, and a "work based -on the Program" means either the Program or any work containing the -Program or a portion of it, either verbatim or with modifications. Each -licensee is addressed as "you". - - 1. You may copy and distribute 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 and -disclaimer of warranty; keep intact all the notices that refer to this -General Public License and to the absence of any warranty; and give any -other recipients of the Program a copy of this General Public License -along with the Program. You may charge a fee for the physical act of -transferring a copy. - - 2. You may modify your copy or copies of the Program or any portion of -it, and copy and distribute such modifications under the terms of Paragraph -1 above, provided that you also do the following: - - a) cause the modified files to carry prominent notices stating that - you changed the files and the date of any change; and - - b) cause the whole of any work that you distribute or publish, that - in whole or in part contains the Program or any part thereof, either - with or without modifications, to be licensed at no charge to all - third parties under the terms of this General Public License (except - that you may choose to grant warranty protection to some or all - third parties, at your option). - - c) If the modified program normally reads commands interactively when - run, you must cause it, when started running for such interactive use - in the simplest and most usual way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this General - Public License. - - d) You may charge a fee for the physical act of transferring a - copy, and you may at your option offer warranty protection in - exchange for a fee. - -Mere aggregation of another independent work with the Program (or its -derivative) on a volume of a storage or distribution medium does not bring -the other work under the scope of these terms. - - 3. You may copy and distribute the Program (or a portion or derivative of -it, under Paragraph 2) in object code or executable form under the terms of -Paragraphs 1 and 2 above provided that you also do one of the following: - - a) accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of - Paragraphs 1 and 2 above; or, - - b) accompany it with a written offer, valid for at least three - years, to give any third party free (except for a nominal charge - for the cost of distribution) a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of - Paragraphs 1 and 2 above; or, - - c) accompany it with the information you received as to where the - corresponding source code may be obtained. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form alone.) - -Source code for a work means the preferred form of the work for making -modifications to it. For an executable file, complete source code means -all the source code for all modules it contains; but, as a special -exception, it need not include source code for modules which are standard -libraries that accompany the operating system on which the executable -file runs, or for standard header files or definitions files that -accompany that operating system. - - 4. You may not copy, modify, sublicense, distribute or transfer the -Program except as expressly provided under this General Public License. -Any attempt otherwise to copy, modify, sublicense, distribute or transfer -the Program is void, and will automatically terminate your rights to use -the Program under this License. However, parties who have received -copies, or rights to use copies, from you under this General Public -License will not have their licenses terminated so long as such parties -remain in full compliance. - - 5. By copying, distributing or modifying the Program (or any work based -on the Program) you indicate your acceptance of this license to do so, -and all its terms and conditions. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the original -licensor to copy, distribute or modify the Program subject to these -terms and conditions. You may not impose any further restrictions on the -recipients' exercise of the rights granted herein. - - 7. The Free Software Foundation may publish revised and/or new versions -of the 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 a version number of the license which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -the license, you may choose any version ever published by the Free Software -Foundation. - - 8. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - - 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE 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. - - END OF TERMS AND CONDITIONS - - Appendix: 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 humanity, 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 convey -the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 1, 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19xx name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the -appropriate parts of the General Public License. Of course, the -commands you use may be called something other than `show w' and `show -c'; they could even be mouse-clicks or menu items--whatever suits your -program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (a program to direct compilers to make passes - at assemblers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -That's all there is to it! - - ---- The Artistic License 1.0 --- - -This software is Copyright (c) 2014 by Rafael Kitover. - -This is free software, licensed under: - - The Artistic License 1.0 - -The Artistic License - -Preamble - -The intent of this document is to state the conditions under which a Package -may be copied, such that the Copyright Holder maintains some semblance of -artistic control over the development of the package, while giving the users of -the package the right to use and distribute the Package in a more-or-less -customary fashion, plus the right to make reasonable modifications. - -Definitions: - - - "Package" refers to the collection of files distributed by the Copyright - Holder, and derivatives of that collection of files created through - textual modification. - - "Standard Version" refers to such a Package if it has not been modified, - or has been modified in accordance with the wishes of the Copyright - Holder. - - "Copyright Holder" is whoever is named in the copyright or copyrights for - the package. - - "You" is you, if you're thinking about copying or distributing this Package. - - "Reasonable copying fee" is whatever you can justify on the basis of media - cost, duplication charges, time of people involved, and so on. (You will - not be required to justify it to the Copyright Holder, but only to the - computing community at large as a market that must bear the fee.) - - "Freely Available" means that no fee is charged for the item itself, though - there may be fees involved in handling the item. It also means that - recipients of the item may redistribute it under the same conditions they - received it. - -1. You may make and give away verbatim copies of the source form of the -Standard Version of this Package without restriction, provided that you -duplicate all of the original copyright notices and associated disclaimers. - -2. You may apply bug fixes, portability fixes and other modifications derived -from the Public Domain or from the Copyright Holder. A Package modified in such -a way shall still be considered the Standard Version. - -3. You may otherwise modify your copy of this Package in any way, provided that -you insert a prominent notice in each changed file stating how and when you -changed that file, and provided that you do at least ONE of the following: - - a) place your modifications in the Public Domain or otherwise make them - Freely Available, such as by posting said modifications to Usenet or an - equivalent medium, or placing the modifications on a major archive site - such as ftp.uu.net, or by allowing the Copyright Holder to include your - modifications in the Standard Version of the Package. - - b) use the modified Package only within your corporation or organization. - - c) rename any non-standard executables so the names do not conflict with - standard executables, which must also be provided, and provide a separate - manual page for each non-standard executable that clearly documents how it - differs from the Standard Version. - - d) make other distribution arrangements with the Copyright Holder. - -4. You may distribute the programs of this Package in object code or executable -form, provided that you do at least ONE of the following: - - a) distribute a Standard Version of the executables and library files, - together with instructions (in the manual page or equivalent) on where to - get the Standard Version. - - b) accompany the distribution with the machine-readable source of the Package - with your modifications. - - c) accompany any non-standard executables with their corresponding Standard - Version executables, giving the non-standard executables non-standard - names, and clearly documenting the differences in manual pages (or - equivalent), together with instructions on where to get the Standard - Version. - - d) make other distribution arrangements with the Copyright Holder. - -5. You may charge a reasonable copying fee for any distribution of this -Package. You may charge any fee you choose for support of this Package. You -may not charge a fee for this Package itself. However, you may distribute this -Package in aggregate with other (possibly commercial) programs as part of a -larger (possibly commercial) software distribution provided that you do not -advertise this Package as a product of your own. - -6. The scripts and library files supplied as input to or produced as output -from the programs of this Package do not automatically fall under the copyright -of this Package, but belong to whomever generated them, and may be sold -commercially, and may be aggregated with this Package. - -7. C or perl subroutines supplied by you and linked into this Package shall not -be considered part of this Package. - -8. The name of the Copyright Holder may not be used to endorse or promote -products derived from this software without specific prior written permission. - -9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - -The End - diff --git a/sources/CatalystX-Component-Traits/MANIFEST b/sources/CatalystX-Component-Traits/MANIFEST deleted file mode 100644 index 89abd58..0000000 --- a/sources/CatalystX-Component-Traits/MANIFEST +++ /dev/null @@ -1,20 +0,0 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.008. -Changes -LICENSE -MANIFEST -META.json -META.yml -Makefile.PL -README -dist.ini -lib/CatalystX/Component/Traits.pm -t/00-compile.t -t/01-basic.t -t/02-trait_search.t -t/03-cx_trait_search.t -t/03-methodattributes.t -t/04-no_merge.t -t/05-app_named_cx.t -t/06-app_root_component.t -t/07-merge-single.t -t/release-pod-syntax.t diff --git a/sources/CatalystX-Component-Traits/META.json b/sources/CatalystX-Component-Traits/META.json deleted file mode 100644 index 40e3227..0000000 --- a/sources/CatalystX-Component-Traits/META.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "abstract" : "Automatic Trait Loading and Resolution for Catalyst Components", - "author" : [ - "Rafael Kitover <rkito...@cpan.org>" - ], - "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.008, CPAN::Meta::Converter version 2.132830", - "license" : [ - "perl_5" - ], - "meta-spec" : { - "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" - }, - "name" : "CatalystX-Component-Traits", - "no_index" : { - "directory" : [ - "t" - ] - }, - "prereqs" : { - "configure" : { - "requires" : { - "ExtUtils::MakeMaker" : "6.30" - } - }, - "develop" : { - "requires" : { - "Test::Pod" : "1.41" - } - }, - "runtime" : { - "requires" : { - "Carp" : "0", - "Catalyst" : "0", - "Class::Load" : "0", - "List::MoreUtils" : "0", - "Moose::Role" : "0", - "MooseX::Traits::Pluggable" : "0", - "Scalar::Util" : "0", - "namespace::autoclean" : "0" - } - }, - "test" : { - "requires" : { - "Catalyst" : "0", - "File::Spec" : "0", - "IO::Handle" : "0", - "IPC::Open3" : "0", - "Moose" : "0", - "MooseX::MethodAttributes" : "0.15", - "Test::More" : "0", - "base" : "0", - "perl" : "5.006", - "strict" : "0", - "version" : "0", - "warnings" : "0" - } - } - }, - "release_status" : "stable", - "resources" : { - "bugtracker" : { - "mailto" : "bug-catalystx-component-tra...@rt.cpan.org", - "web" : "https://rt.cpan.org/Public/Dist/Display.html?Name=CatalystX-Component-Traits" - }, - "homepage" : "http://metacpan.org/release/CatalystX-Component-Traits", - "license" : [ - "http://dev.perl.org/licenses/" - ], - "repository" : { - "type" : "git", - "url" : "git://github.com/rkitover/catalystx-component-traits.git", - "web" : "http://github.com/rkitover/catalystx-component-traits" - } - }, - "version" : "0.19", - "x_authority" : "cpan:RKITOVER" -} - diff --git a/sources/CatalystX-Component-Traits/META.yml b/sources/CatalystX-Component-Traits/META.yml deleted file mode 100644 index 5a98eaa..0000000 --- a/sources/CatalystX-Component-Traits/META.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -abstract: 'Automatic Trait Loading and Resolution for Catalyst Components' -author: - - 'Rafael Kitover <rkito...@cpan.org>' -build_requires: - Catalyst: 0 - File::Spec: 0 - IO::Handle: 0 - IPC::Open3: 0 - Moose: 0 - MooseX::MethodAttributes: 0.15 - Test::More: 0 - base: 0 - perl: 5.006 - strict: 0 - version: 0 - warnings: 0 -configure_requires: - ExtUtils::MakeMaker: 6.30 -dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.008, CPAN::Meta::Converter version 2.132830' -license: perl -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 -name: CatalystX-Component-Traits -no_index: - directory: - - t -requires: - Carp: 0 - Catalyst: 0 - Class::Load: 0 - List::MoreUtils: 0 - Moose::Role: 0 - MooseX::Traits::Pluggable: 0 - Scalar::Util: 0 - namespace::autoclean: 0 -resources: - bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=CatalystX-Component-Traits - homepage: http://metacpan.org/release/CatalystX-Component-Traits - license: http://dev.perl.org/licenses/ - repository: git://github.com/rkitover/catalystx-component-traits.git -version: 0.19 -x_authority: cpan:RKITOVER diff --git a/sources/CatalystX-Component-Traits/Makefile.PL b/sources/CatalystX-Component-Traits/Makefile.PL deleted file mode 100644 index 78e02dd..0000000 --- a/sources/CatalystX-Component-Traits/Makefile.PL +++ /dev/null @@ -1,87 +0,0 @@ - -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.008. -use strict; -use warnings; - - - -use ExtUtils::MakeMaker 6.30; - - - -my %WriteMakefileArgs = ( - "ABSTRACT" => "Automatic Trait Loading and Resolution for Catalyst Components", - "AUTHOR" => "Rafael Kitover <rkitover\@cpan.org>", - "BUILD_REQUIRES" => {}, - "CONFIGURE_REQUIRES" => { - "ExtUtils::MakeMaker" => "6.30" - }, - "DISTNAME" => "CatalystX-Component-Traits", - "EXE_FILES" => [], - "LICENSE" => "perl", - "NAME" => "CatalystX::Component::Traits", - "PREREQ_PM" => { - "Carp" => 0, - "Catalyst" => 0, - "Class::Load" => 0, - "List::MoreUtils" => 0, - "Moose::Role" => 0, - "MooseX::Traits::Pluggable" => 0, - "Scalar::Util" => 0, - "namespace::autoclean" => 0 - }, - "TEST_REQUIRES" => { - "Catalyst" => 0, - "File::Spec" => 0, - "IO::Handle" => 0, - "IPC::Open3" => 0, - "Moose" => 0, - "MooseX::MethodAttributes" => "0.15", - "Test::More" => 0, - "base" => 0, - "strict" => 0, - "version" => 0, - "warnings" => 0 - }, - "VERSION" => "0.19", - "test" => { - "TESTS" => "t/*.t" - } -); - - -my %FallbackPrereqs = ( - "Carp" => 0, - "Catalyst" => 0, - "Class::Load" => 0, - "File::Spec" => 0, - "IO::Handle" => 0, - "IPC::Open3" => 0, - "List::MoreUtils" => 0, - "Moose" => 0, - "Moose::Role" => 0, - "MooseX::MethodAttributes" => "0.15", - "MooseX::Traits::Pluggable" => 0, - "Scalar::Util" => 0, - "Test::More" => 0, - "base" => 0, - "namespace::autoclean" => 0, - "strict" => 0, - "version" => 0, - "warnings" => 0 -); - - -unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { - delete $WriteMakefileArgs{TEST_REQUIRES}; - delete $WriteMakefileArgs{BUILD_REQUIRES}; - $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs; -} - -delete $WriteMakefileArgs{CONFIGURE_REQUIRES} - unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; - -WriteMakefile(%WriteMakefileArgs); - - - diff --git a/sources/CatalystX-Component-Traits/README b/sources/CatalystX-Component-Traits/README deleted file mode 100644 index fd90cfc..0000000 --- a/sources/CatalystX-Component-Traits/README +++ /dev/null @@ -1,113 +0,0 @@ -NAME - CatalystX::Component::Traits - Automatic Trait Loading and Resolution - for Catalyst Components - -SYNOPSIS - package Catalyst::Model::SomeModel; - with 'CatalystX::Component::Traits'; - - package MyApp::Model::MyModel; - use parent 'Catalyst::Model::SomeModel'; - - package MyApp; - - __PACKAGE__->config('Model::MyModel' => { - traits => ['SearchedForTrait', '+Fully::Qualified::Trait'] - }); - -DESCRIPTION - Adds a "COMPONENT" in Catalyst::Component method to your Catalyst - component base class that reads the optional "traits" parameter from app - and component config and instantiates the component subclass with those - traits using "new_with_traits" in MooseX::Traits from - MooseX::Traits::Pluggable. - -TRAIT SEARCH - Trait names qualified with a "+" are taken to be full package names. - - Unqualified names are searched for, using the algorithm described below. - - EXAMPLE - Suppose your inheritance hierarchy is: - - MyApp::Model::MyModel - Catalyst::Model::CatModel - Catalyst::Model - Catalyst::Component - Moose::Object - - The configuration is: - - traits => ['Foo'] - - The package search order for "Foo" will be: - - MyApp::TraitFor::Model::CatModel::Foo - Catalyst::TraitFor::Model::CatModel::Foo - - A MORE PATHOLOGICAL EXAMPLE - For: - - My::App::Controller::AController - CatalystX::Something::ControllerBase::SomeController - Catalyst::Controller - Catalyst::Model - Catalyst::Component - Moose::Object - - With: - - traits => ['Foo'] - - Search order for "Foo" will be: - - My::App::TraitFor::Controller::SomeController::Foo - CatalystX::Something::TraitFor::Controller::SomeController::Foo - - The "Base" after (M|V|C) is automatically removed. - -TRAIT MERGING - Traits from component class config and app config are automatically - merged if you set the "_trait_merge" attribute default, e.g.: - - has '+_trait_merge' => (default => 1); - - You can remove component class config traits by prefixing their names - with a "-" in the app config traits. - - For example: - - package Catalyst::Model::Foo; - has '+_trait_merge' => (default => 1); - __PACKAGE__->config->{traits} = [qw/Foo Bar/]; - - package MyApp; - __PACKAGE__->config->{'Model::Foo'}{traits} = [qw/-Foo Baz/]; - - Will load the traits: - - Bar Baz - -AUTHOR - Rafael Kitover, "<rkito...@cpan.org>" - -CONTRIBUTORS - Tomas Doran, "<bobtf...@bobtfish.net>" - -BUGS - Please report any bugs or feature requests to - "bug-catalystx-component-traits at rt.cpan.org", or through the web - interface at - <http://rt.cpan.org/NoAuth/ReportBug.html?Queue=CatalystX-Component-Trai - ts>. I will be notified, and then you'll automatically be notified of - progress on your bug as I make changes. - -ACKNOWLEDGEMENTS - Matt S. Trout and Tomas Doran helped me with the current design. - -COPYRIGHT & LICENSE - Copyright (c) 2014, Rafael Kitover - - This program is free software; you can redistribute it and/or modify it - under the same terms as Perl itself. - diff --git a/sources/CatalystX-Component-Traits/dist.ini b/sources/CatalystX-Component-Traits/dist.ini deleted file mode 100644 index b24866d..0000000 --- a/sources/CatalystX-Component-Traits/dist.ini +++ /dev/null @@ -1,22 +0,0 @@ -name = CatalystX-Component-Traits -author = Rafael Kitover <rkito...@cpan.org> -license = Perl_5 -copyright_holder = Rafael Kitover -copyright_year = 2014 - -[@AVAR] -dist = CatalystX-Component-Traits -bugtracker = rt -authority = cpan:RKITOVER -github_user = rkitover -install_command = cpanm . -no_AutoPrereq = 1 - -[AutoPrereqs] -skip = ^MyApp:: -skip = ^CatalystX:: -skip = ^Catalyst:: -skip = ^My:: - -[Prereqs] -Catalyst = 0 diff --git a/sources/CatalystX-Component-Traits/lib/CatalystX/Component/Traits.pm b/sources/CatalystX-Component-Traits/lib/CatalystX/Component/Traits.pm deleted file mode 100644 index da8e070..0000000 --- a/sources/CatalystX-Component-Traits/lib/CatalystX/Component/Traits.pm +++ /dev/null @@ -1,267 +0,0 @@ -package CatalystX::Component::Traits; -{ - $CatalystX::Component::Traits::VERSION = '0.19'; -} - -use namespace::autoclean; -use Moose::Role; -use Carp; -use List::MoreUtils qw/firstidx any uniq/; -use Scalar::Util 'reftype'; -use Class::Load qw/ load_first_existing_class /; -with 'MooseX::Traits::Pluggable' => { -excludes => ['_find_trait'] }; - -=head1 NAME - -CatalystX::Component::Traits - Automatic Trait Loading and Resolution for Catalyst Components - -=cut - -our $AUTHORITY = 'id:RKITOVER'; - -=head1 SYNOPSIS - - package Catalyst::Model::SomeModel; - with 'CatalystX::Component::Traits'; - - package MyApp::Model::MyModel; - use parent 'Catalyst::Model::SomeModel'; - - package MyApp; - - __PACKAGE__->config('Model::MyModel' => { - traits => ['SearchedForTrait', '+Fully::Qualified::Trait'] - }); - -=head1 DESCRIPTION - -Adds a L<Catalyst::Component/COMPONENT> method to your L<Catalyst> component -base class that reads the optional C<traits> parameter from app and component -config and instantiates the component subclass with those traits using -L<MooseX::Traits/new_with_traits> from L<MooseX::Traits::Pluggable>. - -=head1 TRAIT SEARCH - -Trait names qualified with a C<+> are taken to be full package names. - -Unqualified names are searched for, using the algorithm described below. - -=head2 EXAMPLE - -Suppose your inheritance hierarchy is: - - MyApp::Model::MyModel - Catalyst::Model::CatModel - Catalyst::Model - Catalyst::Component - Moose::Object - -The configuration is: - - traits => ['Foo'] - -The package search order for C<Foo> will be: - - MyApp::TraitFor::Model::CatModel::Foo - Catalyst::TraitFor::Model::CatModel::Foo - -=head2 A MORE PATHOLOGICAL EXAMPLE - -For: - - My::App::Controller::AController - CatalystX::Something::ControllerBase::SomeController - Catalyst::Controller - Catalyst::Model - Catalyst::Component - Moose::Object - -With: - - traits => ['Foo'] - -Search order for C<Foo> will be: - - My::App::TraitFor::Controller::SomeController::Foo - CatalystX::Something::TraitFor::Controller::SomeController::Foo - -The C<Base> after (M|V|C) is automatically removed. - -=head1 TRAIT MERGING - -Traits from component class config and app config are automatically merged if -you set the C<_trait_merge> attribute default, e.g.: - - has '+_trait_merge' => (default => 1); - -You can remove component class config traits by prefixing their names with a -C<-> in the app config traits. - -For example: - - package Catalyst::Model::Foo; - has '+_trait_merge' => (default => 1); - __PACKAGE__->config->{traits} = [qw/Foo Bar/]; - - package MyApp; - __PACKAGE__->config->{'Model::Foo'}{traits} = [qw/-Foo Baz/]; - -Will load the traits: - - Bar Baz - -=cut - -# override MX::Traits attribute -has '_trait_namespace' => ( - init_arg => undef, - isa => 'Str', - (Moose->VERSION >= 0.84 ) ? (is => 'bare') : (), - default => '+Trait', -); - -has '_trait_merge' => ( - init_arg => undef, - isa => 'Str', - (Moose->VERSION >= 0.84 ) ? (is => 'bare') : (), - default => 0, -); - -sub COMPONENT { - my ($class, $app, $args) = @_; - - my %class_config = %{ $class->config }; - my %app_config = %$args; - - my $traits = $class->_merge_traits( - delete $class_config{traits}, - delete $app_config{traits}, - ); - - $args = $class->merge_config_hashes(\%class_config, \%app_config); - - if ($traits) { - return $class->new_with_traits($app, { - traits => $traits, - %$args - }); - } - - return $class->new($app, $args); -} - -sub _merge_traits { - my $class = shift; - my $left_traits = shift || []; - my $right_traits = shift || []; - - my $should_merge = - eval { $class->meta->find_attribute_by_name('_trait_merge')->default }; - $should_merge = $should_merge->() - if ref($should_merge) && reftype($should_merge) eq 'CODE'; - - my @right_traits = ref($right_traits) ? @$right_traits : $right_traits; - my @left_traits = ref($left_traits) ? @$left_traits : $left_traits; - unless ($should_merge) { - return @right_traits ? \@right_traits : \@left_traits; - } - - my @to_remove = map { /^-(.*)/ ? $1 : () } @left_traits, @right_traits; - @left_traits = grep !/^-/, @left_traits; - @right_traits = grep !/^-/, @right_traits; - - my @traits = grep { - my $trait = $_; - not any { $trait eq $_ } @to_remove; - } (@left_traits, @right_traits); - - return [ uniq @traits ]; -} - -sub _find_trait { - my ($class, $base, $name) = @_; - - load_first_existing_class($class->_trait_search_order($base, $name)); -} - -sub _trait_search_order { - my ($class, $base, $name) = @_; - - my @search_ns = $class->meta->class_precedence_list; - - my $MVCC = qr/(?:Model|View|Controller|Component)/; - - my $possible_parent_idx = - (firstidx { /^CatalystX?::/ } @search_ns[1 .. $#search_ns]) + 1; - - my ($parent, $parent_idx, $parent_name, $parent_name_partial); - - for my $try_parent ($possible_parent_idx, 0) { - $parent_idx = $try_parent; - $parent = $search_ns[$parent_idx]; - - ($parent_name, $parent_name_partial) = - $parent =~ /($MVCC(?:Base)? (?: ::)? (.*))/x; - - last if $parent_name_partial; # otherwise root level component - } - - (my $resolved_parent_name = $parent_name) =~ s/($MVCC)Base\b/$1/; - - my ($parent_part) = $parent =~ /($MVCC) (?:Base)? (?: ::)?/x; - - my @res; - - for my $ns (@search_ns[0 .. $parent_idx]) { - my $find_part = $parent_part; - - my ($part) = $ns =~ /^(.+?)::$parent_part/; - push @res, "${part}::${base}For::${resolved_parent_name}::$name"; - } - - @res; -} - -# we'll come back to this later... -# for my $ns (@search_ns[($parent_idx+1) .. $#search_ns]) { -# my ($part, $rest) = split /::/, $ns, 2; -# -# # no non-core crap in the Moose:: namespace -# $part = 'MooseX' if $part eq 'Moose'; -# -# push @res, "${part}::${base}For::${rest}::$name"; -# } -# -# @res; -#} - -=head1 AUTHOR - -Rafael Kitover, C<< <rkito...@cpan.org> >> - -=head1 CONTRIBUTORS - -Tomas Doran, C<< <bobtf...@bobtfish.net> >> - -=head1 BUGS - -Please report any bugs or feature requests to C<bug-catalystx-component-traits -at rt.cpan.org>, or through the web interface at -L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=CatalystX-Component-Traits>. I -will be notified, and then you'll automatically be notified of progress on your -bug as I make changes. - -=head1 ACKNOWLEDGEMENTS - -Matt S. Trout and Tomas Doran helped me with the current design. - -=head1 COPYRIGHT & LICENSE - -Copyright (c) 2014, Rafael Kitover - -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - -=cut - -__PACKAGE__; # End of CatalystX::Component::Traits diff --git a/sources/CatalystX-Component-Traits/t/00-compile.t b/sources/CatalystX-Component-Traits/t/00-compile.t deleted file mode 100644 index fb09a9c..0000000 --- a/sources/CatalystX-Component-Traits/t/00-compile.t +++ /dev/null @@ -1,50 +0,0 @@ -use 5.006; -use strict; -use warnings; - -# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.039 - -use Test::More tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0); - - - -my @module_files = ( - 'CatalystX/Component/Traits.pm' -); - - - -# no fake home requested - -my $inc_switch = -d 'blib' ? '-Mblib' : '-Ilib'; - -use File::Spec; -use IPC::Open3; -use IO::Handle; - -open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!"; - -my @warnings; -for my $lib (@module_files) -{ - # see L<perlfaq8/How can I capture STDERR from an external command?> - my $stderr = IO::Handle->new; - - my $pid = open3($stdin, '>&STDERR', $stderr, $^X, $inc_switch, '-e', "require q[$lib]"); - binmode $stderr, ':crlf' if $^O eq 'MSWin32'; - my @_warnings = <$stderr>; - waitpid($pid, 0); - is($?, 0, "$lib loaded ok"); - - if (@_warnings) - { - warn @_warnings; - push @warnings, @_warnings; - } -} - - - -is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING}; - - diff --git a/sources/CatalystX-Component-Traits/t/01-basic.t b/sources/CatalystX-Component-Traits/t/01-basic.t deleted file mode 100644 index 50ee3fc..0000000 --- a/sources/CatalystX-Component-Traits/t/01-basic.t +++ /dev/null @@ -1,79 +0,0 @@ -use strict; -use warnings; -use Test::More tests => 7; -use Catalyst::Utils; - -{ - package Catalyst::Controller::SomeController; - use Moose; - extends 'Catalyst::Controller'; - with 'CatalystX::Component::Traits'; - has '+_trait_merge' => (default => 1); - - package Catalyst::TraitFor::Controller::SomeController::Foo; - use Moose::Role; - has 'foo' => (is => 'ro'); - - package MyApp::Controller::MyController; - use Moose; - extends 'Catalyst::Controller::SomeController'; - - __PACKAGE__->config( - traits => ['Foo', 'Bar', 'Baz'], - foo => 'bar' - ); - - sub find_app_class { - my $self = shift; - blessed($self->_application) || $self->_application; - } - - package MyApp::TraitFor::Controller::SomeController::Bar; - use Moose::Role; - has 'bar' => (is => 'ro'); - - package MyApp::TraitFor::Controller::SomeController::Baz; - use Moose::Role; - has 'baz' => (is => 'ro'); - - package MyApp::TraitFor::Controller::SomeController::Quux; - use Moose::Role; - has 'quux' => (is => 'ro'); - - package MyApp; - use Moose; - extends 'Catalyst'; - - __PACKAGE__->config->{'Controller::MyController'}{traits} = - ['-Baz', 'Quux']; - - $INC{'MyApp/Controller/MyController.pm'} = 1; - __PACKAGE__->setup; -} - -my $app_class = 'MyApp'; -ok((my $instance = MyApp::Controller::MyController->COMPONENT( - $app_class, - { bar => 'baz' } - )), - 'created a component instance'); - -ok(($instance->does('Catalyst::TraitFor::Controller::SomeController::Foo')), - 'instance had parent ns trait loaded from component config'); - -ok(($instance->does('MyApp::TraitFor::Controller::SomeController::Bar')), - 'instance had app ns trait loaded from component config'); - -is eval { $instance->foo }, 'bar', - 'trait initialized from component config works'; - -is eval { $instance->bar }, 'baz', - 'trait initialized from app config works'; - -is $instance->find_app_class, 'MyApp', 'Can find app class passing instance'; - -is_deeply( - [MyApp->controller('MyController')->meta->calculate_all_roles]->[0]->name, - 'Catalyst::TraitFor::Controller::SomeController::Foo|MyApp::TraitFor::Controller::SomeController::Bar|MyApp::TraitFor::Controller::SomeController::Quux', - 'traits merged correctly' -); diff --git a/sources/CatalystX-Component-Traits/t/02-trait_search.t b/sources/CatalystX-Component-Traits/t/02-trait_search.t deleted file mode 100644 index 350f773..0000000 --- a/sources/CatalystX-Component-Traits/t/02-trait_search.t +++ /dev/null @@ -1,20 +0,0 @@ -use strict; -use warnings; -use Test::More tests => 2; - -{ - package Catalyst::Model::CatModel; - use Moose; - extends 'Catalyst::Model'; - with 'CatalystX::Component::Traits'; - - package My::App::Model::AModel; - use base 'Catalyst::Model::CatModel'; -} - -ok((my $instance = My::App::Model::AModel->new), 'instance'); - -is_deeply [$instance->_trait_search_order('Trait', 'Foo')], [ - 'My::App::TraitFor::Model::CatModel::Foo', - 'Catalyst::TraitFor::Model::CatModel::Foo', -], 'trait search order'; diff --git a/sources/CatalystX-Component-Traits/t/03-cx_trait_search.t b/sources/CatalystX-Component-Traits/t/03-cx_trait_search.t deleted file mode 100644 index 5010d61..0000000 --- a/sources/CatalystX-Component-Traits/t/03-cx_trait_search.t +++ /dev/null @@ -1,26 +0,0 @@ -use strict; -use warnings; -use Test::More tests => 2; - -{ - package CatalystX::Something::ControllerBase::SomeController; - use Moose; - extends 'Catalyst::Controller'; - with 'CatalystX::Component::Traits'; - - package My::App::Controller::AController; - use base 'CatalystX::Something::ControllerBase::SomeController'; -} - -# squash warning from catalyst -my $instance; -{ - local $SIG{__WARN__} = sub {}; - - ok(($instance = My::App::Controller::AController->new), 'instance'); -} - -is_deeply [$instance->_trait_search_order('Trait', 'Foo')], [ - 'My::App::TraitFor::Controller::SomeController::Foo', - 'CatalystX::Something::TraitFor::Controller::SomeController::Foo', -], 'trait search order'; diff --git a/sources/CatalystX-Component-Traits/t/03-methodattributes.t b/sources/CatalystX-Component-Traits/t/03-methodattributes.t deleted file mode 100644 index 007833b..0000000 --- a/sources/CatalystX-Component-Traits/t/03-methodattributes.t +++ /dev/null @@ -1,37 +0,0 @@ -use strict; -use warnings; -use Test::More; - -unless ( - eval { require version; require MooseX::MethodAttributes; MooseX::MethodAttributes->VERSION('0.15'); } -) { - plan skip_all => 'Need MooseX::MethodAttributes 0.15 for this test'; - exit; -} - -plan tests => 4; - -{ - package My::Role; - use MooseX::MethodAttributes (); - use Moose::Role -traits => 'MethodAttributes'; - - sub foo : Action {} -} - -{ - package My::Controller; - use Moose; - BEGIN { extends 'Catalyst::Controller'; } - with 'CatalystX::Component::Traits'; -} - -my $app = bless {}, 'MyApp'; -my $i = eval { My::Controller->COMPONENT($app, { traits => '+My::Role' } ) }; -ok $i; -ok !$@ or warn $@; -my $meta = $i->meta; -ok $meta->can('get_method_attributes'); -my $attr = $meta->get_method_attributes( $i->can('foo') ); -is_deeply $attr, ['Action']; - diff --git a/sources/CatalystX-Component-Traits/t/04-no_merge.t b/sources/CatalystX-Component-Traits/t/04-no_merge.t deleted file mode 100644 index 7eed01a..0000000 --- a/sources/CatalystX-Component-Traits/t/04-no_merge.t +++ /dev/null @@ -1,63 +0,0 @@ -use strict; -use warnings; -use Test::More tests => 2; -use Catalyst::Utils; - -# test that everything off with trait merge turned OFF - -{ - package Catalyst::Controller::SomeController; - use Moose; - extends 'Catalyst::Controller'; - with 'CatalystX::Component::Traits'; - - package Catalyst::TraitFor::Controller::SomeController::Foo; - use Moose::Role; - has 'foo' => (is => 'ro'); - - package MyApp::Controller::MyController; - use Moose; - extends 'Catalyst::Controller::SomeController'; - - __PACKAGE__->config( - traits => ['Quux'], # these should be overwritten by app config - ); - - sub find_app_class { - my $self = shift; - blessed($self->_application) || $self->_application; - } - - package MyApp::TraitFor::Controller::SomeController::Bar; - use Moose::Role; - has 'bar' => (is => 'ro'); - - package MyApp::TraitFor::Controller::SomeController::Baz; - use Moose::Role; - has 'baz' => (is => 'ro'); - - package MyApp::TraitFor::Controller::SomeController::Quux; - use Moose::Role; - has 'quux' => (is => 'ro'); - - package MyApp; - use Moose; - extends 'Catalyst'; - - __PACKAGE__->config->{'Controller::MyController'} = { - traits => [qw/Foo Bar Baz/], - bar => 'baz', - }; - - $INC{'MyApp/Controller/MyController.pm'} = 1; - __PACKAGE__->setup; -} - -is eval { MyApp->controller('MyController')->bar }, 'baz', - 'trait initialized from app config works'; - -is_deeply( - [MyApp->controller('MyController')->meta->calculate_all_roles]->[0]->name, - 'Catalyst::TraitFor::Controller::SomeController::Foo|MyApp::TraitFor::Controller::SomeController::Bar|MyApp::TraitFor::Controller::SomeController::Baz', - 'traits from app config override traits from component config' -); diff --git a/sources/CatalystX-Component-Traits/t/05-app_named_cx.t b/sources/CatalystX-Component-Traits/t/05-app_named_cx.t deleted file mode 100644 index 4ed6910..0000000 --- a/sources/CatalystX-Component-Traits/t/05-app_named_cx.t +++ /dev/null @@ -1,20 +0,0 @@ -use strict; -use warnings; -use Test::More tests => 2; - -{ - package Catalyst::Model::CatModel; - use Moose; - extends 'Catalyst::Model'; - with 'CatalystX::Component::Traits'; - - package CatalystX::App::Model::AModel; - use base 'Catalyst::Model::CatModel'; -} - -ok((my $instance = CatalystX::App::Model::AModel->new), 'instance'); - -is_deeply [$instance->_trait_search_order('Trait', 'Foo')], [ - 'CatalystX::App::TraitFor::Model::CatModel::Foo', - 'Catalyst::TraitFor::Model::CatModel::Foo', -], 'trait search order'; diff --git a/sources/CatalystX-Component-Traits/t/06-app_root_component.t b/sources/CatalystX-Component-Traits/t/06-app_root_component.t deleted file mode 100644 index 913caf0..0000000 --- a/sources/CatalystX-Component-Traits/t/06-app_root_component.t +++ /dev/null @@ -1,16 +0,0 @@ -use strict; -use warnings; -use Test::More tests => 2; - -{ - package CatalystX::App::Model::AModel; - use Moose; - extends 'Catalyst::Model'; - with 'CatalystX::Component::Traits'; -} - -ok((my $instance = CatalystX::App::Model::AModel->new), 'instance'); - -is_deeply [$instance->_trait_search_order('Trait', 'Foo')], [ - 'CatalystX::App::TraitFor::Model::AModel::Foo' -], 'trait search order'; diff --git a/sources/CatalystX-Component-Traits/t/07-merge-single.t b/sources/CatalystX-Component-Traits/t/07-merge-single.t deleted file mode 100644 index 6b8e2e6..0000000 --- a/sources/CatalystX-Component-Traits/t/07-merge-single.t +++ /dev/null @@ -1,44 +0,0 @@ -use strict; -use warnings; -use Test::More; -use Catalyst::Utils; - -{ - package MyApp::Controller::SomeController; - use Moose; - extends 'Catalyst::Controller'; - with 'CatalystX::Component::Traits'; - has '+_trait_merge' => (default => 1); - - __PACKAGE__->config( traits => 'Foo' ); - - package MyApp::TraitFor::Controller::SomeController::Foo; - use Moose::Role; - has 'foo' => (is => 'ro'); - - package MyApp::TraitFor::Controller::SomeController::Bar; - use Moose::Role; - has 'bar' => (is => 'ro'); - -} - -ok((my $instance = MyApp::Controller::SomeController->COMPONENT( - bless({}, 'Catalyst'), - { traits => 'Bar', foo => 'bar', bar => 'baz' } - )), - 'created a component instance'); - -ok(($instance->does('MyApp::TraitFor::Controller::SomeController::Foo')), - 'instance had parent ns trait loaded from component config'); - -ok(($instance->does('MyApp::TraitFor::Controller::SomeController::Bar')), - 'instance had app ns trait loaded from component config'); - -is eval { $instance->foo }, 'bar', - 'trait initialized from component config works'; - -is eval { $instance->bar }, 'baz', - 'trait initialized from app config works'; - -done_testing; - diff --git a/sources/CatalystX-Component-Traits/t/release-pod-syntax.t b/sources/CatalystX-Component-Traits/t/release-pod-syntax.t deleted file mode 100644 index dddaea4..0000000 --- a/sources/CatalystX-Component-Traits/t/release-pod-syntax.t +++ /dev/null @@ -1,16 +0,0 @@ -#!perl - -BEGIN { - unless ($ENV{RELEASE_TESTING}) { - require Test::More; - Test::More::plan(skip_all => 'these tests are for release candidate testing'); - } -} - -# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. -use Test::More; - -eval "use Test::Pod 1.41"; -plan skip_all => "Test::Pod 1.41 required for testing POD" if $@; - -all_pod_files_ok(); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatalyst-modules-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits