coffee_table 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85d61144259a5b7bed08d5f46414ed9aab9c3530
-  data.tar.gz: 4bd7ab36e8e1b5a917861200a6dd3d4abfc0f40a
+  metadata.gz: d87f1f9b02a63db0921133ad996a2c633b6b73a8
+  data.tar.gz: dfb007210368795bbd1351fa27e03788e6b1a950
 SHA512:
-  metadata.gz: f6507d5dc3b338e5a25ca952a4add6487ccfb4d7ece8c689a46f9ade13d5241ce4b7c835fbfdbba051b0eb93cf568550eaa792fa741580f30ac76efeb0ceeef2
-  data.tar.gz: 65e52ce8da9becd35e3cef824c1b4e8fef0594bd230a53154e47418e790998afef30b972a6724bdef155e3a8525d3441451067fdc91cb96f431d835f5555a70d
+  metadata.gz: a0eeb7161d82bea4df39f2a9778eaffffa34490e3119ee72277b30f19ec0d1219b1457f65ba521cb230bc8ff25a4e32a045e57d2deb8b4cc6af511deb404e611
+  data.tar.gz: c909abec5091d2da8717b10da06bab7da55385661e03ef876a4db5ac0da2dccaeb28bbfa369cd43df4bf04a91234a021d2a407231e05566ab3709193dac71a3b

data/Gemfile

@@ -6,8 +6,8 @@ gemspec
 gem "awesome_print"
 gem "rufus-scheduler"
 gem "activesupport"
-gem "sourcify", :git => "git@github.com:stewartmckee/sourcify.git"
 gem "gzip"
+gem "proc_extensions"
 
 group :test do
   gem "rspec"

data/Gemfile.lock

@@ -1,17 +1,7 @@
-GIT
-  remote: git@github.com:stewartmckee/sourcify.git
-  revision: cdef8e0b3b7017312407000985a279d6627c77e5
-  specs:
-    sourcify (0.6.0.rc3)
-      file-tail (~> 1.0.10)
-      ruby2ruby (~> 1.3.1)
-      ruby_parser (~> 2.3.1)
-      sexp_processor (~> 3.2.0)
-
 PATH
   remote: .
   specs:
-    coffee_table (0.2.2)
+    coffee_table (0.2.3)
       activesupport
       gzip
       redis
@@ -33,13 +23,15 @@ GEM
       simplecov (>= 0.7)
       thor
     diff-lcs (1.2.4)
-    file-tail (1.0.12)
-      tins (~> 0.5)
+    file-tail (1.1.1)
+      tins (~> 1.0)
     gzip (1.0)
     i18n (0.6.4)
     mime-types (1.23)
-    mock_redis (0.9.0)
+    mock_redis (0.17.0)
     multi_json (1.7.8)
+    proc_extensions (0.2)
+      sourcify (~> 0.5)
     redis (3.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -51,21 +43,26 @@ GEM
     rspec-expectations (2.14.1)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
-    ruby2ruby (1.3.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
+    ruby2ruby (2.3.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 (3.2.0)
+    sexp_processor (4.7.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    sourcify (0.5.0)
+      file-tail (>= 1.0.5)
+      ruby2ruby (>= 1.2.5)
+      ruby_parser (>= 2.0.5)
+      sexp_processor (>= 3.0.5)
     spork (0.9.2)
     thor (0.18.1)
-    tins (0.8.3)
+    tins (1.12.0)
     tzinfo (1.0.1)
 
 PLATFORMS
@@ -78,9 +75,9 @@ DEPENDENCIES
   coveralls
   gzip
   mock_redis
+  proc_extensions
   rspec
   rufus-scheduler
-  sourcify!
   spork
 
 BUNDLED WITH

data/README.textile

@@ -33,6 +33,7 @@ Creates a new cache object.  You can pass options into this method to modify the
 
   * :enable_cache This defaults to true, but can be set to false to disable the cache
   * :redis_namespace defaults to ":coffee_table" and is set to seperate out the keys from other redis users or other caches
+  * :redis defaults to nil and can be used to pass in a redis connection, this overrides all other redis params
   * :redis_server defaults to "127.0.0.1"
   * :redis_port defaults to 6789
   * :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.

data/changelog.txt

@@ -1,6 +1,9 @@
+0.2.4
+  - reversed closing connections and instead added :redis option to pass in an existing connection
+
 0.2.3
   - closing redis connections on use
-  
+
 0.2.2
   - added max_threads option due to limited thread environment in heroku
 

data/lib/coffee_table.rb

@@ -9,13 +9,13 @@ require 'rufus/scheduler'
 require 'active_support/inflector'
 require 'digest/md5'
 require 'gzip'
+require "proc_extensions"
 
 module CoffeeTable
   class Cache
 
     include CoffeeTable::Utility
 
-
     # initialize for coffee_table.  takes options to setup behaviour of cache
     def initialize(options={})
       @options = options
@@ -24,24 +24,31 @@ module CoffeeTable
       default_redis_namespace_to :coffee_table
       default_redis_server_to "127.0.0.1"
       default_redis_port_to 6379
+      default_redis_to nil
       default_ignore_code_changes_to false
       default_compress_content_to true
       default_compress_min_size_to 10240
-      default_max_threads_to 28
+      default_max_threads_to 5
 
+      if !@options[:redis].nil?
+        @redis = @options[:redis]
+      elsif @options.has_key?(:redis_url)
+        @redis = Redis.new({: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])
+        @scheduler = Rufus::Scheduler.new(:max_work_threads )
       else
         @scheduler = Rufus::Scheduler.start_new
       end
     end
 
+
     def fetch(initial_key, *related_objects, &block)
       raise CoffeeTable::BlockMissingError, "No block given to generate cache from" unless block_given?
 
-      @redis = get_redis
-
       # extract the options hash if it is present
       options = {}
       if related_objects[-1].instance_of? Hash
@@ -52,11 +59,12 @@ module CoffeeTable
       # check objects are valid
       related_objects.flatten.map{|o| raise CoffeeTable::InvalidObjectError, "Objects passed in must have an id method or be a class" unless object_valid?(o)}
 
-      # if @options[:ignore_code_changes]
+      if @options[:ignore_code_changes]
         block_key = ""
-      # else
-      #   block_key = Digest::MD5.hexdigest(block.to_source)
-      # end
+      else
+        block_source = RubyVM::InstructionSequence.disasm(block.to_proc).to_s.gsub(/\(\s*\d+\)/, "").gsub(/^== disasm.*?$/, "")
+        block_key = Digest::MD5.hexdigest(block_source)
+      end
 
       flags = {}
 
@@ -101,18 +109,14 @@ module CoffeeTable
       else
         result = yield
       end
-
-      @redis.close
       result
     end
 
     def expire_key(key_value)
-      @redis = get_redis
       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
-      @redis.close
     end
 
     def expire_all
@@ -120,10 +124,7 @@ module CoffeeTable
     end
 
     def keys
-      @redis = get_redis
-      members = @redis.smembers("cache_keys")
-      @redis.close
-      memberss
+      @redis.smembers("cache_keys")
     end
 
     def expire_for(*objects)
@@ -183,12 +184,5 @@ module CoffeeTable
     def object_valid?(o)
       o.respond_to?(:id) || o.class == Class
     end
-    def get_redis
-      if @options.has_key?(:redis_url)
-        return Redis.new({:url => @options[:redis_url]})
-      else
-        return Redis.new({:server => @options[:redis_server], :port => @options[:redis_port]})
-      end
-    end
   end
 end

data/lib/coffee_table/version.rb

@@ -1,3 +1,3 @@
 module CoffeeTable
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/lib/coffee_table_spec.rb

@@ -1,18 +1,18 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
+require "base64"
 describe CoffeeTable::Cache do
-  
+
   before(:each) do
     @coffee_table = CoffeeTable::Cache.new
   end
-  
+
   specify { CoffeeTable::Cache.should respond_to :new}
   specify { @coffee_table.should respond_to :fetch}
   specify { @coffee_table.should respond_to :expire_key}
   specify { @coffee_table.should respond_to :expire_all}
   specify { @coffee_table.should respond_to :keys}
   specify { @coffee_table.should respond_to :expire_for}
-  
+
   describe "config" do
     it "should take a hash for config" do
       CoffeeTable::Cache.new({:test => "asdf"})
@@ -21,7 +21,7 @@ describe CoffeeTable::Cache do
       lambda{CoffeeTable::Cache.new}.should_not raise_exception
     end
   end
-  
+
   describe "fetch" do
     it "should raise an exception when block not given" do
       lambda{@coffee_table.fetch("asdf")}.should raise_exception CoffeeTable::BlockMissingError
@@ -30,8 +30,8 @@ describe CoffeeTable::Cache do
       result = @coffee_table.fetch("asdf") do
         "this is a value"
       end
-      
-      result.should == "this is a value"      
+
+      result.should == "this is a value"
     end
     it "should return cached value when cache available" do
       value = "this is a value"
@@ -42,9 +42,9 @@ describe CoffeeTable::Cache do
       result = @coffee_table.fetch("asdf") do
         value
       end
-        
-      result.should == "this is a value"      
-      
+
+      result.should == "this is a value"
+
     end
 
     context "compressing" do
@@ -61,7 +61,7 @@ describe CoffeeTable::Cache do
           "this string should be long"
         end
         result.should eql "this string should be long"
-        @redis.get("test_key|1bdc7485920d15e21276c0c54cdb5bcf|compressed=true").should eql Marshal.dump(zipped_content)
+        @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)
@@ -69,7 +69,7 @@ describe CoffeeTable::Cache do
           {:test => "this value is a decent length to trigger compress"}
         end
         result.should eql ({:test => "this value is a decent length to trigger compress"})
-        @redis.get("test_key|9e6b3fa8a7fd45acb4734946faf5b61c|").should eql "\x04\b{\x06:\ttestI\"6this value is a decent length to trigger compress\x06:\x06EF"
+        Base64.encode64(@redis.get("test_key|6edc6a13bfb5a9f926072f34d1006557|")).should eql "BAh7BjoJdGVzdEkiNnRoaXMgdmFsdWUgaXMgYSBkZWNlbnQgbGVuZ3RoIHRv\nIHRyaWdnZXIgY29tcHJlc3MGOgZFVA==\n"
       end
 
       it "does not compress when turned off" do
@@ -78,7 +78,7 @@ describe CoffeeTable::Cache do
           "this string should be long"
         end
         result.should eql "this string should be long"
-        @redis.get("test_key|1bdc7485920d15e21276c0c54cdb5bcf|").should eql "\x04\bI\"\x1Fthis string should be long\x06:\x06EF"
+        @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)
@@ -86,7 +86,7 @@ describe CoffeeTable::Cache do
           "short"
         end
         result.should eql "short"
-        @redis.get("test_key|73a95ee5162c38b2ebda1f70a3ab5893|").should eql "\x04\bI\"\nshort\x06:\x06EF"
+        @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)
@@ -134,7 +134,7 @@ describe CoffeeTable::Cache do
         end
         @coffee_table.keys.should == ["test_key|#{md5}|sample_classes|"]
       end
-      
+
       it "should use class name for keys" do
         md5 = md5_block do
           "this is a changed value"
@@ -167,9 +167,9 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key, test_object) do
           "this is a changed value"
         end
-        
+
         @coffee_table.keys.should include "test_key|#{md5}|sample_class[9938]|"
-        
+
       end
       it "should raise an exception if a related object does not respond_to id" do
         test_object = SampleClassWithoutId.new
@@ -179,7 +179,7 @@ describe CoffeeTable::Cache do
             "this is a changed value"
           end
         }.should raise_exception CoffeeTable::InvalidObjectError, "Objects passed in must have an id method or be a class"
-        
+
       end
 
       it "should create a universal key if the objects passed in are an uninitialised class" do
@@ -190,8 +190,8 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key, SampleClass) do
           "this is a changed value"
         end
-        
-        @coffee_table.keys.should include "test_key|#{md5}|sample_classes|"          
+
+        @coffee_table.keys.should include "test_key|#{md5}|sample_classes|"
       end
 
     end
@@ -212,8 +212,8 @@ describe CoffeeTable::Cache do
         value = 'this is a changed value'
         result = @coffee_table.fetch("asdf") do
           value
-        end      
-        result.should == "this is a value"      
+        end
+        result.should == "this is a value"
 
       end
       it "should execute block and return value when cache has expired" do
@@ -223,8 +223,8 @@ describe CoffeeTable::Cache do
         sleep 2
         result = @coffee_table.fetch("asdf") do
           "this is a changed value"
-        end      
-        result.should == "this is a changed value"      
+        end
+        result.should == "this is a changed value"
       end
     end
 
@@ -251,7 +251,7 @@ describe CoffeeTable::Cache do
       end
     end
   end
-  
+
   describe "expire_key" do
 
     before(:each) do
@@ -377,7 +377,7 @@ describe CoffeeTable::Cache do
       end
     end
   end
-  
+
   describe "expire_all" do
     before(:each) do
 
@@ -409,7 +409,7 @@ describe CoffeeTable::Cache do
 
     end
   end
-  
+
   describe "keys" do
     before(:each) do
       @object1 = [SampleClass.new(1), SampleClass.new(2), SampleClass.new(3)]
@@ -464,7 +464,7 @@ describe CoffeeTable::Cache do
     end
 
   end
-  
+
   describe "expire_for" do
     before(:each) do
       object1 = [SampleClass.new(1), SampleClass.new(2), SampleClass.new(3)]
@@ -526,5 +526,5 @@ describe CoffeeTable::Cache do
       @coffee_table.keys.count.should == 1
     end
   end
-    
-end
+
+end

data/spec/spec_helper.rb

@@ -21,26 +21,27 @@ end
 Spork.each_run do
   RSpec.configure do |config|
     config.before(:each) {
-      
-      
+
+
       redis = double(:redis)
       Redis.stub(:new).and_return(MockRedis.new)
       CoffeeTable::Cache.new.expire_all
-      
+
     }
 
     config.after(:each) {
     }
-  end  
+  end
 end
 
 def load_sample(filename)
-  File.open(File.dirname(__FILE__) + "/samples/" + filename).map { |line| line}.join("\n")  
+  File.open(File.dirname(__FILE__) + "/samples/" + filename).map { |line| line}.join("\n")
 end
 def load_binary_sample(filename)
   File.open(File.dirname(__FILE__) + "/samples/" + filename, 'rb')
 end
 
 def md5_block(&block)
-  Digest::MD5.hexdigest(block.to_source)
+  block_source = RubyVM::InstructionSequence.disasm(block.to_proc).to_s.gsub(/\(\s*\d+\)/, "").gsub(/^== disasm.*?$/, "")
+  Digest::MD5.hexdigest(block_source)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffee_table
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Stewart McKee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec