truth_serum 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12a65d8466c9536bedf6d6b94a68024359362756
-  data.tar.gz: 33e057b187a1a7cbf3c2887daf10953045c2e578
+  metadata.gz: 77ea2202c19fa2afd7f1eb080169b7314b4ca51d
+  data.tar.gz: b77ae18ef4a9443a04a1d7be69757ef7569961fb
 SHA512:
-  metadata.gz: d24ccb4cdc7496a19cbb680569256b542aa5329c41ed781874b15c009d729b58bdca94962077eaa5e0906ce6a3f1b21101d0b06002f0b5811e599216a709c94a
-  data.tar.gz: 8123b85b4688e75f99ccefd99df925ac0cc4a43d1035a9d958ce58ad2dd41124636399ec3c1063a250a827a851113574e868401132a8b347eb25824ec41f12ea
+  metadata.gz: 5864b0061805904097a13d29087d2367a7ea3b1694b3faf97a59ccbe0e2bab11194d7bf6bc2379e99112924010bef99581dedb2743de656161a00670d245cb1b
+  data.tar.gz: 7c1cadf93db90ae52a1d22c828b831a0b956cfedaa151c6e2405f35e204ac0fe571b0baf5e2cb7e1c34ee67f5a44cbe590a7d1b0630770a3c4a77ce295394a63

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/lib/truth_serum/result.rb

@@ -8,5 +8,49 @@ module TruthSerum
       @filters          = filters
       @negative_filters = negative_filters
     end
+
+    def reconstruct_query
+      result = []
+      result += reconstruct_terms(terms)                      if terms
+      result += negate(reconstruct_terms(negative_terms))     if negative_terms
+      result += reconstruct_filters(filters)                  if filters
+      result += negate(reconstruct_filters(negative_filters)) if negative_filters
+
+      result.compact.join(' ').strip
+    end
+
+    private
+
+    def reconstruct_terms(terms)
+      quotables, others = terms.partition { |t| should_quote(t) }
+      quotables = quotables.map { |t| quote_term(t) }
+
+      [quotables, others].flatten
+    end
+
+    def reconstruct_filters(filters)
+      filters.map do |key, value|
+        key   = quote_term(key)   if should_quote(key)
+        value = quote_term(value) if should_quote(value)
+
+        "#{key}:#{value}"
+      end
+    end
+
+    def negate(terms)
+      terms.map { |t| "-#{t}" }
+    end
+
+    def should_quote(term)
+      term =~ /[ \"\r\n]/
+    end
+
+    def quote_term(term)
+      term = term.gsub(/\r/, '\r')
+        .gsub(/\n/, '\n')
+        .gsub(/\\/, '\\\\')
+
+      "\"#{term}\""
+    end
   end
 end

data/lib/truth_serum/version.rb

@@ -1,3 +1,3 @@
 module TruthSerum
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/truth_serum.rb

@@ -5,7 +5,24 @@ require "truth_serum/lexer"
 require "truth_serum/parser"
 
 module TruthSerum
-  def self.parse(line)
+  module_function
+
+  def parse(line)
     Result.new(**Parser.new(Lexer.new(line).lex).parse)
   end
+
+  def unparse(hash)
+    result = if hash.is_a?(Result)
+               hash
+             else
+               Result.new(
+                 terms:            hash[:terms],
+                 negative_terms:   hash[:negative_terms],
+                 filters:          hash[:filters],
+                 negative_filters: hash[:negative_filters]
+               )
+             end
+
+    result.reconstruct_query
+  end
 end

data/truth_serum.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler",        '~> 1.12'
-  spec.add_development_dependency "rake",           '~> 11.1'
-  spec.add_development_dependency "minitest",       '~> 5.8'
-  spec.add_development_dependency "guard",          '~> 2.13'
+  spec.add_development_dependency "rake",           '~> 11.2'
+  spec.add_development_dependency "minitest",       '~> 5.9'
+  spec.add_development_dependency "guard",          '~> 2.14'
   spec.add_development_dependency "guard-minitest", '~> 2.4'
   spec.add_development_dependency "pry",            '~> 0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truth_serum
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Chakrit Wichian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.9'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Guardfile