coffee_table 0.2.12 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fee2e1ac835d575263dd819e6fd16b08ea050767
-  data.tar.gz: 51f4a70b7b890bc9d84b2249ac0dc3479985c335
+SHA256:
+  metadata.gz: fc2112aca3d10eefa5cbdc4996ee4e31fba80c16fd9900e2f8db7b63fb45039e
+  data.tar.gz: d1fa15f13c2d8eceaa5a197dd3adb7890c2279a52855f9ded03deaf73ddbc784
 SHA512:
-  metadata.gz: b0cad5dbb073a07ce1a78af5376deb303eb1f7a128c1c2c73d75ea89f589f8515a537fb59cb7c85799ad0b0174744a3a45e1bd0ba1718afb2cce19da3e116b5f
-  data.tar.gz: 0f9450b337d1c52c8b0f5ea0467d0c414a565be14d021f9a83678d35fdcad06e5561d4656b0f1220aea9403df276c04d5c3ac894d366d03c9744669f50fcc88e
+  metadata.gz: a51b76cd9d1903797d3dec529631c25ef8d1d3e326d3a73a86f76a1ac238902e679d9bda5809e701f9b5cad1a31b8f87ac6c5b54d957a2b78162fd4b184f5cf6
+  data.tar.gz: 95dc3cb99f04834cb29c86515e2ab8d6a0e1c73d572e23b28b043a060f3c98f356a8f57d7314451672483482ccbdd67195c85c253233b1488a004539ee3c67c9

data/.circleci/config.yml

@@ -0,0 +1,32 @@
+version: 2.1
+
+orbs:
+  ruby: circleci/ruby@1.0
+
+jobs:
+  build:
+    docker:
+      - image: cimg/ruby:2.5
+    steps:
+      - checkout
+      - ruby/install-deps
+  test:
+    parallelism: 3
+    docker:
+      - image: cimg/ruby:2.5
+    environment:
+      BUNDLE_JOBS: "3"
+      BUNDLE_RETRY: "3"
+    steps:
+      - checkout
+      - ruby/install-deps
+      - ruby/rspec-test
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-3.0.2

data/Gemfile

@@ -1,6 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in coffee_table.gemspec
 gemspec
-
-gem "awesome_print"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coffee_table (0.2.11)
+    coffee_table (0.3.1)
       activesupport
       gzip
       redis
@@ -9,77 +9,86 @@ PATH
       sourcify
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (5.1.4)
+    activesupport (6.1.3.1)
       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)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    diff-lcs (1.2.4)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.8)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    diff-lcs (1.3)
+    docile (1.3.2)
     file-tail (1.2.0)
       tins (~> 1.0)
     gzip (1.0)
-    i18n (0.9.3)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    mime-types (1.23)
-    minitest (5.11.3)
-    mock_redis (0.17.0)
-    multi_json (1.7.8)
-    redis (4.0.1)
-    redis-namespace (1.6.0)
+    json (2.3.0)
+    minitest (5.14.4)
+    mock_redis (0.23.0)
+    redis (4.2.5)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.1)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    ruby2ruby (2.4.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    ruby2ruby (2.4.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.10.1)
+    ruby_parser (3.15.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.10.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    sexp_processor (4.15.2)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     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)
-    thread_safe (0.3.6)
-    tins (1.16.3)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (1.0.1)
+    tins (1.25.0)
+      sync
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print
   coffee_table!
   coveralls
   mock_redis
   rspec
+  rspec_junit_formatter
   spork
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.textile

@@ -2,7 +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!
 !https://coveralls.io/repos/stewartmckee/coffee_table/badge.png?branch=master(Coverage Status)!:https://coveralls.io/r/stewartmckee/coffee_table
 
 h2. Intro
@@ -50,6 +49,8 @@ end
 
 Each time this is ran when a cache item doesn't exist, a unique cache key is generated based on the data passed in, and the code block being executed.  It is good practice to put in objects that are used within the block, as in order to expire the key you need to specify the objects you want to expire for.  If this key contained one of those objects, it would be removed and the next time this was ran, fresh data would be placed in the cache.
 
+You can force to store a new cache entry by passing :force => true
+
 If you wish to specify a whole model type, for example, all users from above, you would pass in the class, for example:
 
 bc. user_details = @coffee_table.fetch(:user_detail, User) do

data/changelog.txt

@@ -1,3 +1,6 @@
+0.2.13
+  - removed awesome_print require
+
 0.2.12
   - fixing some specs
 

data/coffee_table.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mock_redis"
   s.add_development_dependency "spork"
   s.add_development_dependency "coveralls"
+  s.add_development_dependency "rspec_junit_formatter"
+
   s.add_dependency "redis"
   s.add_dependency "redis-namespace"
   s.add_dependency "activesupport"

data/lib/coffee_table/key.rb

@@ -6,15 +6,16 @@ module CoffeeTable
 
     def self.parse(string)
       elements = string.split("|", -1).map{|e| decode_element(e) }
-      key = Key.new(elements[0], elements[1], Hash[elements.last.split("&").map{|kv| [kv.split("=")[0].to_sym, kv.split("=")[1]]}])
+      key = Key.new(name: elements[0], block_key: elements[1], flags: Hash[elements.last.split("&").map{|kv| [kv.split("=")[0].to_sym, kv.split("=")[1]]}])
       key.elements =  elements[2..-2]
       key
     end
 
-    def initialize(name, block_key, options, *objects)
-      @name = name
-      @block_key = block_key
-      @options = options
+    def initialize(params = {}, *objects)
+      @block_key = params[:block_key] || ""
+      @flags = params[:flags] || {}
+      @options = params[:options] || {}
+      @name = "#{params[:name]}"
       @elements = objects.flatten.map{|o| key_for_object(o)}
     end
 
@@ -34,15 +35,15 @@ module CoffeeTable
       @block_key
     end
 
-    def options
-      @options
+    def flags
+      @flags
     end
 
-    def add_flag(options)
-      @options.merge!(options)
+    def add_flag(flags)
+      @flags.merge!(flags)
     end
     def remove_flag(key)
-      @options.delete key
+      @flags.delete key
     end
 
     def elements
@@ -50,7 +51,7 @@ module CoffeeTable
     end
 
     def elements=(elements)
-      @elements = elements
+      @elements = Array(elements)
     end
 
     def <=>(o)
@@ -58,16 +59,16 @@ module CoffeeTable
     end
 
     def to_s
-      [encode_element(@name), encode_element(@block_key), @elements.map{|e| encode_element(e) }, encode_element(@options.map{|k,v| "#{k}=#{v}"}.join("&"))].flatten.join("|")
+      [encode_element(@name), encode_element(@block_key), @elements.map{|e| encode_element(e) }, encode_element(@flags.map{|k,v| "#{k}=#{v}"}.join("&"))].flatten.join("|")
     end
 
     private
 
-    def matches?(fragment, options={})
-      if options[:match] == :start
+    def matches?(fragment, flags={})
+      if flags[:match] == :start
         @name == fragment || !@elements.select{|e| e =~ /^#{Regexp.escape(fragment)}/ }.empty?
       else
-        @name == fragment || @elements.include?(fragment)
+        @name == fragment || Array(@elements).include?(fragment)
       end
     end
 

data/lib/coffee_table/version.rb

@@ -1,3 +1,3 @@
 module CoffeeTable
-  VERSION = "0.2.12"
+  VERSION = "0.4.1"
 end

data/lib/coffee_table.rb

@@ -5,11 +5,10 @@ require "coffee_table/invalid_object_error"
 require "coffee_table/block_missing_error"
 require "coffee_table/object_definition"
 require "redis"
-require 'redis-namespace'
+require "redis-namespace"
 require 'active_support/inflector'
 require 'digest/md5'
 require 'gzip'
-require 'awesome_print'
 require 'active_support/hash_with_indifferent_access'
 
 module CoffeeTable
@@ -17,6 +16,8 @@ module CoffeeTable
 
     include CoffeeTable::Utility
 
+    attr_reader :redis
+
     # initialize for coffee_table.  takes options to setup behaviour of cache
     def initialize(options={})
       @options = options.symbolize_keys
@@ -40,6 +41,7 @@ module CoffeeTable
       end
 
       @redis = Redis::Namespace.new(@options[:redis_namespace], :redis => redis_client)
+      @real_redis = redis_client
 
       self
 
@@ -65,22 +67,21 @@ module CoffeeTable
         block_source = RubyVM::InstructionSequence.disasm(block.to_proc).to_s.gsub(/\(\s*\d+\)/, "").gsub(/^== disasm.*?$/, "")
         block_key = Digest::MD5.hexdigest(block_source)
       end
-
       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)
+      key = CoffeeTable::Key.new({name: initial_key, block_key: block_key, options: @options, flags: flags}, related_objects)
       if @options[:enable_cache]
         if options.has_key?(:expiry)
           expiry = options[:expiry]
         else
           expiry = nil
         end
-        if @redis.exists(key.to_s)
+        if keys.include?(key.to_s) && !options[:force]
           result = marshal_value(@redis.get(key.to_s))
         else
           key.add_flag(:compressed => true)
-          if @redis.exists(key.to_s)
+          if keys.include?(key.to_s) && !options[:force]
             result = marshal_value(@redis.get(key.to_s)).gunzip
           else
             key.remove_flag(:compressed)
@@ -165,7 +166,11 @@ module CoffeeTable
 
     private
     def marshal_value(value)
+      return nil if value.nil?
       begin
+        # io = StringIO.new
+        # io.write(value)
+        # io.rewind
         result = Marshal.load(value)
       rescue ArgumentError => e
         puts "Attempting to load class/module #{e.message.split(" ")[-1]}"

data/spec/lib/coffee_table_spec.rb

@@ -6,12 +6,12 @@ describe CoffeeTable::Cache 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}
+  specify { expect(CoffeeTable::Cache).to respond_to :new}
+  specify { expect(@coffee_table).to respond_to :fetch}
+  specify { expect(@coffee_table).to respond_to :expire_key}
+  specify { expect(@coffee_table).to respond_to :expire_all}
+  specify { expect(@coffee_table).to respond_to :keys}
+  specify { expect(@coffee_table).to respond_to :expire_for}
 
   describe "config" do
     it "should take a hash for config" do
@@ -31,7 +31,7 @@ describe CoffeeTable::Cache do
         "this is a value"
       end
 
-      result.should == "this is a value"
+      expect(result).to eq "this is a value"
     end
     it "should return cached value when cache available" do
       value = "this is a value"
@@ -43,7 +43,7 @@ describe CoffeeTable::Cache do
         value
       end
 
-      result.should == "this is a value"
+      expect(result).to eq "this is a value"
 
     end
 
@@ -59,16 +59,17 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key) do
           "this string should be long"
         end
-        result.should eql "this string should be long"
-        @redis.get("test_key|1c083b7ed4b406f263ef329a608a80b9|compressed=true").should eq Marshal.dump(zipped_content)
+        expect(result).to eql "this string should be long"
+        puts "asdf"
+        @redis.get("test_key|009e2965832e67d06fb9a1b667cc1aca|compressed=true").should start_with "\u0004"
       end
       it "does not compress on non strings" do
         @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
-        result.should eql ({:test => "this value is a decent length to trigger compress"})
-        Base64.encode64(@redis.get("test_key|6edc6a13bfb5a9f926072f34d1006557|")).should eql "BAh7BjoJdGVzdEkiNnRoaXMgdmFsdWUgaXMgYSBkZWNlbnQgbGVuZ3RoIHRv\nIHRyaWdnZXIgY29tcHJlc3MGOgZFVA==\n"
+        expect(result).to eql ({:test => "this value is a decent length to trigger compress"})
+        Base64.encode64(@redis.get("test_key|8c3fde43e56b71d90843b9555673e120|")).should eql "BAh7BjoJdGVzdEkiNnRoaXMgdmFsdWUgaXMgYSBkZWNlbnQgbGVuZ3RoIHRv\nIHRyaWdnZXIgY29tcHJlc3MGOgZFVA==\n"
       end
 
       it "does not compress when turned off" do
@@ -76,16 +77,16 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key) do
           "this string should be long"
         end
-        result.should eql "this string should be long"
-        @redis.get("test_key|1c083b7ed4b406f263ef329a608a80b9|").should eql Marshal.dump("this string should be long")
+        expect(result).to eql "this string should be long"
+        @redis.get("test_key|009e2965832e67d06fb9a1b667cc1aca|").should eql Marshal.dump("this string should be long")
       end
       it "does not compress on strings below limit" do
         @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
-        result.should eql "short"
-        @redis.get("test_key|f0b9a08ff52e14e59daa03aae70a5cab|").should eql Marshal.dump("short")
+        expect(result).to eql "short"
+        @redis.get("test_key|a2e7e06547b31ddc5dff0eba32b64753|").should eql Marshal.dump("short")
       end
       it "decompresses compressed value" do
         @coffee_table = CoffeeTable::Cache.new(:redis => @redis, :compress_min_size => 20)
@@ -95,8 +96,8 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key) do
           "this string should be long"
         end
-        result.class.should eql String
-        result.should eql "this string should be long"
+        expect(result.class).to eql String
+        expect(result).to eql "this string should be long"
 
       end
       it "does not decompress a non compressed value" do
@@ -107,7 +108,7 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key) do
           "short"
         end
-        result.should eql "short"
+        expect(result).to eql "short"
       end
 
 
@@ -121,7 +122,7 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key) do
           "this is a changed value"
         end
-        @coffee_table.keys.should == ["test_key|#{md5}|"]
+        expect(@coffee_table.keys).to eq ["test_key|#{md5}|"]
       end
 
       it "should create key from class" do
@@ -131,7 +132,7 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key, SampleClass) do
           "this is a changed value"
         end
-        @coffee_table.keys.should == ["test_key|#{md5}|sample_classes|"]
+        expect(@coffee_table.keys).to eq ["test_key|#{md5}|sample_classes|"]
       end
 
       it "should use class name for keys" do
@@ -141,7 +142,7 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key, SampleClass.new(2)) do
           "this is a changed value"
         end
-        @coffee_table.keys.should == ["test_key|#{md5}|sample_class[2]|"]
+        expect(@coffee_table.keys).to eq ["test_key|#{md5}|sample_class[2]|"]
       end
 
       it "should use id from class in key" do
@@ -151,7 +152,7 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch(:test_key, SampleClass.new(2)) do
           "this is a changed value"
         end
-        @coffee_table.keys.should == ["test_key|#{md5}|sample_class[2]|"]
+        expect(@coffee_table.keys).to eq ["test_key|#{md5}|sample_class[2]|"]
       end
 
     end
@@ -167,7 +168,7 @@ describe CoffeeTable::Cache do
           "this is a changed value"
         end
 
-        @coffee_table.keys.should include "test_key|#{md5}|sample_class[9938]|"
+        expect(@coffee_table.keys).to include "test_key|#{md5}|sample_class[9938]|"
 
       end
       it "should raise an exception if a related object does not respond_to id" do
@@ -190,7 +191,7 @@ describe CoffeeTable::Cache do
           "this is a changed value"
         end
 
-        @coffee_table.keys.should include "test_key|#{md5}|sample_classes|"
+        expect(@coffee_table.keys).to include "test_key|#{md5}|sample_classes|"
       end
 
     end
@@ -199,9 +200,9 @@ describe CoffeeTable::Cache do
         @coffee_table.fetch(:test_key, :expiry => 1) do
           "object1"
         end
-        @coffee_table.keys.count.should == 1
+        expect(@coffee_table.keys.count).to eq 1
         sleep 1
-        @coffee_table.keys.count.should == 0
+        expect(@coffee_table.keys.count).to eq 0
       end
       it "should not execute block during cache period" do
         value = 'this is a value'
@@ -212,8 +213,7 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch("asdf") do
           value
         end
-        result.should == "this is a value"
-
+        expect(result).to eq "this is a value"
       end
       it "should execute block and return value when cache has expired" do
         @coffee_table.fetch("asdf", :expiry => 1) do
@@ -223,7 +223,26 @@ describe CoffeeTable::Cache do
         result = @coffee_table.fetch("asdf") do
           "this is a changed value"
         end
