splicer-dynect 1.0.2 → 1.1.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2VlNGRiOWEwYzM3N2M3MTJkOGRmNjY0ODE5MjRlMDVjNTdmYTVhZg==
+  data.tar.gz: !binary |-
+    ZWYzNzliNTA4MmRhYmVkNGRiYmMwNzNjMzdkNzYzNDc2YmI5ZTkzMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Yzg1MTZiMzRlYzI2OTNiZTYxN2FhMTRmMGRiNTIxMDFkM2FmYTc0ZDE3ZGEz
+    ZGJjODdhNGMyMzM5ZTY5YzY4NmJiM2Y5MDcyMmQxYmVkMWJiMTZiNjIyYjg1
+    NjBhZDkzMDM4NTU1ZjM1ZTJkY2FlODQ1YTYwNWQ1ZDc5NGU5MDU=
+  data.tar.gz: !binary |-
+    ZmU5MWY1ZjI3OWIxNjkzNzAwMWE5ODY4MTRhZDUxOWJjNjQ4N2E0MTE5OWM0
+    N2QyODUyZmQxZWJiNzQ4ZjUyYzA2YjkwMzZlNzc0OTc3OTAyYjBjZjFkNGJm
+    Njk5MTcwZmEwOWIzNzc3ZDAzMzQ4NzgxZjFjNDUyOGU0MjI4NGQ=

data/lib/splicer/dynect/provider.rb

@@ -2,7 +2,7 @@ module Splicer
   module Dynect
 
     # @author Matthew A. Johnston <warmwaffles@gmail.com>
-    class Provider
+    class Provider < Splicer::Provider
       attr_reader :client
 
       def initialize(config)
@@ -10,121 +10,132 @@ module Splicer
         @client = config.client
       end
 
-      # @param [Dynect::Zone] zone
-      # @param [Symbol] method the way you want the zone published
-      def publish(zone, method)
+      def create_zone(zone)
         client.login
 
-        case method
-        when :rewrite
-          rewrite(zone)
-        when :merge
-          merge(zone)
-        else
-          false
+        client.post "Zone/#{zone.name}", rname: "admin@#{zone.name}", ttl: zone.ttl
+
+        zone.records.each do |record|
+          create_record(record, zone)
         end
 
+        publish_zone(zone)
       ensure
         client.logout
       end
 
-      def destroy(zone)
+      def update_zone(zone)
         client.login
-        delete_zone(zone)
+        get_zone(zone)
+
+        zone.records.each do |record|
+          update_record(record, zone)
+        end
+
+        publish_zone(zone)
       ensure
         client.logout
       end
 
-      private
-
-      def rewrite(zone)
+      def rewrite_zone(zone)
         delete_zone(zone)
+        create_zone(zone)
+      end
 
-        client.post "Zone/#{zone.name}", rname: "admin@#{zone.name}", ttl: zone.ttl
+      def delete_zone(zone)
+        client.login
+        get_zone(zone)
+        client.delete "Zone/#{zone.name}"
+      ensure
+        client.logout
+      end
 
-        zone.records.each do |record|
-          case record
-          when Splicer::Records::ARecord
-            create_record('ARecord', record, zone, rdata: { address: record.ip }, ttl: record.ttl)
-          when Splicer::Records::AAAARecord
-            create_record('AAAARecord', record, zone, rdata: { address: record.ip }, ttl: record.ttl)
-          when Splicer::Records::CNAMERecord
-            create_record('CNAMERecord', record, zone, rdata: { cname: record.cname }, ttl: record.ttl)
-          when Splicer::Records::MXRecord
-            create_record('MXRecord', record, zone, rdata: { exchange: record.exchanger, preference: record.priority }, ttl: record.ttl)
-          when Splicer::Records::NSRecord
-            create_record('NSRecord', record, zone, rdata: { nsdname: record.server }, ttl: record.ttl)
-          when Splicer::Records::PTRRecord
-            create_record('PTRRecord', record, zone,rdata: { ptrdname: record.host }, ttl: record.ttl)
-          when Splicer::Records::SPFRecord
-            create_record('SPFRecord', record, zone, rdata: { txtdata: record.text }, ttl: record.ttl)
-          when Splicer::Records::SRVRecord
-            create_record('SRVRecord', record, zone, rdata: { port: record.port, priority: record.priority, target: record.target, weight: record.weight }, ttl: record.ttl)
-          when Splicer::Records::TXTRecord
-            create_record('TXTRecord', record, zone, rdata: { txtdata: record.text }, ttl: record.ttl)
-          end
-        end
+      def delete_record_in_zone(record, zone)
+        client.login
+        id = find_record_id(record, zone)
+        return false unless id
 
-        client.put "Zone/#{zone.name}", publish: true
+        url = record_resource_url(record, zone).concat("/#{id}")
+        client.delete(url)
+        publish_zone(zone)
+      ensure
+        client.logout
       end
 
-      def merge(zone)
-        begin
-          client.get "Zone/#{zone.name}"
-        rescue Splicer::Errors::RequestError => error
-          client.post "Zone/#{zone.name}"
-        end
-
-        zone.records.each do |record|
-          case record
-          when Splicer::Records::ARecord
-            update_or_create_record('ARecord', record, zone, rdata: { address: record.ip }, ttl: record.ttl)
-          when Splicer::Records::AAAARecord
-            update_or_create_record('AAAARecord', record, zone, rdata: { address: record.ip }, ttl: record.ttl)
-          when Splicer::Records::CNAMERecord
-            update_or_create_record('CNAMERecord', record, zone, rdata: { cname: record.cname }, ttl: record.ttl)
-          when Splicer::Records::MXRecord
-            update_or_create_record('MXRecord', record, zone, rdata: { exchange: record.exchanger, preference: record.priority }, ttl: record.ttl)
-          when Splicer::Records::NSRecord
-            update_or_create_record('NSRecord', record, zone, rdata: { nsdname: record.server }, ttl: record.ttl)
-          when Splicer::Records::PTRRecord
-            update_or_create_record('PTRRecord', record, zone,rdata: { ptrdname: record.host }, ttl: record.ttl)
-          when Splicer::Records::SPFRecord
-            update_or_create_record('SPFRecord', record, zone, rdata: { txtdata: record.text }, ttl: record.ttl)
-          when Splicer::Records::SRVRecord
-            update_or_create_record('SRVRecord', record, zone, rdata: { port: record.port, priority: record.priority, target: record.target, weight: record.weight }, ttl: record.ttl)
-          when Splicer::Records::TXTRecord
-            update_or_create_record('TXTRecord', record, zone, rdata: { txtdata: record.text }, ttl: record.ttl)
-          end
-        end
+      def update_record_in_zone(record, zone)
+        client.login
+        update_record(record, zone)
+        publish_zone(zone)
+      ensure
+        client.logout
+      end
 
-        client.put "Zone/#{zone.name}", publish: true
+      def create_record_in_zone(record, zone)
+        client.login
+        create_record(record, zone)
+        publish_zone(zone)
+      ensure
+        client.logout
       end
 
       private
 
-      def delete_zone(zone)
+      def get_zone(zone)
         client.get "Zone/#{zone.name}"
-        client.delete "Zone/#{zone.name}"
-        true
-      rescue Splicer::Errors::RequestError => error
-        false
       end
 
-      def update_or_create_record(resource, record, zone, data={})
-        begin
-          client.put(resource_url(resource, record, zone), data)
-        rescue Splicer::Errors::RequestError => error
-          create_record(resource, record, zone, data)
+      def publish_zone(zone)
+        client.put "Zone/#{zone.name}", publish: true
+      end
+
+      def find_record_id(record, zone)
+        resources = client.get(record_resource_url(record, zone))
+        if resources['data'].empty?
+          return false
+        else
+          resources['data'].first.split('/').last
+        end
+      end
+
+      # Returns the proper record data for a specific record
+      # @param [Splicer::Records::Record] record
+      # @return [Hash]
+      def record_payload(record)
+        case record
+        when Splicer::Records::ARecord
+          { rdata: { address: record.ip }, ttl: record.ttl}
+        when Splicer::Records::AAAARecord
+          { rdata: { address: record.ip }, ttl: record.ttl}
+        when Splicer::Records::CNAMERecord
+          { rdata: { cname: record.cname }, ttl: record.ttl}
+        when Splicer::Records::MXRecord
+          { rdata: { exchange: record.exchanger, preference: record.priority }, ttl: record.ttl}
+        when Splicer::Records::NSRecord
+          { rdata: { nsdname: record.server }, ttl: record.ttl}
+        when Splicer::Records::PTRRecord
+          { rdata: { ptrdname: record.host }, ttl: record.ttl}
+        when Splicer::Records::SPFRecord
+          { rdata: { txtdata: record.text }, ttl: record.ttl}
+        when Splicer::Records::SRVRecord
+          { rdata: { port: record.port, priority: record.priority, target: record.target, weight: record.weight }, ttl: record.ttl}
+        when Splicer::Records::TXTRecord
+          { rdata: { txtdata: record.text }, ttl: record.ttl}
+        else
+          { }
         end
       end
 
-      def create_record(resource, record, zone, data={})
-        client.post(resource_url(resource, record, zone), data)
+      def update_record(record, zone)
+        client.put(record_resource_url(record, zone), record_payload(record))
+      end
+
+      def create_record(record, zone)
+        client.post(record_resource_url(record, zone), record_payload(record))
       end
 
-      def resource_url(resource, record, zone)
-        if record.name.nil? || record.name == zone.name
+      def record_resource_url(record, zone)
+        resource = record.class.name.split('::').last
+        if record.name.nil?
           "#{resource}/#{zone.name}/#{zone.name}"
         else
           "#{resource}/#{zone.name}/#{record.name}.#{zone.name}"

data/lib/splicer/dynect/version.rb

@@ -1,5 +1,5 @@
 module Splicer
   module Dynect
-    VERSION = "1.0.2"
+    VERSION = "1.1.1"
   end
 end

data/spec/splicer/dynect/provider_spec.rb

@@ -4,47 +4,31 @@ describe Splicer::Dynect::Provider do
   let(:config) { Splicer::Dynect::Config.new('customer','user','password') }
   let(:provider) { Splicer::Dynect::Provider.new(config) }
 
-  let(:client) { double('Splicer::Dynect::Client', login: true, logout: true) }
-  let(:zone) { double('Splicer::Zone') }
-
-  before { config.stub(:client).and_return(client) }
-
-  describe '#publish' do
-    context 'when merging a zone' do
-      subject { provider.publish(zone, :merge) }
-
-      context 'and dynect returns successfully' do
-        before { provider.stub(:merge).and_return(true) }
-        it { should eq(true) }
-      end
-
-      context 'and dynect returns an error' do
-        before { provider.stub(:merge).and_raise(Splicer::Errors::RequestError) }
-        it 'should raise Splicer::Errors::RequestError' do
-          expect { subject }.to raise_error(Splicer::Errors::RequestError)
-        end
-      end
-    end
-
-    context 'when rewriting a zone' do
-      subject { provider.publish(zone, :rewrite) }
-
-      context 'and dynect returns successfully' do
-        before { provider.stub(:rewrite).and_return(true) }
-        it { should eq(true) }
-      end
-
-      context 'and dynect returns an error' do
-        before { provider.stub(:rewrite).and_raise(Splicer::Errors::RequestError) }
-        it 'should raise and Splicer::Errors::RequestError' do
-          expect { subject }.to raise_error(Splicer::Errors::RequestError)
-        end
-      end
-    end
-
-    context 'when doing something undefined' do
-      subject { provider.publish(zone, :something) }
-      it { should eq(false) }
-    end
+  describe '#create_zone' do
+    subject { provider.create_zone(zone) }
+  end
+
+  describe '#update_zone' do
+    subject { provider.update_zone(zone) }
+  end
+
+  describe '#rewrite_zone' do
+    subject { provider.rewrite_zone(zone) }
+  end
+
+  describe '#delete_zone' do
+    subject { provider.delete_zone(zone) }
+  end
+
+  describe '#delete_record_in_zone' do
+    subject { provider.delete_record_in_zone(record, zone) }
+  end
+
+  describe '#update_record_in_zone' do
+    subject { provider.update_record_in_zone(record, zone) }
+  end
+
+  describe '#create_record_in_zone' do
+    subject { provider.create_record_in_zone(record, zone) }
   end
 end

data/splicer-dynect.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency('splicer', '~> 1.0')
+  spec.add_dependency('splicer', '~> 1.1')
   spec.add_dependency('rest-client')
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: splicer-dynect
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
 - Matthew Johnston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: splicer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,33 +108,26 @@ files:
 homepage: https://github.com/zippykid/splicer-dynect
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2750849641139883288
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2750849641139883288
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The splicer adapter for interacting Dynect
 test_files:
 - spec/spec_helper.rb