pdns_api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e775769016b6af7782ddfa3baec55322b779ef01
-  data.tar.gz: a782baf51327ab968e84dfb96d1460caf2623df1
+  metadata.gz: c1a4f09dcbfd236725e10397468a523a9b9a19d4
+  data.tar.gz: 4294fc6d7f39065d5c64bdfe902a290def36b48d
 SHA512:
-  metadata.gz: e58156e4d03ee86e35cded0a95b35b6210d0c6af8294fc6618aaa818cf4cbe04df7b5e606aa2c9d0ba8b732c8a4e578d8adfc1ca1e1ed68ee563aae962c25696
-  data.tar.gz: ddc4ba236a91245518f8bb751a62efdcaf3912167435b5da82b63d0c0ccc5fbe80b87d84d380219807d429fa95bc40102efee8d9024c6a8d76eb23b974ebb507
+  metadata.gz: 5ddabc8ebca91f59ddb30cded068d20aba62054266d1c6faf7d89781037bfef3064ba0d046085dd78daecfd085c5a5bbbdd9021e4ba0af590d2fbb06b1073b9f
+  data.tar.gz: d26e976a7a9e62d8225193d848894337afe5b39a5272b7e78e92bb175cab7ae86f3b79575c6839ba85e0369878d0da815dfc248d66548e6aa9bf9412a29304fd

data/lib/pdns_api/api.rb

@@ -4,11 +4,14 @@ require 'pdns_api/http'
 module PDNS
   # Class for interacting with the API
   class API
+    attr_reader :url, :class, :version
+
     def initialize(args)
-      @version = args.key?(:version) ? args[:version] : 1
+      @class   = :client
       @http    = PDNS::HTTP.new(args)
+      @version = @http.version
+      @parent  = self
       @url     = @http.uri
-      @r_url   = @url
       @info    = {}
     end
 
@@ -27,7 +30,7 @@ module PDNS
     # Create this object on the server
     def create(info = nil)
       info(info)
-      @http.post(@r_url, @info)
+      @http.post("#{@parent.url}/#{@class}", @info)
     end
 
     # Get/set info

data/lib/pdns_api/client.rb

@@ -10,11 +10,11 @@ module PDNS
 
     ## Main methods
     def servers(id = nil)
-      return Server.new(@http, @url, id) unless id.nil?
+      return Server.new(@http, self, id) unless id.nil?
 
       # Return a hash of server objects
       servers = @http.get "#{@url}/servers"
-      servers.map! { |s| [s[:id], Server.new(@url, s[:id], s)] }.to_h
+      servers.map! { |s| [s[:id], Server.new(@http, self, s[:id], s)] }.to_h
     end
 
     alias server servers

data/lib/pdns_api/config.rb

@@ -4,20 +4,22 @@ module PDNS
   class Config < API
     attr_accessor :name, :value
 
-    def initialize(http, t_url, name, value = nil)
-      @http  = http
-      @name  = name
-      @r_url = "#{t_url}/config"
-      @url   = "#{t_url}/config/#{name}"
-      @value = value.get if value.nil?
-      value(value)
+    def initialize(http, parent, name, value = nil)
+      @class  = :config
+      @http   = http
+      @parent = parent
+      @name   = name
+      @url    = "#{parent.url}/#{@class}/#{name}"
+      @value  = value.get if value.nil?
+      value(@value)
     end
 
     ## Simple interfaces to metadata
     # Get/set config value
     def value(value = nil)
       return @info[:value] if value.nil?
-      @info = { type: 'ConfigSetting', namen: @name, value: value }
+      @value = value
+      @info  = { type: 'ConfigSetting', name: @name, value: value }
     end
 
     # Get configuration value

data/lib/pdns_api/cryptokey.rb

@@ -2,12 +2,13 @@
 module PDNS
   # Zone CryptoKey
   class CryptoKey < API
-    def initialize(http, t_url, id, info = {})
-      @http  = http
-      @id    = id
-      @info  = info
-      @r_url = "#{t_url}/metadata"
-      @url   = "#{t_url}/metadata/#{kind}"
+    def initialize(http, parent, id, info = {})
+      @class  = :cryptokeys
+      @http   = http
+      @parent = parent
+      @id     = id
+      @info   = info
+      @url    = "#{parent.url}/#{@class}/#{id}"
     end
 
     ## Simple interfaces to metadata

data/lib/pdns_api/http.rb

@@ -3,6 +3,7 @@ module PDNS
   # Class for doing HTTP requests
   class HTTP
     attr_accessor :headers
+    attr_reader   :version
 
     def initialize(args)
       @host    = args[:host]

data/lib/pdns_api/metadata.rb

@@ -2,12 +2,13 @@
 module PDNS
   # Zone Metadata
   class Metadata < API
-    def initialize(http, t_url, kind, info = {})
-      @http  = http
-      @kind  = kind
-      @info  = info
-      @r_url = "#{t_url}/metadata"
-      @url   = "#{t_url}/metadata/#{kind}"
+    def initialize(http, parent, kind, info = {})
+      @class  = :metadata
+      @http   = http
+      @parent = parent
+      @kind   = kind
+      @info   = info
+      @url    = "#{parent.url}/metadata/#{kind}"
     end
 
     ## Simple interfaces to metadata

data/lib/pdns_api/override.rb

@@ -4,12 +4,13 @@ module PDNS
   class Override < API
     attr_reader :id, :url, :info
 
