Skip to content

stop using Data::Walk #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
i110 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stop using Data::Walk #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cpanfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ requires 'B';
requires 'Carp';
requires 'Class::Accessor::Lite';
requires 'Clone';
requires 'Data::Walk';
requires 'Data::Validate::Domain';
requires 'Data::Validate::IP';
requires 'Data::Validate::URI';
Expand Down
41 changes: 23 additions & 18 deletions lib/JSV/Reference.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use warnings;

use Carp;
use Clone qw(clone);
use Data::Walk;
use JSON::Pointer;
use Scalar::Util qw(weaken);
use URI;
Expand Down Expand Up @@ -88,23 +87,7 @@ sub register_schema {
my ($self, $uri, $schema) = @_;
my $normalized_uri = $self->normalize_uri($uri);
my $cloned_schema = clone($schema);

### recursive reference resolution
walkdepth(+{
wanted => sub {
if (
ref $_ eq "HASH" &&
exists $_->{'$ref'} &&
!ref $_->{'$ref'} &&
keys %$_ == 1
) {
my $ref_uri = URI->new($_->{'$ref'});
return if $ref_uri->scheme;
$_->{'$ref'} = $ref_uri->abs($normalized_uri)->as_string;
}
},
}, $cloned_schema);

$self->_resolve_ref_uri($cloned_schema, $normalized_uri);
$self->{registered_schema_map}{$normalized_uri} = $cloned_schema;
}

Expand All @@ -127,6 +110,28 @@ sub normalize_uri {
return wantarray ? ($normalized_uri, $fragment) : $normalized_uri;
}

sub _resolve_ref_uri {
my ($self, $value, $base_uri) = @_;

if (
ref $value eq 'HASH' &&
exists $value->{'$ref'} &&
!ref $value->{'$ref'} &&
keys %$value == 1
) {
my $ref_uri = URI->new($value->{'$ref'});
$value->{'$ref'} = $ref_uri->abs($base_uri)->as_string unless $ref_uri->scheme;
return $value;
}

if (ref $value eq 'HASH') {
$value->{$_} = $self->_resolve_ref_uri($value->{$_}, $base_uri) for keys %$value;
} elsif (ref $value eq 'ARRAY') {
$value->[$_] = $self->_resolve_ref_uri($value->[$_], $base_uri) for (0..$#$value);
}
return $value;
}

1;

__END__