uv-rays 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b968faec5c418f8ee37b41606159333d3f0458f
-  data.tar.gz: d0ba56974349746c9db68e4b52abdf26bc60803c
+  metadata.gz: dbda330c1c29c6e1d6d83dd262df51d94322ec4f
+  data.tar.gz: db15f804d9f4514d39af9926021627169a59b185
 SHA512:
-  metadata.gz: 2eb3efe38bb16b15ee9b90fbe049c40b09effecdcdd142eb309a90fb07ddbf287d3cfe090668b141aad692f595f568d913e03a2d656ccfea78f7d931b14adadf
-  data.tar.gz: ff93f781f3e477cdaa01040ce49c150555254366a5b344a15152e9e5b8825354cb6a29aac5d1b01733060b2cc1adcc4652485de00ca756ff94ad724d86f529d8
+  metadata.gz: bf595aaa5a464e8ee0c111f964c528e190b76581a69b8509909028b0a1e06f01962f19b6cc1dc5c81e7974a4c1260e62027e640a17a57e69a071a2e25450fe5c
+  data.tar.gz: 3947075d8337536b045a03d9aad35cfd6551876ce8153a55c11d5f6e648605bc5394c49fac316d18f187bfceb91ef3a6c1280f34c80704ce69cf3b0d24f585f1

data/lib/uv-rays/abstract_tokenizer.rb

@@ -6,6 +6,7 @@ module UV
     # callback based system for application level tokenization without
     # the heavy lifting.
     class AbstractTokenizer
+        DEFAULT_ENCODING = 'ASCII-8BIT'.freeze
 
         attr_accessor :callback, :indicator, :size_limit, :verbose
 
@@ -15,16 +16,14 @@ module UV
             @indicator  = options[:indicator]
             @size_limit = options[:size_limit]
             @verbose  = options[:verbose] if @size_limit
-            @encoding   = options[:encoding]
+            @encoding   = options[:encoding] || DEFAULT_ENCODING
 
             raise ArgumentError, 'no indicator provided' unless @indicator
             raise ArgumentError, 'no callback provided' unless @callback
 
             @input = ''
-            if @encoding
-                @input.force_encoding(@encoding)
-                @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
-            end
+            @input.force_encoding(@encoding)
+            @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
         end
 
         # Extract takes an arbitrary string of input data and returns an array of
@@ -37,7 +36,7 @@ module UV
         #
         # @param [String] data
         def extract(data)
-            data.force_encoding(@encoding) if @encoding
+            data.force_encoding(@encoding)
             @input << data
 
             messages = @input.split(@indicator, -1)
@@ -120,7 +119,7 @@ module UV
 
         def reset
             @input = ''
-            @input.force_encoding(@encoding) if @encoding
+            @input.force_encoding(@encoding)
         end
     end
 end

data/lib/uv-rays/buffered_tokenizer.rb

@@ -15,6 +15,7 @@
 #     end
 module UV
     class BufferedTokenizer
+        DEFAULT_ENCODING = 'ASCII-8BIT'.freeze
 
         attr_accessor :delimiter, :indicator, :size_limit, :verbose
 
@@ -26,11 +27,14 @@ module UV
             @size_limit = options[:size_limit]
             @min_length = options[:min_length] || 1
             @verbose    = options[:verbose] if @size_limit
-            @encoding   = options[:encoding]
+            @encoding   = options[:encoding] || DEFAULT_ENCODING
 
             if @delimiter
+                @delimiter.force_encoding(@encoding) if @delimiter.is_a?(String)
+                @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
                 @extract_method = method(:delimiter_extract)
             elsif @indicator && @msg_length
+                @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
                 @extract_method = method(:length_extract)
             else
                 raise ArgumentError, 'no delimiter provided'
@@ -49,7 +53,7 @@ module UV
         #
         # @param [String] data
         def extract(data)
-            data.force_encoding(@encoding) if @encoding
+            data.force_encoding(@encoding)
             @input << data
 
             @extract_method.call
@@ -143,16 +147,14 @@ module UV
 
         def init_buffer
             @input = ''
-            if @encoding
-                @input.force_encoding(@encoding)
-                @delimiter.force_encoding(@encoding) if @delimiter.is_a?(String)
-                @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
-            end
+            @input.force_encoding(@encoding)
+            @delimiter.force_encoding(@encoding) if @delimiter.is_a?(String)
+            @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
         end
 
         def reset(value = '')
             @input = value
-            @input.force_encoding(@encoding) if @encoding
+            @input.force_encoding(@encoding)
         end
     end
 end

data/lib/uv-rays/version.rb

@@ -1,3 +1,3 @@
 module UV
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv