coffee_table 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5096de8fb62f3418eb4a02a02d460245b828ce4d
+  data.tar.gz: dee65858546fbc737b5340a821203dcc3309e0d6
+SHA512:
+  metadata.gz: 36db338c9a66794aaf55b9ae72f2cb9d2d9a01aafd23919947fbde22d907ce2cc8a7fe84b0a555e509cf19ee9677a725916aea7358333946c7b417603e5c223e
+  data.tar.gz: 2ab2325828a57a1be2a1666fd03ae6fb8e79b1bbb00f33c219c91c506bcf21bee3fe6cbcd08167675eb9dcf26a452dff6ce1a2f6844f4beb2f5302b91ccf803e

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p392
+ruby-2.3.0

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    coffee_table (0.1.2)
+    coffee_table (0.1.3)
       activesupport
       gzip
       redis
@@ -40,7 +40,7 @@ GEM
     mime-types (1.23)
     mock_redis (0.9.0)
     multi_json (1.7.8)
-    redis (3.0.4)
+    redis (3.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
@@ -82,3 +82,6 @@ DEPENDENCIES
   rufus-scheduler
   sourcify!
   spork
+
+BUNDLED WITH
+   1.11.2

data/lib/coffee_table/object_definition.rb

@@ -6,6 +6,10 @@ module CoffeeTable
       @id = id
     end
 
+    def id
+      @id
+    end
+
     def self.from_hash(hash)
       hash.map {|k, v| ObjectDefinition.new(k, v)}
     end

data/lib/coffee_table/version.rb

@@ -1,3 +1,3 @@
 module CoffeeTable
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/coffee_table.rb

@@ -7,7 +7,6 @@ require "coffee_table/object_definition"
 require "redis"
 require 'rufus/scheduler'
 require 'active_support/inflector'
-require 'sourcify'
 require 'digest/md5'
 require 'gzip'
 
@@ -29,11 +28,15 @@ module CoffeeTable
       default_compress_content_to true
       default_compress_min_size_to 10240
       @redis = Redis.new({:server => @options[:redis_server], :port => @options[:redis_port]})
-      @scheduler = Rufus::Scheduler.start_new
-      
+      rufus_version = Gem::Version.new(Rufus::Scheduler::VERSION)
+      if rufus_version >= Gem::Version.new('3.0.0')
+        @scheduler = Rufus::Scheduler.new
+      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?
 
@@ -47,11 +50,11 @@ 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_key = Digest::MD5.hexdigest(block.to_source)
+      # end
 
       flags = {}
 
@@ -59,14 +62,14 @@ module CoffeeTable
 
       # 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]
         if options.has_key?(:expiry)
           expiry = options[:expiry]
         else
           expiry = nil
         end
-        
+
         @redis.sadd "cache_keys", key unless @redis.sismember "cache_keys", key.to_s
         if @redis.exists(key.to_s)
           if key.options[:compressed]
@@ -98,22 +101,22 @@ module CoffeeTable
       end
       result
     end
-  
+
     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
-  
+
     def expire_all
       keys.map{|key| expire_key(key)}
     end
-  
+
     def keys
       @redis.smembers("cache_keys")
-    end  
-  
+    end
+
     def expire_for(*objects)
       if defined? Rails
         perform_caching = Rails.application.configure do
@@ -122,7 +125,7 @@ module CoffeeTable
       else
         perform_caching = true
       end
-    
+
       if perform_caching
         deleted_keys = []
         unless objects.count == 0
@@ -143,7 +146,7 @@ module CoffeeTable
                 unless key.has_element?("#{object_type.to_sym}[#{object.id}]") or key.has_element?(object_type)
                   expire = false
                 end
-              end 
+              end
             end
             if expire
               expire_key(key.to_s)
@@ -156,7 +159,7 @@ module CoffeeTable
     end
 
     alias :get_cache :fetch
-  
+
     private
     def marshal_value(value)
       begin
@@ -172,4 +175,4 @@ module CoffeeTable
       o.respond_to?(:id) || o.class == Class
     end
   end
-end
+end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: coffee_table
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Stewart McKee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sourcify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: rails cache gem to fragment cache with smart cache key management
@@ -114,11 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.textile
@@ -139,27 +126,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: coffee_table
-rubygems_version: 1.8.25
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gem to manage cache stored in redis
 test_files:
 - spec/lib/coffee_table_spec.rb