-        result.should == "this is a changed value"
+        expect(result).to eq "this is a changed value"
+      end
+    end
+    context "with force" do
+      it "keys should update when cache expires" do
+        @coffee_table.fetch(:test_key, :force => true) do
+          "object1"
+        end
+        expect(@coffee_table.keys.count).to eq 1
+      end
+      it "should not execute block during cache period" do
+        value = 'this is a value'
+        @coffee_table.fetch("asdf") do
+          value
+        end
+        value = 'this is a changed value'
+        result = @coffee_table.fetch("asdf", :force => true) do
+          value
+        end
+        expect(result).to eq "this is a changed value"
       end
     end
 
@@ -237,7 +256,7 @@ describe CoffeeTable::Cache do
         result = @coffee_table.get_cache(:test_key) do
           object
         end
-        result.should == "object1"
+        expect(result).to eq "object1"
       end
       it "should change key with changed code" do
         @coffee_table.get_cache(:test_key) do
@@ -246,7 +265,7 @@ describe CoffeeTable::Cache do
         result = @coffee_table.get_cache(:test_key) do
           "object2"
         end
-        result.should == "object2"
+        expect(result).to eq "object2"
       end
     end
   end
@@ -276,9 +295,9 @@ describe CoffeeTable::Cache do
         "object3"
       end
 
-      @coffee_table.keys.sort.should == ["first_key|#{@proc_md51}|", "second_key|#{@proc_md52}|", "third_key|#{@proc_md53}|"].sort
+      expect(@coffee_table.keys.sort).to eq ["first_key|#{@proc_md51}|", "second_key|#{@proc_md52}|", "third_key|#{@proc_md53}|"].sort
       @coffee_table.expire_key("second_key")
-      @coffee_table.keys.sort.should == ["first_key|#{@proc_md51}|", "third_key|#{@proc_md53}|"].sort
+      expect(@coffee_table.keys.sort).to eq ["first_key|#{@proc_md51}|", "third_key|#{@proc_md53}|"].sort
 
     end
     it "should not expire anything if no matches" do
@@ -302,9 +321,9 @@ describe CoffeeTable::Cache do
         "object3"
       end
 
-      @coffee_table.keys.sort.should == ["first_key|#{@proc_md51}|", "second_key|#{@proc_md52}|", "third_key|#{@proc_md53}|"].sort
+      expect(@coffee_table.keys.sort).to eq ["first_key|#{@proc_md51}|", "second_key|#{@proc_md52}|", "third_key|#{@proc_md53}|"].sort
       @coffee_table.expire_key("fourth_key")
-      @coffee_table.keys.sort.should == ["first_key|#{@proc_md51}|", "second_key|#{@proc_md52}|", "third_key|#{@proc_md53}|"].sort
+      expect(@coffee_table.keys.sort).to eq ["first_key|#{@proc_md51}|", "second_key|#{@proc_md52}|", "third_key|#{@proc_md53}|"].sort
 
     end
 
@@ -322,7 +341,7 @@ describe CoffeeTable::Cache do
           "object2"
         end
 
-        result.should == "object2"
+        expect(result).to eq "object2"
       end
 
       it "should not invalidate block when block has not changed" do
@@ -336,7 +355,7 @@ describe CoffeeTable::Cache do
           object
         end
 
-        result.should == "object1"
+        expect(result).to eq "object1"
       end
 
       it "should not be affected by whitespace only changes" do
@@ -347,12 +366,10 @@ describe CoffeeTable::Cache do
 
         object = "object2"
         result = @coffee_table.fetch(:test_key) do
-
                   object
-
         end
 
-        result.should == "object1"
+        expect(result).to eq "object1"
       end
 
     end
@@ -372,7 +389,7 @@ describe CoffeeTable::Cache do
           "object2"
         end
 
-        result.should == "object1"
+        expect(result).to eq "object1"
       end
     end
   end
@@ -396,15 +413,15 @@ describe CoffeeTable::Cache do
     end
 
     it "should delete all keys" do
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
       @coffee_table.expire_all
-      @coffee_table.keys.count.should == 0
+      expect(@coffee_table.keys.count).to eq 0
 
       result = @coffee_table.fetch(:first_key) do
         "changed value"
       end
 
