coffee_table 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cb5c9e9f996f2b3eb05c490f33c7354ff26836a
-  data.tar.gz: 9225f27d155e088628f766272b3ab5f664a2b38b
+  metadata.gz: 6b61f44f08291532c47af511b52cea6e4ae43abc
+  data.tar.gz: f86c99825f3e14a20786c4f221032663d3c6cc9c
 SHA512:
-  metadata.gz: 40872384ec30a13e2c964c39e7bd374aa15471db0b2cfdb4649655d52129d4d2629b3e1494fe70863c8f4fb98740a66c44054bb3b4bdc9e3c2e8de52663d9c2e
-  data.tar.gz: c8f33be7b34a580d83298bc9c887511550f7767e0fe18c41053d2898a4451fa1e3eb8980ad670bc46daa9393d45f68db3ad0c48fb1d05fb58d7fcdb6be459073
+  metadata.gz: d3ac7bcc8fb7a9830ca44d1f807b6ed598d104bd8b44ac23cf69dd4ade1c6052a433f065f796eb23a9d90401f44175837bc00affb59eac38c7eea9b1cfc47427
+  data.tar.gz: da3ab9a81e3f32f09a7eaf5ff3cb2214cb568ad5b18e51aafdccdfa83ee9cb44430b09d1a0daeecd25e0b2aa5c89a2cf20e7c3b85bf4099162146f604cb0fd54

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.4.1

data/Gemfile

@@ -4,13 +4,3 @@ source "http://rubygems.org"
 gemspec
 
 gem "awesome_print"
-gem "rufus-scheduler"
-gem "activesupport"
-gem "gzip"
-
-group :test do
-  gem "rspec"
-  gem "mock_redis"
-  gem "spork"
-  gem 'coveralls', require: false
-end

data/Gemfile.lock

@@ -1,21 +1,24 @@
 PATH
   remote: .
   specs:
-    coffee_table (0.2.6)
+    coffee_table (0.2.8)
       activesupport
       gzip
       redis
-      rufus-scheduler
+      redis-namespace
       sourcify
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     awesome_print (1.1.0)
     colorize (0.5.8)
+    concurrent-ruby (1.0.5)
     coveralls (0.6.7)
       colorize
       multi_json (~> 1.3)
@@ -23,14 +26,17 @@ GEM
       simplecov (>= 0.7)
       thor
     diff-lcs (1.2.4)
-    file-tail (1.1.1)
+    file-tail (1.2.0)
       tins (~> 1.0)
     gzip (1.0)
-    i18n (0.6.4)
+    i18n (0.8.6)
     mime-types (1.23)
+    minitest (5.10.3)
     mock_redis (0.17.0)
     multi_json (1.7.8)
-    redis (3.2.2)
+    redis (3.3.3)
+    redis-namespace (1.5.3)
+      redis (~> 3.0, >= 3.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
@@ -41,14 +47,12 @@ GEM
     rspec-expectations (2.14.1)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
-    ruby2ruby (2.3.0)
+    ruby2ruby (2.4.0)
       ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.8.2)
