basiccache 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a49be3db84d2126fa39a6836c55ec560f0a3db8
-  data.tar.gz: 6b3a772fcd807e71442f17b790f951fa96ac78da
+  metadata.gz: d4f71e13e981841f75469a57635fb62fa2a05c13
+  data.tar.gz: 481c5488cb94027f7eeb5c6b73c553efca63c3a7
 SHA512:
-  metadata.gz: 1cd94168231bcf330a6f5c878b05da48181b0df67287640eadfe7ba9b22b9437b405b480f5f64864f1e083c61d98531fa3fa92013079647f900199d63c8fc8b2
-  data.tar.gz: 13554660770b5dd53d1c4d30be3fb7f83a81cd077f63a77c64282bec33259b12b27478e3e88cf366f68aeef83c5e725a1feae21e0ce6624ed0ef9e82be363752
+  metadata.gz: 294d82efd515d209d81c6912feb364acd94cfd7c535186d2354f98d36841a35f8877fa3b2148a38bc8b80bafdd0336d1476a233a6f239652d138de2b3d4c489e
+  data.tar.gz: b96dd632fad79b12bb513642d179cc7886f7c98d482652a634a9cb3be45ac18df3ded46b6ecbe142dda75099307f98615a1470c605762d08ab5ce089e00c0831

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 cache: bundler
 rvm:
+- 2.1.2
+- 2.1.1
 - 2.1.0
 - 2.0.0
 - 1.9.3
@@ -8,7 +10,6 @@ notifications:
   email: false
   irc:
     channels:
-      - ircs://irc.oftc.net:6697#akerl
-    channel_key: sekrit
+    - secure: NHoXuLan4NfkC00oLCXcXoYTlfFfJG/YpyGfhgk89EKBhymmBKdgYvAF1BUZ6a7olhTxt8CTNTKa8xu2lF4ET1JyHkFQwYTjp0HvCY0mpVtm7PbBEzoiK7nQWH1bkBMIYHOcmyBHmtK71iFXlXMFOxz1T1MfjLHq2PSQ6OlB6OU=
     template:
-      - '%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}'
+    - "%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}"

data/Rakefile

@@ -2,24 +2,13 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-desc 'Update bundle'
-task :bundle do
-  `bundle update`
-end
-
 desc 'Run tests'
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run Rubocop on the gem'
-Rubocop::RakeTask.new(:rubocop) do |task|
+RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']
   task.fail_on_error = true
 end
 
-desc 'Run travis-lint on .travis.yml'
-task :travislint do
-  print 'There may be an issue with your .travis.yml' unless system('travis-lint')
-end
-
-task default: [:spec, :travislint, :rubocop, :build, :install]
-task release: [:bundle]
+task default: [:spec, :rubocop, :build, :install]

data/basiccache.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'basiccache'
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.summary     = 'Provides a minimal key/value caching layer'
   s.description = "Allows an application to dynamically cache values and retrieve them later"
@@ -12,12 +12,10 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split
   s.test_files  = `git ls-files spec/*`.split
 
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'travis-lint'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fuubar'
-  s.add_development_dependency 'parser'
+  s.add_development_dependency 'rubocop', '~> 0.24.0'
+  s.add_development_dependency 'rake', '~> 10.3.2'
+  s.add_development_dependency 'coveralls', '~> 0.7.0'
+  s.add_development_dependency 'rspec', '~> 3.0.0'
+  s.add_development_dependency 'fuubar', '~> 2.0.0.rc1'
+  s.add_development_dependency 'timecop', '~> 0.7.1'
 end
-

data/lib/basiccache.rb

@@ -25,7 +25,8 @@ module BasicCache
   end
 end
 
-require 'stores/store'
-require 'caches/cache'
-require 'caches/timecache'
-require 'methodcacher'
+require 'basiccache/stores/store'
+require 'basiccache/stores/nullstore'
+require 'basiccache/caches/cache'
+require 'basiccache/caches/timecache'
+require 'basiccache/methodcacher'

data/lib/{methodcacher.rb → basiccache/methodcacher.rb}

@@ -13,7 +13,7 @@ module MethodCacher
       (class << self; self; end).class_eval do
         alias_method uncached_name, name
         define_method(name) do |*a, &b|
-          cache.cache(name) { send uncached_name, *a }
+          cache.cache(name) { send uncached_name, *a, &b }
         end
       end
     end

data/lib/basiccache/stores/nullstore.rb

@@ -0,0 +1,56 @@
+module BasicCache
+  ##
+  # No-op store object, does not store information
+  class NullStore
+    attr_reader :raw
+
+    ##
+    # Generate an empty store
+
+    def initialize
+      @raw = nil
+    end
+
+    ##
+    # Clears a specified key or the whole store
+
+    def clear!(*_)
+      true
+    end
+
+    ##
+    # Retrieve a key
+
+    def [](_)
+      nil
+    end
+
+    ##
+    # Set a key
+
+    def []=(_, value)
+      value
+    end
+
+    ##
+    # Return the size of the store
+
+    def size
+      0
+    end
+
+    ##
+    # Check for a key in the store
+
+    def include?(_)
+      false
+    end
+
+    ##
+    # Array of keys in the store
+
+    def keys
+      []
+    end
+  end
+end

data/spec/{caches → basiccache/caches}/cache_spec.rb

@@ -26,20 +26,20 @@ describe BasicCache::Cache do
     it 'caches values without a key' do
       subject.cache { 9 }
       expect(subject.cache { 10 }).to eql 9
-      expect(subject.include?).to be_true
+      expect(subject.include?).to be_truthy
     end
     it 'caches values with a key' do
       subject.cache('c') { 1 }
       expect(subject.cache('c') { 2 }).to eql 1
-      expect(subject.include? :c). to be_true
+      expect(subject.include? :c). to be_truthy
     end
   end
   describe '#include?' do
     it 'checks for a value in the cache' do
-      expect(cache.include? 'a').to be_true
-      expect(cache.include? :b).to be_true
-      expect(cache.include? 'z').to be_false
-      expect(cache.include? names[2]).to be_true
+      expect(cache.include? 'a').to be_truthy
+      expect(cache.include? :b).to be_truthy
+      expect(cache.include? 'z').to be_falsey
+      expect(cache.include? names[2]).to be_truthy
     end
   end
   describe '#[]' do

data/spec/{caches → basiccache/caches}/timecache_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
+require 'timecop'
 
 describe BasicCache::TimeCache do
   let(:cache) do
-    cache = BasicCache::TimeCache.new(lifetime: 1)
+    cache = BasicCache::TimeCache.new(lifetime: 10)
     cache.cache('a') { 3 }
     cache.cache(:b) { 5 }
     cache.cache { 9 }
@@ -17,7 +18,7 @@ describe BasicCache::TimeCache do
     expect(subject.store).to be_an_instance_of BasicCache::Store
   end
   it 'has a set lifetime' do
-    expect(cache.lifetime).to eq 1
+    expect(cache.lifetime).to eq 10
     expect(BasicCache::TimeCache.new.lifetime).to eq 60
   end
   describe '#size' do
@@ -27,33 +28,35 @@ describe BasicCache::TimeCache do
     end
     it 'does not include expired items in size' do
       expect(cache.size).to eql 3
-      sleep 2
-      expect(cache.size).to eql 0
+      Timecop.freeze(Time.now + 60) do
+        expect(cache.size).to eql 0
+      end
     end
   end
   describe '#cache' do
     it 'caches values without a key' do
       subject.cache { 9 }
       expect(subject.cache { 10 }).to eql 9
-      expect(subject.include?).to be_true
+      expect(subject.include?).to be_truthy
     end
     it 'caches values with a key' do
       subject.cache('c') { 1 }
       expect(subject.cache('c') { 2 }).to eql 1
-      expect(subject.include? :c). to be_true
+      expect(subject.include? :c). to be_truthy
     end
     it 'expires values after their lifetime' do
-      expect(cache.include? 'a').to be_true
-      sleep 2
-      expect(cache.include? 'a').to be_false
+      expect(cache.include? 'a').to be_truthy
+      Timecop.freeze(Time.now + 60) do
+        expect(cache.include? 'a').to be_falsey
+      end
     end
   end
   describe '#include?' do
     it 'checks for a value in the cache' do
-      expect(cache.include? 'a').to be_true
-      expect(cache.include? :b).to be_true
-      expect(cache.include? 'z').to be_false
-      expect(cache.include? names[2]).to be_true
+      expect(cache.include? 'a').to be_truthy
+      expect(cache.include? :b).to be_truthy
+      expect(cache.include? 'z').to be_falsey
+      expect(cache.include? names[2]).to be_truthy
     end
   end
   describe '#[]' do
@@ -64,8 +67,9 @@ describe BasicCache::TimeCache do
     end
     it 'will not return an expired key' do
       expect(cache['a']).to eql 3
-      sleep 2
-      expect { cache['a'] }.to raise_error KeyError
+      Timecop.freeze(Time.now + 60) do
+        expect { cache['a'] }.to raise_error KeyError
+      end
     end
   end
   describe '#clear!' do
@@ -93,10 +97,11 @@ describe BasicCache::TimeCache do
   describe '#prune' do
     it 'prunes invalid cache entries' do
       expect(cache.store.size).to eql 3
-      sleep 2
-      expect(cache.store.size).to eql 3
-      expect(cache.prune).to eql [:a, :b, names[2]]
-      expect(cache.store.size).to eql 0
+      Timecop.freeze(Time.now + 60) do
+        expect(cache.store.size).to eql 3
+        expect(cache.prune).to eql [:a, :b, names[2]]
+        expect(cache.store.size).to eql 0
+      end
     end
   end
 end

data/spec/{methodcacher_spec.rb → basiccache/methodcacher_spec.rb}

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'timecop'
 
 ##
 # Example class for testing method caching
@@ -8,7 +9,7 @@ class Example
   def initialize(skip_cache = false)
     return if skip_cache
     enable_caching [:repeat]
-    enable_caching [:time_repeat], BasicCache::TimeCache.new(lifetime: 1)
+    enable_caching [:time_repeat], BasicCache::TimeCache.new(lifetime: 10)
   end
 
   def repeat(input)
@@ -44,8 +45,9 @@ describe MethodCacher do
     it 'allows a user-supplied cache object' do
       expect(test_object.time_repeat 2).to eql 2
       expect(test_object.time_repeat 3).to eql 2
-      sleep 2
-      expect(test_object.time_repeat 4).to eql 4
+      Timecop.freeze(Time.now + 60) do
+        expect(test_object.time_repeat 4).to eql 4
+      end
     end
     it 'does not override other methods' do
       expect(test_object.not_cached 7).to eql 7

data/spec/basiccache/stores/nullstore_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe BasicCache::NullStore do
+  let(:store) { BasicCache::NullStore.new }
+
+  describe '#initialize' do
+    it 'creates a new null store object' do
+      expect(store.raw).to be_nil
+    end
+  end
+  describe '#clear!' do
+    it 'always returns true' do
+      expect(store.clear!).to be_truthy
+      expect(store.clear!(5)).to be_truthy
+    end
+  end
+  describe '#[]' do
+    it 'always returns nil' do
+      expect(store[1]).to be_nil
+    end
+  end
+  describe '#[]=' do
+    it 'returns the provided value' do
+      expect(store[6] = 10).to eql 10
+      expect(store[6]).to be_nil
+    end
+  end
+  describe '#size' do
+    it 'returns zero' do
+      expect(store.size).to eql 0
+    end
+  end
+  describe '#include?' do
+    it 'always returns false' do
+      expect(store.include? :foo).to be_falsey
+      expect(store.include? 1).to be_falsey
+    end
+  end
+  describe '#keys' do
+    it 'is always an empty array' do
+      expect(store.keys).to eql []
+    end
+  end
+end

data/spec/{stores → basiccache/stores}/store_spec.rb

@@ -43,8 +43,8 @@ describe BasicCache::Store do
   end
   describe '#include?' do
     it 'checks for a key in the store' do
-      expect(store.include? :foo).to be_false
-      expect(store.include? 1).to be_true
+      expect(store.include? :foo).to be_falsey
+      expect(store.include? 1).to be_truthy
     end
   end
   describe '#keys' do

data/spec/basiccache_spec.rb

@@ -9,13 +9,13 @@ describe BasicCache do
 
   describe '#caller_name' do
     it "returns the calling function's name" do
-      expect(BasicCache.caller_name).to eql 'instance_eval'
+      expect(BasicCache.caller_name).to eql 'instance_exec'
     end
     it 'uses caller_locations on Ruby 2.0.0+' do
-      expect(BasicCache::NEW_CALL).to be_true if RUBY_VERSION.to_i >= 2
+      expect(BasicCache::NEW_CALL).to be_truthy if RUBY_VERSION.to_i >= 2
     end
     it 'uses caller on Ruby 1.x' do
-      expect(BasicCache::NEW_CALL).to be_false if RUBY_VERSION.to_i < 2
+      expect(BasicCache::NEW_CALL).to be_falsey if RUBY_VERSION.to_i < 2
     end
   end
 end

metadata

@@ -1,113 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: basiccache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: travis-lint
-  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'
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
-  name: parser
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 description: Allows an application to dynamically cache values and retrieve them later
 email: me@lesaker.org
 executables: []
@@ -124,16 +110,18 @@ files:
 - Rakefile
 - basiccache.gemspec
 - lib/basiccache.rb
-- lib/caches/cache.rb
-- lib/caches/timecache.rb
-- lib/methodcacher.rb
-- lib/stores/store.rb
+- lib/basiccache/caches/cache.rb
+- lib/basiccache/caches/timecache.rb
+- lib/basiccache/methodcacher.rb
+- lib/basiccache/stores/nullstore.rb
+- lib/basiccache/stores/store.rb
+- spec/basiccache/caches/cache_spec.rb
+- spec/basiccache/caches/timecache_spec.rb
+- spec/basiccache/methodcacher_spec.rb
+- spec/basiccache/stores/nullstore_spec.rb
+- spec/basiccache/stores/store_spec.rb
 - spec/basiccache_spec.rb
-- spec/caches/cache_spec.rb
-- spec/caches/timecache_spec.rb
-- spec/methodcacher_spec.rb
 - spec/spec_helper.rb
-- spec/stores/store_spec.rb
 homepage: https://github.com/akerl/basiccache
 licenses:
 - MIT
@@ -154,14 +142,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a minimal key/value caching layer
 test_files:
+- spec/basiccache/caches/cache_spec.rb
+- spec/basiccache/caches/timecache_spec.rb
+- spec/basiccache/methodcacher_spec.rb
+- spec/basiccache/stores/nullstore_spec.rb
+- spec/basiccache/stores/store_spec.rb
 - spec/basiccache_spec.rb
-- spec/caches/cache_spec.rb
-- spec/caches/timecache_spec.rb
-- spec/methodcacher_spec.rb
 - spec/spec_helper.rb
-- spec/stores/store_spec.rb