fastentry 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 140aa4a24b917d6ea3606101cf4a05558c2a02d7c76e53005c0cb20731ead079
-  data.tar.gz: 1130e8c02447b5dee763ceacd84c39f0bca2e149e0a68f81973bc1b068746bf2
+  metadata.gz: 96ab9a433cd14cadcd4bc35ccd1073a4b716d5b3890700cd0a6408ba4617ab2e
+  data.tar.gz: 19e9237bbe5093511e5df18a19046586bf2718c964cd4b44ab62ea136685b2b1
 SHA512:
-  metadata.gz: b34b9fca1a73edb59eefaceed0c8e0d2466cb133e193f249c4c65ba600c22169d824ce70fe7317b2e591dbab400b3749846449fd87185987935e14a6a3d4386d
-  data.tar.gz: 3d27170aecafb5f42b0a2b11597c745352ab78baec018ceb7da324d4ce5f99223be209330bf026a06f799b57e9ba56f714888b36b3509756a4e87355cd0071d7
+  metadata.gz: 5602215e206f29371fa28c8c213123c49fc5dc1f66d02d4c8d12badfb5e45d43664ceb7f62a987bed17062a295c374feeb8f55ff0881d261eb9a8679ce39fe7d
+  data.tar.gz: 228749dc043221af2f98b81dabf232a71ed9bdc62ecb2f5363513988922b76ac242c6504562afbc4d9ca67a367f953d34cbad09b4fce55bb5c4b6509aa7a3616

data/app/controllers/fastentry/cache_controller.rb

@@ -2,20 +2,16 @@ module Fastentry
   class CacheController < Fastentry::ApplicationController
     def show
       @key = params[:key]
-      
-      begin
-        expiration_date = Rails.cache.send(:read_entry, key, {}).expires_at
-      rescue
-        expiration_date = nil
-      end
 
-      @expiration = (Time.at(expiration_date).strftime("%a, %e %b %Y %H:%M:%S %z") if expiration_date.present?)
-      @cache_item = Rails.cache.read(@key)
+      expiration = Fastentry.cache.expiration_for(@key)
+      @expiration = expiration.strftime("%a, %e %b %Y %H:%M:%S %z") if expiration
+
+      @cache_item = Fastentry.cache.read(@key)
     end
 
     def invalidate
       key = params[:key]
-      Rails.cache.delete(key)
+      Fastentry.cache.delete(key)
 
       redirect_back(fallback_location: root_path)
     end

data/app/controllers/fastentry/dashboard_controller.rb

@@ -3,38 +3,23 @@ module Fastentry
     before_action :set_page, only: [:index]
 
     def index
-      @keys = Rails.cache.instance_variable_get(:@data).keys
+      @keys = Fastentry.cache.keys
 
       if params[:query].present?
-        @keys = @keys.select { |key| key.downcase.include?(params[:query].downcase) }
+        @keys.select! { |key| key.downcase.include?(params[:query].downcase) }
       end
 
       @number_of_pages = (@keys.count / @per_page.to_f).ceil
-
       @keys = @keys[@offset, @per_page] || []
 
-      @cached = []
-      @keys.each do |key|
-        # Prevent from crashing if expiration can't be read (temporary fix)
-        begin
-          expiration_date = Rails.cache.send(:read_entry, key, {}).expires_at
-        rescue
-          expiration_date = nil
-        end
-
-        # Prevent from crashing if can't read key
-        begin
-          value = Rails.cache.read(key)
-        rescue
-          value = nil
+      @cached =
+        @keys.map do |key|
+          {
+            cache_key: key,
+            cache_value: Fastentry.cache.read(key),
+            expiration: Fastentry.cache.expiration_for(key)
+          }
         end
-
-        @cached << {
-          cache_key: key,
-          cache_value: value,
-          expiration: (Time.at(expiration_date) if expiration_date.present?)
-        }
-      end
     end
 
     private

data/app/controllers/fastentry/stats_controller.rb

@@ -1,7 +1,7 @@
 module Fastentry
   class StatsController < Fastentry::ApplicationController
     def index
-      @number_of_keys = Rails.cache.instance_variable_get(:@data).keys.count
+      @number_of_keys = Fastentry.cache.keys.size
     end
   end
 end

data/lib/fastentry/version.rb

@@ -1,3 +1,3 @@
 module Fastentry
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/fastentry.rb

@@ -1,6 +1,52 @@
-require "fastentry/engine"
+require 'fastentry/engine'
 require 'awesome_print'
 
 module Fastentry
-  # Your code goes here...
+  class Cache < SimpleDelegator
+    alias cache __getobj__
+
+    def expiration_for(key)
+      expires_at = cache.send(:read_entry, key, {}).expires_at
+      expires_at.to_s.strip.empty? ? nil : Time.at(expires_at)
+    rescue StandardError
+      nil
+    end
+
+    def read(key)
+      cache.read(key)
+    rescue StandardError
+      nil
+    end
+
+    def self.for(cache)
+      case cache
+      when ActiveSupport::Cache::Strategy::LocalCache
+        DefaultCache.new(cache)
+      when ActiveSupport::Cache::FileStore
+        DefaultCache.new(cache)
+      when ActiveSupport::Cache::MemoryStore
+        DefaultCache.new(cache)
+      when ActiveSupport::Cache::RedisCacheStore
+        RedisCache.new(cache)
+      else
+        raise ArgumentError, 'Unsupported cache type'
+      end
+    end
+  end
+
+  class DefaultCache < Cache
+    def keys
+      cache.instance_variable_get(:@data).keys
+    end
+  end
+
+  class RedisCache < Cache
+    def keys
+      cache.redis.keys
+    end
+  end
+
+  def self.cache
+    @cache ||= Cache.for(Rails.cache)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastentry
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Tiago Alves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.13
 description: Cache management for Rails
 email:
 - alvesjtiago@gmail.com