h2ocube_rails_cache 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6fdaa111c24c74f76968d52aa0c38baec02601f
-  data.tar.gz: 78296c48b10451b8b962d1cc778aca9dca6b4a38
+  metadata.gz: 6bcffee68231cef62c1326e5e2138304810eadbd
+  data.tar.gz: 4fba5b4127457e7cae04744fae8389e419f16cbb
 SHA512:
-  metadata.gz: 88be1bbae3b0e746009e637841014d2464fdbfc578c8278e88a1e19928ba0145028b8ae95a759fe7da85c5bf9559e77179bb325c4c7613fbe215a2da881d80b8
-  data.tar.gz: d7295800b31495b54e493e68be8ea36048b1ec838f129e5f9d5635ef27cb777ff6af7473c5ec8ce04b8440128145e3ead2a1cdffb62c59b01e6983d020862bd7
+  metadata.gz: 0155ccd5909e64f348b26198a848ec4e9eac5c4953976f3d074a5900d6da5f84afbcd9d3ca1e72aa55ff80305250b26d69995459d0f8c841af149d9bf480bf0c
+  data.tar.gz: 2ececa04a39fba44fbc698339e96e3888261e0294ea0923dde2bfbe9cfc03f1042852f92cb211f6fc0c8d4c64a0398f197cd018fdca656e6ab57855403b6d344

data/Gemfile

@@ -1,4 +1,5 @@
-source 'https://rubygems.org'
+# source 'https://rubygems.org'
+source 'https://gems.ruby-china.org'
 
 # Specify your gem's dependencies in h2ocube_rails_assets.gemspec
 gemspec

data/README.md

