fmcache 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b79c05d630df6693c5e414e4c715beed1ec241e3731d71fa9e4bf93a4406e6e6
-  data.tar.gz: 074a40df96e911ac2a5150325075336daec5600e64ba53cd8956e0aa92a7d3c1
+  metadata.gz: e8f39c6defd1204754f92cd66b60f31bb5ee374bfd3818d8a7d86af6d06cc13a
+  data.tar.gz: c90c62883e589291e7d605e116881371a542a00d8f0cf59c45a05fc0c28353a2
 SHA512:
-  metadata.gz: 2319028a0e9cb0813e2a3e4bda3c28afb06a8e5305938ff3abb74fdd6885a2080b6025b90452525cbd34c641c191520ccea4f5b7cea9419cc83c2c5954f5054c
-  data.tar.gz: bac1356af719d330b90258d12429b4c32b3133d7e06176a5e7219532d4ff1cf8b5c463d9ccf318db5b24b301c29c80cf20a80be67af54ea9546964aa800650ff
+  metadata.gz: 2ca4ad6417c77e1dc8c4e7a0cd0c8c41f6e1fbefd0bec032b9b3442c24e28570cf01614f44d74d3e2ec8b7273bfc6eeacd0c2bba884cf8088bdd9a1a81c5efac
+  data.tar.gz: 8fd64169c4dccd1775dae0a4eacfdbf6a029240422c19c422b1babb256115ca0fa84fc33e439b1ee68b5fc920ebcafe8137f2c2a3e3052f0018ff710c8d839b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fmcache (0.4.0)
+    fmcache (0.5.0)
       field_mask_parser (~> 0.4.3)
 
 GEM
@@ -64,4 +64,4 @@ DEPENDENCIES
   rspec (~> 3.8)
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/lib/fmcache.rb

@@ -4,6 +4,7 @@ require "fmcache/encoder"
 require "fmcache/engine"
 require "fmcache/field"
 require "fmcache/helper"
+require "fmcache/id_key_gen"
 require "fmcache/incomplete_info"
 require "fmcache/jsonizer"
 require "fmcache/version"

data/lib/fmcache/encoder.rb

@@ -2,6 +2,11 @@ require "fmcache/encoder/itemizer"
 
 module FMCache
   class Encoder
+    # @param [FMCache::IdKeyGen]
+    def initialize(id_key_gen)
+      @id_key_gen = id_key_gen
+    end
+
     # @param [<Hash>] values
     # @param [FieldMaskParser::Node] field_mask
     # @return [{ String => { String => <Hash> } }]
@@ -16,7 +21,7 @@ module FMCache
         h.merge! encode_one(value, field_mask)
 
         id = value.fetch(:id)
-        r[Helper.to_key(id)] = h
+        r[@id_key_gen.to_key(id)] = h
       end
       r
     end

data/lib/fmcache/engine.rb

@@ -5,15 +5,24 @@ module FMCache
     # @param [Redis | MockRRedis] client
     # @param [Proc] fm_parser
     # @param [Integer] ttl
-    # @param [Proc] notifier
-    # @param [#dump#load] json_serializer
-    def initialize(client:, fm_parser:, ttl: DEFAULT_TTL, notifier: nil, json_serializer: nil)
-      @client    = Client.new(client, notifier)
-      @fm_parser = wrap(fm_parser)
-      @ttl       = ttl
-      @encoder   = Encoder.new
-      @decoder   = Decoder.new(@fm_parser)
-      @jsonizer  = Jsonizer.new(json_serializer)
+    # @param [Proc, nil] notifier
+    # @param [#dump#load, nil] json_serializer
+    # @param [String, nil] id_key_prefix
+    def initialize(
+      client:,
+      fm_parser:,
+      ttl:             DEFAULT_TTL,
+      notifier:        nil,
+      json_serializer: nil,
+      id_key_prefix:   nil
+    )
+      @client     = Client.new(client, notifier)
+      @fm_parser  = wrap(fm_parser)
+      @ttl        = ttl
+      @id_key_gen = IdKeyGen.new(id_key_prefix)
+      @encoder    = Encoder.new(@id_key_gen)
+      @decoder    = Decoder.new(@fm_parser)
+      @jsonizer   = Jsonizer.new(json_serializer)
     end
 
     attr_reader :client, :fm_parser, :encoder, :decoder
