globodns_client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd7ba5a0fefa7e06cabe7d77e6d71235c1c9feaf
-  data.tar.gz: bb245192fe6ba4f17142106a0f6a68c98f6d816c
+  metadata.gz: 7300f512dc21e6fe0fbffe785909a011052f5f5b
+  data.tar.gz: 93251bb520a97c317a7094bcc8ca8f8f7ae0e6dd
 SHA512:
-  metadata.gz: '0943026588a318eb62a88510f4b1cd7d3591b49b6be51eb58840e575a80870b625e0321b2e335d9c3d93dceb1b0ecab8eb0035435a3c5e1458282812b11bb20d'
-  data.tar.gz: 0721e82fc8f5426ed2e85c2f4614b2793d980b07431cdb5b9d75e0bf42e0a41de3ad433bc69994a6c7caab173ae84f0e4d5f873202be408ff915d31de08b416f
+  metadata.gz: 017d974ca203a02c4156c1b14c94309f54c482db8fa503084dbf917de7b6a961c1b13e64fa2153d288c47cda017e6babe481ffe3a43a48733e000c4ab06d6e6a
+  data.tar.gz: 20e968a171d48e194bcc9e9fb77ffc5be5b1269da3311b1382f9e9c2e55d93e11de141c94b4e97682962c8fb4c4c2333dba85a3d99745841b96d382cedd337b6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.2.1](https://github.com/globocom/globodns-client-ruby/releases/tag/v0.2.1) (21/08/17)
+##### - Enhancements
+ * Added CNAME records operations (get and create)
+ * Function to get a domain (from a record (record + domain) name of any type or only the domain name)
+
 ## [0.2.0](https://github.com/globocom/globodns-client-ruby/releases/tag/v0.2.0) (25/01/17)
 ##### - Enhancements
  * Authenticantion using bearer_token
@@ -9,4 +14,4 @@
 
 
 ## [0.1.x]
-*  Authentication using auth_token
+*  Authentication using auth_token

data/globodns_client.gemspec

@@ -29,8 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rest-client"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mocha"
   spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "byebug"
 end

data/lib/globodns_client/connection.rb

@@ -14,6 +14,21 @@ module GlobodnsClient
       @bearer_token = token
     end
 
+    def get_domain(key)
+      domain = key.dup
+      domain.chomp!('.')
+      res = {}
+      while domain.count('.') >= 1
+        res = request('get','domain', domain)
+        if !res.empty?
+          domain = ""
+        else
+          domain.gsub!(/^([a-zA-Z0-9\-_]*.)/,'')
+        end
+      end
+      res unless res.empty?
+    end
+
     def get_zone(key, kind = 'A')
       res = request('get','domain', key, nil, kind)
       if kind.eql?('A') && !res.empty?
@@ -24,7 +39,7 @@ module GlobodnsClient
     end
 
     def get_zone_recursive(key, kind = 'A')
-      if kind.eql?('A')
+      if kind.eql?('A') or kind.eql?('CNAME')
         domain = key.split('.', 2).last
       elsif kind.eql?('PTR')
         if key.include?('in-addr.arpa')
@@ -38,7 +53,7 @@ module GlobodnsClient
       end
       res = request('get','domain', domain, nil, kind)
       if res.empty?
-        if domain.count('.') > 1 && kind == 'A' || domain.count('.') > 2 && kind == 'PTR'
+        if domain.count('.') > 1 && (kind == 'A' or kind == 'CNAME') || domain.count('.') > 2 && kind == 'PTR'
           res = get_zone_recursive(domain, kind)
         else
           raise GlobodnsClient::NotFound, "Couldn't find a proper zone for '#{key}'"
@@ -47,27 +62,32 @@ module GlobodnsClient
       res
     end
 
-    def get_record(key, kind, zones=[])
-      zones.flatten!
+    def get_record(key, kind, zone)
+      zone.flatten!
       res = []
-      zones = get_zone(key, kind) if zones.nil?
-      zones.each do |zone|
-        host = get_host(key, zone, kind)
-        response = request('get', 'record', host, zone['domain']['id'], kind)
-        response.each do |r|
-          res << r[kind.downcase] unless r[kind.downcase].nil?
-        end
+      zone = get_zone(key, kind) if zone.nil?
+      host = get_host(key, zone, kind)
+      response = request('get', 'record', host, zone[0][:domain][:id], kind)
+      response.each do |r|
+        res << r[kind.downcase.to_sym] unless r[kind.downcase.to_sym].nil?
       end
       res.empty? ? false : res
     end
 
     def new_record(key, kind, value)
-      zone = get_zone(key, kind)
-      if record = get_record(key, kind, zone)
-        raise GlobodnsClient::AlreadyExists, "Item (#{key}) already exists with reference (#{record['content']})"
-      else
+      zone = get_domain key
+      unless zone.nil?
+        a_records = get_record(key, 'A', zone)
+        case kind
+        when 'A'
+          raise GlobodnsClient::AlreadyExists, "Item (#{key}) already exists with reference (#{a_records[0][:content]})" if a_records.collect{|r| r[:content]}.include? value
+        when 'CNAME'
+          cname_records = get_record(key, 'CNAME', zone)
+          raise GlobodnsClient::AlreadyExists, "Item (#{key}) already exists" if a_records or cname_records
+        end
+
         host = get_host(key, zone, kind)
-        response = request('post', 'record', host, zone['id'], kind, value)
+        response = request('post', 'record', host, zone[0][:domain][:id], kind, value)
       end
       begin
         schedule_export
@@ -78,30 +98,28 @@ module GlobodnsClient
 
     def delete_record(key, kind)
       zone = get_zone(key, kind)
-      unless record = get_record(key, kind, zone)
+      unless records = get_record(key, kind, zone)
         raise GlobodnsClient::NotFound, "Record not found for (#{key})"
       end
-      response = request('delete', 'record', nil, record['id'])
+      response=[]
+      records.each do |record|
+        response << request('delete', 'record', nil, record[:id])
+      end
       begin
         schedule_export
       rescue Exception
+      ensure
+        response
       end
-      response
     end
 
     private
 
     def get_host(key, zone, kind)
-      if kind.eql?('A')
-        host = key.split('.'+zone['domain']['name'])[0]
-        # não sei pq fiz esse bloco em baixo (if/else)
-        # if  key == zone['domain']['name']
-        #   host = nil
-        # else
-        #   host = key.split('.'+zone['domain']['name'])[0]
-        # end
+      if kind.eql?('A') or kind.eql?('CNAME')
+        host = key.split('.'+zone[0][:domain][:name])[0]
       elsif kind.eql?('PTR')
-        case zone['domain']['name'].count('.')
+        case zone[0][:domain][:name].count('.')
         when 4, 5
           host = key.split('.').last
         when 3
@@ -132,10 +150,12 @@ module GlobodnsClient
 
       case method
         when 'get'
-          if type.eql?('A')
+          if type.eql?('A') or type.eql?('CNAME')
             headers[:params] = {query: value}
           elsif type.eql?('PTR')
             headers[:params] = {query: value, reverse: true}
+          elsif kind.eql?('domain')
+            headers[:params] = {query: value}
           else
             raise "Not implemented"
           end
@@ -159,7 +179,7 @@ module GlobodnsClient
       if response.code < 200 || response.code > 399
         raise "Couldn't get a response from GloboDNS - code (#{response.code} / message #{response.body})"
       end
-      method.eql?('delete') ? "" : JSON.parse(response.body)
+      method.eql?('delete') ? "" : JSON.parse(response.body, {:symbolize_names => true, :object_class => Hash})
     end
   end
 

data/lib/globodns_client/version.rb

@@ -1,3 +1,3 @@
 module GlobodnsClient
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: globodns_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ernesto Thorp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: Simple client for GloboDNS API.
 email:
 - ernesto@corp.globo.com
@@ -123,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Simple client for GloboDNS API.