dynect_rest 0.4.1 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/dynect_rest.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dynect_rest}
-  s.version = "0.4.0"
+  s.name = "dynect_rest"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Adam Jacob}]
-  s.date = %q{2011-06-08}
-  s.description = %q{Use the Dynect services REST API}
-  s.email = %q{adam@opscode.com}
+  s.authors = ["Adam Jacob"]
+  s.date = "2012-04-11"
+  s.description = "Use the Dynect services REST API"
+  s.email = "adam@opscode.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -33,10 +33,10 @@ Gem::Specification.new do |s|
     "spec/dynect_rest_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/adamhjk/dynect-rest}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Dynect REST API library}
+  s.homepage = "http://github.com/adamhjk/dynect-rest"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Dynect REST API library"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/dynect_rest.rb

@@ -32,12 +32,14 @@ class DynectRest
   # @param [String] Your dynect password
   # @param [String] The zone you are going to be editing
   # @param [Boolean] Whether to connect immediately or not - runs login for you
-  def initialize(customer_name, user_name, password, zone=nil, connect=true)
+  # @param [Boolean] Verbosity
+  def initialize(customer_name, user_name, password, zone=nil, connect=true, verbose=false)
     @customer_name = customer_name
     @user_name = user_name
     @password = password
     @rest = RestClient::Resource.new('https://api2.dynect.net/REST/', :headers => { :content_type => 'application/json' })
     @zone = zone 
+    @verbose = verbose
     login if connect
   end
 
@@ -128,13 +130,7 @@ class DynectRest
   ##
   %w{AAAA A CNAME DNSKEY DS KEY LOC MX NS PTR RP SOA SRV TXT}.each do |record_type|
     define_method underscore(record_type) do
-      DynectRest::Resource.new(self,"#{record_type}Record" , @zone)
-    end
-  end
-
-  %w{Node NodeList}.each do |type|
-    define_method underscore(type) do
-      DynectRest::Resource.new(self,"#{type}" , @zone)
+      DynectRest::Resource.new(self,"#{record_type}" , @zone)
     end
   end
 
@@ -190,7 +186,9 @@ class DynectRest
       response = block.call
       response.body
     rescue RestClient::Exception => e
-      puts "I have #{e.inspect} with #{e.http_code}"
+      if @verbose
+        puts "I have #{e.inspect} with #{e.http_code}"
+      end
       if e.http_code == 307
         get(e.response)
       end

data/lib/dynect_rest/resource.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,13 +25,13 @@ class DynectRest
       @dynect = dynect
       @record_type = record_type
       @fqdn = fqdn
-      @record_id = record_id 
-      @ttl = ttl 
+      @record_id = record_id
+      @ttl = ttl
       @zone = zone
-      @rdata = rdata 
+      @rdata = rdata
     end
 
-    def [](rdata_key) 
+    def [](rdata_key)
       @rdata[rdata_key]
     end
 
@@ -42,7 +42,7 @@ class DynectRest
     def fqdn(value=nil)
       value ? (@fqdn = value; self) : @fqdn
     end
-    
+
     def record_id(value=nil)
       value ? (@record_id = value; self) : @record_id
     end
@@ -52,10 +52,11 @@ class DynectRest
     end
 
     def resource_path(full=false)
-      if (full == true || full == :full) 
-        "/REST/#{@record_type}Record/#{@zone}"
+      @record_type << "Record" unless @record_type[-6,6] == "Record"
+      if (full == true || full == :full)
+        "/REST/#{@record_type}/#{@zone}"
       else
-        "#{@record_type}Record/#{@zone}"
+        "#{@record_type}/#{@zone}"
       end
     end
 
@@ -63,7 +64,7 @@ class DynectRest
       if record_id && fqdn
         raw_rr = @dynect.get("#{resource_path}/#{fqdn}/#{record_id}")
         DynectRest::Resource.new(dynect,
-                                 raw_rr["record_type"] + 'Record',
+                                 raw_rr["record_type"],
                                  raw_rr["zone"],
                                  raw_rr["fqdn"],
                                  raw_rr["record_id"],
@@ -79,10 +80,10 @@ class DynectRest
           end
         end
         case raw_rr_list.length
-          when 0
-            raise DynectRest::Exceptions::RequestFailed, "Cannot find #{record_type} record for #{fqdn}"
-          when 1
-            raw_rr_list[0]
+        when 0
+          raise DynectRest::Exceptions::RequestFailed, "Cannot find #{record_type} record for #{fqdn}"
+        when 1
+          raw_rr_list[0]
         else
           raw_rr_list
         end
@@ -107,7 +108,7 @@ class DynectRest
       else
         if replace == true || replace == :replace
           @dynect.put("#{resource_path}/#{@fqdn}", self)
-        else 
+        else
           @dynect.post("#{resource_path}/#{@fqdn}", self)
         end
       end
@@ -145,4 +146,3 @@ class DynectRest
   end
 
 end
-

data/spec/dynect_rest_spec.rb

@@ -74,14 +74,4 @@ describe DynectRest do
     subject { d.txt }
     its(:resource_path) { should == 'TXTRecord/zone' }
   end
-
-  describe "node_list" do
-    subject { d.node_list }
-    its(:resource_path) { should == 'NodeList/zone' }
-  end
-
-  describe "node" do
-    subject { d.node }
-    its(:resource_path) { should == 'Node/zone' }
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynect_rest
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &21760740 !ruby/object:Gem::Requirement
+  requirement: &17352460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21760740
+  version_requirements: *17352460
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21759880 !ruby/object:Gem::Requirement
+  requirement: &17351940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21759880
+  version_requirements: *17351940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21758720 !ruby/object:Gem::Requirement
+  requirement: &17369800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21758720
+  version_requirements: *17369800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21799120 !ruby/object:Gem::Requirement
+  requirement: &17368800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *21799120
+  version_requirements: *17368800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &21798260 !ruby/object:Gem::Requirement
+  requirement: &17368240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21798260
+  version_requirements: *17368240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21797320 !ruby/object:Gem::Requirement
+  requirement: &17367600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21797320
+  version_requirements: *17367600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21796000 !ruby/object:Gem::Requirement
+  requirement: &17366920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *21796000
+  version_requirements: *17366920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &21795520 !ruby/object:Gem::Requirement
+  requirement: &17366360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21795520
+  version_requirements: *17366360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21794980 !ruby/object:Gem::Requirement
+  requirement: &17365740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21794980
+  version_requirements: *17365740
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &21794440 !ruby/object:Gem::Requirement
+  requirement: &17364880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21794440
+  version_requirements: *17364880
 description: Use the Dynect services REST API
 email: adam@opscode.com
 executables: []