uv-rays 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcf2dd4cbeb83a76c6f218cc4c0ccc55ed05d755
-  data.tar.gz: 2f1e98b94414be0f86f22b5297b38e45c9cc8882
+  metadata.gz: 83d541d90fa45a28696168870b4c5933354ba968
+  data.tar.gz: 29b0fe26514eb737aa11b912e3549eb509a789b3
 SHA512:
-  metadata.gz: cc24a2d715a2325b8f531bd4823cf73e7ed9e54dcb6ee31eeacc830b3af1df2cd70b4280e68409a61507e5fbfcbf6aa9576e9d59b56f9afe9f07939550759f78
-  data.tar.gz: 3be2b91df14b7be0b7fbe7f2c50c08fbaf45ff56e586b50db736a87a12c02c411e27f21852ac2baa0aaee3e7df296cb03d981043c9f7178e6fd509dbd75b1a69
+  metadata.gz: 049c4c400a002bfa9c1829b1be76c7db3b77d6b7f1052b6327a0c0deab667b2cd654220bb440039af1c580ffde5e72cf79da7a4462e0099c50cbf02baa9c31b2
+  data.tar.gz: 0f13601f2a8e5f3892bd5632a234478bb12f6b3d368531c4512417fcdd5e5532c0ba315396ecc6ff29783e9723b1ddc29cd2e15314fb9ca43444035cb74ae0a8

data/lib/uv-rays/abstract_tokenizer.rb

@@ -19,7 +19,6 @@ module UV
             @verbose  = options[:verbose] if @size_limit
             @encoding   = options[:encoding] || DEFAULT_ENCODING
 
-            raise ArgumentError, 'no indicator provided' unless @indicator
             raise ArgumentError, 'no callback provided' unless @callback
 
             reset
@@ -46,16 +45,23 @@ module UV
             loop do
                 found = false
 
-                check = @input.partition(@indicator)
-                break unless check[1].length > 0
+                last = if @indicator
+                    check = @input.partition(@indicator)
+                    break unless check[1].length > 0
+
+                    check[2]
+                else
+                    @input
+                end
 
-                last = check[2]
                 result = @callback.call(last)
+
                 if result
                     found = true
 
                     # Check for multi-byte indicator edge case
-                    if result.is_a? Fixnum
+                    case result
+                    when Integer, Fixnum
                         entities << last[0...result]
                         @input = last[result..-1]
                     else

data/lib/uv-rays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UV
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
 end

data/spec/abstract_tokenizer_spec.rb

@@ -104,4 +104,26 @@ describe UV::AbstractTokenizer do
         expect(result).to eq(['Star', '1234'])
         expect(@buffer.flush).to eq('56')    # as we've indicated a message length of 4
     end
+
+    it "should work with messages that don't have an indicator" do
+        # i.e. there is a header that defines message length
+        msg1 = "\x0612345\x081234567\x031"
+
+        @buffer = UV::AbstractTokenizer.new({
+            callback: lambda { |data|
+                len = data.bytes[0]
+                if data.length >= len
+                    len
+                else
+                    false
+                end
+            },
+            size_limit: 10,
+            encoding: "ASCII-8BIT"
+        })
+
+        result = @buffer.extract(msg1)
+        expect(result).to eq(["\x0612345", "\x081234567"])
+        expect(@buffer.flush).to eq("\x031")    # as we've indicated a message length of 3
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv