Skip to content

Commit

Permalink
Increment the version of our modified memcache_client code to prevent…
Browse files Browse the repository at this point in the history
… users with the gem installed not seeing our changes.

The changes will be submitted upstream.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1239 state:committed]
  • Loading branch information
Luca Guidi authored and NZKoz committed Nov 6, 2008
1 parent 099f106 commit 4ccbc5d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions activesupport/lib/active_support/vendor.rb
Expand Up @@ -14,9 +14,9 @@
end

begin
gem 'memcache-client', '~> 1.5.0'
gem 'memcache-client', '~> 1.5.1'
rescue Gem::LoadError
$:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.0"
$:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.1"
end

begin
Expand Down
@@ -1,10 +1,10 @@
# All original code copyright 2005, 2006, 2007 Bob Cottrell, Eric Hodel,
# The Robot Co-op. All rights reserved.
#
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
Expand All @@ -13,7 +13,7 @@
# 3. Neither the names of the authors nor the names of their contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Expand Down
6 changes: 6 additions & 0 deletions activesupport/test/caching_test.rb
Expand Up @@ -160,6 +160,12 @@ def test_store_objects_should_be_immutable
@cache.read('foo').gsub!(/.*/, 'baz')
assert_equal 'bar', @cache.read('foo')
end

def test_write_should_return_true_on_success
result = @cache.write('foo', 'bar')
assert_equal 'bar', @cache.read('foo') # make sure 'foo' was written
assert result
end
end

class CompressedMemCacheStore < Test::Unit::TestCase
Expand Down

0 comments on commit 4ccbc5d

Please sign in to comment.