basiccache 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59373a2671eea1a0d1797e282bd2a7d5e84f1fa9
-  data.tar.gz: e19a7bc60ee8be6d5658f6ec227bf466b489c252
+  metadata.gz: da00ad80106e951e1156a2402576d9ce4dd4ee2c
+  data.tar.gz: f1196a82c291a8bf12e4e835a4f4af8b1182a474
 SHA512:
-  metadata.gz: 057250fb3fbe1be8bbc55ae2764bc7c748b41f696e33ef810d1a27d7d65fb9b2f0ae72aab245a324207e9d4d5304d84b006f1e82f54ead086441f8e4c711f4b1
-  data.tar.gz: 26672ff44bf1ff353e07396c7968eed5c95491b38a0463c12a5917e1db0bdfff6bd89775ac1edc20bb40c8df0330bf7f7c772f6ed4023adc1a7f72ba77036a1a
+  metadata.gz: bdca6535cd46161ec82ffae4969fa388ab74176e1847acc372af60d0651f0a698677d807644ff01fa6ca9039e371f01a839f88a506e445964029a2e1bfc649e0
+  data.tar.gz: c1106f9c26269292180a3acd773ddd4146c5e4120042a4183c8458c47690edf7634a7ae151a1c10c456f7fbd0547e3ec2e5a86fc339bbb9fe22def1cd432feb4

data/Rakefile

@@ -1,10 +1,17 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
+require 'rubocop/rake_task'
 
+desc 'Run tests'
 Rake::TestTask.new do |t|
   t.libs << 'test'
 end
 
-desc "Run tests"
-task :default => [:test, :build, :install]
+desc 'Run Rubocop on the gem'
+Rubocop::RakeTask.new(:rubocop) do |task|
+  task.patterns = ['lib/*.rb', 'test/*.rb']
+  task.fail_on_error = true
+end
+
+task :default => [:test, :rubocop, :build, :install]
 

data/basiccache.gemspec

@@ -12,5 +12,6 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files test/`.split
   s.homepage    = 'https://github.com/akerl/basiccache'
   s.license     = 'MIT'
+  s.add_development_dependency 'rubocop'
 end
 

data/lib/basiccache.rb

@@ -2,7 +2,7 @@
 # This module provides a simple key/value cache for storing computation results
 
 module BasicCache
-  VERSION = '0.0.13'
+  VERSION = '0.0.15'
 
   class << self
     ##
@@ -73,6 +73,15 @@ module BasicCache
       key ||= BasicCache.get_caller
       @store.include? key.to_sym
     end
+
+    ##
+    # Retrieve cached value
+
+    def [](key = nil)
+      key ||= BasicCache.get_caller
+      fail KeyError, 'Key not cached' unless @store.include? key.to_sym
+      @store[key.to_sym]
+    end
   end
 
   ##
@@ -96,9 +105,11 @@ module BasicCache
     def cache(key = nil, &code)
       key ||= BasicCache.get_caller
       key = key.to_sym
+      # rubocop:disable AndOr
       unless @store.include? key and Time.now - @store[key].stamp < @lifetime
         @store[key] = @cache_item.new(Time.now, code.call)
       end
+      # rubocop:enable AndOr
       @store[key].value
     end
 
@@ -108,8 +119,13 @@ module BasicCache
     def include?(key = nil)
       key ||= BasicCache.get_caller
       key = key.to_sym
+      # rubocop:disable AndOr
       @store.include? key and Time.now - @store[key].stamp < @lifetime
+      # rubocop:enable AndOr
+    end
+
+    def [](key = nil)
+      super.value
     end
   end
 end
-

data/test/test_cache.rb

@@ -2,11 +2,14 @@ require 'test/unit'
 require 'benchmark'
 require 'basiccache'
 
+##
+# Let's cache some stuff!
+
 class BasicCacheTest < Test::Unit::TestCase
   def compute(n)
     (1..n).reduce { |a, e| a * e }
   end
-  
+
   def test_creation
     a = BasicCache.new
     b = BasicCache::Cache.new
@@ -20,8 +23,8 @@ class BasicCacheTest < Test::Unit::TestCase
     cache = BasicCache.new
     cache.cache { compute(10) }
     assert cache.store.include? :test_caching
-    assert_equal cache.store[:test_caching], 3628800
-    assert_equal cache.cache, 3628800
+    assert_equal cache.store[:test_caching], 3_628_800
+    assert_equal cache.cache, 3_628_800
   end
 
   def test_clearing
@@ -34,8 +37,9 @@ class BasicCacheTest < Test::Unit::TestCase
 
   def test_speed_increase
     cache = BasicCache.new
-    trials = 2.times.map { Benchmark.measure { cache.cache { compute(50_000) } }.real }
-    assert (trials[0] > trials[1]*1000)
+    trials = 2.times.map do
+      Benchmark.measure { cache.cache { compute(50_000) } }.real
+    end
+    assert trials[0] > trials[1] * 1_000
   end
 end
-

data/test/test_timecache.rb

@@ -2,11 +2,14 @@ require 'test/unit'
 require 'benchmark'
 require 'basiccache'
 
+##
+# Lets test some timed caches!
+
 class TimeCacheTest < Test::Unit::TestCase
   def compute(n)
     (1..n).reduce { |a, e| a * e }
   end
-  
+
   def test_creation
     a = BasicCache::TimeCache.new
     assert_instance_of BasicCache::TimeCache, a
@@ -20,8 +23,8 @@ class TimeCacheTest < Test::Unit::TestCase
     cache = BasicCache::TimeCache.new
     cache.cache { compute(10) }
     assert cache.store.include? :test_caching
-    assert_equal cache.store[:test_caching].value, 3628800
-    assert_equal cache.cache, 3628800
+    assert_equal cache.store[:test_caching].value, 3_628_800
+    assert_equal cache.cache, 3_628_800
   end
 
   def test_clearing
@@ -34,8 +37,10 @@ class TimeCacheTest < Test::Unit::TestCase
 
   def test_speed_increase
     cache = BasicCache::TimeCache.new
-    trials = 2.times.map { Benchmark.measure { cache.cache { compute(50_000) } }.real }
-    assert (trials[0] > trials[1]*1000)
+    trials = 2.times.map do
+      Benchmark.measure { cache.cache { compute(50_000) } }.real
+    end
+    assert trials[0] > trials[1] * 1_000
   end
 
   def test_expiration
@@ -46,4 +51,3 @@ class TimeCacheTest < Test::Unit::TestCase
     assert cache.include?(:test) == false
   end
 end
-

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: basiccache
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
-dependencies: []
+date: 2013-11-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 description: Allows an application to dynamically cache values and retrieve them later
 email: me@lesaker.org
 executables: []