redis-protocol 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/redis-protocol.rb

@@ -1,142 +1,9 @@
 # start with *, $, alpha-numeric, \r
 
 module RedisProtocol
-  class Request
-    attr_reader :raw_data, :type, :component_count, :components
-
-    def initialize(data)
-      @raw_data = data
-      @type, @components, @component_count, @current = nil, [], 0, ''
-      @next_length = 0
-      parse
-    end
-
-    private
-
-    def parse
-      @raw_data.chars.each do |c|
-        @type ||= c.eql?('*') ? :standard : :inline
-
-        send(@type, c)
-      end
-
-      complete_token
-      @component_count += @components.count if @type == :inline
-    end
-=begin
-    Inline Parser
-=end
-    def inline(char)
-      c = char.strip
-
-      if c.empty? and not @current.empty?
-        complete_token
-      else
-        @current += c
-      end
-    end
-
-=begin
-    Standard Parser
-=end
-
-    def standard(char)
-      @token_type ||= detect_token_type char
-      @doubt_str = ''
-
-      send(@token_type, char)
-    end
-
-    def args_counts(char)
-      return if char.eql? '*'
-
-      tokenize char do
-        @component_count = @current.to_i
-        clean_context
-      end
-    end
-
-    def length(char)
-      return if char.eql? '$'
-
-      tokenize char do
-        @next_length = @current.to_i
-        clean_context
-      end
-    end
-
-    def payload(char)
-      return if char.eql? '$'
-
-      @next_length = 0 if @current.length == @next_length
-
-      tokenize char do
-        @next_length = 0
-        complete_token
-      end
-    end
-
-    def tokenize(char, &block)
-      reach_delimiter = consume_delimiter(char)
-
-      if reach_delimiter
-        if @doubt_str.empty?
-          block.call
-        end
-        return
-      end
-
-      @current += char
-    end
-
-=begin
-    Common Utilities
-=end
-
-    def complete_token
-      @components << @current
-      clean_context
-    end
-
-    def clean_context
-      @current = ''
-      @token_type = nil
-    end
-
-    def consume_delimiter(char)
-      return false if @next_length != 0
-
-      if @doubt and char.eql? "\n"
-        @doubt_str = ''
-        @doubt = false
-        return true
-      end
-
-      if not @doubt and char.eql? "\r"
-        @doubt_str = "\r"
-        @doubt = true
-        return true
-      end
-
-      @doubt = false
-      @current += @doubt_str unless @doubt_str.empty?
-      @doubt_str = ''
-      return false
-    end
-
-    def detect_token_type(char)
-      case char
-        when '*'
-          :args_counts
-        when '$'
-          :length
-        else
-          :payload
-      end
-    end
-  end
-
   class Response
 
   end
-end
+end
+
+require 'redis-protocol/request'

data/lib/redis-protocol/request.rb

@@ -0,0 +1,134 @@
+class RedisProtocol::Request
+  attr_reader :raw_data, :type, :component_count, :components
+
+  def initialize(data)
+    @raw_data = data
+    @type, @components, @component_count, @current = nil, [], 0, ''
+    @next_length = 0
+    parse
+  end
+
+  private
+
+  def parse
+    @raw_data.chars.each do |c|
+      @type ||= c.eql?('*') ? :standard : :inline
+
+      send(@type, c)
+    end
+
+    complete_token
+    @component_count += @components.count if @type == :inline
+  end
+=begin
+    Inline Parser
+=end
+  def inline(char)
+    c = char.strip
+
+    if c.empty? and not @current.empty?
+      complete_token
+    else
+      @current += c
+    end
+  end
+
+=begin
+    Standard Parser
+=end
+
+  def standard(char)
+    @token_type ||= detect_token_type char
+    @doubt_str = ''
+
+    send(@token_type, char)
+  end
+
+  def args_counts(char)
+    return if char.eql? '*'
+
+    tokenize char do
+      @component_count = @current.to_i
+      clean_context
+    end
+  end
+
+  def length(char)
+    return if char.eql? '$'
+
+    tokenize char do
+      @next_length = @current.to_i
+      clean_context
+    end
+  end
+
+  def payload(char)
+    return if char.eql? '$'
+
+    @next_length = 0 if @current.length == @next_length
+
+    tokenize char do
+      @next_length = 0
+      complete_token
+    end
+  end
+
+  def tokenize(char, &block)
+    reach_delimiter = consume_delimiter(char)
+
+    if reach_delimiter
+      if @doubt_str.empty?
+        block.call
+      end
+      return
+    end
+
+    @current += char
+  end
+
+=begin
+    Common Utilities
+=end
+
+  def complete_token
+    @components << @current
+    clean_context
+  end
+
+  def clean_context
+    @current = ''
+    @token_type = nil
+  end
+
+  def consume_delimiter(char)
+    return false if @next_length != 0
+
+    if @doubt and char.eql? "\n"
+      @doubt_str = ''
+      @doubt = false
+      return true
+    end
+
+    if not @doubt and char.eql? "\r"
+      @doubt_str = "\r"
+      @doubt = true
+      return true
+    end
+
+    @doubt = false
+    @current += @doubt_str unless @doubt_str.empty?
+    @doubt_str = ''
+    return false
+  end
+
+  def detect_token_type(char)
+    case char
+      when '*'
+        :args_counts
+      when '$'
+        :length
+      else
+        :payload
+    end
+  end
+end

data/lib/redis-protocol/static_request.rb

@@ -0,0 +1,74 @@
+class RedisProtocol::StaticRequest
+  attr_reader :raw_data, :type
+  OP_DELIMITER = "\r\n"
+
+  def initialize(data)
+    @raw_data = data
+    parse_request
+  end
+
+  def parse_request
+    @type = check_request_type
+
+    send @type, @raw_data
+  end
+
+  def self.recognize(data)
+    (check_request_type == :inline) ? data.split[0] : data.split(OP_DELIMITER)[2]
+  end
+
+  def check_request_type
+    (@raw_data.start_with? '*') ? :standard : :inline
+  end
+
+  def standard
+    components = []
+    data = @raw_data.dup
+    operand_length, payload = operand_length_for data.split(OP_DELIMITER)
+    1.upto(operand_length).each do |_|
+      data, payload = unpack_payload(payload)
+      components << data
+    end
+    @components = components
+  end
+
+  def operand_length_for(data)
+    operand_length, payload = next_token data
+    raise "invalid packet : #{operand_length}" unless operand_length.start_with? '*'
+    operand_length = operand_length[1..-1].to_i
+
+    [operand_length, payload]
+  end
+
+  def unpack_payload(payload)
+    field_length, payload = next_token payload
+    raise "invalid length format : #{field_length}" unless field_length.start_with? '$'
+    field_length = field_length[1..-1].to_i
+    next_token payload, field_length
+  end
+
+  def inline(data)
+    data.split
+  end
+
+  def next_token(data, length = 0)
+    if data[0].length == length || length == 0
+      [data[0], data[1..-1]]
+    else
+      multiline_token(data, length)
+    end
+  end
+
+  def multiline_token(data, length)
+    val, index = '', 0
+    data.each do |token|
+      val.empty? ? val = token : val += "\r\n#{token}"
+      index += 1
+
+      break if val.length == length
+    end
+    [val, data[index..-1]]
+  end
+
+  private :next_token, :standard, :inline, :operand_length_for, :unpack_payload, :multiline_token
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -126,6 +126,8 @@ files:
 - Rakefile
 - VERSION
 - lib/redis-protocol.rb
+- lib/redis-protocol/request.rb
+- lib/redis-protocol/static_request.rb
 - spec/redis-protocol/request_spec.rb
 - spec/redis-protocol_spec.rb
 - spec/spec_helper.rb
@@ -144,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1380845290125949891
+      hash: 1791670625487340402
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: