puppetdb_query 0.0.39 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43ec0acf224df25664ecc8b8ad85dd0bf6941d2
-  data.tar.gz: 9fa10680ad0a89fafda550111655763c6b8900ec
+  metadata.gz: 5501279b16f9e4c1efe66c8f374393e97fb07036
+  data.tar.gz: ccb1b607446816621b544c6d1cf6885b83bae5f8
 SHA512:
-  metadata.gz: e7ddd9225538c8c0f8291c661b6c2df36864832222b2c46e5820a6ea193d9f0529ca047d6bd455ddf70a7ddbc2254e8d4477327cc6bf864c006662ee732013f2
-  data.tar.gz: 9bc1703089d1baaeb56613ed36f7a9f494a0b298497568bdd127f6e739e0a19f6db06eef7691e01ab0bede2e00908c6bb35f7fbdf38baba02791b4d4198a82fd
+  metadata.gz: 719fcc36e5f63e61dfe9bd3f59fcfee3ad2944aba56e869bac8575d7c59cd1f990e3630df87ede8f7c5ba6f8ed6f516f9fa5fce28edc9878ba32784ebda0752d
+  data.tar.gz: 599e13100028af3edab9d2b908205e7b7698061bd4fa32e3e7751eb253e81569276e18a2554003935e78b33c3234af011bff27190b98f77deb10a6ef456f9676

data/lib/puppetdb_query/mongodb.rb

@@ -3,9 +3,11 @@ require 'time'
 require_relative "logging"
 
 # monkey patch mongodb to get rid of
-# ".. is an illegal key in MongoDB. Keys may not start with '$' or contain a '.'. (BSON::String::IllegalKey)"
+# ".. is an illegal key in MongoDB.
+# Keys may not start with '$' or contain a '.'. (BSON::String::IllegalKey)"
 module Mongo
   module Protocol
+    # fool the monkey
     class Message
       def validating_keys?
         false
@@ -166,21 +168,28 @@ module PuppetDBQuery
     # @param facts [Hash] facts for the node
     def node_update(node, facts)
       logger.debug "  updating #{node}"
-      connection[nodes_collection].find(_id: node).replace_one(facts, upsert: true,
-        bypass_document_validation: true, check_keys: false, validating_keys: false)
+      connection[nodes_collection].find(_id: node).replace_one(facts,
+        upsert: true,
+        bypass_document_validation: true,
+        check_keys: false,
+        validating_keys: false)
     rescue ::Mongo::Error::OperationFailure => e
       logger.warn "  updating #{node} failed with: #{e.message}"
       # mongodb doesn't support keys with a dot
       # see https://docs.mongodb.com/manual/reference/limits/#Restrictions-on-Field-Names
       # as a dirty workaround we delete the document and insert it ;-)
       # The dotted field .. in .. is not valid for storage. (57)
-      # .. is an illegal key in MongoDB. Keys may not start with '$' or contain a '.'. (BSON::String::IllegalKey)
-      raise e unless (e.message =~ /The dotted field / || e.message =~ /is an illegal key/)
-      logger.warn "    we try again deleting and inserting the node"
+      # .. is an illegal key in MongoDB. Keys may not start with '$' or contain a '.'.
+      # (BSON::String::IllegalKey)
+      raise e unless e.message =~ /The dotted field / || e.message =~ /is an illegal key/
+      logger.warn "    we transform the dots into underline characters"
       begin
-        connection[nodes_collection].find(_id: node).delete_one
-        connection[nodes_collection].insert_one(facts.merge(_id: node),
-          bypass_document_validation: true, check_keys: false, validating_keys: false)
+        facts = Hash[facts.map { |k, v| [k.tr('.', '_'), v] }]
+        connection[nodes_collection].find(_id: node).replace_one(facts,
+          upsert: true,
+          bypass_document_validation: true,
+          check_keys: false,
+          validating_keys: false)
       rescue
         logger.error "  inserting node #{node} failed again with: #{e.message}"
       end

data/lib/puppetdb_query/parser.rb

@@ -15,25 +15,33 @@ module PuppetDBQuery
 
     # these are the operators we understand
     # rubocop:disable Style/ExtraSpacing
-    AND       = Operator.new(:_and,       true,  100, 2)
-    OR        = Operator.new(:_or,        true,   90, 2)
-    NOT       = Operator.new(:_not,       false, 150, 1, 1)
-    EQUAL     = Operator.new(:_equal,     true,  200, 2, 2)
-    NOT_EQUAL = Operator.new(:_not_equal, true,  200, 2, 2)
-    MATCH     = Operator.new(:_match,     true,  200, 2, 2)
-    IN        = Operator.new(:_in,        true,  200, 2, 2)
+    AND              = Operator.new(:_and,              true,  100, 2)
+    OR               = Operator.new(:_or,               true,   90, 2)
+    NOT              = Operator.new(:_not,              false, 150, 1, 1)
+    EQUAL            = Operator.new(:_equal,            true,  200, 2, 2)
+    NOT_EQUAL        = Operator.new(:_not_equal,        true,  200, 2, 2)
+    LESS             = Operator.new(:_less,             true,  190, 2, 2)
+    LESS_OR_EQUAL    = Operator.new(:_less_or_equal,    true,  190, 2, 2)
+    GREATER          = Operator.new(:_greater,          true,  190, 2, 2)
+    GREATER_OR_EQUAL = Operator.new(:_greater_or_equal, true,  190, 2, 2)
+    MATCH            = Operator.new(:_match,            true,  200, 2, 2)
+    IN               = Operator.new(:_in,               true,  200, 2, 2)
     # rubocop:enable Style/ExtraSpacing
 
     # map certain symbols (we get them from a tokenizer) to our operators
     OPERATORS = {
-      AND.symbol       =>  AND,
-      OR.symbol        =>  OR,
-      NOT.symbol       =>  NOT,
-      EQUAL.symbol     =>  EQUAL,
-      :_is             =>  EQUAL,
-      NOT_EQUAL.symbol =>  NOT_EQUAL,
-      MATCH.symbol     =>  MATCH,
-      IN.symbol        =>  IN,
+      AND.symbol              =>  AND,
+      OR.symbol               =>  OR,
+      NOT.symbol              =>  NOT,
+      EQUAL.symbol            =>  EQUAL,
+      :_is                    =>  EQUAL,
+      NOT_EQUAL.symbol        =>  NOT_EQUAL,
+      MATCH.symbol            =>  MATCH,
+      IN.symbol               =>  IN,
+      LESS.symbol             =>  LESS,
+      LESS_OR_EQUAL.symbol    =>  LESS_OR_EQUAL,
+      GREATER.symbol          =>  GREATER,
+      GREATER_OR_EQUAL.symbol =>  GREATER_OR_EQUAL,
     }.freeze
 
     attr_reader :symbols  # array of symbols

data/lib/puppetdb_query/to_mongo.rb

@@ -22,14 +22,15 @@ module PuppetDBQuery
     private
 
     # rubocop:disable Metrics/PerceivedComplexity,Metrics/CyclomaticComplexity,Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def query_term(term)
       # rubocop:disable Style/GuardClause
       if term.is_a?(Symbol)
         return term.to_s
       elsif term.is_a?(Integer)
-        return "'#{term}'"
+        return term
       elsif term.is_a?(TrueClass)
-        return term.to_s
+        return term
       elsif !term.is_a?(Term)
         return "'#{term}'"
       end
@@ -54,10 +55,19 @@ module PuppetDBQuery
         { term.args[0] => { :$regex => term.args[1].to_s } }
       when :_in
         { term.args[0] => { :$in => term.args[1] } }
+      when :_greater
+        { term.args[0] => { :$gt => term.args[1] } }
+      when :_greater_or_equal
+        { term.args[0] => { :$gte => term.args[1] } }
+      when :_less
+        { term.args[0] => { :$lt => term.args[1] } }
+      when :_less_or_equal
+        { term.args[0] => { :$lte => term.args[1] } }
       else
         raise "can't handle operator '#{term.operator}' yet"
       end
     end
     # rubocop:enable Metrics/PerceivedComplexity,Metrics/CyclomaticComplexity,Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/puppetdb_query/version.rb

@@ -1,3 +1,3 @@
 module PuppetDBQuery
-  VERSION = "0.0.39".freeze
+  VERSION = "0.0.41".freeze
 end

data/spec/puppetdb_query/to_mongo_spec.rb

@@ -69,6 +69,11 @@ describe PuppetDBQuery::ToMongo do
           { :$in => [:zoo, :kafka] }
       }
     ],
+    [ "operatingsystemmajrelease>6",
+      { operatingsystemmajrelease:
+          { :$gt => 6 },
+      }
+    ],
   ].freeze
 
   TO_MONGO_DATA.each do |q, a|

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_query
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.41
 platform: ruby
 authors:
 - Michael Meyling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: easy_diff
   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: Allow puppetdb access from resources like mongodb.
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -75,24 +75,24 @@ homepage: https://github.com/m-31/puppetdb_query
 licenses:
 - MIT
 metadata: {}
-post_install_message: "  Sitting quietly, doing nothing, spring comes, and grass grows
-  by itself."
+post_install_message: '  Sitting quietly, doing nothing, spring comes, and grass grows
+  by itself.'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: access puppetdb data from other sources