pinky 2.0.0-java → 2.0.1-java

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/pinky/cache.rb

@@ -2,7 +2,7 @@ module Pinky
   class Cache
     extend Forwardable
 
-    attr_reader :name
+    attr_reader :name, :capacity
     def_delegators :cache, :size, :count, :empty?
 
     class << self
@@ -11,8 +11,9 @@ module Pinky
       end
     end
 
-    def initialize(*item_methods)
-      @item_methods = item_methods.flatten.sort
+    def initialize(item_methods, capacity)
+      @capacity = capacity
+      @item_methods = [item_methods].flatten.sort
       @name = self.class.name_for(@item_methods)
     end
 
@@ -25,13 +26,13 @@ module Pinky
       if action == :destroy
         cache.delete key
       else
-        cache[key] = item
+        cache.put(key, item)
       end
     end
 
     def query(query_hash = {})
       key = query_hash.sort.map { |k,v| v }.join '.'
-      cache[key]
+      cache.get(key)
     end
 
     def clear_cache
@@ -44,7 +45,7 @@ module Pinky
     end
 
     def cache
-      @cache ||= {}
+      @cache ||= Collections.synchronizedMap(LruCache.new(@capacity));
     end
   end
 end

data/lib/pinky/has_caches.rb

@@ -1,7 +1,7 @@
-module Pinky
+module Pinky  
   module HasCaches
-    def cachable_by(*methods)
-      create_cache_for methods
+    def cachable_by(opts)
+      create_cache_for opts[:method_names], opts[:capacity]
     end
 
     def update_caches_with(item_hash, action = :create)
@@ -15,8 +15,8 @@ module Pinky
     end
 
     private
-    def create_cache_for(method_names)
-      cache = Cache.new method_names
+    def create_cache_for(method_names, capacity)
+      cache = Cache.new(method_names, capacity || 100)
       pinky_caches_by_name[cache.name] = cache
     end
 
@@ -27,7 +27,5 @@ module Pinky
     def pinky_caches
       pinky_caches_by_name.values
     end
-
   end
-
 end

data/lib/pinky/lru_cache.rb

@@ -0,0 +1,17 @@
+java_import java.util.LinkedHashMap
+java_import java.util.Collections
+
+module Pinky
+  class LruCache < LinkedHashMap
+    attr_reader :maxEntries
+
+    def initialize(maxEntries)
+      super(maxEntries + 1, 1, true)
+      @maxEntries = maxEntries;
+    end
+
+    def removeEldestEntry(map)
+      return true if size > @maxEntries
+    end
+  end
+end

data/pinky.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "pinky"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
   s.platform = "java"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/pinky/cache.rb",
     "lib/pinky/exceptions.rb",
     "lib/pinky/has_caches.rb",
+    "lib/pinky/lru_cache.rb",
     "lib/pinky/model.rb",
     "lib/pinky/model_fetch_methods.rb",
     "pinky.gemspec",

data/spec/pinky/cache_spec.rb

@@ -3,7 +3,7 @@ require 'date'
 
 module Pinky
   describe Cache do
-    let(:cache) { Cache.new :id, :name }
+    let(:cache) { Cache.new([:id, :name], 100) }
 
     context 'Cache#name_for' do
       it { Cache.name_for(:id).should == 'cache_by_id' }
@@ -36,6 +36,22 @@ module Pinky
         cache.update_with(item, :destroy)
         cache.empty?.should be_true
       end
+
+      it 'should only store 20 items if capacity is capped at 20' do
+        cache = Cache.new([:id, :name], 2)
+        10.times {|i| cache.update_with(mock(id: i, name: 'foo'), :create) }
+        cache.send(:cache).size.should == 2
+      end
+
+      it 'orders most recently used items ordered by usage' do
+        cache = Cache.new([:id, :name], 5)
+        10.times do |i|
+          cache.update_with(mock(id: i, name: 'foo'), :create)
+          cache.query(:id => 5, :name => 'foo')
+          cache.query(:id => 7, :name => 'foo')
+        end
+        cache.send(:cache).keys.last(2).should == ['5.foo', '7.foo']
+      end
     end
 
     context 'queryable' do

data/spec/pinky/has_caches_spec.rb

@@ -5,8 +5,8 @@ module Pinky
     context 'with cachable_by declared' do
       klass = Class.new do
         extend Pinky::HasCaches
-        cachable_by :token
-        cachable_by :id, :foo
+        cachable_by method_names: :token
+        cachable_by method_names: [:id, :foo]
 
         attr_reader :id, :foo, :bar, :token
         def initialize id, foo, bar, token

data/spec/pinky/model_fetch_methods_spec.rb

@@ -5,7 +5,7 @@ module Pinky
     context 'caches' do
       member_klass = Class.new do
         extend Pinky::ModelFetchMethods
-        cachable_by :id
+        cachable_by method_names: :id
 
         def initialize hash; @hash = hash end
         def id; @hash[:id] end

metadata

@@ -2,7 +2,7 @@
 name: pinky
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.0.0
+  version: 2.0.1
 platform: java
 authors:
 - Joel Friedman
@@ -152,6 +152,7 @@ files:
 - lib/pinky/cache.rb
 - lib/pinky/exceptions.rb
 - lib/pinky/has_caches.rb
+- lib/pinky/lru_cache.rb
 - lib/pinky/model.rb
 - lib/pinky/model_fetch_methods.rb
 - pinky.gemspec