dm-puppetdb-adapter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc43764da2ab76ebf53855bdc93cf7f11d6fb6b9
-  data.tar.gz: 9fbaf2dbab49f1b7b62e1bd0bb976d846034600f
+  metadata.gz: 445d518825690ce87e8ea8bbdf46bdfaa2947cd0
+  data.tar.gz: c8d0acc1b381d1de67e43029f9177fc2e0031ba4
 SHA512:
-  metadata.gz: 057bec1165d3c9588b6ad4316bb51ecd54ffe9cc83db02dd39b3002e9e87614f933756c6d4802015ab217cca2a6b942013038e6558fdc595f36dba81ac62d824
-  data.tar.gz: a0247bbcb3e0c2c1c5a721d0b9191ec79e7a3c597a52b55cff830eb3774f23a3c8a60a5cfb308172b81c23535980c2664ee8b9c9fbf3e8de8b16e90b40b1dc2e
+  metadata.gz: 959e86b132178136230087361e65008341df7500d6afd6ff82c775aee4caf20a777256c344d3d64e5aef97882fbc9de7229902738bdb7cc3caf4d98f1b16c3dc
+  data.tar.gz: 06bfa287b76ed9037112528da330ac049647ec2be1d8d03368672cc701ff34d9c4277d13eb7f4364518a0a5ace19120645db40036db58fe7e846ec0e7b9f8c76

data/.gitignore

@@ -0,0 +1 @@
+/*.gem

data/README.md

@@ -0,0 +1,53 @@
+# DataMapper PuppetDB Adapter
+
+## Install
+
+Requirements:
+
+* json
+* puppet 3.x
+* dm-types
+
+    gem install dm-puppetdb-adapter
+
+## Usage
+
+It will use the puppet configuration of the user it runs under, so make sure it has a SSL certificate that can connect to your PuppetDB instace.
+
+To setup the adapter:
+
+    DataMapper.setup(:default, {
+      :adapter => 'puppetdb',
+      :host => 'puppetdb.example.com',
+      :port => 8081,
+      :ssl => true,
+    })
+
+Or if you use it under `dm-rails` add this to `config/database.yml`:
+
+    defaults: &defaults
+      adapter: puppetdb
+      host: 'puppetdb.example.com'
+      port: 8081
+      ssl: true
+
+    development:
+      <<: *defaults
+
+    test:
+      <<: *defaults
+
+    production:
+      <<: *defaults
+
+To include all predefined PuppetDB models add this:
+
+    require "dm-puppetdb-adapter/models"
+
+Queries like `Node.all(:name.like => '%.example.com')` etc should then work. See the models and DataMapper documentation for more info on query syntax.
+
+## Notes
+
+* It handles subqueries by doing multiple queries to PuppetDB, so it doesn't have optimal performance for them.
+* There's no select method implemented on the adapter for doing manual queries yet.
+* PuppetDB can only search for some fields server side, so the other fields are filtered client side, but all of them work filtering against. Same goes for limits and offsets.

data/dm-puppetdb-adapter.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json'
   gem.add_dependency 'puppet', '~> 3'
   gem.add_dependency 'dm-types'
+  gem.add_dependency 'dm-core'
 
   gem.add_development_dependency 'rake'
 end

data/lib/dm-puppetdb-adapter/adapter.rb

@@ -11,11 +11,8 @@ module DataMapper
       attr_accessor :http, :host, :port, :ssl
 
       def read(query)
-        puts query.inspect
         model = query.model
 
-        pdbquery = build_query(query)
-        puts pdbquery.inspect
         query.filter_records(puppetdb_get(model.storage_name(model.repository_name), build_query(query)))
       end
 
@@ -37,61 +34,67 @@ module DataMapper
       # contruct a puppetdb query from a datamapper query
       def build_query(query)
         conditions = query.conditions
-        if conditions.empty?
+        if conditions.nil?
           nil
-        elsif conditions.one?
-          puppetdb_condition(conditions.first)
         else
-          q = ['and', *conditions.map do |c|
-            puppetdb_condition c
-          end.compact ]
-          # In case we couldn't build any query from the contained
-          # conditions return nil instead of a empty and
-          return q.last if q.count == 2
-          return nil if q.count < 2
-          q
+           puppetdb_condition(conditions, query.model)
         end
       end
 
       ##
       # return puppetdb syntax for a condition
-      def puppetdb_condition(c)
+      def puppetdb_condition(c, model)
         case c
         when DataMapper::Query::Conditions::NullOperation
           nil
         when DataMapper::Query::Conditions::AbstractOperation
-          q = [c.class.slug.to_s, *c.operands.map { |o| puppetdb_condition o }.compact]
+          q = [c.class.slug.to_s, *c.operands.map { |o| puppetdb_condition o, model }.compact]
           # In case we couldn't build any query from the contained
           # conditions return nil instead of a empty and
+          return q.last if q.count == 2
           return nil if q.count < 2
-          q
+          return q
+        end
+
+        # Determine the property we should match on
+        if c.subject.kind_of? DataMapper::Property
+          property = c.subject
+        elsif c.subject.kind_of? DataMapper::Associations::Relationship
+          property = c.subject.parent_key.first
+        else
+          puts "Unhandled subject #{c.subject.inspect}"
+          raise RuntimeError, "Unhandled subject #{c.subject.inspect}"
         end
 
         # We can only do comparison on certain fields
         # on the server side
-        if c.subject.model.respond_to? :server_fields
-          return nil unless c.subject.model.server_fields.include? c.subject.name
+        if property.model.respond_to? :server_fields
+          return nil unless property.model.server_fields.include? property.name
         end
 
         case c
         when DataMapper::Query::Conditions::EqualToComparison
-          ['=', c.subject.field, format_value(c.value)]
+          ['=', property.field, format_value(c.value)]
         when DataMapper::Query::Conditions::RegexpComparison
-          ['~', c.subject.field, format_value(c.value)]
+          ['~', property.field, format_value(c.value)]
         when DataMapper::Query::Conditions::LessThanComparison
-          ['<', c.subject.field, format_value(c.value)]
+          ['<', property.field, format_value(c.value)]
         when DataMapper::Query::Conditions::GreaterThanComparison
-          ['>', c.subject.field, format_value(c.value)]
+          ['>', property.field, format_value(c.value)]
         # The following comparison operators aren't supported by PuppetDB
         # So we emulate them
         when DataMapper::Query::Conditions::LikeComparison
-          ['~', c.subject.field, c.value.gsub('%', '.*')]
+          ['~', property.field, c.value.gsub('%', '.*')]
         when DataMapper::Query::Conditions::LessThanOrEqualToComparison
-          ['or', ['=', c.subject.field, format_value(c.value)], ['<', c.subject.field, format_value(c.value)]]
+          ['or', ['=', property.field, format_value(c.value)], ['<', property.field, format_value(c.value)]]
         when DataMapper::Query::Conditions::GreaterThanOrEqualToComparison
-          ['or', ['=', c.subject.field, format_value(c.value)], ['>', c.subject.field, format_value(c.value)]]
+          ['or', ['=', property.field, format_value(c.value)], ['>', property.field, format_value(c.value)]]
         when DataMapper::Query::Conditions::InclusionComparison
-          ['or', ['=', c.subject.field, format_value(c.value.first)], ['>', c.subject.field, format_value(c.value.first)], ['<', c.subject.field, format_value(c.value.last)], ['=', c.subject.field, format_value(c.value.last)]]
+          if c.value.kind_of? Range
+            ['or', ['=', property.field, format_value(c.value.first)], ['>', property.field, format_value(c.value.first)], ['<', property.field, format_value(c.value.last)], ['=', property.field, format_value(c.value.last)]]
+          else
+            ['or', *c.value.collect { |v| ['=', property.field, v.value]} ]
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm-puppetdb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Erik Dalén
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -74,8 +88,10 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 files:
+- .gitignore
 - Gemfile
 - LICENSE
+- README.md
 - dm-puppetdb-adapter.gemspec
 - lib/dm-puppetdb-adapter.rb
 - lib/dm-puppetdb-adapter/adapter.rb