cachy 0.3.0 → 0.3.1

data/Gemfile

@@ -1,7 +1,6 @@
 source :rubygems
 gemspec
 
-group :development do
-  gem 'rake'
-  gem 'rspec', '~>2'
-end
+gem 'bump'
+gem 'rake'
+gem 'rspec', '~>2'

data/Gemfile.lock

@@ -1,28 +1,30 @@
 PATH
   remote: .
   specs:
-    cachy (0.3.0)
+    cachy (0.3.1)
       mini_memory_store
 
 GEM
   remote: http://rubygems.org/
   specs:
+    bump (0.3.8)
     diff-lcs (1.1.3)
     mini_memory_store (0.1.0)
-    rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
+    rspec-mocks (2.12.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump
   cachy!
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,22 +1,7 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 
 task :default do
   sh "rspec spec/"
 end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/cachy/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end

data/lib/cachy.rb

@@ -60,7 +60,8 @@ module Cachy
     end * "_"
 
     key = (options[:hash_key] || hash_keys) ? hash(key) : key
-    (options[:prefix].to_s + key + options[:suffix].to_s).gsub(' ', '_')
+    my_prefix = (options[:prefix] || prefix).to_s
+    (my_prefix + key + options[:suffix].to_s).gsub(' ', '_')
   end
 
   # Expire all possible locales of a cache, use the same arguments as with cache
@@ -111,6 +112,7 @@ module Cachy
 
   class << self
     attr_accessor :hash_keys
+    attr_accessor :prefix
   end
 
   # Wrap non ActiveSupport style cache stores,

data/lib/cachy/version.rb

@@ -1,3 +1,3 @@
 module Cachy
-  Version = VERSION = '0.3.0'
+  Version = VERSION = '0.3.1'
 end

data/spec/cachy_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe Cachy do
+
+  def reset_cachy!
+    Cachy.prefix    = nil
+    Cachy.hash_keys = false
+  end
+
   before do
     @cache = TestCache.new
     Cachy.cache_store = @cache
@@ -9,6 +15,10 @@ describe Cachy do
     Cachy.send(:memory_store).clear
   end
 
+  after do
+    reset_cachy!
+  end
+
   describe :cache do
     it "caches" do
       Cachy.cache(:my_key){ "X" }.should == "X"
@@ -173,15 +183,26 @@ describe Cachy do
       key.should == "x_v1_de"
     end
 
+    describe :prefix do
+      it "uses prefix, if set with Cachy.prefix = ..." do
+        user = mock(:cache_key=>'XXX',:something_else=>'YYY')
+        Cachy.prefix = "cachy_"
+        Cachy.key(:my_key, 1, user, "abc").should == 'cachy_my_key_1_XXX_abc_v1'
+      end
+
+      it "can be overridden by :prefix => ... option" do
+        user = mock(:cache_key=>'XXX',:something_else=>'YYY')
+        Cachy.prefix = "cachy_"
+        Cachy.key(:my_key, 1, user, "abc", :prefix => "special_prefix_").should_not == 'cachy_my_key_1_XXX_abc_v1'
+        Cachy.key(:my_key, 1, user, "abc", :prefix => "special_prefix_").should == 'special_prefix_my_key_1_XXX_abc_v1'
+      end
+    end
+
     describe "with :hash_key" do
       before do
         @hash = '3b2b8f418849bc73071375529f8515be'
       end
 
-      after do
-        Cachy.hash_keys = false
-      end
-
       it "hashed the key to a stable value" do
         Cachy.key(:xxx, :hash_key=>true).should == @hash
       end

metadata

@@ -1,45 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cachy
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: mini_memory_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :runtime
-  name: mini_memory_store
-  version_requirements: *id001
 description: 
 email: michael@grosser.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -62,37 +55,34 @@ files:
 - spec/spec_helper.rb
 - spec/test_cache.rb
 homepage: http://github.com/grosser/cachy
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 966047757035435948
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 966047757035435948
+  none: false
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Caching library for projects that have many processes or many caches
 test_files: []
-