lru_redux 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc0a735826e07e6de5cc53e431c4fd87ff32413
-  data.tar.gz: 28446a234e46a8b91a57e56b1677b2d4b16ac68f
+  metadata.gz: 44f9731a90a6a4021eec3488c38c5a82399f7089
+  data.tar.gz: cd4f27cc1d9eca928e1a1e8c9b75507a4c06a81d
 SHA512:
-  metadata.gz: bc3d02a4d7b2f4f3db8189e1e4c5c1515c2e3c713d58ce2e84ba46296aec74312400c11e60f31cebfc8fd757210c347c5beb0ea13375501164a847a12326bebb
-  data.tar.gz: 4c46517993f671162baa8aa946ad201d8ce00f662b1b61f8583463041752f73da2ee57ff802e130448ae427cc12064a32eb4d4e815d3ed96e941e7d2db69593b
+  metadata.gz: e5b6832027fc7e09a7e319981ef2acc9399b11fdce5015c7c24354f6e50dbc8794b056cc995733387dbc9b658e67bc610b92a55dc905905f53b7d8e1f8a50398
+  data.tar.gz: ac925de76a377ffd499c20c626f4eb650232b4deb888cd7958452a24c425ce0a64fe6a8e62373d6c8e8e2a1bc3bd0f14f4aeb54475fb70edb1cf6bea2ae061a4

data/README.md

@@ -95,6 +95,10 @@ lru_redux thread safe   2.530000   0.000000   2.530000 (  2.532061)
 
 ## Changlog
 
+###version 0.8.4 - 20-Feb-2014
+
+- Fix: regression of ThreadSafeCache under JRuby 1.7 @Sevrius
+
 ###version 0.8.3 - 20-Feb-2014
 
 - Perf: improve ThreadSafeCache performance @Sevrius

data/lib/lru_redux.rb

@@ -12,3 +12,5 @@ else
   require "lru_redux/cache"
 end
 require "lru_redux/thread_safe_cache"
+require "lru_redux/thread_safe_cache_jruby" if
+    RUBY_PLATFORM == 'java' && JRUBY_VERSION < '9.0'

data/lib/lru_redux/cache.rb

@@ -89,25 +89,16 @@ class LruRedux::Cache
 
   def delete(key)
     node = @data.delete(key)
+
     return unless node
 
-    if node[3].nil?
-      @head = @head[0]
-      if @head.nil?
-        @tail = nil
-      else
-        @head[3] = nil
-      end
-    elsif node[0].nil?
-      @tail = @tail[3]
-      @tail[0] = nil
-    else
-      prev = node[0]
-      nex = node[3]
+    prev = node[0]
+    nex = node[3]
 
-      prev[3] = nex if prev
-      nex[0] = prev if nex
-    end
+    nex  ? nex[0] = prev : @head = prev
+    prev ? prev[3] = nex : @tail = nex
+
+    node[2]
   end
 
   def clear

data/lib/lru_redux/thread_safe_cache_jruby.rb

@@ -0,0 +1,13 @@
+class LruRedux::ThreadSafeCache
+  def getset(key, &block)
+    synchronize do
+      super(key, &block)
+    end
+  end
+
+  def fetch(key, &block)
+    synchronize do
+      super(key, &block)
+    end
+  end
+end

data/lib/lru_redux/version.rb

@@ -1,3 +1,3 @@
 module LruRedux
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lru_redux
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - lib/lru_redux/cache.rb
 - lib/lru_redux/cache19.rb
 - lib/lru_redux/thread_safe_cache.rb
+- lib/lru_redux/thread_safe_cache_jruby.rb
 - lib/lru_redux/version.rb
 - lru_redux.gemspec
 - test/cache_test.rb