jruby-memcache-client 1.6.0 → 1.6.1

data/README

@@ -15,10 +15,16 @@ As of right now this code only provides a very minimal amount of functionality,
 
 Installation
 ------------
-This is a ruby gem that can be installed.
+This is a ruby gem that can be installed from gemcutter.org.
 
-gem sources -a http://gems.github.com
-gem install ikai-jruby-memcache-client --remote
+You will first need to install the gemcutter gem and configure your system to use it:
+
+jruby -S gem install gemcutter
+jruby -S gem tumble
+
+You will then be able to install the JRuby Memcache Client gem:
+
+jruby -S gem install jruby-memcache-client
 
 Replacing Rail's MemCache Client
 --------------------------------
@@ -34,11 +40,11 @@ if RUBY_PLATFORM =~ /java/i
     Object.instance_eval { remove_const :MemCache }
   end
   # Pull in the exact version we want
-  gem 'ikai-jruby-memcache-client', '1.5.0'
+  gem 'jruby-memcache-client', '1.6.1'
 
   # Ensure that the memcache-client path is at the front of the loadpath
   $LOAD_PATH.each do |path|
-    if path =~ /ikai-jruby-memcache-client/
+    if path =~ /jruby-memcache-client/
       $LOAD_PATH.delete(path)
       $LOAD_PATH.unshift(path)
     end

data/Rakefile

@@ -3,10 +3,10 @@ begin
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "jruby-memcache-client"
     gemspec.summary = "A drop in replacement for Ruby's memcache-client."
-    gemspec.email = "abhi@traytwo.com"
-    gemspec.homepage = "http://github.com/abhiyerra/jruby-memcache-client"
+    gemspec.email = "fred@fredjean.net"
+    gemspec.homepage = "http://github.com/ikai/jruby-memcache-client"
     gemspec.description = "A drop in replacement for Ruby's memcache-client."
-    gemspec.authors = ["Abhi Yerra", "Ikai Lan", "Frederic Jean", "Lennon Day-Reynolds"]
+    gemspec.authors = ["Abhi Yerra", "Ikai Lan", "Frederic Jean", "Lennon Day-Reynolds", "slyphon"]
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -15,9 +15,9 @@ end
 if RUBY_PLATFORM =~ /java/i
   begin
     require 'spec/rake/spectask'
-    
+
     task :default => :spec
-    
+
     desc "Run the specs for the jruby-memcache-client gem"
     Spec::Rake::SpecTask.new
   rescue LoadError

data/VERSION.yml

@@ -1,4 +1,4 @@
----
-:minor: 6
+--- 
 :major: 1
-:patch: 0
+:minor: 6
+:patch: 1

data/jruby-memcache-client.gemspec

@@ -1,14 +1,17 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-memcache-client}
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Abhi Yerra", "Ikai Lan", "Frederic Jean", "Lennon Day-Reynolds"]
-  s.date = %q{2009-05-20}
+  s.authors = ["Abhi Yerra", "Ikai Lan", "Frederic Jean", "Lennon Day-Reynolds", "slyphon"]
+  s.date = %q{2009-11-22}
   s.description = %q{A drop in replacement for Ruby's memcache-client.}
-  s.email = %q{abhi@traytwo.com}
+  s.email = %q{fred@fredjean.net}
   s.extra_rdoc_files = [
     "README"
   ]
@@ -23,11 +26,10 @@ Gem::Specification.new do |s|
      "lib/memcache.rb",
      "spec/jruby_memcache_spec.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/ikai/jruby-memcache-client}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A drop in replacement for Ruby's memcache-client.}
   s.test_files = [
     "spec/jruby_memcache_spec.rb"
@@ -35,7 +37,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/lib/memcache.rb

@@ -1,4 +1,5 @@
 require 'java'
+require 'base64'
 
 require File.dirname(__FILE__) + '/java/java_memcached-release_2.0.1.jar'
 
@@ -160,7 +161,8 @@ class MemCache
     return nil if value.nil?
     unless raw
       marshal_bytes = java.lang.String.new(value).getBytes(MARSHALLING_CHARSET)
-      value = Marshal.load(String.from_java_bytes(marshal_bytes))
+      decoded = Base64.decode64(String.from_java_bytes(marshal_bytes))
+      value = Marshal.load(decoded)
     end
     value
   end
@@ -179,7 +181,8 @@ class MemCache
       next if v.nil?
       unless raw
         marshal_bytes = java.lang.String.new(v).getBytes(MARSHALLING_CHARSET)
-        v = Marshal.load(String.from_java_bytes(marshal_bytes))
+        decoded = Base64.decode64(String.from_java_bytes(marshal_bytes))
+        v = Marshal.load(decoded)
       end
       values[k] = v
     }
@@ -299,7 +302,8 @@ class MemCache
   end
 
   def marshal_value(value)
-    marshal_bytes = Marshal.dump(value).to_java_bytes
+    encoded = Base64.encode64(Marshal.dump(value))
+    marshal_bytes = encoded.to_java_bytes
     java.lang.String.new(marshal_bytes, MARSHALLING_CHARSET)
   end
 end

data/spec/jruby_memcache_spec.rb

@@ -182,6 +182,20 @@ describe MemCache do
       @client.set('obj', obj)
       @client.get('obj').should == obj
     end
+
+    it %[should work with those whose marshalled stream contains invalid UTF8 byte sequences] do
+      # this test fails w/o the Base64 encoding step
+      obj = { :foo => 900 }
+      @client.set('obj', obj)
+      @client.get('obj').should == obj
+    end
+    
+    it %[should work with binary blobs] do
+      # this test fails w/o the Base64 encoding step
+      blob = "\377\330\377\340\000\020JFIF\000\001\001\000\000\001\000\001\000\000\377"
+      @client.set('blob', blob)
+      @client.get('blob').should == blob
+    end
   end
 
   describe "using set with an expiration" do

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors: 
 - Abhi Yerra
 - Ikai Lan
 - Frederic Jean
 - Lennon Day-Reynolds
+- slyphon
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -06:00
+date: 2009-11-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: A drop in replacement for Ruby's memcache-client.
-email: abhi@traytwo.com
+email: fred@fredjean.net
 executables: []
 
 extensions: []
@@ -58,9 +59,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A drop in replacement for Ruby's memcache-client.
 test_files: 
 - spec/jruby_memcache_spec.rb