@@ -34,13 +43,13 @@ module FMCache
       ids = ids.map(&:to_i)
       normalize!(field_mask)
 
-      keys   = Helper.to_keys(ids)
+      keys   = @id_key_gen.to_keys(ids)
       fields = Helper.to_fields(field_mask)
       h = client.get(keys: keys, fields: fields)
 
       with_id, with_no_id = split(h)
       v, i_v, i_i = decode(@jsonizer.dejsonize(with_id), field_mask)
-      with_no_id_list = Helper.to_ids(with_no_id.keys)
+      with_no_id_list = @id_key_gen.to_ids(with_no_id.keys)
 
       return v, i_v, merge(i_i, with_no_id_list, field_mask)
     end
@@ -81,7 +90,7 @@ module FMCache
     # @param [<Integer | String>] ids
     def delete(ids:)
       ids = ids.map(&:to_i)
-      client.del(keys: Helper.to_keys(ids))
+      client.del(keys: @id_key_gen.to_keys(ids))
     end
 
   private

data/lib/fmcache/helper.rb

@@ -1,7 +1,5 @@
 module FMCache
   class Helper
-    KEY_PREFIX = "fmcache:"
-
     class << self
       # @param [FieldMaskParser::Node] field_mask
       # @param [<Symbol>] prefix
@@ -10,34 +8,6 @@ module FMCache
         field_mask.to_paths(prefix: prefix, sort: false)
       end
 
-      # @param [<Integer>] ids
-      # @return [<String>]
-      def to_keys(ids)
-        ids.map { |id| to_key(id) }
-      end
-
-      # @param [Integer] id
-      # @return [String]
-      def to_key(id)
-        "#{KEY_PREFIX}#{id}"
-      end
-
-      # @param [<String>] keys
-      # @return [<Integer>]
-      def to_ids(keys)
-        keys.map { |key| to_id(key) }
-      end
-
-      # @param [String] id
-      # @return [Integer]
-      def to_id(key)
-        if key[0..7] == KEY_PREFIX
-          key[8..-1].to_i
-        else
-          raise "invalid key: #{key}"
-        end
-      end
-
       # @param [<Hash>] values
       # @param [<Integer>] ids
       # @return [<Hash>]

data/lib/fmcache/id_key_gen.rb

@@ -0,0 +1,40 @@
+module FMCache
+  class IdKeyGen
+    DEFAULT_KEY_PREFIX = "fmcache"
+
+    # @param [String, nil] prefix
+    def initialize(prefix)
+      p = prefix || DEFAULT_KEY_PREFIX
+      @prefix = "#{p}:"
+    end
+
+    # @param [<Integer>] ids
+    # @return [<String>]
+    def to_keys(ids)
+      ids.map { |id| to_key(id) }
+    end
+
+    # @param [Integer] id
+    # @return [String]
+    def to_key(id)
+      "#{@prefix}#{id}"
+    end
+
+    # @param [<String>] keys
+    # @return [<Integer>]
+    def to_ids(keys)
+      keys.map { |key| to_id(key) }
+    end
+
+    # @param [String] id
+    # @return [Integer]
+    def to_id(key)
+      prefix_len = @prefix.size
+      if key[0..(prefix_len-1)] == @prefix
+        key[prefix_len..-1].to_i
+      else
+        raise "invalid key: #{key}"
+      end
+    end
+  end
+end

data/lib/fmcache/version.rb

@@ -1,3 +1,3 @@
 module FMCache
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmcache
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - lib/fmcache/engine.rb
 - lib/fmcache/field.rb
 - lib/fmcache/helper.rb
+- lib/fmcache/id_key_gen.rb
 - lib/fmcache/incomplete_info.rb
 - lib/fmcache/jsonizer.rb
 - lib/fmcache/jsonizer/default_json_serializer.rb
@@ -176,8 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Library for caching json masked by FieldMask