cache_driver 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb24235fcbfcdb06afee7a91d14c0c517e012e7c
-  data.tar.gz: e5b3de59744bf88657d54f3c41ceecbceca65d3e
+  metadata.gz: 402b06942adc9a03461be8eed481772cf10c1b09
+  data.tar.gz: d9d317fc326141587e83dd42483387c42475e27c
 SHA512:
-  metadata.gz: d8f3503c9c88ff14000ce1686d1c3d0660aba7bbe553c05990f3afff0248e3e46fcc57b4b6d836c12ab5a840b18683792404ccbb4d4de510a401eb068ac4303c
-  data.tar.gz: 4f34d2e450ed91001198ac7dbbf2409e6e08bed40857d017b45ec59432dc6560d3b0102ea789056081396bb23e4b1fbfab510cdffe083cf53c5b73bcac748a1a
+  metadata.gz: cd99e95e14c5261382c8e3e3ee89d6e7db524205ba4c9ee6022e580ad8a6613c2e509ce2a6d7af603cb84178a694c26a10af64e75588e7da21e0c73e16d1ad53
+  data.tar.gz: 47059c2b1880671f93c627f4270acce731339b29ca9296b72e66e9119dbe6d75ecf70a47c7b4ba7386c169d0dabc8f48d65782117b15edc52ca5a1df8a298874

data/cache_driver.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_runtime_dependency 'redis', '~> 3.3'
 end

data/lib/cache_driver.rb

@@ -3,6 +3,7 @@ require "cache_driver/config"
 require "cache_driver/cache_record"
 require "cache_driver/cache_util"
 require "cache_driver/file_cache_util"
+require "cache_driver/redis_cache_util"
 
 
 module CacheDriver

data/lib/cache_driver/cache_record.rb

@@ -1,38 +1,31 @@
 class CacheRecord
-	def self.find_all
-		if CacheDriver.store_file?
-			FileCacheUtil.read_all CacheUtil.class_to_type(self)
-		end
-	end
+  @@cache_util = CacheDriver.store_file? ? FileCacheUtil : CacheDriver.store_redis? ? RedisCacheUtil : nil
 
-	def self.find_by_id(id)
-		if CacheDriver.store_file?
-			FileCacheUtil.read CacheUtil.class_to_type(self), id
-		end
-	end
+  def self.find_all
+    @@cache_util.read_all CacheUtil.class_to_type(self)
+  end
 
-	def save!
-		if CacheDriver.store_file?
-			FileCacheUtil.write CacheUtil.class_to_type(self.class), self
-		end
-	end
+  def self.find_by_key(key)
+    @@cache_util.read CacheUtil.class_to_type(self), id
+  end
 
-	def destroy
-		if CacheDriver.store_file?
-			FileCacheUtil.delete CacheUtil.class_to_type(self.class), self.id
-		end
-	end
+  def save!
+    @@cache_util.write CacheUtil.class_to_type(self.class), self
+  end
 
-	def to_cache
-		self.to_json
-	end
+  def destroy
+    @@cache_util.delete CacheUtil.class_to_type(self.class), self.id
+  end
 
-	def self.from_cache(str)
-		json = JSON.parse str
-		ins = self.new
-		json.each do |key, value|
-			ins.send "#{key}=", value
-		end
-		ins
-	end
+  def to_cache
+    self.to_json
+  end
+
+  def self.from_cache(obj)
+    ins = self.new
+    obj.each do |key, value|
+      ins.send "#{key}=", value
+    end
+    ins
+  end
 end

data/lib/cache_driver/cache_util.rb

@@ -1,36 +1,36 @@
 class CacheUtil
 
-	class << self
-		def write(type, data)
-			puts "[CACHE] save #{type} to cache: #{data}"
-		end
+  class << self
+    def write(type, key, data)
+      puts "[CACHE] save #{type} ##{key} to cache: #{data}"
+    end
 
-		def read(type, data_id)
-			puts "[CACHE] get #{type} from cache: #{data_id}"
-		end
-		
-		def read_all(type)
-			puts "[CACHE] get #{type} from cache: all"
-		end
+    def read(type, key)
+      puts "[CACHE] get #{type} ##{key} from cache"
+    end
+    
+    def read_all(type)
+      puts "[CACHE] get all #{type} from cache"
+    end
 
-		def delete(type, data_id)
-			puts "[CACHE] delete #{type} from cache: #{data_id}"
-		end
+    def delete(type, key)
+      puts "[CACHE] delete #{type} ##{key} from cache"
+    end
 
-		# type --> :room
-		# class --> Room
-		# dir --> 'rooms'
-		def type_to_class(type)
-			type.to_s.capitalize.constantize
-		end
+    # type --> :room
+    # class --> Room
+    # dir --> 'rooms'
+    def type_to_class(type)
+      type.to_s.capitalize.constantize
+    end
 
-		def class_to_type(clazz)
-			cla_str = clazz.name
-			(cla_str[0].downcase + cla_str[1..-1]).to_sym
-		end
+    def class_to_type(clazz)
+      cla_str = clazz.name
+      (cla_str[0].downcase + cla_str[1..-1]).to_sym
+    end
 
-		def type_to_dir(type)
-			type.to_s + 's'
-		end
-	end
+    def type_to_dir(type)
+      type.to_s + 's'
+    end
+  end
 end

data/lib/cache_driver/config.rb

@@ -1,24 +1,23 @@
 module CacheDriver
-	class Config
-		attr_accessor :store
-	end
+  class Config
+    attr_accessor :store, :file_dir, :redis_host, :redis_port, :redis_namespace
+  end
 
-	@@config = Config.new
+  def self.configed?
+    @@config.store
+  end
 
-	def self.configed?
-		@@config.store
-	end
+  def self.store_file?
+    @@config.store == :file
+  end
 
-	def self.store_file?
-		@@config.store == :file
-	end
+  def self.store_redis?
+    @@config.store == :redis
+  end
 
-	def self.store_redis?
-		false
-	end
-
-	def self.setup
-		yield @@config
-	end
+  def self.setup
+    @@config = Config.new
+    yield @@config
+  end
 
 end

data/lib/cache_driver/file_cache_util.rb

@@ -1,106 +1,75 @@
 class FileCacheUtil < CacheUtil
-	CACHE_DIR = Pathname.new(File.expand_path "../../../tmp/cache", __FILE__)
-
-	class << self
-		def get_count(type)
-			dir = CACHE_DIR.join type_to_dir(type)
-			Dir.mkdir dir unless Dir.exist? dir
-
-			current_id = 0;
-			if File.exist? dir.join('count')
-				file = File.new dir.join('count'), 'r'
-				current_id = file.read.to_i
-				file.close
-			end
-
-			current_id
-		end
-
-		def set_count(type, count)
-			dir = CACHE_DIR.join type_to_dir(type)
-			Dir.mkdir dir unless Dir.exist? dir
-
-			file = File.new dir.join('count'), 'w'
-			file.puts count
-			file.close
-		end
-
-		def write(type, data)
-			super type, data
-
-			dir = CACHE_DIR.join type_to_dir(type)
-			Dir.mkdir dir unless Dir.exist? dir
-
-			current_id = get_count(type)
-			if data.id
-				if data.id > current_id
-					raise "ID out of bounds"
-				end
-			else
-				current_id += 1
-				data.id = current_id
-				set_count(type, current_id)
-			end 
-			file = File.new dir.join("#{data.id}.cache"), 'w'
-			file.puts "#{Time.now}\t#{data.to_cache}"
-			file.close
-
-			data.id
-		end
-
-		def read(type, data_id)
-			super type, data_id
-
-			dir = CACHE_DIR.join type_to_dir(type)
-			Dir.mkdir dir unless Dir.exist? dir
-
-			file_path = dir.join("#{data_id}.cache")
-			return unless File.exist? file_path
-			file = File.new file_path, 'r'
-			data_str = file.read.split("\t")[1]
-
-			unless data_str
-				puts "cache #{type}-#{data_id} data miss"
-				return
-			end
-
-			type_to_class(type).from_cache data_str
-		end
-
-		def read_all(type)
-			super type
-
-			dir = CACHE_DIR.join type_to_dir(type)
-			Dir.mkdir dir unless Dir.exist? dir
-			dir_scaner = Dir.new dir
-
-			data = []
-			dir_scaner.each do |file_name|
-				file = File.new dir.join(file_name), 'r'
-				next unless File.file?(file) and File.extname(file) == ".cache"
-				data_str = file.read.split("\t")[1]
-
-				unless data_str
-					puts "cache #{type}-#{file} data miss"
-					next
-				end
-
-				data << type_to_class(type).from_cache(data_str)
-			end
-
-			data
-		end
-
-		def delete(type, data_id)
-			super type, data_id
-
-			dir = CACHE_DIR.join type_to_dir(type)
-			return true unless Dir.exist? dir
-
-			file_path = dir.join("#{data_id}.cache")
-			return true unless File.exist? file_path
-			File.delete file_path
-			true
-		end
-	end
+  @@file_dir = CacheDriver.file_dir
+
+  class << self
+    def write(type, key, data)
+      super type, data
+
+      dir = @@file_dir.join type_to_dir(type)
+      Dir.mkdir dir unless Dir.exist? dir
+
+      file = File.new dir.join("#{key}.cache"), 'w'
+      file.puts "#{Time.now} --> #{data.to_cache}"
+      file.close
+
+      key
+    end
+
+    def read(type, key)
+      super type, key
+
+      dir = @@file_dir.join type_to_dir(type)
+      Dir.mkdir dir unless Dir.exist? dir
+
+      file_path = dir.join("#{key}.cache")
+      return nil unless File.exist? file_path
+      file = File.new file_path, 'r'
+      data_str = file.read.split(" --> ")[1]
+
+      unless data_str
+        puts "cache #{type} ##{key} data miss"
+        return nil
+      end
+
+      data = JSON.parse data_str
+      type_to_class(type).from_cache data
+    end
+
+    def read_all(type)
+      super type
+
+      dir = @@file_dir.join type_to_dir(type)
+      Dir.mkdir dir unless Dir.exist? dir
+      dir_scaner = Dir.new dir
+
+      data = []
+      dir_scaner.each do |file_name|
+        file = File.new dir.join(file_name), 'r'
+        next unless File.file?(file) and File.extname(file) == ".cache"
+        data_str = file.read.split(" --> ")[1]
+
+        unless data_str
+          puts "cache #{type} ##{file_name} data miss"
+          next
+        end
+
+        d = JSON.parse data_str
+        data << type_to_class(type).from_cache(d)
+      end
+
+      data
+    end
+
+    def delete(type, key)
+      super type, key
+
+      dir = @@file_dir.join type_to_dir(type)
+      return true unless Dir.exist? dir
+
+      file_path = dir.join("#{key}.cache")
+      return true unless File.exist? file_path
+      File.delete file_path
+      true
+    end
+  end
 end

data/lib/cache_driver/redis_cache_util.rb

@@ -0,0 +1,63 @@
+class RedisCacheUtil < CacheUtil
+  @@redis = Redis.new :host => CacheDriver.redis_host, :port => CacheDriver.redis_port
+  @@namespace = CacheDriver.redis_namespace
+
+  class << self
+    def write(type, key, data)
+      super type, data
+
+      res = @@redis.set "#{@@namespace}:#{type_to_dir(type)}##{key}", "#{Time.now} --> #{data.to_cache}"
+      res == "OK" ? key : nil
+    end
+
+    def read(type, key)
+      super type, key
+
+      content = @@redis.get("#{@@namespace}:#{type_to_dir(type)}##{key}")
+      unless content
+        puts "cache #{type} ##{key} data miss"
+        return nil
+      end
+
+      data_str = file.read.split(" --> ")[1]
+      unless data_str
+        puts "cache #{type} ##{key} data miss"
+        return nil
+      end
+
+      data = JSON.parse data_str
+      type_to_class(type).from_cache data
+    end
+
+    def read_all(type)
+      super type
+
+      data = []
+      @@redis.keys("#{@@namespace}:#{type_to_dir(type)}#*").each do |key|
+        content = @@redis.get(key)
+        unless content
+          puts "cache #{key} data miss"
+          next
+        end
+
+        data_str = file.read.split(" --> ")[1]
+        unless data_str
+          puts "cache #{key} data miss"
+          next
+        end
+
+        d = JSON.parse data_str
+        data << type_to_class(type).from_cache(d)
+      end
+
+      data
+    end
+
+    def delete(type, key)
+      super type, key
+
+      res = @@redis.del("#{@@namespace}:#{type_to_dir(type)}##{key}")
+      res == 1
+    end
+  end
+end

data/lib/cache_driver/version.rb

@@ -1,3 +1,3 @@
 module CacheDriver
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cache_driver
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - goshan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: make rails model act as ActiveRecord, but not save data into database
   but cache system, file or redis
 email:
@@ -57,10 +71,9 @@ files:
 - lib/cache_driver/cache_util.rb
 - lib/cache_driver/config.rb
 - lib/cache_driver/file_cache_util.rb
+- lib/cache_driver/redis_cache_util.rb
 - lib/cache_driver/version.rb
 - lib/tasks/cache.rake
-- pkg/cache_driver-0.1.0.gem
-- pkg/cache_driver-0.2.0.gem
 - tmp/cache/empty
 homepage: https://github.com/goshan/cache_driver
 licenses:
@@ -82,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A cache adapter for model accepting file or redis