@@ -3,20 +3,18 @@
 [![Gem Version](https://badge.fury.io/rb/h2ocube_rails_cache.png)](http://badge.fury.io/rb/h2ocube_rails_cache)
 [![Build Status](https://travis-ci.org/h2ocube/h2ocube_rails_cache.png?branch=master)](https://travis-ci.org/h2ocube/h2ocube_rails_cache)
 
-Just an redis cache.
+Just an redis cache. Default expires_in `60.minutes`.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'h2ocube_rails_cache', group: :production
+    gem 'h2ocube_rails_cache'
 
 And then execute:
 
     $ bundle
 
-Disable default session_store in config/initializers/session_store.rb
-
 ## Rails.cache support methods
 
 * `keys key = '*'`

data/h2ocube_rails_cache.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'h2ocube_rails_cache'
-  gem.version       = '0.0.13'
+  gem.version       = '0.1.0'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
   gem.description   = 'Just an redis cache.'
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'redis-namespace'
+  gem.add_dependency 'redis'
 
   %w(rails minitest-rails).each { |g| gem.add_development_dependency g }
 end

data/lib/active_support/cache/h2ocube_rails_cache.rb

@@ -1,24 +1,28 @@
 require 'redis'
-require 'redis/namespace'
 
 module ActiveSupport
   module Cache
     class H2ocubeRailsCache < Store
-      def initialize(options = nil, &blk)
+      attr_reader :config, :namespace, :data
+
+      def initialize(options = {})
         options ||= {}
+        @config = options
+        @data = Redis.new(options)
         super(options)
-        @data = Redis::Namespace.new("#{Rails.application.class.to_s.split('::').first}:#{Rails.env}:Cache", redis: Redis::Store.new)
       end
 
       def keys(key = '*')
-        key = expanded_key key
+        options.reverse_merge! config
+        key = normalize_key key, config
         @data.keys key
       end
 
       def fetch(key, options = {}, &block)
-        key = expanded_key key
+        options.reverse_merge! config
+        key = normalize_key(key, options)
 
-        if exist?(key)
+        if @data.exists(key)
           if options.key?(:force)
             force = options[:force].is_a?(Proc) ? options[:force].call(key, options) : options[:force]
             if force
@@ -39,21 +43,25 @@ module ActiveSupport
       end
 
       def fetch_raw(key, options = {}, &block)
+        options.reverse_merge! config
+        key = normalize_key key, options
         instrument :fetch, key, options do
-          exist?(key) ? read(key, options) : write(key, block, options)
+          exist?(key) ? read(key) : write(key, block, options)
         end
       end
 
       def read(key, options = {})
-        key = expanded_key key
+        options.reverse_merge! config
+        key = normalize_key key, options
         return nil if key.start_with?('http')
         instrument :read, key, options do
           exist?(key) ? load_entry(@data.get(key)) : nil
         end
       end
 
-      def read_raw(key, _options = {})
-        key = expanded_key key
+      def read_raw(key, options = {})
+        options.reverse_merge! config
+        key = normalize_key key, options
         @data.get key
       end
 
@@ -70,7 +78,9 @@ module ActiveSupport
       end
 
       def write(key, entry, options = {})
-        key = expanded_key key
+        options.reverse_merge! config
+        key = normalize_key(key, options)
+
         return false if key.start_with?('http')
 
         instrument :write, key, options do
@@ -79,15 +89,17 @@ module ActiveSupport
             Rails.logger.warn "CacheWarn: '#{key}' is not cacheable!"
             nil
           else
-            @data.set key, entry, options
-            @data.set "#{key}_updated_at", Time.now.to_i if options[:updated_at]
+            expires_in = options[:expires_in].to_i
+            @data.setex key, expires_in, entry
+            @data.setex "#{key}_updated_at", expires_in, Time.now.to_i if options[:updated_at]
             load_entry entry
           end
         end
       end
 
       def delete(key, options = {})
-        key = expanded_key key
+        options.reverse_merge! config
+        key = normalize_key key, options
 
         instrument :delete, key, options do
           @data.keys(key).each { |k| @data.del k }
@@ -95,8 +107,9 @@ module ActiveSupport
         end
       end
 
-      def exist?(key, _options = {})
-        key = expanded_key key
+      def exist?(key, options = {})
+        options.reverse_merge! config
+        key = normalize_key key, options
         @data.exists key
       end
 
@@ -111,10 +124,11 @@ module ActiveSupport
         @data.info
       end
 
-      def increment(key, amount = 1, _options = {})
-        key = expanded_key key
+      def increment(key, amount = 1, options = {})
+        options.reverse_merge! config
+        key = normalize_key key, options
 
-        instrument :increment, key, amount do
+        instrument :increment, key, amount: amount do
           if amount == 1
             @data.incr key
           else
@@ -123,10 +137,11 @@ module ActiveSupport
         end
       end
 
-      def decrement(key, amount = 1, _options = {})
-        key = expanded_key key
+      def decrement(key, amount = 1, options = {})
+        options.reverse_merge! config
+        key = normalize_key key, options
 
-        instrument :decrement, key, amount do
+        instrument :decrement, key, amount: amount do
           if amount == 1
             @data.decr key
           else
@@ -141,27 +156,35 @@ module ActiveSupport
 
       private
 
-      def instrument(operation, key, options = {})
-        payload = { key: key }
-        payload.merge!(options) if options.is_a?(Hash)
-        ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload) { yield(payload) }
-      end
-
-      def log(operation, key, options = {})
-        return unless logger && logger.debug? && !silence?
-        logger.debug("  \e[95mCACHE #{operation}\e[0m #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
-      end
+      def normalize_key(key, options)
+        key = expanded_key(key)
+        namespace = options[:namespace] if options
+        prefix = namespace.is_a?(Proc) ? namespace.call : namespace
+        key = "#{prefix}:#{key}" if prefix && !key.start_with?(prefix)
+        key
+      end
+
+      # def instrument(operation, key, options = {})
+      #   payload = { key: key }
+      #   payload.merge!(options) if options.is_a?(Hash)
+      #   ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload) { yield(payload) }
+      # end
+      #
+      # def log(operation, key, options = {})
+      #   return unless logger && logger.debug? && !silence?
+      #   logger.debug("  \e[95mCACHE #{operation}\e[0m #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
+      # end
 
       def dump_entry(entry)
         entry = entry.call if entry.class.to_s == 'Proc'
 
         case entry.class.to_s
-        when 'String', 'Fixnum', 'Float'
+        when 'String', 'Integer', 'Float'
           entry
         else
           begin
             Marshal.dump entry
-          rescue Exception => e
+          rescue => e
             Rails.logger.error "CacheError: #{e}"
             return nil
           end
@@ -170,7 +193,7 @@ module ActiveSupport
 
       def load_entry(entry)
         begin
-          Marshal.load entry
+          Marshal.load(entry)
         rescue
           return entry.to_f if entry.respond_to?(:to_f) && entry.to_f.to_s == entry
           return entry.to_i if entry.respond_to?(:to_i) && entry.to_i.to_s == entry

data/lib/h2ocube_rails_cache.rb

@@ -1,28 +1,9 @@
-# coding: utf-8
 require 'active_support/cache/h2ocube_rails_cache'
-require 'rack/session/h2ocube_rails_cache_session'
-require 'action_dispatch/middleware/session/h2ocube_rails_cache_session'
-
-class Redis
-  class Store < self
-    def set(key, value, options = nil)
-      if options && options[:expires_in]
-        setex(key, options[:expires_in].to_i, value)
-      else
-        super(key, value)
-      end
-    end
-  end
-end
 
 module H2ocubeRailsCache
   class Railtie < Rails::Railtie
-    config.before_configuration do |app|
-      app.config.cache_store = :h2ocube_rails_cache
-      app.config.session_store :h2ocube_rails_cache_session
-    end
-
-    config.after_initialize do
+    config.after_initialize do |app|
+      Rails.cache = ActiveSupport::Cache.lookup_store :h2ocube_rails_cache, namespace: "#{Rails.application.class.to_s.split("::").first}:#{Rails.env}#{ENV['TEST_ENV_NUMBER']}", expires_in: 60.minutes
       Rails.cache.logger = Rails.logger
 
       ActiveSupport::Notifications.subscribe(/cache_[^.]+.active_support/) do |name, start, finish, id, payload|

data/lib/tasks/tmp.rake

@@ -1,13 +1,6 @@
 namespace :tmp do
-  namespace :sessions do
-    task :clear => :environment do
-      FileUtils.rm(Dir['tmp/sessions/[^.]*'])
-      Rails.application.config.session_store.clear
-    end
-  end
-
   namespace :cache do
-    task :clear => :environment do
+    task clear: :environment do
       FileUtils.rm_rf(Dir['tmp/cache/[^.]*'])
       Rails.cache.clear
     end

data/test/cache_test.rb

@@ -2,15 +2,11 @@ require 'test_helper'
 
 describe 'h2ocube_rails_cache' do
   before do
-    @redis = Redis.new
-    @cache_key = "#{Rails.application.class.to_s.split("::").first}:#{Rails.env}:Cache"
-    @cache = Redis::Namespace.new(@cache_key)
     Rails.cache.clear
   end
 
   it 'should work' do
     Rails.cache.class.to_s.must_equal 'ActiveSupport::Cache::H2ocubeRailsCache'
-    Rails.application.config.session_store.to_s.must_equal 'ActionDispatch::Session::H2ocubeRailsCacheSession'
   end
 
   it '.keys' do
@@ -20,8 +16,6 @@ describe 'h2ocube_rails_cache' do
   it '.clear' do
     Rails.cache.clear.must_be_same_as true
     Rails.cache.keys('*').must_be_empty
-
-    @redis.keys(@cache_key).must_be_empty
   end
 
   it '.write, .exist?, .read and .delete' do
@@ -31,8 +25,6 @@ describe 'h2ocube_rails_cache' do
 
     Rails.cache.read('a').must_equal true
 
-    Marshal.load(@redis.get("#{@cache_key}:a")).must_equal true
-
     Rails.cache.delete('a').must_be_same_as true
 
     Rails.cache.exist?('a').must_be_same_as false
@@ -42,7 +34,7 @@ describe 'h2ocube_rails_cache' do
 
   it 'expire' do
     Rails.cache.delete 'expire'
-    Rails.cache.write 'expire', 1, expires_in: 1
+    Rails.cache.write 'expire', true, expires_in: 1.second
     Rails.cache.exist?('expire').must_be_same_as true
     sleep 2
     Rails.cache.exist?('expire').must_be_same_as false
@@ -50,11 +42,11 @@ describe 'h2ocube_rails_cache' do
 
   it 'key class' do
     Rails.cache.write ['a', 0], 'a0'
-    Rails.cache.keys[0].must_equal 'a/0'
+    Rails.cache.keys[0].must_equal "#{Rails.cache.config[:namespace]}:a/0"
     Rails.cache.clear
 
-    Rails.cache.write({a: 0}, 'a0')
-    Rails.cache.keys[0].must_equal 'a=0'
+    Rails.cache.write({ a: 0 }, 'a0')
+    Rails.cache.keys[0].must_equal "#{Rails.cache.config[:namespace]}:a=0"
     Rails.cache.clear
   end
 
@@ -62,13 +54,13 @@ describe 'h2ocube_rails_cache' do
     Rails.cache.write 'String', 'String'
     Rails.cache.read_raw('String').must_be_kind_of String
 
-    Rails.cache.write 'Fixnum', 1
-    Rails.cache.read('Fixnum').must_be_kind_of Fixnum
+    Rails.cache.write 'Integer', 1
+    Rails.cache.read('Integer').must_be_kind_of Integer
 
     Rails.cache.write 'Float', 1.1
     Rails.cache.read('Float').must_be_kind_of Float
 
-    Rails.cache.write 'Proc', Proc.new{ 1 }
+    Rails.cache.write 'Proc', proc { 1 }
     Rails.cache.read('Proc').must_equal 1
   end
 

data/test/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
 require 'rails/test_help'
 require 'minitest/rails'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,10 +66,8 @@ files:
 - README.md
 - Rakefile
 - h2ocube_rails_cache.gemspec
-- lib/action_dispatch/middleware/session/h2ocube_rails_cache_session.rb
 - lib/active_support/cache/h2ocube_rails_cache.rb
 - lib/h2ocube_rails_cache.rb
-- lib/rack/session/h2ocube_rails_cache_session.rb
 - lib/tasks/tmp.rake
 - test/cache_test.rb
 - test/dummy/Rakefile
@@ -77,6 +75,7 @@ files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/application/home.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/bin/rails
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -89,7 +88,6 @@ files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/script/rails
 - test/test_helper.rb
 homepage: https://github.com/h2ocube/h2ocube_rails_cache
 licenses:
@@ -111,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Just an redis cache.
@@ -122,6 +120,7 @@ test_files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/application/home.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/bin/rails
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -134,5 +133,4 @@ test_files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/script/rails
 - test/test_helper.rb

data/lib/action_dispatch/middleware/session/h2ocube_rails_cache_session.rb

@@ -1,22 +0,0 @@
-require 'redis'
-require 'redis/namespace'
-require 'action_dispatch/middleware/session/abstract_store'
-
-module ActionDispatch
-  module Session
-    class H2ocubeRailsCacheSession < Rack::Session::H2ocubeRailsCacheSession
-      include Compatibility
-      include StaleSessionCheck
-      def initialize(app, options = {})
-        options = options.dup
-        super
-      end
-
-      def self.clear
-        r = Redis::Namespace.new("#{Rails.application.class.to_s.split("::").first}:#{Rails.env}:Session", redis: Redis::Store.new)
-        r.keys('*').each{ |k| r.del k }
-        true
-      end
-    end
-  end
-end

data/lib/rack/session/h2ocube_rails_cache_session.rb

@@ -1,69 +0,0 @@
-require 'redis'
-require 'redis/namespace'
-require 'rack/session/abstract/id'
-
-module Rack
-  module Session
-    class H2ocubeRailsCacheSession < Abstract::ID
-      attr_reader :mutex, :pool
-
-      DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \
-        expire_after: 30.days
-
-      def initialize(app, options = nil)
-        super
-
-        @mutex = Mutex.new
-        @pool = Redis::Namespace.new("#{Rails.application.class.to_s.split("::").first}:#{Rails.env}:Session", redis: Redis::Store.new)
-      end
-
-      def generate_sid
-        loop do
-          sid = super
-          break sid unless @pool.get(sid)
-        end
-      end
-
-      def get_session(env, sid)
-        with_lock(env, [nil, {}]) do
-          unless sid and session = @pool.get(sid)
-            sid, session = generate_sid, Hash.new
-            unless /^OK/ =~ @pool.set(sid, Marshal.dump(session), @default_options)
-              raise "Session collision on '#{sid.inspect}'"
-            end
-          else
-            session = Marshal.load(session)
-          end
-          [sid, session]
-        end
-      end
-
-      def set_session(env, session_id, new_session, options)
-        with_lock(env, false) do
-          @pool.set session_id, Marshal.dump(new_session), options
-          session_id
-        end
-      end
-
-      def destroy_session(env, session_id, options)
-        with_lock(env) do
-          @pool.del(session_id)
-          generate_sid unless options[:drop]
-        end
-      end
-
-      def with_lock(env, default=nil)
-        @mutex.lock if env['rack.multithread']
-        yield
-      rescue Errno::ECONNREFUSED
-        if $VERBOSE
-          warn "#{self} is unable to find Redis server."
-          warn $!.inspect
-        end
-        default
-      ensure
-        @mutex.unlock if @mutex.locked?
-      end
-    end
-  end
-end

data/test/dummy/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'