-      result.should == "changed value"
+      expect(result).to eq "changed value"
 
     end
   end
@@ -428,8 +445,8 @@ describe CoffeeTable::Cache do
     end
 
     it "should return an array of string" do
-      @coffee_table.keys.should be_an_instance_of Array
-      @coffee_table.keys.map{|key| key.should be_an_instance_of String}
+      expect(@coffee_table.keys).to be_an_instance_of Array
+      @coffee_table.keys.map{|key| expect(key).to be_an_instance_of String}
     end
     it "should return key created without objects" do
       @coffee_table.fetch(:first_key) do
@@ -442,7 +459,7 @@ describe CoffeeTable::Cache do
         "object3"
       end
 
-      @coffee_table.keys.sort.should == ["first_key|#{@proc_md51}|",
+      expect(@coffee_table.keys.sort).to eq ["first_key|#{@proc_md51}|",
                                "second_key|#{@proc_md52}|",
                                "third_key|#{@proc_md53}|"].sort
 
@@ -457,7 +474,7 @@ describe CoffeeTable::Cache do
       @coffee_table.fetch(:third_key, @object3) do
         "object3"
       end
-      @coffee_table.keys.sort.should == ["first_key|#{@proc_md51}|sample_class[1]|sample_class[2]|sample_class[3]|",
+      expect(@coffee_table.keys.sort).to eq ["first_key|#{@proc_md51}|sample_class[1]|sample_class[2]|sample_class[3]|",
                                "second_key|#{@proc_md52}|sample_class[4]|sample_class[2]|sample_class[5]|",
                                "third_key|#{@proc_md53}|sample_class[7]|sample_class[2]|sample_class[8]|"].sort
     end
@@ -482,47 +499,47 @@ describe CoffeeTable::Cache do
     end
 
     it "should expire based on the initial key" do
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
       @coffee_table.expire_for(:second_key)
-      @coffee_table.keys.count.should == 2
+      expect(@coffee_table.keys.count).to eq 2
     end
 
     it "should expire based on a simple string" do
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
       @coffee_table.expire_for("sample_class[4]")
-      @coffee_table.keys.count.should == 2
+      expect(@coffee_table.keys.count).to eq 2
     end
 
     it "should not expire based on a part match" do
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
       @coffee_table.expire_for("impl")
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
     end
 
     it "should not delete any keys if object is not present" do
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
       @coffee_table.expire_for(SampleClass.new(18))
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
     end
     it "should only delete keys that object is present in" do
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
       @coffee_table.expire_for(SampleClass.new(1))
-      @coffee_table.keys.count.should == 2
+      expect(@coffee_table.keys.count).to eq 2
     end
 
     it "should delete a key if the object is at the end of they key" do
-      @coffee_table.keys.count.should == 3
+      expect(@coffee_table.keys.count).to eq 3
       @coffee_table.expire_for(SampleClass.new(3))
-      @coffee_table.keys.count.should == 2
+      expect(@coffee_table.keys.count).to eq 2
     end
 
     it "should expire all keys relating to a class if uninitialised class is passed in" do
       @coffee_table.fetch(:fourth_key) do
         "object4"
       end
-      @coffee_table.keys.count.should == 4
+      expect(@coffee_table.keys.count).to eq 4
       @coffee_table.expire_for(SampleClass)
-      @coffee_table.keys.count.should == 1
+      expect(@coffee_table.keys.count).to eq 1
     end
   end
 

data/spec/lib/key_spec.rb

@@ -4,13 +4,13 @@ describe CoffeeTable::Key do
 
   context "has correct methods" do
     it "should have a parse class method" do
-      CoffeeTable::Key.should respond_to :parse
+      expect(CoffeeTable::Key).to respond_to :parse
     end
     it "should have a has_element? instance method" do
-      CoffeeTable::Key.new("name", "key", {}).should respond_to :has_element?
+      expect(CoffeeTable::Key.new(name: "name", block_key: "key")).to respond_to :has_element?
     end
     it "should have a has_element_type? instance method" do
-      CoffeeTable::Key.new("name", "key", {}).should respond_to :has_element_type?
+      expect(CoffeeTable::Key.new(name: "name", block_key: "key")).to respond_to :has_element_type?
     end
   end
 
@@ -19,51 +19,51 @@ describe CoffeeTable::Key do
       key = CoffeeTable::Key.parse("test|asdf|sample_class|")
 
 
-      key.elements.count.should == 1
-      key.name.should == "test"
-      key.code_hash.should == "asdf"
-      key.elements[0].should == "sample_class"
+      expect(key.elements.count).to eq 1
+      expect(key.name).to eq "test"
+      expect(key.code_hash).to eq "asdf"
+      expect(key.elements[0]).to eq "sample_class"
 
     end
     it "should decode encoded elements" do
       key = CoffeeTable::Key.parse("te|s&t|asdf|s&|sample_|s&class|")
 
 
-      key.elements.count.should == 1
-      key.name.should == "te|s&t"
-      key.code_hash.should == "asdf|s&"
-      key.elements[0].should == "sample_|s&class"
+      expect(key.elements.count).to eq 1
+      expect(key.name).to eq "te|s&t"
+      expect(key.code_hash).to eq "asdf|s&"
+      expect(key.elements[0]).to eq "sample_|s&class"
     end
     it "should encode the key data" do
 
-      key = CoffeeTable::Key.new("te|s&t", "asdf|s&", {}, "sample_|s&class")
+      key = CoffeeTable::Key.new({name: "te|s&t", block_key: "asdf|s&"}, "sample_|s&class")
 
-      key.name.should == "te|s&t"
-      key.code_hash.should == "asdf|s&"
-      key.elements[0].should == "sample_|s&class"
+      expect(key.name).to eq "te|s&t"
+      expect(key.code_hash).to eq "asdf|s&"
+      expect(key.elements[0]).to eq "sample_|s&class"
 
-      key.to_s.should == "te|s&t|asdf|s&|sample_|s&class|"
+      expect(key.to_s).to eq "te|s&t|asdf|s&|sample_|s&class|"
 
     end
   end
 
   context "matching keys" do
     it "should match a key on its name" do
-      key = CoffeeTable::Key.new("name", "key", {}, "value", ["value1", "value2"])
-      key.has_element?("name").should be_true
-      key.has_element?("key").should be_false
+      key = CoffeeTable::Key.new({name: "name", block_key: "key"}, "value", ["value1", "value2"])
+      expect(key.has_element?("name")).to be_truthy
+      expect(key.has_element?("key")).to be_falsey
     end
     it "should match a key on its data" do
-      key = CoffeeTable::Key.new("name", "key", {}, "value", ["value1", "value2"])
-      key.has_element?("key").should be_false
-      key.has_element?("value").should be_true
-      key.has_element?("value1").should be_true
-      key.has_element?("value2").should be_true
+      key = CoffeeTable::Key.new({name: "name", block_key: "key"}, "value", ["value1", "value2"])
+      expect(key.has_element?("key")).to be_falsey
+      expect(key.has_element?("value")).to be_truthy
+      expect(key.has_element?("value1")).to be_truthy
+      expect(key.has_element?("value2")).to be_truthy
     end
     it "should match a key on a class type" do
-      key = CoffeeTable::Key.new("name", "key", {}, "sample_class[3]", ["value1", "value2"])
-      key.has_element?("key").should be_false
-      key.has_element_type?("sample_class").should be_true
+      key = CoffeeTable::Key.new({name: "name", block_key: "key"}, "sample_class[3]", ["value1", "value2"])
+      expect(key.has_element?("key")).to be_falsey
+      expect(key.has_element_type?("sample_class")).to be_truthy
     end
   end
 
@@ -76,39 +76,39 @@ describe CoffeeTable::Key do
     end
 
     it "should encode options into key" do
-      key = CoffeeTable::Key.new("name", "key", {:option => "value", :option2 => "value2"})
-      key.to_s.should eql "name|key|option=value&option2=value2"
+      key = CoffeeTable::Key.new(name: "name", block_key: "key", flags: {:option => "value", :option2 => "value2"})
+      expect(key.to_s).to eql "name|key|option=value&option2=value2"
     end
     it "should parse back options out of key" do
       key = CoffeeTable::Key.parse("name|block|key=value")
-      key.options.should eql ({:key => "value"})
+      expect(key.flags).to eql ({:key => "value"})
 
     end
     it "should handle no options" do
-      key = CoffeeTable::Key.new("name", "key", {})
-      key.to_s.should eql "name|key|"
+      key = CoffeeTable::Key.new(name: "name", block_key: "key")
+      expect(key.to_s).to eql "name|key|"
     end
 
     it "should handle one option" do
-      key = CoffeeTable::Key.new("name", "key", {:option => "value"})
-      key.to_s.should eql "name|key|option=value"
+      key = CoffeeTable::Key.new(name: "name", block_key: "key", flags: {:option => "value"})
+      expect(key.to_s).to eql "name|key|option=value"
     end
     it "should handle multiple options" do
-      key = CoffeeTable::Key.new("name", "key", {:option => "value", :option2 => "value2"})
-      key.to_s.should eql "name|key|option=value&option2=value2"
+      key = CoffeeTable::Key.new(name: "name", block_key: "key", flags: {:option => "value", :option2 => "value2"})
+      expect(key.to_s).to eql "name|key|option=value&option2=value2"
     end
 
     it "matches regardless of flags" do
-      key = CoffeeTable::Key.new("name", "key", {:option => "value", :option2 => "value2"}, @obj1, @obj2, @obj3)
-      key.has_element?("test[1]").should be_true
-      key.has_element?("test[2]").should be_true
-      key.has_element?("test[3]").should be_true
-      key.has_element?("test[4]").should be_false
+      key = CoffeeTable::Key.new({name: "name", block_key: "key", flgas: {:option => "value", :option2 => "value2"}}, @obj1, @obj2, @obj3)
+      expect(key.has_element?("test[1]")).to be_truthy
+      expect(key.has_element?("test[2]")).to be_truthy
+      expect(key.has_element?("test[3]")).to be_truthy
+      expect(key.has_element?("test[4]")).to be_falsey
     end
 
     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
+      key = CoffeeTable::Key.new({name: "name", block_key: "key", flags: {:option => "value", :option2 => "value2"}}, @obj1, @obj2, @obj3)
+      expect(key.has_element?("option=value&option2=value2")).to be_falsey
 
     end
 

data/spec/spec_helper.rb

@@ -7,29 +7,28 @@ Coveralls.wear!
 require 'digest/md5'
 require 'spork'
 # require 'mock_redis'
-require File.expand_path(File.dirname(__FILE__) + '/../../coffee_table/spec/lib/sample_class')
-require File.expand_path(File.dirname(__FILE__) + '/../../coffee_table/spec/lib/sample_class_without_id')
+require File.expand_path(File.dirname(__FILE__) + '/../spec/lib/sample_class.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../spec/lib/sample_class_without_id.rb')
 
 
 Spork.prefork do
-  require File.expand_path(File.dirname(__FILE__) + '/../../coffee_table/lib/coffee_table.rb')
-  require File.expand_path(File.dirname(__FILE__) + '/../../coffee_table/lib/coffee_table/block_missing_error.rb')
-  require File.expand_path(File.dirname(__FILE__) + '/../../coffee_table/lib/coffee_table/invalid_object_error.rb')
-  require File.expand_path(File.dirname(__FILE__) + '/../../coffee_table/lib/coffee_table/key.rb')
+  require File.expand_path(File.dirname(__FILE__) + '/../lib/coffee_table.rb')
+  require File.expand_path(File.dirname(__FILE__) + '/../lib/coffee_table/block_missing_error.rb')
+  require File.expand_path(File.dirname(__FILE__) + '/../lib/coffee_table/invalid_object_error.rb')
+  require File.expand_path(File.dirname(__FILE__) + '/../lib/coffee_table/key.rb')
 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
+      redis = CoffeeTable::Cache.new.redis
+      redis.keys.map{|k| redis.del k }
 
     }
 
     config.after(:each) {
+      # CoffeeTable::Cache.new.expire_all
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffee_table
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.4.1
 platform: ruby
 authors:
 - Stewart McKee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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
@@ -143,6 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -169,7 +184,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,9 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: coffee_table
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Gem to manage cache stored in redis
 test_files: