oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor code to force assets to always be hidden into a role and use it.

Browse source
This commit is contained in:
Colin Kuskie 2010-02-16 08:50:00 -08:00
parent 1d777d4596
commit abaeab36e0
8 changed files with 71 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/WebGUI/Asset/Event.pm
View file

@ -133,14 +133,7 @@ property userDefined5 => (
default => '',
);
around isHidden => sub {
my $orig = shift;
my $self = shift;
if (@_ > 0) {
$_[0] = 1;
}
$self->$orig(@_);
};
with 'WebGUI::AssetRole::AlwaysHidden';
use WebGUI::DateTime;

10
lib/WebGUI/Asset/File/GalleryFile.pm
View file

@ -39,15 +39,7 @@ for my $i ( 1 .. 5 ) {
);
}
around isHidden => sub {
my $orig = shift;
my $self = shift;
if (@_ > 0) {
$_[0] = 1;
}
$self->$orig(@_);
};
with 'WebGUI::AssetRole::AlwaysHidden';
use Carp qw( croak confess );
use URI::Escape;

9
lib/WebGUI/Asset/Post.pm
View file

@ -73,14 +73,7 @@ property content => (
default => undef,
);
around isHidden => sub {
my $orig = shift;
my $self = shift;
if (@_ > 0) {
$_[0] = 1;
}
$self->$orig(@_);
};
with 'WebGUI::AssetRole::AlwaysHidden';
sub _set_ownerUserId {
my ($self, $new, $old) = @_;

10
lib/WebGUI/Asset/Story.pm
View file

@ -67,15 +67,7 @@ property photo => (
noFormPost => 1,
);
around isHidden => sub {
my $orig = shift;
my $self = shift;
if (@_ > 0) {
$_[0] = 1;
}
$self->$orig(@_);
};
with 'WebGUI::AssetRole::AlwaysHidden';
use WebGUI::Utility;
use WebGUI::International;

9
lib/WebGUI/Asset/WikiPage.pm
View file

@ -55,14 +55,7 @@ property isFeatured => (
noFormPost => 1,
);
around isHidden => sub {
my $orig = shift;
my $self = shift;
if (@_ > 0) {
$_[0] = 1;
}
$self->$orig(@_);
};
with 'WebGUI::AssetRole::AlwaysHidden';
use WebGUI::International;
use WebGUI::Utility;

10
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
View file

@ -41,15 +41,7 @@ for my $i ( 1 .. 5 ) {
);
}
around isHidden => sub {
my $orig = shift;
my $self = shift;
if (@_ > 0) {
$_[0] = 1;
}
$self->$orig(@_);
};
with 'WebGUI::AssetRole::AlwaysHidden';
use Carp qw( croak );
use File::Find;

45
lib/WebGUI/AssetRole/AlwaysHidden.pm Normal file
View file

@ -0,0 +1,45 @@
package WebGUI::AssetRole::AlwaysHidden;
=head1 LEGAL
-------------------------------------------------------------------
WebGUI is Copyright 2001-2009 Plain Black Corporation.
-------------------------------------------------------------------
Please read the legal notices (docs/legal.txt) and the license
(docs/license.txt) that came with this distribution before using
this software.
-------------------------------------------------------------------
http://www.plainblack.com info@plainblack.com
-------------------------------------------------------------------
=cut
=head1 NAME
Package WebGUI::AssetRole::AlwaysHidden
=head1 DESCRIPTION
Asset Role that guarantees that the isHidden property is always 1.
=head1 SYNOPSIS
with WebGUI::AssetRole::AlwaysHidden;
=cut
use Moose::Role;
around isHidden => sub {
my $orig = shift;
my $self = shift;
if (@_ > 0) {
shift @_;
unshift @_, 1;
}
$self->$orig(@_);
};
1;

21
t/Asset/Event.t
View file

@ -19,7 +19,7 @@ use WebGUI::Asset::Event;
use Test::More; # increment this value for each test you create
use Test::Deep;
plan tests => 18;
plan tests => 20;
my $session = WebGUI::Test->session;
@ -131,3 +131,22 @@ ok($session->id->valid($event6a->get('storageId')), 'addRevision gives the new r
isnt($event6a->get('storageId'), $event6->get('storageId'), '... and it is different from the previous revision');
my $versionTag2 = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->tagsToRollback($versionTag2);
$versionTag2->commit;
my $event7 = $cal->addChild(
{
className => 'WebGUI::Asset::Event',
assetId => 'EventAssetTestStorage6',
url => 'hidden_event',
}, undef, undef, { skipNotifications => 1, skipAutoCommitWorkflows => 1 },
);
my $tag = WebGUI::VersionTag->getWorking($session);
$tag->commit;
addToCleanup($tag);
is $event7->isHidden, 1, 'isHidden set to 1 by default';
$event7->isHidden(0);
is $event7->isHidden, 1, 'isHidden cannot be set to 0';