dnsimple-ruby 0.9.3 → 0.9.4

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/features/cli/contacts/create_contact.feature

@@ -0,0 +1,10 @@
+Feature: create a contact with the CLI
+  As a user
+  In order to add a contact to my list of contacts
+  I should be able to use the CLI to create a contact
+
+  @announce-cmd
+  Scenario:
+    Given I have set up my credentials
+    When I run `dnsimple contact:create first:John last:Smith address1:"Example Road" city:Anytown state:Florida postal_code:12345 country:US email:john.smith@example.com phone:12225051122 label:test-contact`
+    Then the output should contain "Created contact John Smith"

data/features/cli/domains/check_domain.feature

@@ -6,5 +6,5 @@ Feature: check a domain with the CLI
   @announce-cmd
   Scenario:
     Given I have set up my credentials
-    When I run "dnsimple check domain.com"
+    When I run `dnsimple check domain.com`
     Then the output should contain "Check domain result for domain.com: registered"

data/features/cli/templates/apply_template.feature

@@ -0,0 +1,11 @@
+Feature: apply a template to a domain
+  As a user
+  In order to apply a set of records to a domain at once
+  I should be able to use the CLI to apply a template
+
+  Scenario:
+    Given I have set up my credentials
+    When I run `dnsimple create` with a new domain
+    And I run `dnsimple apply` with the domain and the template named "googleapps"
+    Then the output should show that the template was applied
+    And I the domain should have 13 records

data/features/step_definitions/record_steps.rb

@@ -30,3 +30,9 @@ Then /^the output should show that the record was deleted$/ do
   steps %Q(Then the output should contain "Deleted #{@record_id} from #{@domain_name}")
 end
 
+Then /^I the domain should have (\d+) records$/ do |n|
+  steps %Q(
+    When I run `dnsimple record:list #{@domain_name}`
+    Then the output should contain "Found #{n} records for #{@domain_name}"
+  )
+end

data/features/step_definitions/template_steps.rb

@@ -0,0 +1,9 @@
+When /^I run `(.*)` with the domain and the template named "([^\"]*)"$/ do |cmd, template|
+  @template_name = template
+  steps %Q(When I run `#{cmd} #{@domain_name} #{template}`)
+end
+
+Then /^the output should show that the template was applied$/ do
+  steps %Q(Then the output should contain "Applied template #{@template_name} to #{@domain_name}")
+end
+

data/lib/dnsimple/client.rb

@@ -45,7 +45,11 @@ module DNSimple
     end
 
     def self.standard_options
-      {:basic_auth => credentials, :format => :json, :headers => {'Accept' => 'application/json'}}
+      {:format => :json, :headers => {'Accept' => 'application/json'}}
+    end
+
+    def self.standard_options_with_credentials
+      standard_options.merge({:basic_auth => credentials})
     end
   end
 end

data/lib/dnsimple/commands/create_contact.rb

@@ -14,7 +14,7 @@ module DNSimple
         end
 
         contact = Contact.create(attributes, options)
-        puts "Created #{contact.name} (id: #{contact.id})"
+        puts "Created contact #{contact.name} (id: #{contact.id})"
       end
     end
   end

data/lib/dnsimple/contact.rb

@@ -74,10 +74,10 @@ module DNSimple #:nodoc:
         contact_hash[Contact.resolve(attribute)] = self.send(attribute)
       end
 
-      options.merge!({:basic_auth => Client.credentials})
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       options.merge!({:body => {:contact => contact_hash}})
       
-      response = self.class.put("#{Client.base_uri}/contacts/#{id}.json", options)
+      response = self.class.put("#{Client.base_uri}/contacts/#{id}", options)
 
       pp response if Client.debug?
 
@@ -112,11 +112,19 @@ module DNSimple #:nodoc:
       aliases[name] || name
     end
 
+    def self.resolve_attributes(attributes)
+      resolved_attributes = {}
+      attributes.each do |k, v|
+        resolved_attributes[resolve(k)] = v
+      end
+      resolved_attributes
+    end
+
     # Create the contact with the given attributes in DNSimple.
     # This method returns a Contact instance of the contact is created
     # and raises an error otherwise.
     def self.create(attributes, options={})
-      contact_hash = attributes
+      contact_hash = resolve_attributes(attributes)
 
       options.merge!({:body => {:contact => contact_hash}})
       options.merge!({:basic_auth => Client.credentials})

data/lib/dnsimple/domain.rb

@@ -29,7 +29,7 @@ module DNSimple #:nodoc:
     # Delete the domain from DNSimple. WARNING: this cannot
     # be undone.
     def delete(options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       self.class.delete("#{Client.base_uri}/domains/#{id}", options)
     end
     alias :destroy :delete
@@ -37,7 +37,7 @@ module DNSimple #:nodoc:
     # Apply the given named template to the domain. This will add
     # all of the records in the template to the domain.
     def apply(template, options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       template = resolve_template(template)
       self.class.post("#{Client.base_uri}/domains/#{id}/templates/#{template.id}/apply", options)
     end
@@ -53,7 +53,7 @@ module DNSimple #:nodoc:
     end
 
     def applied_services(options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       response = self.class.get("#{Client.base_uri}/domains/#{id}/applied_services", options)
       pp response if Client.debug?
       case response.code
@@ -67,7 +67,7 @@ module DNSimple #:nodoc:
     end
 
     def available_services(options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       response = self.class.get("#{Client.base_uri}/domains/#{id}/available_services", options)
       pp response if Client.debug?
       case response.code
@@ -81,7 +81,7 @@ module DNSimple #:nodoc:
     end
 
     def add_service(id_or_short_name, options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       options.merge!(:body => {:service => {:id => id_or_short_name}})
       response = self.class.post("#{Client.base_uri}/domains/#{name}/applied_services", options)
       pp response if Client.debug?
@@ -96,7 +96,7 @@ module DNSimple #:nodoc:
     end
 
     def remove_service(id, options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       response = self.class.delete("#{Client.base_uri}/domains/#{name}/applied_services/#{id}", options)
       pp response if Client.debug?
       case response.code
@@ -111,7 +111,7 @@ module DNSimple #:nodoc:
 
     # Check the availability of a name
     def self.check(name, options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       response = self.get("#{Client.base_uri}/domains/#{name}/check", options)
       pp response if Client.debug?
       case response.code
@@ -130,7 +130,7 @@ module DNSimple #:nodoc:
     # method returns a Domain instance if the name is created
     # and raises an error otherwise.
     def self.create(name, options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
 
       domain_hash = {:name => name}
       options.merge!({:body => {:domain => domain_hash}})
@@ -150,7 +150,7 @@ module DNSimple #:nodoc:
     end
 
     def self.register(name, registrant={}, extended_attributes={}, options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
 
       body = {:domain => {:name => name}}
       if registrant[:id]
@@ -178,7 +178,7 @@ module DNSimple #:nodoc:
     # Find a specific domain in the account either by the numeric ID
     # or by the fully-qualified domain name.
     def self.find(id_or_name, options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       response = self.get("#{Client.base_uri}/domains/#{id_or_name}", options)
       
       pp response if Client.debug?
@@ -197,7 +197,7 @@ module DNSimple #:nodoc:
 
     # Get all domains for the account.
     def self.all(options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       response = self.get("#{Client.base_uri}/domains", options)
       
       pp response if Client.debug?

data/lib/dnsimple/record.rb

@@ -34,7 +34,7 @@ module DNSimple
         record_hash[Record.resolve(attribute)] = self.send(attribute)
       end
 
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       options.merge!(:body => {:record => record_hash})
 
       response = self.class.put("#{Client.base_uri}/domains/#{domain.id}/records/#{id}.json", options)
@@ -52,7 +52,7 @@ module DNSimple
     end
     
     def delete(options={})
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       self.class.delete("#{Client.base_uri}/domains/#{domain.id}/records/#{id}", options)
     end
     alias :destroy :delete
@@ -73,7 +73,7 @@ module DNSimple
       record_hash[:prio] = options.delete(:priority)
       record_hash[:prio] = options.delete(:prio) || ''
       
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       options.merge!({:query => {:record => record_hash}})
 
       response = self.post("#{Client.base_uri}/domains/#{domain.id}/records", options) 
@@ -94,7 +94,7 @@ module DNSimple
 
     def self.find(domain_name, id, options={})
       domain = Domain.find(domain_name)
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       response = self.get("#{Client.base_uri}/domains/#{domain.id}/records/#{id}", options)
 
       pp response if Client.debug?
@@ -113,7 +113,7 @@ module DNSimple
 
     def self.all(domain_name, options={})
       domain = Domain.find(domain_name)
-      options.merge!(DNSimple::Client.standard_options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       response = self.get("#{Client.base_uri}/domains/#{domain.id}/records", options)
 
       pp response if Client.debug?

data/lib/dnsimple/template.rb

@@ -25,12 +25,13 @@ module DNSimple
     # Delete the template from DNSimple. WARNING: this cannot
     # be undone.
     def delete(options={})
-      options.merge!({:basic_auth => Client.credentials})
-      self.class.delete("#{Client.base_uri}/templates/#{id}.json", options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
+      self.class.delete("#{Client.base_uri}/templates/#{id}", options)
     end
     alias :destroy :delete
 
     def self.create(name, short_name, description=nil, options={})
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
       template_hash = {
         :name => name, 
         :short_name => short_name,
@@ -38,9 +39,8 @@ module DNSimple
       }
 
       options.merge!(:body => {:dns_template => template_hash})
-      options.merge!({:basic_auth => Client.credentials})
 
-      response = self.post("#{Client.base_uri}/templates.json", options)
+      response = self.post("#{Client.base_uri}/templates", options)
 
       pp response if Client.debug?
 
@@ -55,8 +55,8 @@ module DNSimple
     end
 
     def self.find(id_or_short_name, options={})
-      options.merge!({:basic_auth => Client.credentials})
-      response = self.get("#{Client.base_uri}/templates/#{id_or_short_name}.json", options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
+      response = self.get("#{Client.base_uri}/templates/#{id_or_short_name}", options)
       
       pp response if Client.debug?
       
@@ -73,8 +73,8 @@ module DNSimple
     end
 
     def self.all(options={})
-      options.merge!({:basic_auth => Client.credentials})
-      response = self.get("#{Client.base_uri}/templates.json", options)
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
+      response = self.get("#{Client.base_uri}/templates", options)
 
       pp response if Client.debug?
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnsimple-ruby
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Anthony Eden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 +01:00
+date: 2011-03-26 00:00:00 +01:00
 default_executable: dnsimple
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,15 +171,18 @@ files:
 - bin/dnsimple
 - bin/dnsimple.rb
 - dnsimple-ruby.gemspec
+- features/cli/contacts/create_contact.feature
 - features/cli/domains/check_domain.feature
 - features/cli/domains/create_domain.feature
 - features/cli/domains/delete_domain.feature
 - features/cli/records/create_ptr_record.feature
 - features/cli/records/create_record.feature
 - features/cli/records/delete_record.feature
+- features/cli/templates/apply_template.feature
 - features/step_definitions/cli_steps.rb
 - features/step_definitions/domain_steps.rb
 - features/step_definitions/record_steps.rb
+- features/step_definitions/template_steps.rb
 - features/support/env.rb
 - lib/dnsimple.rb
 - lib/dnsimple/cli.rb