splicer-dns_made_easy 1.2.6 → 2.1.1

data/lib/splicer/dns_made_easy/config.rb

@@ -12,10 +12,6 @@ module Splicer
       def provider
         Provider.new(self)
       end
-
-      def client
-        Client.new(key, secret)
-      end
     end
 
   end

data/lib/splicer/dns_made_easy/domain.rb

@@ -9,13 +9,11 @@ module Splicer
         @data = params
       end
 
-      def id?
+      def persisted?
         !!@id
       end
+      alias_method :id?, :persisted?
 
-      def persisted?
-        id?
-      end
     end
 
   end

data/lib/splicer/dns_made_easy/provider.rb

@@ -7,7 +7,7 @@ module Splicer
 
       def initialize(config)
         @config = config
-        @client = config.client
+        @client = Client.new(config.key, config.secret)
       end
 
       def create_zone(zone)
@@ -15,36 +15,12 @@ module Splicer
         domain = find_domain(zone.name)
         return false if domain.persisted?
 
-        client.post('dns/managed', name: zone.name)
-
-        zone.records.each do |record|
-          create_record(domain.id, record)
-        end
-      end
-
-      def update_zone(zone)
-        Splicer.logger.debug "[SPLICER][DNSMADEEASY] #update_zone zone=#{zone.inspect}"
-        rewrite_zone(zone)
-      end
-
-      def rewrite_zone(zone)
-        Splicer.logger.debug "[SPLICER][DNSMADEEASY] #rewrite_zone zone=#{zone.inspect}"
-        domain = find_domain(zone.name)
-
-        unless domain.persisted?
-          client.post('dns/managed', name: zone.name)
-          domain = find_domain(zone.name)
-        end
-
-        if domain.persisted?
-          fetch_records(domain.id).each do |record|
-            delete_record(domain.id, record.id)
-          end
-        end
+        create_domain(zone)
 
         zone.records.each do |record|
           create_record(domain.id, record)
         end
+        true
       end
 
       def delete_zone(zone)
@@ -72,18 +48,19 @@ module Splicer
 
         records = find_records(record.name, record.type, domain.id)
         return false if records.empty?
-
         update_record(domain.id, records.first.id, record)
       end
 
       def create_record_in_zone(record, zone)
         Splicer.logger.debug "[SPLICER][DNSMADEEASY] #create_record_in_zone record=#{record.inspect} zone=#{zone.inspect}"
         domain = find_domain(zone.name)
-        return false unless domain.persisted?
+        unless domain.persisted?
+          create_domain(zone)
+          domain = find_domain(zone.name)
+        end
 
         records = find_records(record.name, record.type, domain.id)
         return false unless records.empty?
-
         create_record(domain.id, record)
       end
 
@@ -92,7 +69,7 @@ module Splicer
       # @param [Integer] domain_id
       # @return [Array<Splicer::DnsMadeEasy::Record>]
       def fetch_records(domain_id)
-        response = JSON.parse(client.get(records_resource_url(domain_id)))
+        response = JSON.parse(client.get(record_url(domain_id)))
         list = []
         response['data'].each do |r|
           list << Record.new(r)
@@ -103,13 +80,14 @@ module Splicer
       end
 
       # @param [Integer] domain_id
+      # @param [String] type
       # @return [Array<Splicer::DnsMadeEasy::Record>]
       def find_records(name, type, domain_id)
         payload = {
           type: type,
           recordName: name ? name : ''
         }
-        response = JSON.parse(client.get(records_resource_url(domain_id), payload))
+        response = JSON.parse(client.get(record_url(domain_id), payload))
         if response['data'].is_a?(Array)
           list = []
           response['data'].each do |params|
@@ -120,15 +98,20 @@ module Splicer
           [Record.new(response['data'])]
         end
       rescue Splicer::Errors::Error => error
-        Splicer.logger.debug "[SPLICER][DNSMADEEASY] #{error}"
         []
       end
 
+      def create_domain(zone)
+        client.post('dns/managed', name: zone.name)
+      end
+
       # @param [Integer] domain_id
       # @param [Splicer::Records::Record] splicer_record
       # @return [String]
       def create_record(domain_id, splicer_record)
-        client.post(records_resource_url(domain_id), record_resource_payload(splicer_record))
+        url = record_url(domain_id)
+        payload = record_payload(splicer_record)
+        client.post(url, payload)
       end
 
       # @param [Integer] record_id
@@ -136,19 +119,23 @@ module Splicer
       # @param [Splicer::Records::Record] splicer_record
       # @return [String]
       def update_record(domain_id, record_id, splicer_record)
-        client.put(records_resource_url(domain_id, record_id), record_resource_payload(splicer_record).merge({id: record_id}))
+        url = record_url(domain_id, record_id)
+        payload = record_payload(splicer_record).merge({id: record_id})
+        client.put(url, payload)
       end
 
       # @param [Integer] record_id
       # @param [Integer] domain_id
       # @return [String]
       def delete_record(domain_id, record_id)
-        client.delete(records_resource_url(domain_id, record_id), id: record_id)
+        url = record_url(domain_id, record_id)
+        payload = { id: record_id }
+        client.delete(url, payload)
       end
 
       # @param [Integer] domain_id
       # @return [String]
-      def records_resource_url(domain_id, record_id=nil)
+      def record_url(domain_id, record_id=nil)
         if record_id
           "dns/managed/#{domain_id}/records/#{record_id}"
         else
@@ -172,7 +159,7 @@ module Splicer
       # Returns a hash for the record data
       # @param [Splicer::Records::Record] record
       # @return [Hash]
-      def record_resource_payload(record)
+      def record_payload(record)
         payload = {
           type: record.type,
           gtdLocation: 'DEFAULT',

data/lib/splicer/dns_made_easy/record.rb

@@ -11,9 +11,10 @@ module Splicer
         @data = params
       end
 
-      def id?
+      def persisted?
         !!@id
       end
+      alias_method :id?, :persisted?
     end
 
   end

data/lib/splicer/dns_made_easy/version.rb

@@ -1,5 +1,5 @@
 module Splicer
   module DnsMadeEasy
-    VERSION = "1.2.6"
+    VERSION = "2.1.1"
   end
 end

data/spec/spec_helper.rb

@@ -5,3 +5,6 @@ require 'splicer/dns_made_easy'
 RSpec.configure do |config|
   config.mock_with :rspec
 end
+
+Splicer.configure do |config|
+end

data/spec/splicer/dns_made_easy/domain_spec.rb

@@ -3,5 +3,24 @@ require 'spec_helper'
 describe Splicer::DnsMadeEasy::Domain do
 
   describe '#initialize' do
+    def params
+      { 'id' => 1 }
+    end
+    subject { Splicer::DnsMadeEasy::Domain.new(params) }
+    its(:id) { should eq(1) }
+    its(:data) { should eq(params) }
+  end
+
+  describe '#persisted?' do
+    subject { domain.persisted? }
+    context 'when the domain is persisted' do
+      let(:domain) { Splicer::DnsMadeEasy::Domain.new({'id' => 1}) }
+      it { should be_true }
+    end
+
+    context 'when the domain is not persisted' do
+      let(:domain) { Splicer::DnsMadeEasy::Domain.new }
+      it { should be_false }
+    end
   end
 end

data/spec/splicer/dns_made_easy/provider_spec.rb

@@ -3,32 +3,54 @@ require 'spec_helper'
 describe Splicer::DnsMadeEasy::Provider do
   let(:config) { Splicer::DnsMadeEasy::Config.new('key','secret') }
   let(:provider) { Splicer::DnsMadeEasy::Provider.new(config) }
+  let(:domain) { Splicer::DnsMadeEasy::Domain.new({'id' => 1}) }
 
   describe '#create_zone' do
+    let(:zone) { Splicer::Zone.new('rspectesting.com') }
     subject { provider.create_zone(zone) }
-  end
 
-  describe '#update_zone' do
-    subject { provider.update_zone(zone) }
+    context 'when the domain exists' do
+      before do
+        provider.stub(:find_domain).and_return(domain)
+        provider.stub(:create_domain).and_raise(Splicer::Errors::RequestError)
+      end
+      it { should be_false }
+    end
+
+    context 'when the domain exists' do
+      before do
+        provider.stub(:find_domain).and_return(Splicer::DnsMadeEasy::Domain.new)
+        provider.stub(:create_domain).and_return(true)
+        provider.stub(:create_record).and_return(true)
+      end
+      it { should be_true }
+    end
   end
 
-  describe '#rewrite_zone' do
-    subject { provider.rewrite_zone(zone) }
-  end
 
   describe '#delete_zone' do
+    let(:zone) { Splicer::Zone.new('rspectesting.com') }
     subject { provider.delete_zone(zone) }
   end
 
+
   describe '#delete_record_in_zone' do
+    let(:record) { Splicer::Records::ARecord.new(nil, '127.0.0.1') }
+    let(:zone) { Splicer::Zone.new('rspectesting.com') }
     subject { provider.delete_record_in_zone(record, zone) }
   end
 
+
   describe '#update_record_in_zone' do
+    let(:record) { Splicer::Records::ARecord.new(nil, '127.0.0.1') }
+    let(:zone) { Splicer::Zone.new('rspectesting.com') }
     subject { provider.update_record_in_zone(record, zone) }
   end
 
+
   describe '#create_record_in_zone' do
+    let(:record) { Splicer::Records::ARecord.new(nil, '127.0.0.1') }
+    let(:zone) { Splicer::Zone.new('rspectesting.com') }
     subject { provider.create_record_in_zone(record, zone) }
   end
 end

data/spec/splicer/dns_made_easy/record_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Splicer::DnsMadeEasy::Record do
+  describe '#initialize' do
+    def params
+      {
+        'id' => 1,
+        'type' => 'A',
+        'value' => '127.0.0.1',
+        'ttl' => 3600
+      }
+    end
+    subject { Splicer::DnsMadeEasy::Record.new(params) }
+    its(:id) { should eq(params['id']) }
+    its(:type) { should eq(params['type']) }
+    its(:value) { should eq(params['value']) }
+    its(:ttl) { should eq(params['ttl']) }
+    its(:data) { should eq(params) }
+  end
+
+  describe '#persisted?' do
+    subject { record.persisted? }
+    context 'when the record is persisted' do
+      let(:record) { Splicer::DnsMadeEasy::Record.new({'id' => 1}) }
+      it { should be_true }
+    end
+
+    context 'when the record is not persisted' do
+      let(:record) { Splicer::DnsMadeEasy::Record.new }
+      it { should be_false }
+    end
+  end
+end

data/splicer-dns_made_easy.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.1')
+  spec.add_dependency('splicer', '~> 2.1')
   spec.add_dependency('rest-client')
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: splicer-dns_made_easy
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: splicer
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,7 @@ files:
 - spec/splicer/dns_made_easy/config_spec.rb
 - spec/splicer/dns_made_easy/domain_spec.rb
 - spec/splicer/dns_made_easy/provider_spec.rb
+- spec/splicer/dns_made_easy/record_spec.rb
 - splicer-dns_made_easy.gemspec
 homepage: https://github.com/zippykid/dns_made_easy
 licenses:
@@ -135,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 992635597092004664
+      hash: 2898526824841093068
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 992635597092004664
+      hash: 2898526824841093068
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -157,3 +158,4 @@ test_files:
 - spec/splicer/dns_made_easy/config_spec.rb
 - spec/splicer/dns_made_easy/domain_spec.rb
 - spec/splicer/dns_made_easy/provider_spec.rb
+- spec/splicer/dns_made_easy/record_spec.rb