reso_transport 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b45ccf4b5c9867e0b0321837c60b9d02132500287e4c7b8da0f4778055f187eb
-  data.tar.gz: 6bf1974a3a47e6992436a44189cec2d3b0d09111b5db8b9460962395699fd2d1
+  metadata.gz: 2335572f0d3ef63bfcf2ffde2ce74aad86b843d8b540fbe891e8a34edb9df9d7
+  data.tar.gz: f017cccca468e854956b34382082bd64ad2b211bf78553e60420d34bff99564c
 SHA512:
-  metadata.gz: 0b370d94911dc23c85ed636fa8ec498755e9f45dc1c9bbf881fad758f1441b68c166ead9e9011a31835437efcf2cb46b97a5b2ecc4ed1c45e4889ebf32b0e5b7
-  data.tar.gz: d0a446c18da53056591f581ec613d44727a01269fc8de44001611100c5208457168d89c6a882b4ba7c8aa3b1a8b2e84a77f7bd1e4597b4bc90f4b0fddf3f94e3
+  metadata.gz: bb24dda1feaf4fae8aad65b0a8167d43fd5846ec5b1e3f323702a841440904e3e76d13b49dd0d27d875f9cca75a4364fe0708d39f353005985a68ecaea5d213c
+  data.tar.gz: '093d5d225e02b7fb37de029f8c949b54f225187384e30231db4ceb0ac71c00f6b1609e488d17f24c2f8ddd2dc916b91fc7c6a78b4c6f56ecfc675bfa448ffdfc'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reso_transport (1.1.0)
+    reso_transport (1.2.0)
       faraday (~> 0.15.0)
 
 GEM

data/lib/reso_transport/query.rb

@@ -1,7 +1,7 @@
 module ResoTransport
   Query = Struct.new(:resource) do
 
-    def all(&block)
+    def all(*contexts, &block)
       new_query_context('and')
       instance_eval(&block)
       clear_query_context
@@ -117,17 +117,17 @@ module ResoTransport
       global = groups.delete(:global)
       filter_groups = groups.values
 
-      filter_string = ""
+      filter_chunks = []
 
       if global && global[:criteria]&.any?
-        filter_string << global[:criteria].join(" #{global[:context]} ")  
+        filter_chunks << global[:criteria].join(" #{global[:context]} ")  
       end
 
-      filter_string << filter_groups.map do |g|
+      filter_chunks << filter_groups.map do |g|
         "(#{g[:criteria].join(" #{g[:context]} ")})"
       end.join(" and ")
 
-      filter_string
+      filter_chunks.reject {|c| c == ""}.join(" and ")
     end
 
     def compile_params

data/lib/reso_transport/version.rb

@@ -1,3 +1,3 @@
 module ResoTransport
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reso_transport
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jon Druse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday