dalli-keys-match 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b6875a0ca5dc289edfd2ee3a9000a2ac338558b
-  data.tar.gz: a89d71e02345a54730ff8d939f718ffe8320b626
+  metadata.gz: 3493c1811a60bdfae98deb7224fa1aca3a83f4d8
+  data.tar.gz: 0d8ddc214a7d12ebbb01c0c36b8b5e71cf980ea5
 SHA512:
-  metadata.gz: 312ed9714d7ad958fba934410622a0702048b2e455948041235d4e32d25549e4f4aa2aba24c3f8a14666b034371275f100b257507fa28f34797f17eeee857116
-  data.tar.gz: 6bcd5241247222d179a2c3113a6f52a7ad7733a9994ec682edc8aa497af6bb3f0f8c54f94a38470e02162ba75ec24e1df611c4fd89581573fa4c6927df321c2e
+  metadata.gz: e5493d8abc7690e992b3a1b3ff659fdf7573e19251963fb7691c73884af7ac79649f5294919abff2a3657a2a7a06d0d1a1adf7c164d7cedf62cbf72584038b87
+  data.tar.gz: ae209493e3fc5efba013ead8770b72a060287d66a9ebfa00abac2a5ebf82429856b21ef2776cb3e2f294f09adb33d3e7a8537301860f7cf62fe0f4af23167c7f

data/.gitignore

@@ -1,3 +1,5 @@
+*.gem
+*.rbc
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Marcos G. Zimmermann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -25,11 +25,8 @@ Or install it yourself as:
 require 'dalli/keys_match'
 
 > client = Dalli::Client.new('localhost:11211')
- => #<Dalli::Client:0x007fcb14afe830 @servers=["localhost:11211"], @options={}, @ring=nil>
 > client.set('dalli-keys-match-1' , 1)
- => 10163216984091656192
->  client.set('dalli-keys-match-2' , 2)
- => 10235274578129584128
+> client.set('dalli-keys-match-2' , 2)
 > client.keys(/dalli-keys-match-\d/)
  => ["dalli-keys-match-2", "dalli-keys-match-1"]
 > client.keys('dalli-keys-match-')
@@ -40,6 +37,25 @@ require 'dalli/keys_match'
  => ["dalli-keys-match-2"]
 ```
 
+Gem also handles namespaces. Keys are normalized and filters are always optimized to only look into the namespace
+```
+> dc1 = Dalli::Client.new('localhost:11211')
+> dc2 = Dalli::Client.new('localhost:11211', namespace: 'marcosgz')
+> dc1.set('zimmermann', 'last-name')
+> dc2.set('zimmermann', 'last-name')
+> dc1.keys(/zimmermann/)
+ => ["zimmermann", "marcosgz:zimmermann"]
+> dc2.keys(/zimmermann/)
+ => ["zimmermann"]
+> dc2.keys_with_namespace(/zimmermann/)
+ => ["marcosgz:zimmermann"]
+> dc2.delete_matched(/^zimmermann/)
+ => 1
+> dc1.keys(/zimmermann/)
+ => ["zimmermann"]
+```
+
+
 ### Optional Configuration
 ```
 Dalli::KeysMatch.config.telnet = {

data/lib/dalli/keys_match.rb

@@ -19,14 +19,11 @@ module Dalli
         [].tap do |keys|
           telnet.cmd("String" => "stats cachedump #{id} #{size}").split("\n").each do |line|
             if /ITEM (.+) \[\d+ b; \d+ s\]/ =~ line
-              case pattern.class.name
-              when 'NilClass'
+              if pattern.nil?
                 keys << $1
-              when 'Regexp'
+              else
                 cache_key = $1
                 keys << cache_key if cache_key =~ pattern
-              else
-                keys << $1 if $1[pattern.to_s]
               end
             end
           end
@@ -39,6 +36,8 @@ module Dalli
         @telnet = nil
       end
 
+      protected
+
       def telnet
         @telnet ||= begin
           configs = Dalli::KeysMatch.config.telnet(
@@ -51,7 +50,8 @@ module Dalli
     end
 
     module Client
-      def keys(pattern = nil)
+      def keys_with_namespace(pattern = nil)
+        re = stats_pattern_regexp(pattern)
         result = []
         ring.servers.each do |server|
           next unless server.alive?
@@ -61,19 +61,48 @@ module Dalli
             r
           end
           slabs.each do |id, size|
-            result.push(*server.stats_cachedump(id, size, pattern))
+            result.push(*server.stats_cachedump(id, size, re))
           end
           server.close_telnet!
         end
         result
       end
 
+      def keys(pattern = nil)
+        keys_with_namespace(pattern).map do |key|
+          key_without_namespace(key)
+        end
+      end
+
       def delete_matched(pattern)
         return 0 if pattern.nil?
 
         matches = keys(pattern)
         matches.map { |k| delete(k) }.select { |r| r }.size
       end
+
+      protected
+
+      def stats_pattern_regexp(pattern)
+        return if namespace.nil? && pattern.nil?
+
+        if namespace
+          if pattern.is_a?(Regexp)
+            opts, source = pattern.to_s.scan(/^\(\?([a-z\-]{3,4})\:(.*)\)$/m).flatten
+            source_with_namespace = \
+              if source.sub!(/^\^/,'')
+                "^#{namespace}:#{source}"
+              else
+                "^#{namespace}:.*#{source}"
+              end
+            Regexp.new("(?#{opts}:#{source_with_namespace})")
+          else
+            Regexp.new("#{namespace}:.*#{pattern}")
+          end
+        else
+          Regexp.new(pattern.to_s)
+        end
+      end
     end
   end
 end

data/lib/dalli/keys_match/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Dalli
   module KeysMatch
-    VERSION = '0.2.0'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dalli-keys-match
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Marcos G. Zimmermann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -98,6 +98,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/console