-    def initialize(http, t_url, id, info = {})
-      @http  = http
-      @id    = id
-      @info  = info
-      @r_url = "#{t_url}/metadata"
-      @url   = "#{t_url}/metadata/#{kind}"
+    def initialize(http, parent, id, info = {})
+      @class  = :overrides
+      @http   = http
+      @parent = parent
+      @id     = id
+      @info   = info
+      @url    = "#{parent.url}/#{@class}/#{id}"
     end
 
     ## Simple interfaces to overrides

data/lib/pdns_api/server.rb

@@ -6,14 +6,15 @@ require 'pdns_api/zone'
 module PDNS
   # PDNS Server
   class Server < API
-    attr_reader :id, :url
-
-    def initialize(http, t_url, id, info = {})
-      @http  = http
-      @id    = id
-      @r_url = "#{t_url}/servers"
-      @url   = "#{t_url}/servers/#{id}"
-      @info  = info
+    attr_reader :id
+
+    def initialize(http, parent, id, info = {})
+      @class  = :servers
+      @http   = http
+      @parent = parent
+      @id     = id
+      @url    = "#{parent.url}/#{@class}/#{id}"
+      @info   = info
     end
 
     ## Server interfaces
@@ -45,8 +46,8 @@ module PDNS
 
     # Get or set server config
     def config(name = nil, value = nil)
-      return Config.new(@http, @url, name, value).create unless name.nil? || value.nil?
-      return Config.new(@http, @url, name) unless name.nil?
+      return Config.new(@http, self, name, value).create unless name.nil? || value.nil?
+      return Config.new(@http, self, name) unless name.nil?
 
       # Get all current configuration
       config = @http.get("#{@url}/config")
@@ -55,18 +56,18 @@ module PDNS
 
     # Get or set server overrides, not yet implemented
     def overrides(id = nil)
-      return Override.new(@http, @url, id) unless id.nil?
+      return Override.new(@http, self, id) unless id.nil?
 
       overrides = @http.get("#{@url}/config")
-      overrides.map { |o| [o[:id], Override.new(@http, @url, o[:id], o)] }.to_h
+      overrides.map { |o| [o[:id], Override.new(@http, self, o[:id], o)] }.to_h
     end
 
     # Get zones or create one
     def zones(zone_id = nil)
-      return Zone.new(@http, @url, zone_id) unless zone_id.nil?
+      return Zone.new(@http, self, zone_id) unless zone_id.nil?
 
       zones = @http.get("#{@url}/zones")
-      zones.map { |z| [z[:id], Zone.new(@http, @url, z[:id], z)] }.to_h
+      zones.map { |z| [z[:id], Zone.new(@http, self, z[:id], z)] }.to_h
     end
 
     alias override overrides

data/lib/pdns_api/version.rb

@@ -1,4 +1,4 @@
 # PDNS version
 module PDNS
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/lib/pdns_api/zone.rb

@@ -5,14 +5,15 @@ module PDNS
 
   # Zone
   class Zone < API
-    attr_reader :id, :url
-
-    def initialize(http, t_url, id, info = {})
-      @http  = http
-      @id    = id
-      @info  = info
-      @r_url = "#{t_url}/zones"
-      @url   = "#{t_url}/zones/#{id}"
+    attr_reader :id
+
+    def initialize(http, parent, id, info = {})
+      @class  = :zones
+      @http   = http
+      @parent = parent
+      @id     = id
+      @info   = info
+      @url    = "#{parent.url}/#{@class}/#{id}"
     end
 
     ## Zone interfaces
@@ -55,8 +56,8 @@ module PDNS
 
     # Manipulate metadata for a zone
     def metadata(kind = nil, value = nil)
-      return Metadata.new(@http, @url, kind, value).create unless kind.nil? || value.nil?
-      return Metadata.new(@http, @url, kind) unless kind.nil?
+      return Metadata.new(@http, self, kind, value).create unless kind.nil? || value.nil?
+      return Metadata.new(@http, self, kind) unless kind.nil?
 
       # Get all current metadata
       metadata = @http.get("#{@url}/metadata")
@@ -70,13 +71,13 @@ module PDNS
 
     # Change cryptokeys for a zone
     def cryptokeys(id = nil)
-      return CryptoKey.new(@http, @url, id) unless id.nil?
+      return CryptoKey.new(@http, self, id) unless id.nil?
 
       # Get all current metadata
       cryptokeys = @http.get("#{@url}/cryptokeys")
 
       # Convert cryptokeys to hash
-      cryptokeys.map! { |c| [c[:id], CryptoKey.new(@http, @url, c[:id], c)] }.to_h
+      cryptokeys.map! { |c| [c[:id], CryptoKey.new(@http, self, c[:id], c)] }.to_h
     end
 
     ## Additional methods
@@ -108,7 +109,7 @@ module PDNS
         record[:disabled] ||= !!rrset[:disabled]
 
         # Return record
-        next record unless @version == 0
+        next record unless @http.version == 0
 
         # But add some more for APIv0
         record.merge(name: rrset[:name], type: rrset[:type], ttl: rrset[:ttl])
@@ -126,7 +127,7 @@ module PDNS
       return data if data.key?(:error)
 
       # Run v0 version
-      return add_v0(rrsets, data) if @version == 0
+      return add_v0(rrsets, data) if @http.version == 0
 
       # Add these records to the rrset
       rrsets.map! do |rrset|
@@ -178,7 +179,7 @@ module PDNS
         rrset[:changetype] = 'DELETE'
         rrset
       end
-      apply(rrsets)
+      modify(rrsets)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdns_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Silke Hofstra