[Jifty-commit] jifty branch, master, updated. cc5875495525ee78d77d0b34c6a473a701209663

Jifty commits jifty-commit at lists.jifty.org
Sun Feb 28 05:42:52 EST 2010


The branch, master has been updated
       via  cc5875495525ee78d77d0b34c6a473a701209663 (commit)
       via  70a16808335401f4efb9d7f1297db8958b850353 (commit)
      from  8ead717cdfe166f2103c26ab6b2419dffe119157 (commit)

Summary of changes:
 Makefile.PL       |   16 ----------------
 t/cas-memcached.t |   18 ++++++------------
 2 files changed, 6 insertions(+), 28 deletions(-)

- Log -----------------------------------------------------------------
commit 70a16808335401f4efb9d7f1297db8958b850353
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Sun Feb 28 00:41:25 2010 -1000

    deflated cas blob is no more.

diff --git a/t/cas-memcached.t b/t/cas-memcached.t
index 65fbeff..1be3562 100644
--- a/t/cas-memcached.t
+++ b/t/cas-memcached.t
@@ -11,14 +11,14 @@ require IO::Socket::INET;
 plan skip_all => "Testing CAS memcached store requires a memcached running on the default port"
     unless IO::Socket::INET->new('127.0.0.1:11211');
 
-plan tests => 23;
+plan tests => 17;
 
 my $data    = "a" x (1024*10);
 my $databig = "a" x (1024*1024*2);
 
 {
     ok((grep { $_ eq 'Jifty::CAS::Store::Memcached' } @Jifty::CAS::ISA), 'Using memcached backed store');
-    my $key = Jifty::CAS->publish("test$$", 'one', $data, { deflate => 1, content_type => 'text/plain' });
+    my $key = Jifty::CAS->publish("test$$", 'one', $data, { content_type => 'text/plain' });
     ok $key, "Published";
     is length $key, 32, "Key is 32 chars long - an MD5 sum";
     is(Jifty::CAS->key("test$$", "one"), $key, "Matches what we get back from ->key");
@@ -27,21 +27,18 @@ my $databig = "a" x (1024*1024*2);
     ok $blob, "retrieved value";
     isa_ok $blob, 'Jifty::CAS::Blob', 'got a blob';
     is $blob->content, $data, "content is the same";
-    is_deeply $blob->metadata, { deflate => 1, content_type => 'text/plain' }, "metadata is still good";
-    is $blob->{content_deflated}, undef, "no deflated content until we request it";
-    ok $blob->content_deflated, "got deflated content";
-    ok $blob->{content_deflated}, "now deflated content exists";
+    is_deeply $blob->metadata, { content_type => 'text/plain' }, "metadata is still good";
 }
 
 {
-    my $key = Jifty::CAS->publish("test$$", "two", $databig, { deflate => 1, content_type => 'text/plain' });
+    my $key = Jifty::CAS->publish("test$$", "two", $databig, { content_type => 'text/plain' });
     is $key, undef, "Not published, there was an error";
     is(Jifty::CAS->key("test$$", "two"), undef, "Can't lookup a key because it isn't there");
 }
 
 {
     Jifty->config->framework('CAS')->{'MemcachedFallback'} = 1;
-    my $key = Jifty::CAS->publish("test$$", "three", $databig, { deflate => 1, content_type => 'text/plain' });
+    my $key = Jifty::CAS->publish("test$$", "three", $databig, { content_type => 'text/plain' });
     ok $key, "Published";
     is length $key, 32, "Key is 32 chars long - an MD5 sum";
     is(Jifty::CAS->key("test$$", "three"), $key, "Matches what we get back from ->key");
@@ -50,10 +47,7 @@ my $databig = "a" x (1024*1024*2);
     ok $blob, "retrieved value";
     isa_ok $blob, 'Jifty::CAS::Blob', 'got a blob';
     is $blob->content, $databig, "content is the same";
-    is_deeply $blob->metadata, { deflate => 1, content_type => 'text/plain' }, "metadata is still good";
-    is $blob->{content_deflated}, undef, "no deflated content until we request it";
-    ok $blob->content_deflated, "got deflated content";
-    ok $blob->{content_deflated}, "now deflated content exists";
+    is_deeply $blob->metadata, { content_type => 'text/plain' }, "metadata is still good";
 }
 
 # XXX TODO test serving up of CAS content

commit cc5875495525ee78d77d0b34c6a473a701209663
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Sun Feb 28 00:42:28 2010 -1000

    Remove optional deps for old jifty servers.

diff --git a/Makefile.PL b/Makefile.PL
index d550770..52e0bfb 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -143,22 +143,6 @@ feature 'Development of the jifty framework' =>
     recommends('Module::Install::Admin' => '0.50'),
     ;
 
-
-feature 'Forking jifty server' =>
-    -default => 0,
-    recommends('Net::Server::Fork' => 0),
-    ;
-
-feature 'Pre-forking jifty server' =>
-    -default => 0,
-    recommends('Net::Server::PreFork' => 0),
-    ;
-
-feature 'Apache2/ModPerl2 handler' =>
-    -default => 0,
-    recommends('Apache2::Const' => 0),
-    ;
-
 feature 'Improved halos' =>
     -default => 0,
     recommends('Data::Dump::Streamer' => 0),

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list