-      sexp_processor (~> 4.1)
-    rufus-scheduler (2.0.23)
-      tzinfo (>= 0.3.23)
-    sexp_processor (4.7.0)
+      sexp_processor (~> 4.6)
+    ruby_parser (3.10.1)
+      sexp_processor (~> 4.9)
+    sexp_processor (4.10.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -60,22 +64,21 @@ GEM
       sexp_processor (>= 3.0.5)
     spork (0.9.2)
     thor (0.18.1)
-    tins (1.12.0)
-    tzinfo (1.0.1)
+    thread_safe (0.3.6)
+    tins (1.15.0)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
   awesome_print
   coffee_table!
   coveralls
-  gzip
   mock_redis
   rspec
-  rufus-scheduler
   spork
 
 BUNDLED WITH
-   1.11.2
+   1.15.4

data/README.textile

@@ -1,5 +1,5 @@
 
-h1. CoffeeTable v0.2.6
+h1. CoffeeTable v0.2.8
 
 !https://badge.fury.io/rb/coffee_table.png!:http://badge.fury.io/rb/coffee_table
 !https://gemnasium.com/stewartmckee/coffee_table.png!
@@ -39,7 +39,6 @@ Creates a new cache object.  You can pass options into this method to modify the
   * :ignore_code_changes defaults to false.  By default a md5 hash of the code in the block is included in the key, if you change the code, the key automatically invalidates.  This is to protect against code changes that won't be picked up due to the cache returning.
   * :compress_content defaults to true and sets whether large strings are compressed
   * :compress_min_size defaults to 10240, which is 10k any strings larger than this are compressed before being stored
-  * :max_threads defaults to 28, if running in limited thread environment you can reduce this (eg Heroku)
 
 h4. fetch(initial_key, *related_objects, &block)
 

data/changelog.txt

@@ -1,3 +1,6 @@
+0.2.8
+  - removed rufus-scheduler
+
 0.2.6
   - fixed bug in creating coffee table object
 

data/coffee_table.gemspec

@@ -20,8 +20,11 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
+  s.add_development_dependency "mock_redis"
+  s.add_development_dependency "spork"
+  s.add_development_dependency "coveralls"
   s.add_dependency "redis"
-  s.add_dependency "rufus-scheduler"
+  s.add_dependency "redis-namespace"
   s.add_dependency "activesupport"
   s.add_dependency "sourcify"
   s.add_dependency "gzip"

data/lib/coffee_table.rb

@@ -5,10 +5,11 @@ require "coffee_table/invalid_object_error"
 require "coffee_table/block_missing_error"
 require "coffee_table/object_definition"
 require "redis"
-require 'rufus/scheduler'
+require 'redis-namespace'
 require 'active_support/inflector'
 require 'digest/md5'
 require 'gzip'
+require 'awesome_print'
 
 module CoffeeTable
   class Cache
@@ -27,20 +28,13 @@ module CoffeeTable
       default_ignore_code_changes_to false
       default_compress_content_to true
       default_compress_min_size_to 10240
-      default_max_threads_to 5
 
       if !@options[:redis].nil?
-        @redis = @options[:redis]
+          @redis = Redis::Namespace.new(@options[:redis_namespace], :redis => @options[:redis])
       elsif @options.has_key?(:redis_url)
-        @redis = Redis.new({:url => @options[:redis_url]})
+        @redis = Redis::Namespace.new(@options[:redis_namespace], {:url => @options[:redis_url]})
       else
-        @redis = Redis.new({:server => @options[:redis_server], :port => @options[:redis_port]})
-      end
-      rufus_version = Gem::Version.new(Rufus::Scheduler::VERSION)
-      if rufus_version >= Gem::Version.new('3.0.0')
-        @scheduler = Rufus::Scheduler.new(:max_work_threads => @options[:max_threads])
-      else
-        @scheduler = Rufus::Scheduler.start_new
+        @redis = Redis::Namespace.new(@options[:redis_namespace], {:server => @options[:redis_server], :port => @options[:redis_port]})
       end
     end
 
@@ -67,8 +61,6 @@ module CoffeeTable
 
       flags = {}
 
-
-
       # if first related_object is integer or fixnum it is used as an expiry time for the cache object
       key = CoffeeTable::Key.new(initial_key, block_key, flags, related_objects)
       if @options[:enable_cache]
@@ -91,19 +83,13 @@ module CoffeeTable
 
             if compress_result
               key.add_flag(:compressed => true)
-              @redis.sadd "cache_keys", key.to_s
               @redis.set(key.to_s, Marshal.dump(result.gzip))
             else
-              @redis.sadd "cache_keys", key.to_s
               @redis.set(key.to_s, Marshal.dump(result))
             end
 
             unless expiry.nil?
               @redis.expire key.to_s, expiry
-              @scheduler.in "#{expiry}s" do
-                @redis.del(key.to_s)
-                @redis.srem "cache_keys", key.to_s
-              end
             end
           end
         end
@@ -116,7 +102,6 @@ module CoffeeTable
     def expire_key(key_value)
       keys.map{|k| CoffeeTable::Key.parse(k)}.select{|key| key.has_element?(key_value) || key.to_s == key_value }.each do |key|
         @redis.del(key.to_s)
-        @redis.srem "cache_keys", key.to_s
       end
     end
 
@@ -125,7 +110,7 @@ module CoffeeTable
     end
 
     def keys
-      @redis.smembers("cache_keys")
+      @redis.keys
     end
 
     def expire_for(*objects)

data/lib/coffee_table/utility.rb

@@ -1,7 +1,6 @@
 module CoffeeTable
   module Utility
 
-    
     # used for setting default options
     def method_missing(method_sym, *arguments, &block)
       if method_sym.to_s =~ /^default_(.*)_to$/
@@ -20,4 +19,4 @@ module CoffeeTable
       downcase
     end
   end
-end
+end

data/lib/coffee_table/version.rb

@@ -1,3 +1,3 @@
 module CoffeeTable
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/lib/coffee_table_spec.rb

@@ -50,12 +50,12 @@ describe CoffeeTable::Cache do
     context "compressing" do
 
       before(:each) do
-        @redis = Redis.new({:server => "127.0.0.1", :port => 6379})
+        @redis = Redis::Namespace.new("coffee_table", {:server => "127.0.0.1", :port => 6379})
 
       end
 
       it "compresses on strings greater than limit" do
-        @coffee_table = CoffeeTable::Cache.new(:compress_min_size => 20)
+        @coffee_table = CoffeeTable::Cache.new(:server => "127.0.0.1", :port => 6379, :compress_min_size => 20)
         zipped_content = "this string should be long".gzip
         result = @coffee_table.fetch(:test_key) do
           "this string should be long"
@@ -64,7 +64,7 @@ describe CoffeeTable::Cache do
         @redis.get("test_key|1c083b7ed4b406f263ef329a608a80b9|compressed=true").should eq Marshal.dump(zipped_content)
       end
       it "does not compress on non strings" do
-        @coffee_table = CoffeeTable::Cache.new(:compress_min_size => 20)
+        @coffee_table = CoffeeTable::Cache.new(:server => "127.0.0.1", :port => 6379, :compress_min_size => 20)
         result = @coffee_table.fetch(:test_key) do
           {:test => "this value is a decent length to trigger compress"}
         end
@@ -73,7 +73,7 @@ describe CoffeeTable::Cache do
       end
 
       it "does not compress when turned off" do
-        @coffee_table = CoffeeTable::Cache.new(:compress_content => false)
+        @coffee_table = CoffeeTable::Cache.new(:server => "127.0.0.1", :port => 6379, :compress_content => false)
         result = @coffee_table.fetch(:test_key) do
           "this string should be long"
         end
@@ -81,7 +81,7 @@ describe CoffeeTable::Cache do
         @redis.get("test_key|1c083b7ed4b406f263ef329a608a80b9|").should eql Marshal.dump("this string should be long")
       end
       it "does not compress on strings below limit" do
-        @coffee_table = CoffeeTable::Cache.new(:compress_min_size => 20)
+        @coffee_table = CoffeeTable::Cache.new(:server => "127.0.0.1", :port => 6379, :compress_min_size => 20)
         result = @coffee_table.fetch(:test_key) do
           "short"
         end
@@ -89,7 +89,7 @@ describe CoffeeTable::Cache do
         @redis.get("test_key|f0b9a08ff52e14e59daa03aae70a5cab|").should eql Marshal.dump("short")
       end
       it "decompresses compressed value" do
-        @coffee_table = CoffeeTable::Cache.new(:compress_min_size => 20)
+        @coffee_table = CoffeeTable::Cache.new(:redis => @redis, :compress_min_size => 20)
         @coffee_table.fetch(:test_key) do
           "this string should be long"
         end
@@ -101,7 +101,7 @@ describe CoffeeTable::Cache do
 
       end
       it "does not decompress a non compressed value" do
-        @coffee_table = CoffeeTable::Cache.new(:compress_min_size => 20)
+        @coffee_table = CoffeeTable::Cache.new(:redis => @redis, :compress_min_size => 20)
         @coffee_table.fetch(:test_key) do
           "short"
         end
@@ -197,11 +197,11 @@ describe CoffeeTable::Cache do
     end
     context "with expiry" do
       it "keys should update when cache expires" do
-        @coffee_table.fetch(:test_key, :expiry => 0.2) do
+        @coffee_table.fetch(:test_key, :expiry => 1) do
           "object1"
         end
         @coffee_table.keys.count.should == 1
-        sleep 0.5
+        sleep 1
         @coffee_table.keys.count.should == 0
       end
       it "should not execute block during cache period" do

data/spec/lib/key_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe CoffeeTable::Key do
-  
+
   context "has correct methods" do
     it "should have a parse class method" do
       CoffeeTable::Key.should respond_to :parse
@@ -43,7 +43,7 @@ describe CoffeeTable::Key do
       key.elements[0].should == "sample_|s&class"
 
       key.to_s.should == "te|s&t|asdf|s&|sample_|s&class|"
-    
+
     end
   end
 
@@ -109,8 +109,8 @@ describe CoffeeTable::Key do
     it "does not match on flag values" do
       key = CoffeeTable::Key.new("name", "key", {:option => "value", :option2 => "value2"}, @obj1, @obj2, @obj3)
       key.has_element?("option=value&option2=value2").should be_false
-      
+
     end
 
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffee_table
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Stewart McKee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mock_redis
+  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: spork
+  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: coveralls
+  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: redis
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rufus-scheduler
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: coffee_table
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Gem to manage cache stored in redis