sohm 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2d4f419606a66335e7a44d8440732b4179a068f
-  data.tar.gz: 6565464772af7ad624fb92268cac9ede60f70b44
+  metadata.gz: 859ccb91894c9f987316960595b6fe50084b5755
+  data.tar.gz: 4fddfad5a05999a99dc46fc65df4e36405ef582e
 SHA512:
-  metadata.gz: 6336ecb58d5112f896f673730c58b9810731342bf88183bebae05cef484a7eb377a9ffff95978211122889d6be61d0820bebc2d6c134d8c97a007e9e501aaf3d
-  data.tar.gz: f6c0592a5f52e04352121bc9975b30b45ac13c6e677a4b27a43f1032df8bc1c92aa1123d83e03ca7f41a269c02bd50679e44e675df8f54bdc1619cee2f9cb370
+  metadata.gz: 219278de40db8ec365bc2fbfe553bcda87dd08407c200e6ad200f0d3b66ed94d24a67ca4baf8f5a04e4a3c25ea473c23eda6530b4d9ad048ff36bc15ec7a8993
+  data.tar.gz: dfbd6ab50d8e91b0eb77ccff049d93fdb063a16b71e76477366ae5754789040d8fe94f7bf672024d6feb725087e574b92577e456b3bc53d1d1e5804e6fadc219

data/lib/sohm.rb

@@ -6,7 +6,6 @@ require "nido"
 require "redic"
 require "securerandom"
 require "set"
-require_relative "sohm/command"
 
 module Sohm
   LUA_SAVE = File.read(File.expand_path("../sohm/lua/save.lua",   __FILE__))

data/sohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "sohm"
-  s.version = "0.10.0"
+  s.version = "0.10.1"
   s.summary = %{Slim ohm for twemproxy-like system}
   s.description = %Q{Slim ohm is a forked ohm that works with twemproxy-like redis system, only a limited set of features in ohm is supported}
   s.authors = ["Xuejie Xiao"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sohm
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Xuejie Xiao
@@ -83,14 +83,12 @@ files:
 - README.md
 - lib/sohm.rb
 - lib/sohm/auto_id.rb
-- lib/sohm/command.rb
 - lib/sohm/index_all.rb
 - lib/sohm/json.rb
 - lib/sohm/lua/save.lua
 - makefile
 - sohm.gemspec
 - test/association.rb
-- test/command.rb
 - test/connection.rb
 - test/core.rb
 - test/counters.rb

data/lib/sohm/command.rb

@@ -1,51 +0,0 @@
-module Sohm
-  class Command
-    def self.[](operation, head, *tail)
-      return head if tail.empty?
-
-      new(operation, head, *tail)
-    end
-
-    attr :operation
-    attr :args
-    attr :keys
-
-    def initialize(operation, *args)
-      @operation = operation
-      @args = args
-      @keys = []
-    end
-
-    def call(nido, redis)
-      newkey(nido, redis) do |key|
-        redis.call(@operation, key, *params(nido, redis))
-      end
-    end
-
-    def clean
-      keys.each do |key, redis|
-        redis.call("DEL", key)
-      end
-
-      subcommands.each { |cmd| cmd.clean }
-    end
-
-  private
-    def subcommands
-      args.select { |arg| arg.respond_to?(:call) }
-    end
-
-    def params(nido, redis)
-      args.map { |arg| arg.respond_to?(:call) ? arg.call(nido, redis) : arg }
-    end
-
-    def newkey(nido, redis)
-      key = nido[SecureRandom.hex(32)]
-      keys << [key, redis]
-
-      yield key
-
-      return key
-    end
-  end
-end

data/test/command.rb

@@ -1,55 +0,0 @@
-require_relative "helper"
-
-scope do
-  setup do
-    redis = Redic.new
-    redis.call("FLUSHDB")
-
-    nido = Nido.new("User:tmp")
-
-    [1, 2, 3].each { |i| redis.call("SADD", "A", i) }
-    [1, 4, 5].each { |i| redis.call("SADD", "B", i) }
-
-    [10, 11, 12].each { |i| redis.call("SADD", "C", i) }
-    [11, 12, 13].each { |i| redis.call("SADD", "D", i) }
-    [12, 13, 14].each { |i| redis.call("SADD", "E", i) }
-
-    [10, 11, 12].each { |i| redis.call("SADD", "F", i) }
-    [11, 12, 13].each { |i| redis.call("SADD", "G", i) }
-    [12, 13, 14].each { |i| redis.call("SADD", "H", i) }
-
-    [redis, nido]
-  end
-
-  test "special condition: single argument returns that arg" do
-    assert_equal "A", Sohm::Command[:sinterstore, "A"]
-  end
-
-  test "full stack test"  do |redis, nido|
-    cmd1 = Sohm::Command[:sinterstore, "A", "B"]
-
-    res = cmd1.call(nido, redis)
-    assert_equal ["1"], redis.call("SMEMBERS", res)
-
-    cmd1.clean
-    assert_equal 0, redis.call("EXISTS", res)
-
-    cmd2 = Sohm::Command[:sinterstore, "C", "D", "E"]
-    cmd3 = Sohm::Command[:sunionstore, cmd1, cmd2]
-
-    res = cmd3.call(nido, redis)
-    assert_equal ["1", "12"], redis.call("SMEMBERS", res)
-
-    cmd3.clean
-    assert redis.call("KEYS", nido["*"]).empty?
-
-    cmd4 = Sohm::Command[:sinterstore, "F", "G", "H"]
-    cmd5 = Sohm::Command[:sdiffstore, cmd3, cmd4]
-
-    res = cmd5.call(nido, redis)
-    assert_equal ["1"], redis.call("SMEMBERS", res)
-
-    cmd5.clean
-    assert redis.call("KEYS", nido["*"]).empty?
-  end
-end