boogex 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9474689b9e61cffbef211549d9e942254c1d0e8
-  data.tar.gz: f56c73ade74210ca6aa2a82e69936e7bedeb678a
+  metadata.gz: de3fe706280ac098115350c77c0420f36ca96af9
+  data.tar.gz: e9f87414d4bfd2d1ee3d617eabbd919f3e5fb777
 SHA512:
-  metadata.gz: 19d9416eb7d615dee24a748f0405f81eb188264e168576ff66cba4e0086d790149605a3f3b09b1696e33cba81ec39c8ecf7c71587e4e838db68a3831d19b6c6f
-  data.tar.gz: 41d95f425232c4ee624570d6121606cb65ef134919302f18aa458d278fec408963afdd80744b13fce032aabf72e0ebca5e8d62fa137e5c888b2573208aab8e9a
+  metadata.gz: bf3676878d21a6342639ca8f57671d80932442c4c266ce478be5a5a5320d45b23b721fe9a419c4739fbd3f8a456f9916e118a94ccc465cf876f36e9839c075ab
+  data.tar.gz: 0dab88ba6541a518550808c7cf6ae1a64b5c537adc5b4f056a7369243a274f9f7747e440d318b627179a69c940039f605aa22f8c39d5e4aec3ad5851181f710c

data/.gitignore

@@ -0,0 +1,3 @@
+**.DS_Store
+**.gem
+

data/boogex.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'boogex'
-  s.version     = '0.0.1'
+  s.version     = '0.1.0'
   s.date        = '2016-02-14'
   s.homepage    = 'https://github.com/lexerdev/boogex.gem'
   s.license     = 'MIT'

data/lib/boogex/convertor.rb

@@ -41,7 +41,7 @@ module Boogex
           result << splits.last
         end
       end
-    end.uniq
+    end.uniq.compact
 
     # This recursively converts any brackets in the text back into the array_struct function
     # where the upper limit of recursion is 3 levels of bracketing. This is limitied by the regex
@@ -97,6 +97,16 @@ module Boogex
     
     # if an all string array, then check if any of the elements of the array need bracket wrapped and return
     if all_strings?(obj)
+      if obj.any? do |str|
+        contain_AND?(str)
+      end
+        result = obj.each_with_object(['AND']) do |str, arr|
+          str.split(' AND ').reject(&:empty?).collect do |str|
+            arr << regex_formatting(str)
+          end
+        end
+        return result
+      end
       needs_brackets = obj.any? do |text|
         not_in_or?(text)
       end
@@ -148,7 +158,13 @@ module Boogex
   end
 
   def self.construct_AND_array(array)
-    '#{andify["' + array.join('", "') + '"]}' 
+    and_prefix = 'AND(['
+    and_suffix = "])" 
+    internal_str = array.collect do |str|
+      next "'" + str + "'" unless str.include?(and_prefix)
+      str
+    end.join(',')
+    and_prefix + internal_str + and_suffix
   end
 
   def self.contain_AND?(obj)

data/lib/boogex/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Boogex
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/test/convertor_test.rb

@@ -8,28 +8,30 @@ describe Boogex do
     assert_equal expecting, result
   end
 
-  it 'turns AND into andify array string' do
+  it 'turns boolean AND into AND array string' do
     string = 'This AND That'
-    expecting = '#{andify["(?:This)", "(?:That)"]}'
+    expecting = "AND(['(?:This)','(?:That)'])"
     result = Boogex.convert(string)
     assert_equal expecting, result
   end
 
   it 'understands bracketing' do
     string = '(This OR That) AND My self'
-    expecting = '#{andify["(?:This|That)", "(?:My self)"]}'
-    result = Boogex.convert(string)
-    assert_equal expecting, result
-
-    string = 'This AND (That OR (My self)'
-    expecting = '#{andify["(?:This|That)", "(?:My self)"]}'
+    expecting = "AND(['(?:This|That)','(?:My self)'])"
     result = Boogex.convert(string)
     assert_equal expecting, result
   end
 
   it 'correctly convert this Lucene boolean query string' do
     string = '(((asd OR dd) AND that) AND this) OR What?'
-    expecting = '#{andify["#{andify["(?:asd|dd)", "(?:that)"]}", "(?:this)"]}|What?'
+    expecting = "AND([AND(['(?:asd|dd)','(?:that)']),'(?:this)'])|What?"
+    result = Boogex.convert(string)
+    assert_equal expecting, result
+  end
+  
+  it 'understands embedded AND' do
+    string = '((im AND researching) AND travelling)'
+    expecting = "AND([AND(['(?:im)','(?:researching)']),'(?:travelling)'])"
     result = Boogex.convert(string)
     assert_equal expecting, result
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boogex
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Sam Crouch
@@ -16,6 +16,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -55,6 +56,7 @@ signing_key:
 specification_version: 4
 summary: Boolean Lucene to Regex convertor.
 test_files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE