truth_serum 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481325393cb070fe642976b798174028b1cab102
-  data.tar.gz: 02e677d5647e0c5ba3975a568347ab973428f458
+  metadata.gz: 590e540a36b34b56954e0faf0fba315eb8042a6b
+  data.tar.gz: f833f7c7ac478dbf6c9734df218645bfc2d5dd1c
 SHA512:
-  metadata.gz: aacdbaca8bcc71dea85002dd4322ea66c49a9aea893c94d1cd3bc028a999645e77322e4d4a1d9f1b6cc615020f9347107234913f39ac7a328e619c02f541bd22
-  data.tar.gz: 39f70a2285576824d300aec02c6b8a317d6cfc7372c7c8e57d21a5179291d9dedde7ad5968c846174ed418ae3c6a126bda7f2bfde742faaf46781c0fd08a48e4
+  metadata.gz: 738641475d633e50d67471307cd8ecf1e871aa5219bd64e15ae0714872e50ea1ac279dce7e2414e18c917ea4d3e63ff865cd7dc610a57ee79dd42e6c1fdce4a6
+  data.tar.gz: f5ddc48b3fff0bd64cfd70f8ea10564aad0950967735eb18c19b07ae50fcc6a39537d46ede6186e15d1ef0629a6de55bb880a755676bbb74476c9db9c270e89a

data/lib/truth_serum/lexer.rb

@@ -82,6 +82,8 @@ module TruthSerum
         append("\r")
       when 'n'
         append("\n")
+      when nil
+        append('\\') # EOF, treat preceding \ as literal
       else # '\\' '"' and everything else is passed verbatim
         append(char)
       end
@@ -98,7 +100,8 @@ module TruthSerum
     end
 
     def emit(type)
-      super(Token.new(type, @buffer || ''))
+      @buffer ||= ''
+      super(Token.new(type, @buffer))
       @buffer = nil
     end
   end

data/lib/truth_serum/parser.rb

@@ -8,19 +8,15 @@ module TruthSerum
     # convert result stream to hash
     def execute
       @negate = false
-      result = {
+      @hash = {
         terms:            [],
         negative_terms:   [],
         filters:          {},
         negative_filters: {}
       }
 
-      stream = super
-      until stream.empty?
-        result = merge_result(result, stream.shift)
-      end
-
-      result
+      super
+      @hash
     end
 
     state :start do
@@ -109,32 +105,22 @@ module TruthSerum
       type = @negate ? :negative_terms : :terms
       @negate = false
 
-      emit(type => [term])
+      if @hash.key?(type)
+        @hash[type] << term
+      else
+        @hash[type] = [term]
+      end
     end
 
     def emit_filter(key, value)
       type = @negate ? :negative_filters : :filters
       @negate = false
 
-      emit(type => { key => value })
-    end
-
-    # simplified 1-deep merge
-    def merge_result(x, y)
-      result = x.merge({})
-      y.each do |key, value|
-        if result.key?(key)
-          if value.is_a?(Hash)
-            result[key] = result[key].merge(value)
-          elsif value.is_a?(Array)
-            result[key] = result[key] + value
-          end
-        else
-          result[key] = value
-        end
+      if @hash.key?(type)
+        @hash[type][key] = value
+      else
+        @hash[type] = { key => value }
       end
-
-      result
     end
   end
 end

data/lib/truth_serum/token.rb

@@ -11,6 +11,14 @@ module TruthSerum
 
     attr_accessor :type, :text
 
+    class << self
+      def from_array(arr)
+        arr.map do |type, text|
+          Token.new(type, text)
+        end
+      end
+    end
+
     def initialize(type, text)
       @type = type
       @text = text

data/lib/truth_serum/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module TruthSerum
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truth_serum
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Chakrit Wichian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler