String-Diff-0.07 000755 000765 000024 0 12566305504 12457 5 ustar 00ko staff 000000 000000 README 100644 000765 000024 10641 12566305504 13442 0 ustar 00ko staff 000000 000000 String-Diff-0.07 NAME
String::Diff - Simple diff to String
SYNOPSIS
use String::Diff;
use String::Diff qw( diff_fully diff diff_merge diff_regexp );# export functions
# simple diff
my($old, $new) = String::Diff::diff('this is Perl', 'this is Ruby');
print "$old\n";# this is [Perl]
print "$new\n";# this is {Ruby}
my $diff = String::Diff::diff('this is Perl', 'this is Ruby');
print "$diff->[0]\n";# this is [Perl]
print "$diff->[1]\n";# this is {Ruby}
my $diff = String::Diff::diff('this is Perl', 'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
);
print "$diff->[0]\n";# this is Perl
print "$diff->[1]\n";# this is Ruby
# merged
my $diff = String::Diff::diff_merge('this is Perl', 'this is Ruby');
print "$diff\n";# this is [Perl]{Ruby}
my $diff = String::Diff::diff_merge('this is Perl', 'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
);
print "$diff\n";# this is PerlRuby
# change to default marks
%String::Diff::DEFAULT_MARKS = (
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
separator => '<-OLD|NEW->', # for diff_merge
);
# generated for regexp
my $diff = String::Diff::diff_regexp('this is Perl', 'this is Ruby');
print "$diff\n";# this\ is\ (?:Perl|Ruby)
# detailed list
my $diff = String::Diff::diff_fully('this is Perl', 'this is Ruby');
for my $line (@{ $diff->[0] }) {
print "$line->[0]: '$line->[1]'\n";
}
# u: 'this is '
# -: 'Perl'
for my $line (@{ $diff->[1] }) {
print "$line->[0]: '$line->[1]'\n";
}
# u: 'this is '
# +: 'Ruby'
DESCRIPTION
String::Diff is the difference of a consecutive string is made. after
general diff is done, the difference in the line is searchable.
the mark of the addition and the deletion can be freely changed. the
color is colored to the terminal with ANSI, using the HTML display it.
after the line is divided, diff is taken when 'linebreak' option is
specified.
my($old_string, $new_string) = String::Diff::diff_fully('this is Perl', 'this is Ruby', linebreak => 1);
my($old_string, $new_string) = String::Diff::diff('this is Perl', 'this is Ruby', linebreak => 1);
my $string = String::Diff::diff_merge('this is Perl', 'this is Ruby', linebreak => 1);
my $string = String::Diff::diff_regexp('this is Perl', 'this is Ruby', linebreak => 1);
In diff and diff_merge methods the mark of the difference can be
changed.
my $diff = String::Diff::diff('this is Perl', 'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
);
You can escape callback set to diff function and diff_merge function.
use HTML::Entities
my($diff_old, $diff_new) = String::Diff::diff(
'this is Perl',
'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
escape => sub { encode_entities($_[0]) },
});
is($diff_old, 'this is <b>Perl</b>');
is($diff_new, 'this is <b><BIG>R</BIG>uby</b>');
METHODS
diff_fully
the list that divides diff according to the mark is returnd.
my($old_string, $new_string) = String::Diff::diff_fully('this is Perl', 'this is Ruby');
diff
abd the mark of the deletion and the addition is given to the string.
diff_merge
old and new string is merged with diff.
diff_regexp
the regular expression to which old string and new string are matched with regexp is returned.
AUTHOR
Kazuhiro Osawa
SEE ALSO
Algorithm::Diff
LICENSE
Copyright 2008 (C) Kazuhiro Osawa
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Changes 100644 000765 000024 2034 12566305504 14032 0 ustar 00ko staff 000000 000000 String-Diff-0.07 Revision history for Perl extension String::Diff
0.07 2015-08-23 17:58:40 JST
- Correctly escape hunks in the end of the merged string pull-req #2 (mar-kolya ++)
- Add copyright in a pod RT #48063 (frequency++)
- Fixed to documentation bug RT #96057 (valmid++)
0.06 2012-06-28T10:51:01+09:00
- add escape option for diff/diff_merge RT #55265 (TINITA++)
- fixed bug, quotemeta being quoted is the IDEOGRAPHIC COMMA (U+3001)(、) RT #76371 (ANDK++)
0.05 2012-06-22T15:55:30+09:00
- modern Makefile.PL
- fixed Bugs RT #71678
0.04 2008-10-23T18:04:35+09:00
- Algorithm::Diff::XS support
0.03 2007-06-10T14:39:00+09:00
- fixed to invalid handling of zeros bug. rt.cpan #26493
- fixed to description of POD is wrong. rt.cpan ticket #26476
- appended to inc directory. rt.cpan ticket #27049, #25981
0.02 2006-11-20T17:40:45+09:00
- default marks is editable. (idea from dankogai)
0.01 Thu Nov 16 23:55:03 2006
- original version
LICENSE 100644 000765 000024 44012 12566305504 13566 0 ustar 00ko staff 000000 000000 String-Diff-0.07 This software is copyright (c) 2008 by Kazuhiro Osawa .
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) 2008 by Kazuhiro Osawa .
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, Fifth Floor, Boston, MA 02110-1301 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.
Copyright (C) 19yy
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.
, 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) 2008 by Kazuhiro Osawa .
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
cpanfile 100644 000765 000024 221 12566305504 14217 0 ustar 00ko staff 000000 000000 String-Diff-0.07 requires 'perl', '5.008005';
requires 'Algorithm::Diff', '0';
on test => sub {
requires 'Test::More', '0.88';
requires 'YAML', '0';
};
dist.ini 100644 000765 000024 11 12566305504 14134 0 ustar 00ko staff 000000 000000 String-Diff-0.07 [@Milla]
Build.PL 100644 000765 000024 261 12566305504 14013 0 ustar 00ko staff 000000 000000 String-Diff-0.07 # This Build.PL for String-Diff was generated by Dist::Zilla::Plugin::ModuleBuildTiny 0.014.
use strict;
use warnings;
use 5.008005;
use Module::Build::Tiny 0.034;
Build_PL();
META.yml 100644 000765 000024 1656 12566305504 14021 0 ustar 00ko staff 000000 000000 String-Diff-0.07 ---
abstract: 'Simple diff to String'
author:
- 'Kazuhiro Osawa '
build_requires:
Test::More: '0.88'
YAML: '0'
configure_requires:
Module::Build::Tiny: '0.034'
dynamic_config: 0
generated_by: 'Dist::Zilla version 5.039, Dist::Milla version v1.0.15, CPAN::Meta::Converter version 2.150005'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: '1.4'
name: String-Diff
no_index:
directory:
- t
- xt
- inc
- share
- eg
- examples
requires:
Algorithm::Diff: '0'
perl: '5.008005'
resources:
bugtracker: https://github.com/yappo/p5-String-Diff/issues
homepage: https://github.com/yappo/p5-String-Diff
repository: https://github.com/yappo/p5-String-Diff.git
version: '0.07'
x_contributors:
- 'Kazuhiro Osawa '
- 'Nikolay Martynov '
- 'yappo '
MANIFEST 100644 000765 000024 1137 12566305504 13673 0 ustar 00ko staff 000000 000000 String-Diff-0.07 # This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.039.
Build.PL
Changes
LICENSE
MANIFEST
META.json
META.yml
Makefile.PL
README
cpanfile
dist.ini
lib/String/Diff.pm
t/00_compile-pp.t
t/00_compile.t
t/01_export-pp.t
t/01_export.t
t/02_diff_fully-pp.t
t/02_diff_fully.t
t/03_diff-pp.t
t/03_diff.t
t/04_diff_merge-pp.t
t/04_diff_merge.t
t/05_diff_regexp-pp.t
t/05_diff_regexp.t
t/06_escape.t
t/release-pod-syntax.t
tools/benchmark-script.pl
tools/benchmark.pl
tools/coverage_test.sh
tools/gen_pp_test.pl
tools/release.pl
xt/97_podspell.t
xt/98_perlcritic.t
xt/99_pod.t
xt/perlcriticrc
META.json 100644 000765 000024 3260 12566305504 14162 0 ustar 00ko staff 000000 000000 String-Diff-0.07 {
"abstract" : "Simple diff to String",
"author" : [
"Kazuhiro Osawa "
],
"dynamic_config" : 0,
"generated_by" : "Dist::Zilla version 5.039, Dist::Milla version v1.0.15, CPAN::Meta::Converter version 2.150005",
"license" : [
"perl_5"
],
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
"version" : "2"
},
"name" : "String-Diff",
"no_index" : {
"directory" : [
"t",
"xt",
"inc",
"share",
"eg",
"examples"
]
},
"prereqs" : {
"configure" : {
"requires" : {
"Module::Build::Tiny" : "0.034"
}
},
"develop" : {
"requires" : {
"Dist::Milla" : "v1.0.15",
"Test::Pod" : "1.41"
}
},
"runtime" : {
"requires" : {
"Algorithm::Diff" : "0",
"perl" : "5.008005"
}
},
"test" : {
"requires" : {
"Test::More" : "0.88",
"YAML" : "0"
}
}
},
"release_status" : "stable",
"resources" : {
"bugtracker" : {
"web" : "https://github.com/yappo/p5-String-Diff/issues"
},
"homepage" : "https://github.com/yappo/p5-String-Diff",
"repository" : {
"type" : "git",
"url" : "https://github.com/yappo/p5-String-Diff.git",
"web" : "https://github.com/yappo/p5-String-Diff"
}
},
"version" : "0.07",
"x_contributors" : [
"Kazuhiro Osawa ",
"Nikolay Martynov ",
"yappo "
]
}
Makefile.PL 100644 000765 000024 726 12566305504 14477 0 ustar 00ko staff 000000 000000 String-Diff-0.07 use 5.008001;
use inc::Module::Install;
use Module::Install::ReadmeFromPod;
use Module::Install::ReadmeMarkdownFromPod;
use Module::Install::GithubMeta;
use Module::Install::Repository;
name 'String-Diff';
all_from 'lib/String/Diff.pm';
readme_from 'lib/String/Diff.pm';
readme_markdown_from 'lib/String/Diff.pm';
githubmeta;
requires 'Algorithm::Diff';
build_requires 'Test::Base';
build_requires 'Test::More';
build_requires 'YAML';
auto_set_repository;
WriteAll;
t 000755 000765 000024 0 12566305504 12643 5 ustar 00ko staff 000000 000000 String-Diff-0.07 03_diff.t 100644 000765 000024 11211 12566305504 14416 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t use strict;
use utf8;
use Test::Base;
plan tests => 2 * blocks;
use String::Diff qw( diff );
filters { data1 => 'yaml', data2 => 'yaml' };
sub string_diff {
my $input = shift;
my $diff = diff($input->{old}, $input->{new}, %{ $input->{options} });
$diff;
}
run {
my $block = shift;
my $diff = diff($block->data2->{old}, $block->data2->{new}, %{ $block->data2->{options} });
my @diff = diff($block->data2->{old}, $block->data2->{new}, %{ $block->data2->{options} });
is_deeply $block->data1, $diff;
is_deeply $block->data1, \@diff;
};
__END__
===
--- data1
- perl
- pe{a}rl
--- data2
old: perl
new: pearl
===
--- data1
- 'th[i]s [is ]a[ pen]'
- "th{at'}s a{ll}"
--- data2
old: this is a pen
new: that's all
===
--- data1
- '[S]oo[z]y'
- '{B}oo{f}y'
--- data2
old: Soozy
new: Boofy
===
--- data1
- '[あ]る[晴れた日に散歩をすると]、そ[こに]は'
- '{いつもい}る{人がいないので}、そ{れ}は'
--- data2
old: ある晴れた日に散歩をすると、そこには
new: いつもいる人がいないので、それは
===
--- data1
- |-
This library is [free software]; you can redistribute it and[/or] modify
it under the same terms as Perl itself.
- |-
This library is {自由なソフト}; you can {not }redistribute it {or/}and modify
it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
===
--- data1
- |-
This library is [free software]; you can redistribute it and[/or] modify[
]it under the same terms as Perl itself.
- This library is {自由なソフト}; you can {not }redistribute it {or/}and modify{ }it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: This library is 自由なソフト; you can not redistribute it or/and modify it under the same terms as Pearl it self.
===
--- data1
- |-
[remove
]This library is [free software]; you can redistribute it and[/or] modify
(snip)
it under the same terms as Perl itself.
- |-
This library is {自由なソフト}; you can {not }redistribute it {or/}and modify
(snip)
it under the same terms as Pe{a}rl it{ }self.{
append}
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
===
--- data1
- |-
This library is [free software]; you can redistribute it and[/or] modify
it under the same terms as Perl itself.
- |-
This library is {自由なソフト}; you can {not }redistribute it {or/}and modify
it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
- |-
remo[ve]
[This library is free software; you can redistribute it and/or modify][
](snip)
it under the same terms as Perl itself.
- |-
{This lib}r{ary is 自由なソフト; you can not r}e{distribute it or/and }mo{dify}
(snip)
it under the same terms as Pe{a}rl it{ }self.{
}{append}
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
options:
linebreak: 1
===
--- data1
- |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
- |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
remove_open:
remove_close:
append_open:
append_close:
===
--- data1
- 1[0]
- 1{1}
--- data2
old: 10
new: 11
xt 000755 000765 000024 0 12566305504 13033 5 ustar 00ko staff 000000 000000 String-Diff-0.07 99_pod.t 100644 000765 000024 201 12566305504 14434 0 ustar 00ko staff 000000 000000 String-Diff-0.07/xt use Test::More;
eval "use Test::Pod 1.00";
plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
all_pod_files_ok();
01_export.t 100644 000765 000024 301 12566305504 14763 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t use Test::Base;
use String::Diff qw( diff_fully diff diff_merge diff_regexp );
plan tests => 4;
ok(defined &diff_fully);
ok(defined &diff);
ok(defined &diff_merge);
ok(defined &diff_regexp);
06_escape.t 100644 000765 000024 3266 12566305504 14744 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t use strict;
use warnings;
use Test::More;
eval q{ use HTML::Entities };
plan skip_all => "HTML::Entities is not installed." if $@;
use String::Diff;
my @diff = String::Diff::diff(
'this is Perl',
'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
escape => sub { encode_entities($_[0]) },
);
is($diff[0], 'this is <b>Perl</b>');
is($diff[1], 'this is <b><BIG>R</BIG>uby</b>');
my $diff = String::Diff::diff_merge(
'this is Perl',
'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
escape => sub { encode_entities($_[0]) },
);
is($diff, 'this is <b>Perl<BIG>R</BIG>uby</b>');
subtest('Hunk added in the end', sub {
my $diff = String::Diff::diff_merge(
'this is ',
'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
escape => sub { encode_entities($_[0]) },
);
is($diff, 'this is <b><BIG>R</BIG>uby</b>');
});
subtest('Hunk removed in the end', sub {
my $diff = String::Diff::diff_merge(
'this is Perl',
'this is ',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
escape => sub { encode_entities($_[0]) },
);
is($diff, 'this is <b><BIG>P</BIG>erl</b>');
});
done_testing;
00_compile.t 100644 000765 000024 110 12566305504 15067 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t use strict;
use Test::More tests => 1;
BEGIN { use_ok 'String::Diff' }
03_diff-pp.t 100644 000765 000024 11254 12566305504 15042 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t BEGIN{ $ENV{STRING_DIFF_PP} = 1; }
use strict;
use utf8;
use Test::Base;
plan tests => 2 * blocks;
use String::Diff qw( diff );
filters { data1 => 'yaml', data2 => 'yaml' };
sub string_diff {
my $input = shift;
my $diff = diff($input->{old}, $input->{new}, %{ $input->{options} });
$diff;
}
run {
my $block = shift;
my $diff = diff($block->data2->{old}, $block->data2->{new}, %{ $block->data2->{options} });
my @diff = diff($block->data2->{old}, $block->data2->{new}, %{ $block->data2->{options} });
is_deeply $block->data1, $diff;
is_deeply $block->data1, \@diff;
};
__END__
===
--- data1
- perl
- pe{a}rl
--- data2
old: perl
new: pearl
===
--- data1
- 'th[i]s [is ]a[ pen]'
- "th{at'}s a{ll}"
--- data2
old: this is a pen
new: that's all
===
--- data1
- '[S]oo[z]y'
- '{B}oo{f}y'
--- data2
old: Soozy
new: Boofy
===
--- data1
- '[あ]る[晴れた日に散歩をすると]、そ[こに]は'
- '{いつもい}る{人がいないので}、そ{れ}は'
--- data2
old: ある晴れた日に散歩をすると、そこには
new: いつもいる人がいないので、それは
===
--- data1
- |-
This library is [free software]; you can redistribute it and[/or] modify
it under the same terms as Perl itself.
- |-
This library is {自由なソフト}; you can {not }redistribute it {or/}and modify
it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
===
--- data1
- |-
This library is [free software]; you can redistribute it and[/or] modify[
]it under the same terms as Perl itself.
- This library is {自由なソフト}; you can {not }redistribute it {or/}and modify{ }it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: This library is 自由なソフト; you can not redistribute it or/and modify it under the same terms as Pearl it self.
===
--- data1
- |-
[remove
]This library is [free software]; you can redistribute it and[/or] modify
(snip)
it under the same terms as Perl itself.
- |-
This library is {自由なソフト}; you can {not }redistribute it {or/}and modify
(snip)
it under the same terms as Pe{a}rl it{ }self.{
append}
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
===
--- data1
- |-
This library is [free software]; you can redistribute it and[/or] modify
it under the same terms as Perl itself.
- |-
This library is {自由なソフト}; you can {not }redistribute it {or/}and modify
it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
- |-
remo[ve]
[This library is free software; you can redistribute it and/or modify][
](snip)
it under the same terms as Perl itself.
- |-
{This lib}r{ary is 自由なソフト; you can not r}e{distribute it or/and }mo{dify}
(snip)
it under the same terms as Pe{a}rl it{ }self.{
}{append}
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
options:
linebreak: 1
===
--- data1
- |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
- |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
remove_open:
remove_close:
append_open:
append_close:
===
--- data1
- 1[0]
- 1{1}
--- data2
old: 10
new: 11
perlcriticrc 100644 000765 000024 63 12566305504 15542 0 ustar 00ko staff 000000 000000 String-Diff-0.07/xt [TestingAndDebugging::ProhibitNoStrict]
allow=refs
01_export-pp.t 100644 000765 000024 344 12566305504 15407 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t BEGIN{ $ENV{STRING_DIFF_PP} = 1; }
use Test::Base;
use String::Diff qw( diff_fully diff diff_merge diff_regexp );
plan tests => 4;
ok(defined &diff_fully);
ok(defined &diff);
ok(defined &diff_merge);
ok(defined &diff_regexp);
tools 000755 000765 000024 0 12566305504 13540 5 ustar 00ko staff 000000 000000 String-Diff-0.07 release.pl 100755 000765 000024 3413 12566305504 15661 0 ustar 00ko staff 000000 000000 String-Diff-0.07/tools #!/usr/bin/perl
use warnings;
use strict;
use File::Path;
use LWP::Simple;
use ExtUtils::MakeMaker qw(prompt);
my $version = shift @ARGV or die "Usage: release.pl version";
my $workdir = "$ENV{HOME}/pmsetup";
my $checkout = "String-Diff-$version";
chdir $workdir;
if (-e $checkout) {
die "$workdir/$checkout exists. Remove it first";
}
system("svk co //mirror/public/String-Diff/trunk $checkout");
sleep(2);
if (-e $checkout) {
chdir $checkout;
rewrite_version("lib/String/Diff.pm", $version);
system("perl Makefile.PL --skip");
system("make manifest");
check_version("Changes", $version);
if (!system("make disttest")) {
system("svk ci -m 'packaging $version'");
system("svk cp -m 'tag release $version' //mirror/public/String-Diff/trunk //mirror/public/String-Diff/tags/release-$version");
system("make dist");
if (prompt("upload to CPAN?: [yN]", 'n') =~ /[yY]/) {
system("cpan-upload -verbose String-Diff-$version.tar.gz");
} else {
rename "String-Diff-$version.tar.gz", "../String-Diff-$version.tar.gz";
}
} else {
warn "make disttest failed. Don't upload";
}
chdir "..";
system("svk co --detach $checkout");
}
rmtree("$workdir/$checkout");
sub rewrite_version {
my($file, $version) = @_;
open my $fh, $file or die "$file: $!";
my $content = join '', <$fh>;
close $fh;
$content =~ s/^our \$VERSION = .*?;$/our \$VERSION = '$version';/m;
open my $out, ">", "lib/String/Diff.pm";
print $out $content;
close $out;
}
sub check_version {
my($file, $version) = @_;
open my $fh, $file or die "$file: $!";
while (<$fh>) {
/^\Q$version\E / and return 1;
}
die "$file doesn't contain log for $version";
}
97_podspell.t 100644 000765 000024 421 12566305504 15476 0 ustar 00ko staff 000000 000000 String-Diff-0.07/xt use Test::More;
eval q{ use Test::Spelling };
plan skip_all => "Test::Spelling is not installed." if $@;
add_stopwords(map { split /[\s\:\-]/ } );
$ENV{LANG} = 'C';
all_pod_files_spelling_ok('lib');
__DATA__
Kazuhiro Osawa
String::Diff
searchable
HTML
linebreak
diff
00_compile-pp.t 100644 000765 000024 153 12566305504 15513 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t BEGIN{ $ENV{STRING_DIFF_PP} = 1; }
use strict;
use Test::More tests => 1;
BEGIN { use_ok 'String::Diff' }
02_diff_fully.t 100644 000765 000024 13553 12566305504 15643 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t use strict;
use utf8;
use Test::Base;
use String::Diff qw( diff_fully );
filters { data1 => [qw/ yaml /], data2 => [qw/ yaml string_diff /] };
sub string_diff {
my $input = shift;
my $diff = diff_fully($input->{old}, $input->{new}, %{ $input->{options} });
$diff;
}
run_compare;
__END__
===
--- data1
- []
-
- ['+', 'perl']
--- data2
old:
new: perl
===
--- data1
-
- ['-', 'perl']
-
--- data2
old: perl
new:
===
--- data1
- []
- []
--- data2
old:
new:
===
--- data1
-
- ['u', 'pe']
- ['u', 'rl']
-
- ['u', 'pe']
- ['+', 'a']
- ['u', 'rl']
--- data2
old: perl
new: pearl
===
--- data1
-
- ['u', 'th']
- ['-', 'i']
- ['u', 's ']
- ['-', 'is ']
- ['u', 'a']
- ['-', ' pen']
-
- ['u', 'th']
- ['+', "at'"]
- ['u', 's ']
- ['u', 'a']
- ['+', 'll']
--- data2
old: this is a pen
new: "that's all"
===
--- data1
-
- ['-', 'S']
- ['u', 'oo']
- ['-', 'z']
- ['u', 'y']
-
- ['+', 'B']
- ['u', 'oo']
- ['+', 'f']
- ['u', 'y']
--- data2
old: Soozy
new: Boofy
===
--- data1
-
- ['-', 'あ']
- ['u', 'る']
- ['-', '晴れた日に散歩をすると']
- ['u', '、そ']
- ['-', 'こに']
- ['u', 'は']
-
- ['+', 'いつもい']
- ['u', 'る']
- ['+', '人がいないので']
- ['u', '、そ']
- ['+', 'れ']
- ['u', 'は']
--- data2
old: ある晴れた日に散歩をすると、そこには
new: いつもいる人がいないので、それは
===
--- data1
-
- ['u', 'This library is ']
- ['-', 'free software']
- ['u', '; you can ']
- ['u', 'redistribute it ']
- ['u', 'and']
- ['-', '/or']
- ['u', " modify\nit under the same terms as Pe"]
- ['u', 'rl it']
- ['u', 'self.']
-
- ['u', 'This library is ']
- ['+', '自由なソフト']
- ['u', '; you can ']
- ['+', 'not ']
- ['u', 'redistribute it ']
- ['+', 'or/']
- ['u', 'and']
- ['u', " modify\nit under the same terms as Pe"]
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
===
--- data1
-
- ['u', 'This library is ']
- ['-', 'free software']
- ['u', '; you can ']
- ['u', 'redistribute it ']
- ['u', 'and']
- ['-', '/or']
- ['u', ' modify']
- ['-', "\n"]
- ['u', 'it under the same terms as Pe']
- ['u', 'rl it']
- ['u', 'self.']
-
- ['u', 'This library is ']
- ['+', '自由なソフト']
- ['u', '; you can ']
- ['+', 'not ']
- ['u', 'redistribute it ']
- ['+', 'or/']
- ['u', 'and']
- ['u', ' modify']
- ['+', " "]
- ['u', 'it under the same terms as Pe']
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: This library is 自由なソフト; you can not redistribute it or/and modify it under the same terms as Pearl it self.
===
--- data1
-
- ['-', "remove\n"]
- ['u', 'This library is ']
- ['-', 'free software']
- ['u', '; you can ']
- ['u', 'redistribute it ']
- ['u', 'and']
- ['-', '/or']
- ['u', " modify\n(snip)\nit under the same terms as Pe"]
- ['u', 'rl it']
- ['u', 'self.']
-
- ['u', 'This library is ']
- ['+', '自由なソフト']
- ['u', '; you can ']
- ['+', 'not ']
- ['u', 'redistribute it ']
- ['+', 'or/']
- ['u', 'and']
- ['u', " modify\n(snip)\nit under the same terms as Pe"]
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
- ['+', "\nappend"]
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
===
--- data1
-
- ['u', 'This library is ']
- ['-', 'free software']
- ['u', '; you can ']
- ['u', 'redistribute it ']
- ['u', 'and']
- ['-', '/or']
- ['u', ' modify']
- ['u', "\n"]
- ['u', 'it under the same terms as Pe']
- ['u', 'rl it']
- ['u', 'self.']
-
- ['u', 'This library is ']
- ['+', '自由なソフト']
- ['u', '; you can ']
- ['+', 'not ']
- ['u', 'redistribute it ']
- ['+', 'or/']
- ['u', 'and']
- ['u', ' modify']
- ['u', "\n"]
- ['u', 'it under the same terms as Pe']
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
-
- ['u', 'r']
- ['u', 'e']
- ['u', 'mo']
- ['-', 've']
- ['u', "\n"]
- ['-', 'This library is free software; you can redistribute it and/or modify']
- ['-', "\n"]
- ['u', '(snip)']
- ['u', "\n"]
- ['u', 'it under the same terms as Pe']
- ['u', 'rl it']
- ['u', 'self.']
-
- ['+', 'This lib']
- ['u', 'r']
- ['+', 'ary is 自由なソフト; you can not r']
- ['u', 'e']
- ['+', 'distribute it or/and ']
- ['u', 'mo']
- ['+', 'dify']
- ['u', "\n"]
- ['u', '(snip)']
- ['u', "\n"]
- ['u', 'it under the same terms as Pe']
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
- ['+', "\n"]
- ['+', 'append']
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
options:
linebreak: 1
===
--- data1
-
- ['u', '1']
- ['-', '0']
-
- ['u', '1']
- ['+', '1']
--- data2
old: 10
new: 11
04_diff_merge.t 100644 000765 000024 11672 12566305504 15611 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t use strict;
use utf8;
use Test::Base;
use String::Diff qw( diff_merge );
filters { data1 => 'chomp', data2 => [qw/ yaml string_diff /] };
sub string_diff {
my $input = shift;
diff_merge($input->{old}, $input->{new}, %{ $input->{options} });
}
run_is;
__END__
===
--- data1
pe[a]r[a]l
--- data2
old: pearal
new: perl
===
--- data1
pe[a]rl
--- data2
old: pearl
new: perl
===
--- data1
pe{a}rl
--- data2
old: perl
new: pearl
===
--- data1
th[i]{at'}s [is ]a[ pen]{ll}
--- data2
old: this is a pen
new: that's all
===
--- data1
[S]{B}oo[z]{f}y
--- data2
old: Soozy
new: Boofy
===
--- data1
(?:S|B)oo(?:z|f)y
--- data2
old: Soozy
new: Boofy
options:
remove_open: '(?:'
remove_close: ''
append_open: ''
append_close: ')'
separator: '|'
===
--- data1
[あ]{いつもい}る[晴れた日に散歩をすると]{人がいないので}、そ[こに]{れ}は
--- data2
old: ある晴れた日に散歩をすると、そこには
new: いつもいる人がいないので、それは
===
--- data1
This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify
it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
===
--- data1
This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify[
]{ }it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: This library is 自由なソフト; you can not redistribute it or/and modify it under the same terms as Pearl it self.
===
--- data1
[remove
]This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify
(snip)
it under the same terms as Pe{a}rl it{ }self.{
append}
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
===
--- data1
This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify
it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify
it under the same terms as Pe{a}rl it{ }self.[
][delete]
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
delete
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
{This lib}r{ary is 自由なソフト; you can not r}e{distribute it or/and }mo[ve]{dify}
[This library is free software; you can redistribute it and/or modify][
](snip)
it under the same terms as Pe{a}rl it{ }self.{
}{append}
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
options:
linebreak: 1
===
--- data1
{This lib}r{ary is 自由なソフト; you can not r}e{distribute it or/and }mo[ve]{dify}
[This library is free software; you can redistribute it and/or modify][
](snip)
it under the same terms as Pe{a}rl it{ }self.[
][delete]
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
delete
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
This library is free software自由なソフト; you can not redistribute it or/and/or modify
it under the same terms as Pearl it self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
remove_open:
remove_close:
append_open:
append_close:
===
--- data1
1[0]{1}
--- data2
old: 10
new: 11
String 000755 000765 000024 0 12566305504 14414 5 ustar 00ko staff 000000 000000 String-Diff-0.07/lib Diff.pm 100644 000765 000024 25250 12566305504 16006 0 ustar 00ko staff 000000 000000 String-Diff-0.07/lib/String package String::Diff;
use strict;
use warnings;
use base qw(Exporter);
our @EXPORT_OK = qw( diff_fully diff diff_merge diff_regexp );
BEGIN {
local $@;
if ($ENV{STRING_DIFF_PP}) {
$@ = 1;
} else {
eval "use Algorithm::Diff::XS qw( sdiff );"; ## no critic
}
if ($@) {
eval "use Algorithm::Diff qw( sdiff );"; ## no critic
die $@ if $@;
}
}
our $VERSION = '0.07';
our %DEFAULT_MARKS = (
remove_open => '[',
remove_close => ']',
append_open => '{',
append_close => '}',
separator => '', # for diff_merge
);
sub diff_fully {
my($old, $new, %opts) = @_;
my $old_diff = [];
my $new_diff = [];
if ($opts{linebreak}) {
my @diff = sdiff( map{ my @l = map { ( $_, "\n") } split /\n/, $_; pop @l; [ @l ]} $old, $new);
for my $line (@diff) {
if ($line->[0] eq 'c') {
# change
my($old_diff_tmp, $new_diff_tmp) = _fully($line->[1], $line->[2]);
push @{ $old_diff }, @{ $old_diff_tmp };
push @{ $new_diff }, @{ $new_diff_tmp };
} elsif ($line->[0] eq '-') {
# remove
push @{ $old_diff }, ['-', $line->[1]];
} elsif ($line->[0] eq '+') {
# append
push @{ $new_diff }, ['+', $line->[2]];
} else {
# unchage
push @{ $old_diff }, ['u', $line->[1]];
push @{ $new_diff }, ['u', $line->[2]];
}
}
} else {
($old_diff, $new_diff) = _fully($old, $new);
}
wantarray ? ($old_diff, $new_diff) : [ $old_diff, $new_diff];
}
sub _fully {
my($old, $new) = @_;
return ([], []) unless $old || $new;
my @old_diff = ();
my @new_diff = ();
my $old_str;
my $new_str;
my @diff = sdiff( map{ $_ ? [ split //, $_ ] : [] } $old, $new);
my $last_mode = $diff[0]->[0];
for my $line (@diff) {
if ($last_mode ne $line->[0]) {
push @old_diff, [$last_mode, $old_str] if defined $old_str;
push @new_diff, [$last_mode, $new_str] if defined $new_str;
# skip concut ## i forget s mark
push @old_diff, ['s', ''] unless defined $old_str;
push @new_diff, ['s', ''] unless defined $new_str;
$old_str = $new_str = undef;
}
$old_str .= $line->[1];
$new_str .= $line->[2];
$last_mode = $line->[0];
}
push @old_diff, [$last_mode, $old_str] if defined $old_str;
push @new_diff, [$last_mode, $new_str] if defined $new_str;
@old_diff = _fully_filter('-', @old_diff);
@new_diff = _fully_filter('+', @new_diff);
return (\@old_diff, \@new_diff);
}
sub _fully_filter {
my($c_mode, @diff) = @_;
my @filter = ();
my $last_line = ['', ''];
for my $line (@diff) {
$line->[0] = $c_mode if $line->[0] eq 'c';
if ($last_line->[0] eq $line->[0]) {
$last_line->[1] .= $line->[1];
next;
}
push @filter, $last_line if length $last_line->[1];
$last_line = $line;
}
push @filter, $last_line if length $last_line->[1];
@filter;
}
sub diff {
my($old, $new, %opts) = @_;
my($old_diff, $new_diff) = diff_fully($old, $new, %opts);
%opts = (%DEFAULT_MARKS, %opts);
my $old_str = _str($old_diff, %opts);
my $new_str = _str($new_diff, %opts);
wantarray ? ($old_str, $new_str) : [ $old_str, $new_str];
}
sub _str {
my($diff, %opts) = @_;
my $str = '';
my $escape;
if ($opts{escape} && ref($opts{escape}) eq 'CODE') {
$escape = $opts{escape};
}
for my $parts (@{ $diff }) {
my $word = $escape ? $escape->($parts->[1]) : $parts->[1];
if ($parts->[0] eq '-') {
$str .= "$opts{remove_open}$word$opts{remove_close}";
} elsif ($parts->[0] eq '+') {
$str .= "$opts{append_open}$word$opts{append_close}";
} else {
$str .= $word;
}
}
$str;
}
sub diff_merge {
my($old, $new, %opts) = @_;
my($old_diff, $new_diff) = diff_fully($old, $new, %opts);
%opts = (%DEFAULT_MARKS, %opts);
my $old_c = 0;
my $new_c = 0;
my $str = '';
my $escape;
if ($opts{regexp}) {
$escape = sub { quotemeta($_[0]) };
} elsif ($opts{escape} && ref($opts{escape}) eq 'CODE') {
$escape = $opts{escape};
}
LOOP:
while (scalar(@{ $old_diff }) > $old_c && scalar(@{ $new_diff }) > $new_c) {
my $old_str = $escape ? $escape->($old_diff->[$old_c]->[1]) : $old_diff->[$old_c]->[1];
my $new_str = $escape ? $escape->($new_diff->[$new_c]->[1]) : $new_diff->[$new_c]->[1];
if ($old_diff->[$old_c]->[0] eq 'u' && $new_diff->[$new_c]->[0] eq 'u') {
$str .= $old_str;
$old_c++;
$new_c++;
} elsif ($old_diff->[$old_c]->[0] eq '-' && $new_diff->[$new_c]->[0] eq '+') {
$str .= "$opts{remove_open}$old_str";
$str .= "$opts{remove_close}$opts{separator}$opts{append_open}" unless $opts{regexp};
$str .= $opts{separator} if $opts{regexp};
$str .= "$new_str$opts{append_close}";
$old_c++;
$new_c++;
} elsif ($old_diff->[$old_c]->[0] eq 'u' && $new_diff->[$new_c]->[0] eq '+') {
$str .= "$opts{append_open}$new_str$opts{append_close}";
$new_c++;
} elsif ($old_diff->[$old_c]->[0] eq '-' && $new_diff->[$new_c]->[0] eq 'u') {
$str .= "$opts{remove_open}$old_str$opts{remove_close}";
$old_c++;
}
}
$str .= _list_gc($old_diff, $old_c, %opts);
$str .= _list_gc($new_diff, $new_c, %opts);
$str;
}
sub _list_gc {
my($diff, $c, %opts) = @_;
my $str = '';
my $escape;
if ($opts{regexp}) {
$escape = sub { quotemeta($_[0]) };
} elsif ($opts{escape} && ref($opts{escape}) eq 'CODE') {
$escape = $opts{escape};
}
while (scalar(@{ $diff }) > $c) {
my $_str = $escape ? $escape->($diff->[$c]->[1]) : $diff->[$c]->[1];
if ($diff->[$c]->[0] eq '-') {
$str .= "$opts{remove_open}$_str$opts{remove_close}";
} elsif ($diff->[$c]->[0] eq '+') {
$str .= "$opts{append_open}$_str$opts{append_close}";
} else {
$str .= $_str;
}
$c++;
}
$str;
}
my %regexp_opts = (
remove_open => '(?:',
remove_close => ')',
append_open => '(?:',
append_close => ')',
separator => '|',
regexp => 1,
escape => undef,
);
sub diff_regexp {
my($old, $new, %opts) = @_;
diff_merge($old, $new, %opts, %regexp_opts);
}
1;
__END__
=head1 NAME
String::Diff - Simple diff to String
=head1 SYNOPSIS
use String::Diff;
use String::Diff qw( diff_fully diff diff_merge diff_regexp );# export functions
# simple diff
my($old, $new) = String::Diff::diff('this is Perl', 'this is Ruby');
print "$old\n";# this is [Perl]
print "$new\n";# this is {Ruby}
my $diff = String::Diff::diff('this is Perl', 'this is Ruby');
print "$diff->[0]\n";# this is [Perl]
print "$diff->[1]\n";# this is {Ruby}
my $diff = String::Diff::diff('this is Perl', 'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
);
print "$diff->[0]\n";# this is Perl
print "$diff->[1]\n";# this is Ruby
# merged
my $diff = String::Diff::diff_merge('this is Perl', 'this is Ruby');
print "$diff\n";# this is [Perl]{Ruby}
my $diff = String::Diff::diff_merge('this is Perl', 'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
);
print "$diff\n";# this is PerlRuby
# change to default marks
%String::Diff::DEFAULT_MARKS = (
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
separator => '<-OLD|NEW->', # for diff_merge
);
# generated for regexp
my $diff = String::Diff::diff_regexp('this is Perl', 'this is Ruby');
print "$diff\n";# this\ is\ (?:Perl|Ruby)
# detailed list
my $diff = String::Diff::diff_fully('this is Perl', 'this is Ruby');
for my $line (@{ $diff->[0] }) {
print "$line->[0]: '$line->[1]'\n";
}
# u: 'this is '
# -: 'Perl'
for my $line (@{ $diff->[1] }) {
print "$line->[0]: '$line->[1]'\n";
}
# u: 'this is '
# +: 'Ruby'
=head1 DESCRIPTION
String::Diff is the difference of a consecutive string is made.
after general diff is done, the difference in the line is searchable.
the mark of the addition and the deletion can be freely changed.
the color is colored to the terminal with ANSI, using the HTML display it.
after the line is divided, diff is taken when 'linebreak' option is specified.
my($old_string, $new_string) = String::Diff::diff_fully('this is Perl', 'this is Ruby', linebreak => 1);
my($old_string, $new_string) = String::Diff::diff('this is Perl', 'this is Ruby', linebreak => 1);
my $string = String::Diff::diff_merge('this is Perl', 'this is Ruby', linebreak => 1);
my $string = String::Diff::diff_regexp('this is Perl', 'this is Ruby', linebreak => 1);
In diff and diff_merge methods the mark of the difference can be changed.
my $diff = String::Diff::diff('this is Perl', 'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
);
You can escape callback set to diff function and diff_merge function.
use HTML::Entities
my($diff_old, $diff_new) = String::Diff::diff(
'this is Perl',
'this is Ruby',
remove_open => '',
remove_close => '',
append_open => '',
append_close => '',
escape => sub { encode_entities($_[0]) },
});
is($diff_old, 'this is <b>Perl</b>');
is($diff_new, 'this is <b><BIG>R</BIG>uby</b>');
=head1 METHODS
=over 4
=item diff_fully
the list that divides diff according to the mark is returnd.
my($old_string, $new_string) = String::Diff::diff_fully('this is Perl', 'this is Ruby');
=item diff
abd the mark of the deletion and the addition is given to the string.
=item diff_merge
old and new string is merged with diff.
=item diff_regexp
the regular expression to which old string and new string are matched with regexp is returned.
=back
=head1 AUTHOR
Kazuhiro Osawa Eyappo {@} shibuya {dot} plE
=head1 SEE ALSO
L
=head1 LICENSE
Copyright 2008 (C) Kazuhiro Osawa
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
05_diff_regexp.t 100644 000765 000024 6373 12566305504 15767 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t use strict;
use utf8;
use Test::Base;
use String::Diff qw( diff_regexp );
filters { data1 => [qw/ chomp quote_filter /], data2 => [qw/ yaml string_diff /] };
sub string_diff {
my $input = shift;
diff_regexp($input->{old}, $input->{new}, %{ $input->{options} });
}
sub quote_filter {
my $str = shift;
$str =~ s{(['; /\n\.])}{\\$1}g;
$str;
}
run_is;
__END__
===
--- data1
pe(?:a)rl
--- data2
old: perl
new: pearl
===
--- data1
th(?:i|at')s (?:is )a(?: pen|ll)
--- data2
old: this is a pen
new: that's all
===
--- data1
(?:S|B)oo(?:z|f)y
--- data2
old: Soozy
new: Boofy
===
--- data1
(?:あ|いつもい)る(?:晴れた日に散歩をすると|人がいないので)！そ(?:こに|れ)は
--- data2
old: ある晴れた日に散歩をすると！そこには
new: いつもいる人がいないので！それは
===
--- data1
This library is (?:free software|自由なソフト); you can (?:not )redistribute it (?:or/)and(?:/or) modify
it under the same terms as Pe(?:a)rl it(?: )self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
===
--- data1
This library is (?:free software|自由なソフト); you can (?:not )redistribute it (?:or/)and(?:/or) modify(?:
| )it under the same terms as Pe(?:a)rl it(?: )self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: This library is 自由なソフト; you can not redistribute it or/and modify it under the same terms as Pearl it self.
===
--- data1
(?:remove
)This library is (?:free software|自由なソフト); you can (?:not )redistribute it (?:or/)and(?:/or) modify
\(snip\)
it under the same terms as Pe(?:a)rl it(?: )self.(?:
append)
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
===
--- data1
This library is (?:free software|自由なソフト); you can (?:not )redistribute it (?:or/)and(?:/or) modify
it under the same terms as Pe(?:a)rl it(?: )self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
(?:This lib)r(?:ary is 自由なソフト; you can not r)e(?:distribute it or/and )mo(?:ve|dify)
(?:This library is free software; you can redistribute it and/or modify)(?:
)\(snip\)
it under the same terms as Pe(?:a)rl it(?: )self.(?:
)(?:append)
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
options:
linebreak: 1
===
--- data1
1(?:0|1)
--- data2
old: 10
new: 11
benchmark.pl 100644 000765 000024 443 12566305504 16150 0 ustar 00ko staff 000000 000000 String-Diff-0.07/tools use strict;
use warnings;
use Benchmark qw/cmpthese/;
cmpthese(
10,
{
'Algorithm::Diff' => sub { system 'STRING_DIFF_PP=1 perl ./tools/benchmark-script.pl' },
'Algorithm::Diff::XS' => sub { system 'STRING_DIFF_PP=0 perl ./tools/benchmark-script.pl' },
},
);
98_perlcritic.t 100644 000765 000024 261 12566305504 16017 0 ustar 00ko staff 000000 000000 String-Diff-0.07/xt use strict;
use Test::More;
eval q{ use Test::Perl::Critic -profile => 'xt/perlcriticrc' };
plan skip_all => "Test::Perl::Critic is not installed." if $@;
all_critic_ok('lib');
02_diff_fully-pp.t 100644 000765 000024 13616 12566305504 16260 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t BEGIN{ $ENV{STRING_DIFF_PP} = 1; }
use strict;
use utf8;
use Test::Base;
use String::Diff qw( diff_fully );
filters { data1 => [qw/ yaml /], data2 => [qw/ yaml string_diff /] };
sub string_diff {
my $input = shift;
my $diff = diff_fully($input->{old}, $input->{new}, %{ $input->{options} });
$diff;
}
run_compare;
__END__
===
--- data1
- []
-
- ['+', 'perl']
--- data2
old:
new: perl
===
--- data1
-
- ['-', 'perl']
-
--- data2
old: perl
new:
===
--- data1
- []
- []
--- data2
old:
new:
===
--- data1
-
- ['u', 'pe']
- ['u', 'rl']
-
- ['u', 'pe']
- ['+', 'a']
- ['u', 'rl']
--- data2
old: perl
new: pearl
===
--- data1
-
- ['u', 'th']
- ['-', 'i']
- ['u', 's ']
- ['-', 'is ']
- ['u', 'a']
- ['-', ' pen']
-
- ['u', 'th']
- ['+', "at'"]
- ['u', 's ']
- ['u', 'a']
- ['+', 'll']
--- data2
old: this is a pen
new: "that's all"
===
--- data1
-
- ['-', 'S']
- ['u', 'oo']
- ['-', 'z']
- ['u', 'y']
-
- ['+', 'B']
- ['u', 'oo']
- ['+', 'f']
- ['u', 'y']
--- data2
old: Soozy
new: Boofy
===
--- data1
-
- ['-', 'あ']
- ['u', 'る']
- ['-', '晴れた日に散歩をすると']
- ['u', '、そ']
- ['-', 'こに']
- ['u', 'は']
-
- ['+', 'いつもい']
- ['u', 'る']
- ['+', '人がいないので']
- ['u', '、そ']
- ['+', 'れ']
- ['u', 'は']
--- data2
old: ある晴れた日に散歩をすると、そこには
new: いつもいる人がいないので、それは
===
--- data1
-
- ['u', 'This library is ']
- ['-', 'free software']
- ['u', '; you can ']
- ['u', 'redistribute it ']
- ['u', 'and']
- ['-', '/or']
- ['u', " modify\nit under the same terms as Pe"]
- ['u', 'rl it']
- ['u', 'self.']
-
- ['u', 'This library is ']
- ['+', '自由なソフト']
- ['u', '; you can ']
- ['+', 'not ']
- ['u', 'redistribute it ']
- ['+', 'or/']
- ['u', 'and']
- ['u', " modify\nit under the same terms as Pe"]
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
===
--- data1
-
- ['u', 'This library is ']
- ['-', 'free software']
- ['u', '; you can ']
- ['u', 'redistribute it ']
- ['u', 'and']
- ['-', '/or']
- ['u', ' modify']
- ['-', "\n"]
- ['u', 'it under the same terms as Pe']
- ['u', 'rl it']
- ['u', 'self.']
-
- ['u', 'This library is ']
- ['+', '自由なソフト']
- ['u', '; you can ']
- ['+', 'not ']
- ['u', 'redistribute it ']
- ['+', 'or/']
- ['u', 'and']
- ['u', ' modify']
- ['+', " "]
- ['u', 'it under the same terms as Pe']
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: This library is 自由なソフト; you can not redistribute it or/and modify it under the same terms as Pearl it self.
===
--- data1
-
- ['-', "remove\n"]
- ['u', 'This library is ']
- ['-', 'free software']
- ['u', '; you can ']
- ['u', 'redistribute it ']
- ['u', 'and']
- ['-', '/or']
- ['u', " modify\n(snip)\nit under the same terms as Pe"]
- ['u', 'rl it']
- ['u', 'self.']
-
- ['u', 'This library is ']
- ['+', '自由なソフト']
- ['u', '; you can ']
- ['+', 'not ']
- ['u', 'redistribute it ']
- ['+', 'or/']
- ['u', 'and']
- ['u', " modify\n(snip)\nit under the same terms as Pe"]
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
- ['+', "\nappend"]
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
===
--- data1
-
- ['u', 'This library is ']
- ['-', 'free software']
- ['u', '; you can ']
- ['u', 'redistribute it ']
- ['u', 'and']
- ['-', '/or']
- ['u', ' modify']
- ['u', "\n"]
- ['u', 'it under the same terms as Pe']
- ['u', 'rl it']
- ['u', 'self.']
-
- ['u', 'This library is ']
- ['+', '自由なソフト']
- ['u', '; you can ']
- ['+', 'not ']
- ['u', 'redistribute it ']
- ['+', 'or/']
- ['u', 'and']
- ['u', ' modify']
- ['u', "\n"]
- ['u', 'it under the same terms as Pe']
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
-
- ['u', 'r']
- ['u', 'e']
- ['u', 'mo']
- ['-', 've']
- ['u', "\n"]
- ['-', 'This library is free software; you can redistribute it and/or modify']
- ['-', "\n"]
- ['u', '(snip)']
- ['u', "\n"]
- ['u', 'it under the same terms as Pe']
- ['u', 'rl it']
- ['u', 'self.']
-
- ['+', 'This lib']
- ['u', 'r']
- ['+', 'ary is 自由なソフト; you can not r']
- ['u', 'e']
- ['+', 'distribute it or/and ']
- ['u', 'mo']
- ['+', 'dify']
- ['u', "\n"]
- ['u', '(snip)']
- ['u', "\n"]
- ['u', 'it under the same terms as Pe']
- ['+', 'a']
- ['u', 'rl it']
- ['+', ' ']
- ['u', 'self.']
- ['+', "\n"]
- ['+', 'append']
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
options:
linebreak: 1
===
--- data1
-
- ['u', '1']
- ['-', '0']
-
- ['u', '1']
- ['+', '1']
--- data2
old: 10
new: 11
04_diff_merge-pp.t 100644 000765 000024 11735 12566305504 16226 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t BEGIN{ $ENV{STRING_DIFF_PP} = 1; }
use strict;
use utf8;
use Test::Base;
use String::Diff qw( diff_merge );
filters { data1 => 'chomp', data2 => [qw/ yaml string_diff /] };
sub string_diff {
my $input = shift;
diff_merge($input->{old}, $input->{new}, %{ $input->{options} });
}
run_is;
__END__
===
--- data1
pe[a]r[a]l
--- data2
old: pearal
new: perl
===
--- data1
pe[a]rl
--- data2
old: pearl
new: perl
===
--- data1
pe{a}rl
--- data2
old: perl
new: pearl
===
--- data1
th[i]{at'}s [is ]a[ pen]{ll}
--- data2
old: this is a pen
new: that's all
===
--- data1
[S]{B}oo[z]{f}y
--- data2
old: Soozy
new: Boofy
===
--- data1
(?:S|B)oo(?:z|f)y
--- data2
old: Soozy
new: Boofy
options:
remove_open: '(?:'
remove_close: ''
append_open: ''
append_close: ')'
separator: '|'
===
--- data1
[あ]{いつもい}る[晴れた日に散歩をすると]{人がいないので}、そ[こに]{れ}は
--- data2
old: ある晴れた日に散歩をすると、そこには
new: いつもいる人がいないので、それは
===
--- data1
This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify
it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
===
--- data1
This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify[
]{ }it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: This library is 自由なソフト; you can not redistribute it or/and modify it under the same terms as Pearl it self.
===
--- data1
[remove
]This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify
(snip)
it under the same terms as Pe{a}rl it{ }self.{
append}
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
===
--- data1
This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify
it under the same terms as Pe{a}rl it{ }self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
This library is [free software]{自由なソフト}; you can {not }redistribute it {or/}and[/or] modify
it under the same terms as Pe{a}rl it{ }self.[
][delete]
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
delete
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
{This lib}r{ary is 自由なソフト; you can not r}e{distribute it or/and }mo[ve]{dify}
[This library is free software; you can redistribute it and/or modify][
](snip)
it under the same terms as Pe{a}rl it{ }self.{
}{append}
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
options:
linebreak: 1
===
--- data1
{This lib}r{ary is 自由なソフト; you can not r}e{distribute it or/and }mo[ve]{dify}
[This library is free software; you can redistribute it and/or modify][
](snip)
it under the same terms as Pe{a}rl it{ }self.[
][delete]
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
delete
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
This library is free software自由なソフト; you can not redistribute it or/and/or modify
it under the same terms as Pearl it self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
remove_open:
remove_close:
append_open:
append_close:
===
--- data1
1[0]{1}
--- data2
old: 10
new: 11
gen_pp_test.pl 100644 000765 000024 752 12566305504 16530 0 ustar 00ko staff 000000 000000 String-Diff-0.07/tools use strict;
use warnings;
use Path::Class;
my $t = Path::Class::Dir->new('t');
for my $file ($t->children) {
next if $file->is_dir;
next if $file->basename =~ /^.+\-pp\.t$/;
next if $file->basename =~ /^9.+\.t$/;
next unless $file->basename =~ /^\d.+\.t$/;
my $new_name = $file->basename;
$new_name =~ s/\.t$/-pp.t/;
my $data = $file->slurp;
my $fh = $t->file($new_name)->openw;
print $fh "BEGIN{ \$ENV{STRING_DIFF_PP} = 1; }\n$data";
close $fh;
}
05_diff_regexp-pp.t 100644 000765 000024 6436 12566305504 16404 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t BEGIN{ $ENV{STRING_DIFF_PP} = 1; }
use strict;
use utf8;
use Test::Base;
use String::Diff qw( diff_regexp );
filters { data1 => [qw/ chomp quote_filter /], data2 => [qw/ yaml string_diff /] };
sub string_diff {
my $input = shift;
diff_regexp($input->{old}, $input->{new}, %{ $input->{options} });
}
sub quote_filter {
my $str = shift;
$str =~ s{(['; /\n\.])}{\\$1}g;
$str;
}
run_is;
__END__
===
--- data1
pe(?:a)rl
--- data2
old: perl
new: pearl
===
--- data1
th(?:i|at')s (?:is )a(?: pen|ll)
--- data2
old: this is a pen
new: that's all
===
--- data1
(?:S|B)oo(?:z|f)y
--- data2
old: Soozy
new: Boofy
===
--- data1
(?:あ|いつもい)る(?:晴れた日に散歩をすると|人がいないので)！そ(?:こに|れ)は
--- data2
old: ある晴れた日に散歩をすると！そこには
new: いつもいる人がいないので！それは
===
--- data1
This library is (?:free software|自由なソフト); you can (?:not )redistribute it (?:or/)and(?:/or) modify
it under the same terms as Pe(?:a)rl it(?: )self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
===
--- data1
This library is (?:free software|自由なソフト); you can (?:not )redistribute it (?:or/)and(?:/or) modify(?:
| )it under the same terms as Pe(?:a)rl it(?: )self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: This library is 自由なソフト; you can not redistribute it or/and modify it under the same terms as Pearl it self.
===
--- data1
(?:remove
)This library is (?:free software|自由なソフト); you can (?:not )redistribute it (?:or/)and(?:/or) modify
\(snip\)
it under the same terms as Pe(?:a)rl it(?: )self.(?:
append)
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
===
--- data1
This library is (?:free software|自由なソフト); you can (?:not )redistribute it (?:or/)and(?:/or) modify
it under the same terms as Pe(?:a)rl it(?: )self.
--- data2
old: |-
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
it under the same terms as Pearl it self.
options:
linebreak: 1
===
--- data1
(?:This lib)r(?:ary is 自由なソフト; you can not r)e(?:distribute it or/and )mo(?:ve|dify)
(?:This library is free software; you can redistribute it and/or modify)(?:
)\(snip\)
it under the same terms as Pe(?:a)rl it(?: )self.(?:
)(?:append)
--- data2
old: |-
remove
This library is free software; you can redistribute it and/or modify
(snip)
it under the same terms as Perl itself.
new: |-
This library is 自由なソフト; you can not redistribute it or/and modify
(snip)
it under the same terms as Pearl it self.
append
options:
linebreak: 1
===
--- data1
1(?:0|1)
--- data2
old: 10
new: 11
coverage_test.sh 100755 000765 000024 1046 12566305504 17072 0 ustar 00ko staff 000000 000000 String-Diff-0.07/tools #!/bin/zsh
# generate to t/00_allload.t
echo "
use strict;
use warnings;
use Test::More;
my @modules = qw(
" > t/00_allload.t
find lib -name "*.pm" | sed "s/lib\// /;s/\.pm//;s/\//::/g" >> t/00_allload.t
echo "
);
plan tests => scalar(@modules);
use_ok \$_ for @modules;
" >> t/00_allload.t
rm -rf cover_db
perl Makefile.PL
HARNESS_PERL_SWITCHES=-MDevel::Cover=+ignore,inc,-coverage,statement,branch,condition,path,subroutine make test
cover
rm t/00_allload.t
rm -rf cover_db_view
mv cover_db cover_db_view
open cover_db_view/coverage.html
release-pod-syntax.t 100644 000765 000024 456 12566305504 16701 0 ustar 00ko staff 000000 000000 String-Diff-0.07/t #!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;
use Test::Pod 1.41;
all_pod_files_ok();
benchmark-script.pl 100644 000765 000024 767 12566305504 17463 0 ustar 00ko staff 000000 000000 String-Diff-0.07/tools use strict;
use warnings;
use lib 'lib';
use String::Diff qw(diff);
my $old = join '', qw(ji ;hgiugsd ;hjlhseug gr;e:a guysag:f :ojigsy :dkaue:dii) x 16;
my $new = join '', qw(jifehiugg phrg:sgu :krhf:soi kfnjsyi :tjigsdhf gyrugs) x 16;
for (1..32) {
diff($old, $new)
}
__END__
$ STRING_DIFF_PP=0 time perl tools/benchmark-script.pl
8.63 real 8.54 user 0.03 sys
$ STRING_DIFF_PP=1 time perl tools/benchmark-script.pl
8.56 real 8.49 user 0.02 sys