uv-rays 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e980250a6d02103acb85079de12729af1c77cb5
-  data.tar.gz: ebda36f5eec3a50be714255a5c08946faadee54c
+  metadata.gz: 4455f4c45f8835bff0c2dd2f0213d229d7d5a567
+  data.tar.gz: 9b575ec7380f6e3c525caa0f752327babb930a6f
 SHA512:
-  metadata.gz: e64d927cb58e16370b425c29b23f8a13c045930a6a5ac2f0aeb372cbb6c45de2205267e6c979ce2b54f5ae440ba9b19a7a703cc3d1e664bb1bb7bcbc51f480b9
-  data.tar.gz: bafad5da678f13d052d18978d8d058f8ac8cf770f6955056bc91a2fce042f6126a747c370613f75e417d9e16a7640b27d9d5aa0a9ce3ab6d4c7d5672a55842ed
+  metadata.gz: 65317d8a548b648e7ef33ffa2437116dcdcbe0407ab3317ec925ad2a48bba484c1dcdd35e56f5c893108ade3b671f92a68e60f4b86d9bd4d55a705425b237f25
+  data.tar.gz: cc6e8a3abf8c5aede9cf23aab253590d0c14a8a19f9672a787090853766f9bdd66527fb56c66272cc4935a14a99682a5600e137a588271e1082eb2714af86a87

data/lib/uv-rays/abstract_tokenizer.rb

@@ -39,47 +39,30 @@ module UV
             data.force_encoding(@encoding)
             @input << data
 
-            messages = @input.split(@indicator, -1)
-            if messages.length > 1
-                messages.shift      # the first item will always be junk
-                last = messages.pop # the last item may require buffering
-
-                entities = []
-                messages.each do |msg|
-                    result = @callback.call(msg)
-                    entities << msg[0...result] if result
-                end
+            entities = []
+
+            loop do
+                found = false
+
+                check = @input.partition(@indicator)
+                break unless check[1].length > 0
 
-                # Check if buffering is required
+                last = check[2]
                 result = @callback.call(last)
                 if result
+                    found = true
+
                     # Check for multi-byte indicator edge case
                     if result.is_a? Fixnum
                         entities << last[0...result]
                         @input = last[result..-1]
                     else
-                        reset
                         entities << last
+                        reset
                     end
-                else
-                    # This will work with a regex
-                    index = if messages.last.nil?
-                        0
-                    else
-                        # Possible that rindex will not find a match
-                        check = @input[0...-last.length].rindex(messages.last)
-                        if check.nil?
-                            0
-                        else
-                            check + messages.last.length
-                        end
-                    end
-                    indicator_val = @input[index...-last.length]
-                    @input = indicator_val + last
                 end
-            else
-                @input = messages.pop
-                entities = messages
+
+                break if not found
             end
 
             # Check to see if the buffer has exceeded capacity, if we're imposing a limit
@@ -118,8 +101,7 @@ module UV
 
 
         def reset
-            @input = ''
-            @input.force_encoding(@encoding)
+            @input = ''.force_encoding(@encoding)
         end
     end
 end

data/lib/uv-rays/version.rb

@@ -1,3 +1,3 @@
 module UV
-    VERSION = '1.3.5'
+    VERSION = '1.3.6'
 end

data/spec/abstract_tokenizer_spec.rb

@@ -93,4 +93,15 @@ describe UV::AbstractTokenizer do
         result = @buffer.extract('bcd')
         expect(result).to eq(['abcd'])
     end
+
+    it "should work where the indicator is part of the message" do
+        # i.e. We are looking for \x02\x06\xLEN\x00\x00\x02\x06\x00\xEND
+        # Where the indicator may appear as part of the message body
+
+        msg1 = "StartStartStart123456"
+
+        result = @buffer.extract(msg1)
+        expect(result).to eq(['Star', '1234'])
+        expect(@buffer.flush).to eq('56')    # as we've indicated a message length of 4
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv