query_syntax 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3f0b97a58aac031c6f02e32923cc4be8fd55890
-  data.tar.gz: fb754008f53ded3ad1df221e46a7c531ba155f81
+  metadata.gz: f224f5ad8ad645fb93562ba42e6b1e3bdb825b97
+  data.tar.gz: 9193eee9560f3b63d159b6d7ac80fa44c2d84eae
 SHA512:
-  metadata.gz: a0062cddfc11e670ac5b5ea096f9dc60398fc6459b9daa8c57996e8cb989dc5c88dcdea0c533237d15154307bc76ae72dec278b593dff0e67e3e48e134d30aa1
-  data.tar.gz: 849ff5e15195afc1fcde6a3b0415477f9d8fa81cf794fc5a43cd7a2ca4e3a9d711810050d42c20ace5e92f8cd91e6f9c5b3e07f47713c2483a195033d8f769fe
+  metadata.gz: 8c329ed16e263a2d1abdd9cf1ba52cc541dded99eb563648be63c554e009bd3fc935e774209e82d67b5143c4bbb0d7a126264a7c01aab5b5c833f0783584f887
+  data.tar.gz: 021d85ee412bd315f9cac3f535c9360460a0370ca45d26383b65e49459e165c30477e3d3fd00e4b29502dfb31e889a4c9e28ad699f96cee7002cc0674bdd3ede

data/lib/query_syntax/query.rb

@@ -53,15 +53,9 @@ module QuerySyntax
       URI.escape(to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     end
 
-    def search(&block)
+    def search(*args, &block)
       begin
-        if Kernel.block_given?
-          Chef::Search::Query.new.search(index, encode, &block)
-        else 
-          results = Array.new
-          search { |result| results << result }
-          results
-        end
+        Chef::Search::Query.new.search(index, encode, args, &block)
       rescue Net::HTTPServerException => e
         error = Chef::JSONCompat.from_json(e.response.body)["error"].first
         Chef::Log.error("Search failed with : #{error}")
@@ -75,24 +69,7 @@ module QuerySyntax
 
     def partial(keys, &block)
       keys = Hash[keys.map { |k,v| [k,Array(v)] }]
-
-      begin
-        if Kernel.block_given?
-          Chef::PartialSearch.new.search(index, encode, keys:keys, &block)
-        else
-          results = Array.new
-          partial(keys) { |result| results << result }
-          results
-        end
-      rescue Net::HTTPServerException => e
-        error = Chef::JSONCompat.from_json(e.response.body)["error"].first
-        Chef::Log.error("Search failed with : #{error}")
-
-        if @ignore_failure
-        then Array.new
-        else raise Net::HTTPServerException
-        end
-      end
+      Chef::Search::Query.new.search(filter_result: keys, &block)
     end
 
     def each(&block)

data/lib/query_syntax/scope/nested.rb

@@ -96,7 +96,6 @@ module QuerySyntax
 
     def push(other)
       @scopes << other
-      scope!(operator)
       self
     end
 

data/lib/query_syntax/version.rb

@@ -1,5 +1,5 @@
 
 module QuerySyntax
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: query_syntax
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jonathan Serafini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides a mechanism to craft Chef queries through object chains such
@@ -46,7 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,17 +69,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provide chainable objects to build Chef search queries