[Jifty-commit] r654 - Jifty-DBI/trunk/inc/Module
Jifty-DBI/trunk/lib/Jifty/DBI/Record
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sat Mar 4 17:57:13 EST 2006
Author: jesse
Date: Sat Mar 4 17:57:12 2006
New Revision: 654
Modified:
/ (props changed)
Jifty-DBI/trunk/inc/Module/AutoInstall.pm
Jifty-DBI/trunk/inc/Module/Install.pm
Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm
Jifty-DBI/trunk/inc/Module/Install/Base.pm
Jifty-DBI/trunk/inc/Module/Install/Can.pm
Jifty-DBI/trunk/inc/Module/Install/Fetch.pm
Jifty-DBI/trunk/inc/Module/Install/Include.pm
Jifty-DBI/trunk/inc/Module/Install/Makefile.pm
Jifty-DBI/trunk/inc/Module/Install/Metadata.pm
Jifty-DBI/trunk/inc/Module/Install/Win32.pm
Jifty-DBI/trunk/inc/Module/Install/WriteAll.pm
Jifty-DBI/trunk/lib/Jifty/DBI/Record/Cachable.pm
Log:
r25513 at truegrounds: jesse | 2006-03-04 14:08:57 -0800
* Refactoring Record::Cachable in advance of memcached support
Modified: Jifty-DBI/trunk/inc/Module/AutoInstall.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/AutoInstall.pm (original)
+++ Jifty-DBI/trunk/inc/Module/AutoInstall.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/AutoInstall.pm"
+#line 1 "inc/Module/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/AutoInstall.pm"
package Module::AutoInstall;
$Module::AutoInstall::VERSION = '1.01';
Modified: Jifty-DBI/trunk/inc/Module/Install.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "/home/chmrr/work/rt/local/Jifty-DBI/inc/Module/Install.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install.pm"
+#line 1 "/home/jesse/svk/jifty.org/Jifty-DBI/trunk/inc/Module/Install.pm - /usr/local/share/perl/5.8.7/Module/Install.pm"
package Module::Install;
use 5.004;
Modified: Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/AutoInstall.pm"
+#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/Install/AutoInstall.pm"
package Module::Install::AutoInstall;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Modified: Jifty-DBI/trunk/inc/Module/Install/Base.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Base.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Base.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Base.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Base.pm"
+#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.7/Module/Install/Base.pm"
package Module::Install::Base;
# Suspend handler for "redefined" warnings
Modified: Jifty-DBI/trunk/inc/Module/Install/Can.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Can.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Can.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Can.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Can.pm"
+#line 1 "inc/Module/Install/Can.pm - /usr/local/share/perl/5.8.7/Module/Install/Can.pm"
package Module::Install::Can;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
$VERSION = '0.01';
@@ -52,6 +52,7 @@
# Fix Cygwin bug on maybe_command();
if ($^O eq 'cygwin') {
require ExtUtils::MM_Cygwin;
+ require ExtUtils::MM_Win32;
if (!defined(&ExtUtils::MM_Cygwin::maybe_command)) {
*ExtUtils::MM_Cygwin::maybe_command = sub {
my ($self, $file) = @_;
Modified: Jifty-DBI/trunk/inc/Module/Install/Fetch.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Fetch.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Fetch.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Fetch.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Fetch.pm"
+#line 1 "inc/Module/Install/Fetch.pm - /usr/local/share/perl/5.8.7/Module/Install/Fetch.pm"
package Module::Install::Fetch;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Modified: Jifty-DBI/trunk/inc/Module/Install/Include.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Include.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Include.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Include.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Include.pm"
+#line 1 "inc/Module/Install/Include.pm - /usr/local/share/perl/5.8.7/Module/Install/Include.pm"
package Module::Install::Include;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
@@ -6,5 +6,5 @@
sub include_deps { +shift->admin->include_deps(@_) };
sub auto_include { +shift->admin->auto_include(@_) };
sub auto_include_deps { +shift->admin->auto_include_deps(@_) };
-
+sub auto_include_dependent_dists { +shift->admin->auto_include_dependent_dists(@_) }
1;
Modified: Jifty-DBI/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Makefile.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Makefile.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Makefile.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Makefile.pm"
+#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.7/Module/Install/Makefile.pm"
package Module::Install::Makefile;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Modified: Jifty-DBI/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Metadata.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Metadata.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Metadata.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Metadata.pm"
+#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.7/Module/Install/Metadata.pm"
package Module::Install::Metadata;
use strict 'vars';
Modified: Jifty-DBI/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Win32.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Win32.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Win32.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Win32.pm"
+#line 1 "inc/Module/Install/Win32.pm - /usr/local/share/perl/5.8.7/Module/Install/Win32.pm"
package Module::Install::Win32;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Modified: Jifty-DBI/trunk/inc/Module/Install/WriteAll.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/WriteAll.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/WriteAll.pm Sat Mar 4 17:57:12 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/WriteAll.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/WriteAll.pm"
+#line 1 "inc/Module/Install/WriteAll.pm - /usr/local/share/perl/5.8.7/Module/Install/WriteAll.pm"
package Module::Install::WriteAll;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Record/Cachable.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Record/Cachable.pm (original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Record/Cachable.pm Sat Mar 4 17:57:12 2006
@@ -10,11 +10,11 @@
=head1 NAME
-Jifty::DBI::Record::Cachable - Records with caching behavior
+Jifty::DBI::Record::Cachable - records with caching behavior
=head1 SYNOPSIS
- package MyRecord;
+ package Myrecord;
use base qw/Jifty::DBI::Record::Cachable/;
=head1 DESCRIPTION
@@ -66,7 +66,7 @@
my $self = shift;
my $cache = $self->_handle->DSN
. "-KEYS--"
- . ( $self->{'_Class'} ||= ref($self) );
+ . ( $self->{'_class'} ||= ref($self) );
$self->_setup_cache($cache) unless exists( $_CACHES{$cache} );
return ( $_CACHES{$cache} );
@@ -82,14 +82,14 @@
my $self = shift;
my $cache = $self->_handle->DSN
. "-KEYS--"
- . ( $self->{'_Class'} ||= ref($self) );
+ . ( $self->{'_class'} ||= ref($self) );
$self->_setup_cache($cache);
}
sub _record_cache {
my $self = shift;
my $cache
- = $self->_handle->DSN . "--" . ( $self->{'_Class'} ||= ref($self) );
+ = $self->_handle->DSN . "--" . ( $self->{'_class'} ||= ref($self) );
$self->_setup_cache($cache) unless exists( $_CACHES{$cache} );
return ( $_CACHES{$cache} );
@@ -99,10 +99,10 @@
my $self = shift;
# Blow away the primary cache key since we're loading.
- $self->{'_SB_Record_Primary_RecordCache_key'} = undef;
+ $self->{'_jifty_cache_pkey'} = undef;
my ( $rvalue, $msg ) = $self->SUPER::load_from_hash(@_);
- my $cache_key = $self->_primary_RecordCache_key();
+ my $cache_key = $self->_primary_record_cache_key();
## Check the return value, if its good, cache it!
if ($rvalue) {
@@ -116,13 +116,13 @@
my ( $self, %attr ) = @_;
## Generate the cache key
- my $alt_key = $self->_gen_alternate_RecordCache_key(%attr);
- if ( $self->_fetch( $self->_lookup_primary_RecordCache_key($alt_key) ) ) {
+ my $alt_key = $self->_gen_alternate_record_cache_key(%attr);
+ if ( $self->_fetch( $self->_lookup_primary_record_cache_key($alt_key) ) ) {
return ( 1, "Fetched from cache" );
}
# Blow away the primary cache key since we're loading.
- $self->{'_SB_Record_Primary_RecordCache_key'} = undef;
+ $self->{'_jifty_cache_pkey'} = undef;
## Fetch from the DB!
my ( $rvalue, $msg ) = $self->SUPER::load_by_cols(%attr);
@@ -130,7 +130,7 @@
if ($rvalue) {
## Only cache the object if its okay to do so.
$self->_store();
- $self->_key_cache->set( $alt_key, $self->_primary_RecordCache_key );
+ $self->_key_cache->set( $alt_key, $self->_primary_record_cache_key );
}
return ( $rvalue, $msg );
@@ -159,7 +159,6 @@
my ($self) = @_;
$self->_expire();
-
return $self->SUPER::__delete();
}
@@ -172,10 +171,9 @@
sub _expire (\$) {
my $self = shift;
- $self->_record_cache->set( $self->_primary_RecordCache_key,
- undef, time - 1 );
+ $self->_record_cache->set( $self->_primary_record_cache_key, undef, time - 1 );
-# We should be doing something more surgical to clean out the key cache. but we do need to expire it
+ # We should be doing something more surgical to clean out the key cache. but we do need to expire it
$self->_flush_key_cache;
}
@@ -209,7 +207,7 @@
sub _store (\$) {
my $self = shift;
- $self->_record_cache->set( $self->_primary_RecordCache_key,
+ $self->_record_cache->set( $self->_primary_record_cache_key,
$self->_serialize );
return (1);
}
@@ -224,16 +222,15 @@
);
}
-# Function: _gen_alternate_RecordCache_key
+# Function: _gen_alternate_record_cache_key
# Type : private instance
# Args : hash (attr)
# Lvalue : 1
# Desc : Takes a perl hash and generates a key from it.
-sub _gen_alternate_RecordCache_key {
+sub _gen_alternate_record_cache_key {
my ( $self, %attr ) = @_;
- #return( Storable::nfreeze( %attr));
my $cache_key;
while ( my ( $key, $value ) = each %attr ) {
$key ||= '__undef';
@@ -250,51 +247,51 @@
return ($cache_key);
}
-# Function: _fetch_RecordCache_key
+# Function: _fetch_record_cache_key
# Type : private instance
# Args : nil
# Lvalue : 1
-sub _fetch_RecordCache_key {
+sub _fetch_record_cache_key {
my ($self) = @_;
my $cache_key = $self->_cache_config->{'cache_key'};
return ($cache_key);
}
-# Function: _primary_RecordCache_key
+# Function: _primary_record_cache_key
# Type : private instance
# Args : none
# Lvalue: : 1
# Desc : generate a primary-key based variant of this object's cache key
# primary keys is in the cache
-sub _primary_RecordCache_key {
+sub _primary_record_cache_key {
my ($self) = @_;
return undef unless ( $self->id );
- unless ( $self->{'_SB_Record_Primary_RecordCache_key'} ) {
+ unless ( $self->{'_jifty_cache_pkey'} ) {
- my $primary_RecordCache_key = $self->table() . ':';
+ my $primary_record_cache_key = $self->table() . ':';
my @attributes;
foreach my $key ( @{ $self->_primary_keys } ) {
push @attributes, $key . '=' . $self->SUPER::__value($key);
}
- $primary_RecordCache_key .= join( ',', @attributes );
+ $primary_record_cache_key .= join( ',', @attributes );
- $self->{'_SB_Record_Primary_RecordCache_key'}
- = $primary_RecordCache_key;
+ $self->{'_jifty_cache_pkey'}
+ = $primary_record_cache_key;
}
- return ( $self->{'_SB_Record_Primary_RecordCache_key'} );
+ return ( $self->{'_jifty_cache_pkey'} );
}
-# Function: lookup_primary_RecordCache_key
+# Function: lookup_primary_record_cache_key
# Type : private class
# Args : string(alternate cache id)
# Lvalue : string(cache id)
-sub _lookup_primary_RecordCache_key {
+sub _lookup_primary_record_cache_key {
my $self = shift;
my $alternate_key = shift;
return undef unless ($alternate_key);
More information about the Jifty-commit
mailing list