rochefort 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8b15abe5b9fc1c8b93e4a885c3ecfb91a11f4f
-  data.tar.gz: 9ff9c898a2e7d14c646214591e0522aa7c434333
+  metadata.gz: fa87001a98b3f2cf7a5c008dba36df9425cd473e
+  data.tar.gz: 0f945723f6133643e4bd4c2ed144c0639177ff1d
 SHA512:
-  metadata.gz: 2705f8e5cb3609da99029270ff62e6c61fde9c837774ab8a49af3445fc247b4d95ff5fd0607687ddff1962c8e4e1ded2f67d20a22cf69d95586320d11d214484
-  data.tar.gz: 0f6625494b8b8d7a60f4123318bd11c1a5f18fa4234d7f0a0ab18eff11af9e9de3e668c132a1d0cf76411d0eaa037f633494b9b44afcdd00acdf4dd69c9ce31b
+  metadata.gz: 688eab3f7fbaa1480e4205ac669ad8ba8e8f0841d0154cb3cda3003a6587281977daa288659a03e97113e9286b291d308acc6d73d87594cad4fa0f0f26822e8e
+  data.tar.gz: 9c52c1ea55bacb0b048ef5e5d2b2f7f4edbfaddf3b292ca4d78db00b0c2d5c56fd968b1f30957a7bb66e22ee3401836e48615c4caa017086ac5a490f618b08b0

data/lib/rochefort.rb

@@ -2,7 +2,7 @@ require 'rest-client'
 require 'uri'
 require 'json'
 
-# client for https://github.com/jackdoe/rochefort - disk speed append + offset service (poor man's kafka), 
+# client for https://github.com/jackdoe/rochefort - disk speed append + offset service (poor man's kafka),
 # example usage
 #  r = new Rochefort("http://localhost:8001")
 #  offset = r.append(namespace: "example-namespace", data:"example-data")
@@ -14,6 +14,7 @@ class Rochefort
     @urlModify = URI::join(url,'modify').to_s
     @urlGet = URI::join(url,'get').to_s
     @urlScan = URI::join(url,'scan').to_s
+    @urlQuery = URI::join(url,'query').to_s
     @urlGetMulti = URI::join(url,'getMulti').to_s
   end
 
@@ -60,7 +61,7 @@ class Rochefort
     return out["success"]
   end
 
-  
+
   # get data from rochefort
   #  r = Rochefort.new(url)
   #  r.get(
@@ -103,14 +104,8 @@ class Rochefort
     return out
   end
 
-  # scans a namespace, reading from a stream, so the namespace can be very big
-  # also accepts array of tags to search for
-  #  r = Rochefort.new(url)
-  #  r.scan(namespace: ns) do |len, offset, value|
-  #    puts value
-  #  end
-  # @return calls the block for each item
-  def scan(opts,&input_block)
+
+  def scanParser(input_block)
     block = proc do |response|
       buffer = ""
       header_len = 12
@@ -124,7 +119,6 @@ class Rochefort
       response.read_body do |chunk|
         buffer << chunk
         while buffer.length >= need
-
           if waiting_for_header
             h = buffer.unpack('l<q<')
             len = h[0]
@@ -135,7 +129,7 @@ class Rochefort
           end
 
           if buffer.length >= need
-            input_block.call(len, rochefort_offset, buffer[0, len])
+            input_block.call(rochefort_offset, buffer[0, len])
             buffer = buffer[len, buffer.length - len]
             need = header_len
             waiting_for_header = true
@@ -143,12 +137,41 @@ class Rochefort
         end
       end
     end
+    return block
+  end
 
-    tags = opts[:tags] || []
+
+  # scans a namespace, reading from a stream, so the namespace can be very big
+  #  r = Rochefort.new(url)
+  #  r.scan(namespace: ns) do |offset, value|
+  #    puts value
+  #  end
+  # @return calls the block for each item
+  def scan(opts,&input_block)
     RestClient::Request.execute(method: :get,
-                                url: "#{@urlScan}?namespace=#{opts[:namespace]}&tags=#{tags.join(",")}",
+                                url: "#{@urlScan}?namespace=#{opts[:namespace]}",
+                                read_timeout: opts[:read_timeout] || 1,
+                                open_timeout: opts[:open_timeout] || 1,
+                                block_response: scanParser(input_block))
+  end
+
+  # searches a namespace, for the tagged /append blobs, reading from a stream, so the namespace can be very big
+  #  r = Rochefort.new(url)
+  #  r.search(query: {tag: 'a'}, namespace: ns) do |offset, value|
+  #    puts value
+  #  end
+  #
+  # the dsl is fairly simple: (A OR B OR (C AND D)
+  #  {
+  #    or: [ { tag: 'a' }, { tag: 'a' }, { and: [ {tag: 'c'}, {tag:'d'} ] } ]
+  #  }
+  # @return calls the block for each item
+  def search(opts,&input_block)
+    RestClient::Request.execute(method: :post,
+                                payload: JSON.generate(opts[:query]),
+                                url: "#{@urlQuery}?namespace=#{opts[:namespace]}",
                                 read_timeout: opts[:read_timeout] || 1,
                                 open_timeout: opts[:open_timeout] || 1,
-                                block_response: block)
+                                block_response: scanParser(input_block))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rochefort
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Borislav Nikolov