lru-cacher 1.1.0 → 1.2.0

data/lib/lru-cacher/item_limited.rb

@@ -0,0 +1,11 @@
+require 'lib/lru-cacher'
+class ItemLimited < LRUCacher
+  def initialize(max_items)
+    @max_items = max_items
+    super()
+  end
+
+  def over_threshold?
+    @table.size > @max_items
+  end
+end

data/lib/lru-cacher/memory_limited.rb

@@ -0,0 +1,25 @@
+require 'lib/lru-cacher'
+require 'java'
+import java.lang.management.ManagementFactory
+
+class MemoryLimited < LRUCacher
+  def initialize(max_mem_size)
+    @max_mem_size = max_mem_size
+    @mem_mx_bean  = ManagementFactory.getMemoryMXBean
+    super()
+  end
+
+  def over_threshold?
+    ((@mem_mx_bean.heap_memory_usage.used + @mem_mx_bean.non_heap_memory_usage.used) / 1048576) > @max_mem_size
+  end
+
+  def pop
+    super()
+    @mem_mx_bean.gc
+  end
+
+  def delete(key)
+    super(key)
+    @mem_mx_bean.gc
+  end
+end

data/lib/lru-cacher/version.rb

@@ -1,3 +1,3 @@
 class LRUCacher
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/lru-cacher.rb

@@ -1,45 +1,42 @@
 require 'lru-cacher/node'
 class LRUCacher
-  attr_accessor :head, :tail, :max_items, :table
-
-  def initialize(max_items)
-    @max_items = max_items
-    @table     = {}
-    @head      = nil
-    @tail      = nil
+  def initialize
+    @table = {}
+    @head  = nil
+    @tail  = nil
   end
 
   def set(key, value)
-    if @table.size > @max_items
-      @table.delete @head.key
-      @head = @head.next_node
-    end
-    if !@table.key?(key)
-      new_node = LRUCacher::Node.new value, key, @tail, nil
-    else
-      new_node       = @table[key]
-      new_node.value = value
-    end
+    new_node        = LRUCacher::Node.new value, key, @tail, nil
     @head           = new_node if @tail == nil
     @tail.next_node = new_node if @tail != nil
     @tail           = new_node
     @table[key]     = new_node
+    if over_threshold?
+      delete(@head.key) if @head
+    end
+  end
+
+  def exists?(key)
+    @table.key? key
   end
 
   def get(key)
     current_node = @table[key]
     if current_node
-      return current_node if current_node.next_node == nil
-      if current_node.prev_node != nil
-        current_node.prev_node.next_node = current_node.next_node
+      if @head == current_node
+        @head = current_node.next_node
+        @tail.next_node        = current_node
+        @tail                  = current_node
+      elsif @tail == current_node
+        current_node
       else
-        @head           = current_node.next_node
-        @head.prev_node = nil
+        current_node.prev_node.next_node = current_node.next_node
+        current_node.next_node.prev_node = current_node.prev_node
+        @tail.next_node        = current_node
+        @tail                  = current_node
       end
-      @tail.next_node        = current_node
-      current_node.next_node = nil
-      current_node.prev_node = @tail
-      @tail                  = current_node
+      current_node
     end
   end
 
@@ -57,4 +54,19 @@ class LRUCacher
       @table.delete(key)
     end
   end
-end
+
+end
+
+
+
+#         (0)
+#    nn   ||
+#    V    ||
+#         ||
+#         ||  ^
+#         ||  pn
+#         V
+
+
+
+

data/lru-cacher.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('simplecov', '~> 0.10.0')                    # no 1.0 release out yet
+  spec.add_development_dependency('simplecov-rcov', '~> 0.2.3')
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lru-cacher
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Manther
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 description: LRU Caching gem.
 email:
 - jason.manther.young@gmail.com
@@ -61,8 +103,11 @@ files:
 - bin/console
 - bin/setup
 - lib/lru-cacher.rb
+- lib/lru-cacher/item_limited.rb
+- lib/lru-cacher/memory_limited.rb
 - lib/lru-cacher/node.rb
 - lib/lru-cacher/version.rb
+- lru-cacher-1.0.0.gem
 - lru-cacher.gemspec
 homepage: https://github.com/Manther/lru-cache
 licenses: