gandirb 1.1.1 → 2.0.0

data/spec/gandi/errors_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'gandi/errors'
+
+describe Gandi::DataError do
+  it "should define a custom error class" do
+    Gandi::DataError.ancestors.should include(ArgumentError)
+  end
+end
+describe Gandi::ServerError do
+  it "should define a custom error class" do
+    Gandi::ServerError.ancestors.should include(RuntimeError)
+  end
+end
+describe Gandi::NoMethodError do
+  it "should define a custom error class" do
+    Gandi::NoMethodError.ancestors.should include(NoMethodError)
+  end
+end

data/spec/gandi/gandi_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+require 'gandi'
+
+describe Gandi do
+  it "should have a settable url defaulting to the test url" do
+    Gandi.url.should == Gandi::TEST_URL
+    Gandi.url = 'settable url'
+    Gandi.url.should == 'settable url'
+  end
+  
+  it "should have a settable apikey" do
+    Gandi.apikey.should == nil
+    Gandi.apikey = 'settable apikey'
+    Gandi.apikey.should == 'settable apikey'
+  end
+  
+  it "should have a settable connection" do
+    Gandi.apikey = 'settable apikey'
+    Gandi.url = 'settable url'
+    Gandi::Connection.should_receive(:new).with('settable apikey', 'settable url').once.and_return('connection object')
+    Gandi.connection.should == 'connection object'
+    
+    Gandi.connection = 'settable connection'
+    Gandi.connection.should == 'settable connection'
+  end
+  
+  context "with a connection" do
+    before do
+      @connection = double()
+      Gandi.connection = @connection
+    end
+    
+    describe "#call" do
+      it "passes the called method to the connection" do
+        @connection.should_receive(:call).with('called.method', 'arg1', 'arg2').once.and_return('returned value')
+        Gandi.call('called.method', 'arg1', 'arg2').should == 'returned value'
+      end
+    end
+    
+    describe "#api_version" do
+      it "returns a string containing the current version" do
+        @connection.should_receive(:call).with('version.info').once.and_return({"api_version"=>'X.Y'})
+        Gandi.api_version.should == 'X.Y'
+      end
+    end
+    
+    it "resets the connection when changing the url" do
+      Gandi.url = Gandi::TEST_URL
+      Gandi.connection.should_not == @connection
+    end
+    
+    it "resets the connection when changing the apikey" do
+      Gandi.apikey = 'apikey'
+      Gandi.connection.should_not == @connection
+    end
+  end
+end

data/spec/gandi/operation_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+require 'gandi'
+
+describe Gandi::Operation do
+  before do
+    @connection_mock = double()
+    ::Gandi.connection = @connection_mock
+  end
+  
+  context "a new instance" do
+    before do
+      @id = '123'
+      @attributes = operation_information_attributes_hash('id' => '123')
+      @connection_mock.should_receive(:call).with('operation.info', @id).and_return(@attributes)
+    end
+    subject { Gandi::Operation.new(@id) }
+    
+    its(:id) { should == @id }
+    
+    it "can read its attributes" do
+      subject.to_hash.should == @attributes
+      subject['step'].should == @attributes['step']
+    end
+    
+    it "can fetch its informations" do
+      @connection_mock.should_receive(:call).with('operation.info', @id).and_return(@attributes)
+      subject.info['step'].should == @attributes['step']
+    end
+    
+    describe '#cancel' do
+      context "successful" do
+        before do
+          @connection_mock.should_receive(:call).with('operation.cancel', @id).and_return(true)
+          @cancel_result = subject.cancel
+        end
+        
+        specify { @cancel_result.should be_true }
+        specify { subject['step'].should == 'CANCEL' }
+      end
+      
+      #Can this really happen ?
+      context "failed" do
+        before do
+          @connection_mock.should_receive(:call).with('operation.cancel', @id).and_return(false)
+          @cancel_result = subject.cancel
+        end
+        
+        specify { @cancel_result.should be_false }
+        specify { subject['step'].should == @attributes['step'] }
+      end
+    end
+  end
+  
+  describe '.count' do
+    it "returns an integer" do
+      @connection_mock.should_receive(:call).with('operation.count', {}).and_return(42)
+      Gandi::Operation.count.should == 42
+    end
+  end
+  
+  describe '.list' do
+    it "returns an array of operations" do
+      @operations_array = [operation_information_attributes_hash('id' => '123'), operation_information_attributes_hash('id' => '456')]
+      @connection_mock.should_receive(:call).with('operation.list', {}).and_return(@operations_array)
+      
+      operations = Gandi::Operation.list
+      
+      operations.length.should == @operations_array.length
+      operations.first.should be_a(Gandi::Operation)
+      operations.first.id.should == @operations_array.first['id']
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end

data/spec/support/contact_macros.rb

@@ -0,0 +1,18 @@
+module ContactMacros
+  def contact_information_attributes_hash(ext_attrs = {})
+    {"city"=>"Aix", 
+      "given"=>"John", 
+      "family"=>"Doe", 
+      "zip"=>"13100", 
+      "country"=>"FR", 
+      "streetaddr"=>"1 Rue du Pont", 
+      "phone"=>"+33.400000000", 
+      "password"=>"password", 
+      "type"=>0, 
+      "email"=>"johndoe@domain1.tld"}.merge(ext_attrs)
+  end
+end
+
+RSpec.configure do |config|
+  config.include ContactMacros
+end

data/spec/support/domain_macros.rb

@@ -0,0 +1,103 @@
+module DomainMacros
+  def domain_information_attributes_hash(ext_attrs = {})
+    year, month, day, hour, min, sec = 1970, 1, 1, 1, 1, 1
+    {
+      "status"=>["clientTransferProhibited"], 
+      "date_renew_end"=> XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "date_pending_delete_end"=> XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "zone_id"=> 1, 
+      "tags"=>[], 
+      "date_updated"=> XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "date_delete"=> XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "contacts"=>{
+        "owner"=>{"handle"=>"FLN123-GANDI", "id"=>1}, 
+        "admin"=>{"handle"=>"FLN123-GANDI", "id"=>1}, 
+        "bill"=>{"handle"=>"FLN123-GANDI", "id"=>1}, 
+        "tech"=>{"handle"=>"FLN123-GANDI", "id"=>1}, 
+        "reseller"=>{"handle"=>"FLN123-GANDI", "id"=>1}
+      },
+      "date_registry_end"=> XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "nameservers"=>["a.dns.gandi.net", "b.dns.gandi.net", "c.dns.gandi.net"], 
+      "authinfo"=>"aaa", 
+      "date_registry_creation"=> XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "date_renew_begin"=> XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "date_hold_end" => XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "date_created"=> XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "date_restore_end"=>XMLRPC::DateTime.new(year, month, day, hour, min, sec), 
+      "id"=>1, 
+      "tld"=>"com"
+      #"fqdn"=>"domain.com",
+    }.merge(ext_attrs)
+  end
+  
+  def domain_creation_operation_hash(ext_attrs = {})
+    ext_attrs = {"type" => 'domain_create',
+      'id' => 0,
+      "session_id"=>0,
+      "eta"=>0,
+      'params' => {"domain"=>"fqdn", "bill"=>"FLN123-GANDI", "reseller"=>"FLN123-GANDI", "admin"=>"FLN123-GANDI", "pre_migration"=>true, "source_ip"=>"127.0.0.1", "ns"=>["gandi.net"], "duration"=>1, "source_client"=>"", "backend-version"=>3, "owner"=>"FLN123-GANDI", "tech"=>"FLN123-GANDI", "param_type"=>"domain", "auth_id"=>0},
+      "last_error" => "0",
+      'infos' => {"product_action"=>"create", "product_type"=>"domain", "product_name"=>".tld", "extras"=>{}, "label"=>"fqdn", "id"=>"", "quantity"=>""},
+      "step"=>"BILL"
+      }.merge(ext_attrs)
+    operation_information_attributes_hash(ext_attrs)
+  end
+  
+  def domain_renew_spec(ext_attrs = {})
+    {
+      'duration' => 1,
+      'current_year' => Date.today.year
+    }.merge(ext_attrs)
+  end
+  
+  def domain_renewal_operation_hash(ext_attrs = {})
+    ext_attrs = {"type" => 'domain_renew',
+      'id' => 0,
+      "session_id"=>0,
+      "eta"=>0,
+      'params' => {"domain"=>"fqdn", "bill"=>"FLN123-GANDI", "reseller"=>"FLN123-GANDI", "admin"=>"FLN123-GANDI", "pre_migration"=>true, "source_ip"=>"127.0.0.1", "ns"=>["gandi.net"], "duration"=>1, "source_client"=>"", "backend-version"=>3, "owner"=>"FLN123-GANDI", "tech"=>"FLN123-GANDI", "param_type"=>"domain", "auth_id"=>0},
+      "last_error" => "0",
+      'infos' => {"product_action"=>"renew", "product_type"=>"domain", "product_name"=>".tld", "extras"=>{}, "label"=>"fqdn", "id"=>"", "quantity"=>""},
+      "step"=>"BILL"
+      }.merge(ext_attrs)
+    operation_information_attributes_hash(ext_attrs)
+  end
+
+  def domain_tld_regions
+    {"generic"=>["aero", "biz", "com", "coop", "info", "mobi", "name", "net", "org", "pro", "tel", "travel"], "europe"=>["at", "be", "ch", "co.uk", "com.de", "de", "de.com", "es", "eu", "eu.com", "fr", "gb.com", "gb.net", "gr.com", "hu.com", "im", "it", "li", "lt", "lu", "me", "me.uk", "nl", "no", "no.com", "nu", "org.uk", "pl", "pt", "ru", "ru.com", "se", "se.com", "se.net", "uk.com", "uk.net"], "america"=>["ag", "ar.com", "br.com", "bz", "ca", "cc", "co", "gs", "gy", "hn", "ht", "la", "lc", "qc.com", "us", "us.com", "us.org", "uy.com", "vc"], "africa"=>["mu", "re", "sc", "za.com"], "asia"=>["ae.org", "af", "asia", "cn", "cn.com", "cx", "fm", "hk", "jp", "jpn.com", "ki", "kr.com", "mn", "nf", "sa.com", "sb", "tl", "tv", "tw", "ws"]}
+  end
+
+  def domain_tld_list
+    [{"region"=>"asia", "id"=>87, "name"=>"ae.org"}, {"region"=>"generic", "id"=>41, "name"=>"aero"}, {"region"=>"asia", "id"=>92, "name"=>"af"}, {"region"=>"america", "id"=>95, "name"=>"ag"}, {"region"=>"america", "id"=>77, "name"=>"ar.com"}, {"region"=>"asia", "id"=>21, "name"=>"asia"}, {"region"=>"europe", "id"=>23, "name"=>"at"}, {"region"=>"europe", "id"=>7, "name"=>"be"}, {"region"=>"generic", "id"=>5, "name"=>"biz"}, {"region"=>"america", "id"=>76, "name"=>"br.com"}, {"region"=>"america", "id"=>46, "name"=>"bz"}, {"region"=>"america", "id"=>115, "name"=>"ca"}, {"region"=>"america", "id"=>18, "name"=>"cc"}, {"region"=>"europe", "id"=>14, "name"=>"ch"}, {"region"=>"asia", "id"=>25, "name"=>"cn"}, {"region"=>"asia", "id"=>70, "name"=>"cn.com"}, {"region"=>"america", "id"=>88, "name"=>"co"}, {"region"=>"europe", "id"=>13, "name"=>"co.uk"}, {"region"=>"generic", "id"=>1, "name"=>"com"}, {"region"=>"europe", "id"=>138, "name"=>"com.de"}, {"region"=>"generic", "id"=>113, "name"=>"coop"}, {"region"=>"asia", "id"=>56, "name"=>"cx"}, {"region"=>"europe", "id"=>22, "name"=>"de"}, {"region"=>"europe", "id"=>82, "name"=>"de.com"}, {"region"=>"europe", "id"=>32, "name"=>"es"}, {"region"=>"europe", "id"=>9, "name"=>"eu"}, {"region"=>"europe", "id"=>64, "name"=>"eu.com"}, {"region"=>"asia", "id"=>61, "name"=>"fm"}, {"region"=>"europe", "id"=>8, "name"=>"fr"}, {"region"=>"europe", "id"=>66, "name"=>"gb.com"}, {"region"=>"europe", "id"=>67, "name"=>"gb.net"}, {"region"=>"europe", "id"=>91, "name"=>"gr.com"}, {"region"=>"america", "id"=>52, "name"=>"gs"}, {"region"=>"america", "id"=>110, "name"=>"gy"}, {"region"=>"asia", "id"=>62, "name"=>"hk"}, {"region"=>"america", "id"=>49, "name"=>"hn"}, {"region"=>"america", "id"=>51, "name"=>"ht"}, {"region"=>"europe", "id"=>85, "name"=>"hu.com"}, {"region"=>"europe", "id"=>33, "name"=>"im"}, {"region"=>"generic", "id"=>4, "name"=>"info"}, {"region"=>"europe", "id"=>20, "name"=>"it"}, {"region"=>"asia", "id"=>39, "name"=>"jp"}, {"region"=>"asia", "id"=>71, "name"=>"jpn.com"}, {"region"=>"asia", "id"=>94, "name"=>"ki"}, {"region"=>"asia", "id"=>72, "name"=>"kr.com"}, {"region"=>"america", "id"=>69, "name"=>"la"}, {"region"=>"america", "id"=>96, "name"=>"lc"}, {"region"=>"europe", "id"=>15, "name"=>"li"}, {"region"=>"europe", "id"=>63, "name"=>"lt"}, {"region"=>"europe", "id"=>29, "name"=>"lu"}, {"region"=>"europe", "id"=>28, "name"=>"me"}, {"region"=>"europe", "id"=>38, "name"=>"me.uk"}, {"region"=>"asia", "id"=>47, "name"=>"mn"}, {"region"=>"generic", "id"=>12, "name"=>"mobi"}, {"region"=>"africa", "id"=>55, "name"=>"mu"}, {"region"=>"generic", "id"=>6, "name"=>"name"}, {"region"=>"generic", "id"=>2, "name"=>"net"}, {"region"=>"asia", "id"=>93, "name"=>"nf"}, {"region"=>"europe", "id"=>37, "name"=>"nl"}, {"region"=>"europe", "id"=>90, "name"=>"no"}, {"region"=>"europe", "id"=>86, "name"=>"no.com"}, {"region"=>"europe", "id"=>19, "name"=>"nu"}, {"region"=>"generic", "id"=>3, "name"=>"org"}, {"region"=>"europe", "id"=>16, "name"=>"org.uk"}, {"region"=>"europe", "id"=>30, "name"=>"pl"}, {"region"=>"generic", "id"=>31, "name"=>"pro"}, {"region"=>"europe", "id"=>42, "name"=>"pt"}, {"region"=>"america", "id"=>79, "name"=>"qc.com"}, {"region"=>"africa", "id"=>11, "name"=>"re"}, {"region"=>"europe", "id"=>36, "name"=>"ru"}, {"region"=>"europe", "id"=>78, "name"=>"ru.com"}, {"region"=>"asia", "id"=>73, "name"=>"sa.com"}, {"region"=>"asia", "id"=>53, "name"=>"sb"}, {"region"=>"africa", "id"=>48, "name"=>"sc"}, {"region"=>"europe", "id"=>40, "name"=>"se"}, {"region"=>"europe", "id"=>83, "name"=>"se.com"}, {"region"=>"europe", "id"=>84, "name"=>"se.net"}, {"region"=>"generic", "id"=>35, "name"=>"tel"}, {"region"=>"asia", "id"=>54, "name"=>"tl"}, {"region"=>"generic", "id"=>112, "name"=>"travel"}, {"region"=>"asia", "id"=>17, "name"=>"tv"}, {"region"=>"asia", "id"=>27, "name"=>"tw"}, {"region"=>"europe", "id"=>65, "name"=>"uk.com"}, {"region"=>"europe", "id"=>68, "name"=>"uk.net"}, {"region"=>"america", "id"=>10, "name"=>"us"}, {"region"=>"america", "id"=>75, "name"=>"us.com"}, {"region"=>"america", "id"=>109, "name"=>"us.org"}, {"region"=>"america", "id"=>80, "name"=>"uy.com"}, {"region"=>"america", "id"=>50, "name"=>"vc"}, {"region"=>"asia", "id"=>103, "name"=>"ws"}, {"region"=>"africa", "id"=>81, "name"=>"za.com"}]
+  end
+  
+  def domain_host_attributes_hash(ext_attrs = {})
+    {"ips"=>["1.2.3.4"], "name"=>"", 'domain' => ''}.merge(ext_attrs)
+  end
+  
+  def mock_domain(fqdn, ext_attrs = {})
+    ext_attrs.merge!('fqdn' => fqdn)
+    old_connexion = Gandi.connection
+    new_connexion = double
+    new_connexion.should_receive(:call).with('domain.info', fqdn).and_return(domain_information_attributes_hash(ext_attrs))
+    Gandi.connection = new_connexion
+    
+    domain = Gandi::Domain.new(fqdn)
+    
+    Gandi.connection = old_connexion
+    return domain
+  end
+  
+  #FIXME: domain.mailbox.info is currently defunct in OT&E
+  def domain_mailbox_attributes(ext_attrs = {})
+    {}.merge(ext_attrs)
+  end
+  
+  def domain_forward_attributes(source, destinations = ['john.doe@domain.tld', 'jane.doe@domain2.tld'])
+    {'source' => source, 'destinations' => destinations}
+  end
+end
+
+RSpec.configure do |config|
+  config.include DomainMacros
+end

data/spec/support/operation_macros.rb

@@ -0,0 +1,22 @@
+module OperationMacros
+  def operation_information_attributes_hash(ext_attrs = {})
+    year, month, day, hour, min, sec = 1970, 1, 1, 1, 1, 1
+    { 
+      "source" => 'HA0-GANDI',
+      "date_created" => XMLRPC::DateTime.new(year, month, day, hour, min, sec),
+      "date_updated" => XMLRPC::DateTime.new(year, month, day, hour, min, sec),
+      "date_start" => '',
+      "step" => 'WAIT'
+      #"type" => 'domain_create'
+      #"session_id"=>0,
+      #"eta"=>0
+      #params => {}
+      #"last_error" => "0"
+      #infos => {}
+    }.merge(ext_attrs)
+  end
+end
+
+RSpec.configure do |config|
+  config.include OperationMacros
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gandirb
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &71303820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *71303820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &71303600 !ruby/object:Gem::Requirement
+  requirement: &70245430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71303600
+  version_requirements: *70245430
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &71303310 !ruby/object:Gem::Requirement
+  requirement: &70245170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,60 +32,68 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71303310
+  version_requirements: *70245170
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &71302990 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: *71302990
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &71302680 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70244870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *71302680
-description: ! "  This is a ruby library for using the Gandi XML-RPC API.\n  It currently
-  only provides methods for using the domain and mail API, but is extensible enough
-  to add hosting in the future.\n"
+  version_requirements: *70244870
+description: ! "  A Ruby library for using the Gandi XML-RPC API.\n  At the moment
+  support is planned for the Domain, Contact and Operation APIs only, but Hosting
+  and Catalog APIs support may be added in the future.\n"
 email: ''
 executables: []
 extensions: []
 extra_rdoc_files:
+- USAGE.rdoc
 - CHANGELOG
 - LICENSE
 files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
+- USAGE.rdoc
 - Gemfile
 - Rakefile
 - gandirb.gemspec
-- lib/gandi/domain_modules/mail.rb
-- lib/gandi/domain_modules/redirection.rb
-- lib/gandi/domain_modules/contact.rb
-- lib/gandi/domain_modules/name_servers.rb
-- lib/gandi/domain_modules/host.rb
-- lib/gandi/domain_modules/operations.rb
+- lib/gandi/contact.rb
+- lib/gandi/domain/forward.rb
+- lib/gandi/domain/nameservers.rb
+- lib/gandi/domain/transferin.rb
+- lib/gandi/domain/tld.rb
+- lib/gandi/domain/mailbox.rb
+- lib/gandi/domain/host.rb
+- lib/gandi/domain/status.rb
+- lib/gandi/domain/contacts.rb
+- lib/gandi/gandi_object_methods.rb
+- lib/gandi/connection.rb
 - lib/gandi/domain.rb
-- lib/gandi/base.rb
+- lib/gandi/connector.rb
+- lib/gandi/operation.rb
 - lib/gandi/version.rb
+- lib/gandi/errors.rb
 - lib/gandi.rb
-- test/gandi/domain_test.rb
-- test/gandi/base_test.rb
-- test/gandi_test.rb
-- test/test_helper.rb
-homepage: http://github.com/pickabee/gandirb
+- spec/gandi/gandi_spec.rb
+- spec/gandi/connection_spec.rb
+- spec/gandi/operation_spec.rb
+- spec/gandi/domain/mailbox_spec.rb
+- spec/gandi/domain/forward_spec.rb
+- spec/gandi/domain/host_spec.rb
+- spec/gandi/domain/tld_spec.rb
+- spec/gandi/contact_spec.rb
+- spec/gandi/errors_spec.rb
+- spec/gandi/domain_spec.rb
+- spec/spec_helper.rb
+- spec/support/domain_macros.rb
+- spec/support/operation_macros.rb
+- spec/support/contact_macros.rb
+homepage: http://github.com/pickabee/gandi
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -127,7 +124,17 @@ signing_key:
 specification_version: 3
 summary: Ruby library for using the Gandi XML-RPC API
 test_files:
-- test/gandi/domain_test.rb
-- test/gandi/base_test.rb
-- test/gandi_test.rb
-- test/test_helper.rb
+- spec/gandi/gandi_spec.rb
+- spec/gandi/connection_spec.rb
+- spec/gandi/operation_spec.rb
+- spec/gandi/domain/mailbox_spec.rb
+- spec/gandi/domain/forward_spec.rb
+- spec/gandi/domain/host_spec.rb
+- spec/gandi/domain/tld_spec.rb
+- spec/gandi/contact_spec.rb
+- spec/gandi/errors_spec.rb
+- spec/gandi/domain_spec.rb
+- spec/spec_helper.rb
+- spec/support/domain_macros.rb
+- spec/support/operation_macros.rb
+- spec/support/contact_macros.rb

data/lib/gandi/base.rb

@@ -1,121 +0,0 @@
-require 'xmlrpc/client'
-require 'openssl'
-
-#Common session, account and call methods
-module Gandi
-  class Base
-    TIMEOUT_EXCEPTIONS = [EOFError, Errno::EPIPE, OpenSSL::SSL::SSLError]
-
-    URL = "https://api.gandi.net/xmlrpc/"
-    TEST_URL = "https://api.ote.gandi.net/xmlrpc/"
-
-    SSL_VERIFY_MODE = OpenSSL::SSL::VERIFY_NONE
-
-    attr_reader :session_id, :handler
-
-    public
-
-    def initialize(login, password, uri = nil)
-      @login = login
-      @password = password
-      @uri = uri
-      raise ArgumentError.new("You must provide an URL when using Gandi::Base directly") unless @uri
-    end
-
-    #Calls a RPC method, transparently providing the session id
-    def call(method, *arguments)
-      raise "You have to log in before using methods requiring a session id" unless logged_in?
-      raw_call(method.to_s, @session_id, *arguments)
-    end
-
-    #Instanciates a rpc handler and log in to the interface to retrieve a session id
-    def login
-      @handler = XMLRPC::Client.new_from_uri(@uri)
-      #Get rid of SSL warnings "peer certificate won't be verified in this SSL session"
-      #See http://developer.amazonwebservices.com/connect/thread.jspa?threadID=37139
-      #and http://blog.chmouel.com/2008/03/21/ruby-xmlrpc-over-a-self-certified-ssl-with-a-warning/
-      #and http://stackoverflow.com/questions/4748633/how-can-i-make-rubys-xmlrpc-client-ignore-ssl-certificate-errors for ruby 1.9 (which does not set @ssl_context before a request)
-      if @handler.instance_variable_get('@http').use_ssl?
-        if @handler.instance_variable_get('@http').instance_variable_get("@ssl_context") #Ruby 1.8.7
-          @handler.instance_variable_get('@http').instance_variable_get("@ssl_context").verify_mode = SSL_VERIFY_MODE
-        else
-          @handler.instance_variable_get('@http').instance_variable_set(:@verify_mode, SSL_VERIFY_MODE) #Ruby 1.9
-        end
-      end
-      @session_id = raw_call("login", @login, @password, false)
-    end
-
-    #Gets a new session id by switching to another handle
-    def su(handle)
-      @session_id = call("su", handle)
-    end
-
-    #Changes password
-    def password(password)
-      @password = password
-      call("password", password)
-    end
-
-    #Current prepaid account balance
-    def account_balance
-      call('account_balance')
-    end
-
-    #Currency name used with the prepaid account
-    def account_currency
-      call('account_currency')
-    end
-
-    def self.login(login, password, uri = nil)
-      client = self.new(login, password, uri)
-      client.login
-      return client
-    end
-
-    private
-
-    #Handle RPC calls and exceptions
-    #A reconnection system is used to work around what seems to be a ruby bug :
-    #When waiting during 15 seconds between calls, a timeout is reached and the RPC handler starts throwing various exceptions
-    #EOFError, Errno::EPIPE, then OpenSSL::SSL::SSLError.
-    #When this happens, another handler and another session are created
-    #Exceptions are not handled if happening two times consecutively, or during a login call
-    #TODO: This method may be optimized by only creating another handler and keeping the session id.
-    #In this case a server timeout of 12 hours (see the Gandi documentation) may be reached more easily and should be handled.
-    def raw_call(*args)
-      begin
-        raise "no connexion handler is set" unless @handler
-        result = @handler.call(*args)
-        @reconnected = false unless (args.first == 'login')
-        return result
-      rescue StandardError => e
-        case e
-        when XMLRPC::FaultException
-          raise (e.faultCode.to_s.chars.first == '5' ? Gandi::DataError : Gandi::ServerError), e.faultString
-        when *TIMEOUT_EXCEPTIONS
-          if @reconnected || (args.first == 'login')
-            raise e #only one retry, and no retries if logging in
-          else
-            @reconnected = true
-            args[1] = login #use the new session string
-            raw_call(*args)
-          end
-        else
-          @reconnected = false
-          raise e
-        end
-      end
-    end
-
-    def logged_in?
-      @session_id.is_a? String
-    end
-
-    #Raises a NoMethodError exception.
-    #Used for methods that are presents in the API but not yet available
-    def not_supported
-      raise NoMethodError.new("This method is not supported and will be available in v1.10 of the API")
-    end
-
-  end
-end

data/lib/gandi/domain_modules/contact.rb

@@ -1,36 +0,0 @@
-module Gandi
-  module DomainModules
-    module Contact
-      CONTACT_CLASSES = ['individual', 'company', 'public', 'association']
-      
-      #Create a Gandi contact of a given type. See glossary, Account.
-      #Return the Gandi handle of the created contact
-      #Note: contact_class argument is used instead of class (due to a ruby keyword conflict)
-      #TODO check contact class
-      def contact_create(contact_class, firstname, lastname, address, zipcode, city, country, phone, email, params = {})
-        args = [contact_class, firstname, lastname, address, zipcode, city, country, phone, email, params]
-        args.pop if params.empty?
-        
-        call('contact_create', *args)
-      end
-      
-      #Update a Gandi contact
-      #Return the operation attributed ID
-      #TODO: check for frozen params
-      def contact_update(handle, params)
-        call('contact_update', handle, params)
-      end
-      
-      #Delete a Gandi contact
-      #Return the operation attributed ID
-      def contact_del(handle)
-        call('contact_del', handle)
-      end
-      
-      #Retrieve a hash of Gandi contact informations
-      def contact_info(handle)
-        call('contact_info', handle)
-      end
-    end
-  end
-end