rediska 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f8e37b9ab4297926f687d271ce9155ea1680a31
-  data.tar.gz: 36bf08ab258f141e165c23ee13b7b3a326b90b06
+  metadata.gz: 2e4ac28eb56bf3a2cab47dc9b091b7182acc88b8
+  data.tar.gz: 5d6d48bc843232644fbfbf92063a7785a6db947e
 SHA512:
-  metadata.gz: effd83624ed9df79f4d456b9942abfe4a11bae414472dd251db10661fb4e1118368ecfcae6d6f5f3a323df2c10f2b48a950151cd0fec2b9253e0031877a14476
-  data.tar.gz: 25f44ac315938e63414e5cf70b814eabd2ff82bc74a7f5701b68a9f312bc12037bec43a3dc3a7c871c64edb8abf93d86d155a1074507f186cea347e916e3b3ee
+  metadata.gz: 7b149f856ed62eb989464acdf464424d2c870a752b5e00014e0e83b7c3cb48c66a375d819a792641b7989f19868dc60d5f6b86d7f89a4f5ce335d5e0d8255b99
+  data.tar.gz: 5c5cfffc7e706fe27dee1ea447d36a9c58cff8f63e906060c516f1c9e4b4d190f618cc79a2b4746ae464091231e2a3aa521ae4192ab7eddd3307a8febb994971

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rediska (0.0.11)
+    rediska (0.1.0)
       redis (~> 3.0.0)
 
 GEM
@@ -16,22 +16,26 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.3)
     json (1.8.1)
-    mime-types (2.2)
-    multi_json (1.9.2)
-    rake (10.2.2)
+    mime-types (2.3)
+    multi_json (1.10.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
     redis (3.0.7)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -40,7 +44,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    tins (1.0.1)
+    tins (1.3.0)
 
 PLATFORMS
   ruby
@@ -50,4 +54,4 @@ DEPENDENCIES
   rake
   rdoc
   rediska!
-  rspec (~> 2.14)
+  rspec

data/lib/rediska/command_executor.rb

@@ -0,0 +1,25 @@
+module Rediska
+  module CommandExecutor
+    def write(command)
+      meffod = command.shift.to_s.downcase.to_sym
+
+      if in_multi && !(TRANSACTION_COMMANDS.include? meffod) # queue commands
+        queued_commands << [meffod, *command]
+        reply = 'QUEUED'
+      elsif respond_to?(meffod)
+        reply = send(meffod, *command)
+      else
+        raise Redis::CommandError, "ERR unknown command '#{meffod}'"
+      end
+
+      if reply == true
+        reply = 1
+      elsif reply == false
+        reply = 0
+      end
+
+      replies << reply
+      nil
+    end
+  end
+end

data/lib/rediska/connection.rb

@@ -1,13 +1,20 @@
 require 'rediska/databases/memory'
 require 'rediska/databases/pstore'
+require 'rediska/sort_method'
 require 'rediska/sorted_set_argument_handler'
 require 'rediska/sorted_set_store'
 require 'rediska/zset'
 require 'rediska/driver'
+require 'rediska/command_executor'
+require 'rediska/transaction_commands'
 
 module Rediska
   class Connection
     include Driver
+    include SortMethod
+    include TransactionCommands
+    include CommandExecutor
+
 
     class << self
       def databases
@@ -63,5 +70,5 @@ module Rediska
         raise ArgumentError, "invalid database type: #{Rediska.configuration.database}"
       end
     end
-   end
+  end
 end

data/lib/rediska/driver.rb

@@ -1,6 +1,6 @@
 module Rediska
   module Driver
-    attr_accessor :buffer, :database_id
+    attr_accessor :database_id
     attr_writer :replies
 
     def replies
@@ -20,25 +20,6 @@ module Rediska
     def timeout=(usecs)
     end
 
-    def write(command)
-      meffod = command.shift.to_s.downcase.to_sym
-      if respond_to?(meffod)
-        reply = send(meffod, *command)
-      else
-        raise Redis::CommandError, "ERR unknown command #{meffod.upcase}"
-      end
-
-      if reply == true
-        reply = 1
-      elsif reply == false
-        reply = 0
-      end
-
-      replies << reply
-      buffer << reply if buffer && meffod != :multi
-      nil
-    end
-
     def read
       replies.shift
     end
@@ -47,8 +28,6 @@ module Rediska
     # * blpop
     # * brpop
     # * brpoplpush
-    # * discard
-    # * sort
     # * subscribe
     # * psubscribe
     # * publish
@@ -159,8 +138,9 @@ module Rediska
     def hdel(key, field)
       field = field.to_s
       data_type_check(key, Hash)
-      data[key] && data[key].delete(field)
+      deleted = data[key] && data[key].delete(field)
       remove_key_for_empty_collection(key)
+      deleted ? 1 : 0
     end
 
     def hkeys(key)
@@ -307,7 +287,7 @@ module Rediska
     def rpoplpush(key1, key2)
       data_type_check(key1, Array)
       rpop(key1).tap do |elem|
-        lpush(key2, elem)
+        lpush(key2, elem) unless elem.nil?
       end
     end
 
@@ -590,9 +570,23 @@ module Rediska
       set(key, value)
     end
 
-    def set(key, value)
+    def set(key, value, *array_options)
+      option_nx = array_options.delete('NX')
+      option_xx = array_options.delete('XX')
+
+      return false if option_nx && option_xx
+
+      return false if option_nx && exists(key)
+      return false if option_xx && !exists(key)
+
       data[key] = value.to_s
 
+      options = Hash[array_options.each_slice(2).to_a]
+      ttl_in_seconds = options['EX'] if options['EX']
+      ttl_in_seconds = options['PX'] / 1000.0 if options['PX']
+
+      expire(key, ttl_in_seconds) if ttl_in_seconds
+
       'OK'
     end
 
@@ -646,10 +640,6 @@ module Rediska
       true
     end
 
-    def sort(key)
-      # TODO: Implement
-    end
-
     def incr(key)
       data.merge!({ key => (data[key].to_i + 1).to_s || '1'})
       data[key].to_i
@@ -690,25 +680,6 @@ module Rediska
     def slaveof(host, port)
     end
 
-    def exec
-      buffer.tap {|x| self.buffer = nil }
-    end
-
-    def multi
-      self.buffer = []
-      yield if block_given?
-
-      'OK'
-    end
-
-    def watch(_)
-      'OK'
-    end
-
-    def unwatch
-      'OK'
-    end
-
     def scan(start_cursor, *args)
       match = '*'
       count = 10
@@ -896,6 +867,17 @@ module Rediska
       range.size
     end
 
+    def zremrangebyrank(key, start, stop)
+      data_type_check(key, ZSet)
+      return 0 unless data[key]
+
+      sorted_elements = data[key].sort_by { |k, v| v }
+      start = sorted_elements.length if start > sorted_elements.length
+      elements_to_delete = sorted_elements[start..stop]
+      elements_to_delete.each { |elem, rank| data[key].delete(elem) }
+      elements_to_delete.size
+    end
+
     def zinterstore(out, *args)
       data_type_check(out, ZSet)
       args_handler = SortedSetArgumentHandler.new(args)
@@ -910,14 +892,6 @@ module Rediska
       data[out].size
     end
 
-    def zremrangebyrank(key, start, stop)
-      sorted_elements = data[key].sort_by { |k, v| v }
-      start = sorted_elements.length if start > sorted_elements.length
-      elements_to_delete = sorted_elements[start..stop]
-      elements_to_delete.each { |elem, rank| data[key].delete(elem) }
-      elements_to_delete.size
-    end
-
     private
     def raise_argument_error(command, match_string = command)
       error_message = if %w(hmset mset_odd).include?(match_string.downcase)

data/lib/rediska/sort_method.rb

@@ -0,0 +1,108 @@
+# Codes are mostly referenced from MockRedis' implementation.
+module Rediska
+  module SortMethod
+    def sort(key, *redis_options_array)
+      return [] unless key
+
+      unless %w(list set zset).include? type(key)
+        warn "Operation against a key holding the wrong kind of value: Expected list, set or zset at #{key}."
+        raise Redis::CommandError.new('WRONGTYPE Operation against a key holding the wrong kind of value')
+      end
+
+      options = extract_options_from(redis_options_array)
+
+      projected = project(data[key], options[:by], options[:get])
+      sorted = sort_by(projected, options[:order])
+      sliced = slice(sorted, options[:limit])
+
+      options[:store] ? rpush(options[:store], sliced) : sliced.flatten(1)
+    end
+
+    private
+    ASCENDING_SORT = Proc.new { |a, b| a.first <=> b.first }
+    DESCENDING_SORT = Proc.new { |a, b| b.first <=> a.first }
+
+    def extract_options_from(options_array)
+      options = {
+        limit: [],
+        order: 'ASC',
+        get: []
+      }
+
+      if options_array.first == 'BY'
+        options_array.shift
+        options[:by] = options_array.shift
+      end
+
+      if options_array.first == 'LIMIT'
+        options_array.shift
+        options[:limit] = [options_array.shift, options_array.shift]
+      end
+
+      while options_array.first == 'GET'
+        options_array.shift
+        options[:get] << options_array.shift
+      end
+
+      if %w(ASC DESC ALPHA).include?(options_array.first)
+        options[:order] = options_array.shift
+        options[:order] = 'ASC' if options[:order] == 'ALPHA'
+      end
+
+      if options_array.first == 'STORE'
+        options_array.shift
+        options[:store] = options_array.shift
+      end
+
+      options
+    end
+
+    def project(enumerable, by, get_patterns)
+      enumerable.map do |*elements|
+        element = elements.flatten.first
+        weight = by ? lookup_from_pattern(by, element) : element
+        value = element
+
+        if get_patterns.length > 0
+          value = get_patterns.map do |pattern|
+            pattern == '#' ? element : lookup_from_pattern(pattern, element)
+          end
+          value = value.first if value.length == 1
+        end
+
+        [weight, value]
+      end
+    end
+
+    def sort_by(projected, direction)
+      sorter =
+        case direction.upcase
+          when 'DESC'
+            DESCENDING_SORT
+          when 'ASC', 'ALPHA'
+            ASCENDING_SORT
+          else
+            raise "Invalid direction '#{direction}'"
+        end
+
+      projected.sort(&sorter).map(&:last)
+    end
+
+    def slice(sorted, limit)
+      skip = limit.first || 0
+      take = limit.last || sorted.length
+
+      sorted[skip...(skip + take)] || sorted
+    end
+
+    def lookup_from_pattern(pattern, element)
+      key = pattern.sub('*', element)
+
+      if (hash_parts = key.split('->')).length > 1
+        hget hash_parts.first, hash_parts.last
+      else
+        get key
+      end
+    end
+  end
+end

data/lib/rediska/transaction_commands.rb

@@ -0,0 +1,83 @@
+module Rediska
+  TRANSACTION_COMMANDS = [:discard, :exec, :multi, :watch, :unwatch]
+
+  module TransactionCommands
+    def self.included(klass)
+      klass.class_eval do
+        def self.queued_commands
+          @queued_commands ||= Hash.new {|h,k| h[k] = [] }
+        end
+
+        def self.in_multi
+          @in_multi ||= Hash.new{|h,k| h[k] = false}
+        end
+
+        def queued_commands
+          self.class.queued_commands[database_instance_key]
+        end
+
+        def queued_commands=(cmds)
+          self.class.queued_commands[database_instance_key] = cmds
+        end
+
+        def in_multi
+          self.class.in_multi[database_instance_key]
+        end
+
+        def in_multi=(multi_state)
+          self.class.in_multi[database_instance_key] = multi_state
+        end
+      end
+    end
+
+    def discard
+      unless in_multi
+        raise Redis::CommandError, 'ERR DISCARD without MULTI'
+      end
+
+      self.in_multi = false
+      self.queued_commands = []
+
+      'OK'
+    end
+
+    def exec
+      unless in_multi
+        raise Redis::CommandError, 'ERR EXEC without MULTI'
+      end
+
+      responses  = queued_commands.map do |cmd|
+        begin
+          send(*cmd)
+        rescue => e
+          e
+        end
+      end
+
+      self.queued_commands = [] # reset queued_commands
+      self.in_multi = false     # reset in_multi state
+
+      responses
+    end
+
+    def multi
+      if in_multi
+        raise Redis::CommandError, 'ERR MULTI calls can not be nested'
+      end
+
+      self.in_multi = true
+
+      yield(self) if block_given?
+
+      'OK'
+    end
+
+    def watch(_)
+      'OK'
+    end
+
+    def unwatch
+      'OK'
+    end
+  end
+end