one-email_direct 0.6.4 → 0.6.8

data/lib/one/email_direct/exception.rb

@@ -0,0 +1,28 @@
+# Class to encapsulate EmailDirect web service errors.
+#
+class One::EmailDirect::EmailDirectException < StandardError
+
+  attr_reader :code, :message
+
+
+
+  # Constructs an EmailDirectException instance.
+  #
+  # @param code [Fixnum] the webservice error status.
+  # @param message [String] the webservice error message.
+  #
+  def initialize(code, message)
+    @code = code
+    @message = message
+  end
+
+
+
+  # Returns a string representation of this object.
+  #
+  # @return [String] string representation of this object.
+  def to_s()
+    '[%s] %s' % [@code, @message]
+  end
+
+end

data/lib/one/email_direct/mixins/email.rb

@@ -29,7 +29,7 @@ module One::EmailDirect::Mixins::EmailFacade
         :force => force
       }
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 
@@ -68,7 +68,7 @@ module One::EmailDirect::Mixins::EmailFacade
         :custom_fields => custom_fields
       }
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 
@@ -92,7 +92,7 @@ module One::EmailDirect::Mixins::EmailFacade
         :force => force
       }
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 

data/lib/one/email_direct/mixins/list.rb

@@ -16,7 +16,7 @@ module One::EmailDirect::Mixins::ListFacade
         :list_name => name,
         :list_description => description}
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 
@@ -35,7 +35,7 @@ module One::EmailDirect::Mixins::ListFacade
         :credentials => credentials,
         :list_id => list_id}
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 

data/lib/one/email_direct/mixins/publication.rb

@@ -16,7 +16,7 @@ module One::EmailDirect::Mixins::PublicationFacade
         :publication_name => name,
         :publication_description => description}
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 
@@ -35,7 +35,7 @@ module One::EmailDirect::Mixins::PublicationFacade
         :credentials => credentials,
         :publication_id => publication_id}
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 

data/lib/one/email_direct/mixins/source.rb

@@ -16,7 +16,7 @@ module One::EmailDirect::Mixins::SourceFacade
         :source_name => name,
         :source_description => description}
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 
@@ -35,7 +35,7 @@ module One::EmailDirect::Mixins::SourceFacade
         :credentials => credentials,
         :source_id => source_id}
     )
-    raise StandardError, '[%s] %s' % [response[:code], response[:message]] if response[:code] != '0'
+    raise One::EmailDirect::EmailDirectException.new(response[:code], response[:message]) if response[:code] != '0'
   end
 
 

data/lib/one-email_direct.rb

@@ -17,6 +17,7 @@ module One
 
     autoload :Client, "#{File.dirname(__FILE__)}/one/email_direct/client"
     autoload :Credentials, "#{File.dirname(__FILE__)}/one/email_direct/credentials"
+    autoload :EmailDirectException, "#{File.dirname(__FILE__)}/one/email_direct/exception"
     autoload :Facade, "#{File.dirname(__FILE__)}/one/email_direct/facade"
 
   end
@@ -28,10 +29,4 @@ end
 configuration_file = 'config/development.yaml' # default
 configuration_file = ENV['ONE_CONFIG'] if ENV.has_key? 'ONE_CONFIG'
 
-Steenzout::ConfigurationManager.load configuration_file
-
-Savon.configure do |config|
-#  config.log = false            # disable logging
-#  config.log_level = :info      # changing the log level
-#  config.logger = Rails.logger  # using the Rails logger
-end
+Steenzout::ConfigurationManager.load configuration_file

data/test/unit/one/emaildirect/email/facade_test.rb

@@ -56,23 +56,23 @@ class TestEmailFacade < Test::Unit::TestCase
     @custom_fields1 = {
       'FirstName' => 'John',
       'LastName' => 'Doe',
-      'Age' => 30
+      'Birthyear' => 1981
     }
     @custom_fields2 = {
       'FirstName' => 'Johny',
       'LastName' => 'Doey',
-      'Age' => 31
+      'Birthyear' => 1980
     }
 
     @expected_custom_fields1 = [
       {:value => 'John',  :field_name => 'FirstName'},
       {:value => 'Doe',   :field_name => 'LastName'},
-      {:value => '30',    :field_name => 'Age'}
+      {:value => '1981',    :field_name => 'Birthyear'}
     ]
     @expected_custom_fields2 = [
       {:value => 'Johny',  :field_name => 'FirstName'},
       {:value => 'Doey',   :field_name => 'LastName'},
-      {:value => '31',    :field_name => 'Age'}
+      {:value => '1980',    :field_name => 'Birthyear'}
     ]
   end
 
@@ -91,6 +91,28 @@ class TestEmailFacade < Test::Unit::TestCase
     }
   end
 
+
+
+  # Removes dynamic properties for a Email_GetProperties output.
+  #
+  # @param result [Hash] the output to be cleaned.
+  # @return [Hash] filtered output.
+  #
+  def clean_email_getproperties(result)
+    result.delete(:create_date)
+    result.delete(:date_stamp)
+    result.delete(:ip_address)
+    result.delete(:email_id)
+    cleaned_custom_fields = []
+    result[:custom_fields][:custom_field].each { |element|
+      cleaned_custom_fields << element if !element[:field_name].eql? 'DateStamp' and !element[:field_name].eql? 'IPAddress'
+    }
+    result[:custom_fields][:custom_field] = cleaned_custom_fields
+    result
+  end
+
+
+
   # Tests for One::EmailDirect::Facade.email_add.
   #
   # 1. create a new email
@@ -154,7 +176,7 @@ class TestEmailFacade < Test::Unit::TestCase
 
 
     # 1.6
-    assert_raises StandardError do
+    assert_raises One::EmailDirect::EmailDirectException do
       One::EmailDirect::Facade.email_add(
         @credentials, nil,
         @source1[:element_id], [@publication1[:element_id]], [@list1[:element_id]],
@@ -171,18 +193,6 @@ class TestEmailFacade < Test::Unit::TestCase
     )
   end
 
-  def clean_email_getproperties(result)
-    result.delete(:create_date)
-    result.delete(:date_stamp)
-    result.delete(:ip_address)
-    result.delete(:email_id)
-    cleaned_custom_fields = []
-    result[:custom_fields][:custom_field].each { |element|
-      cleaned_custom_fields << element if !element[:field_name].eql? 'DateStamp' and !element[:field_name].eql? 'IPAddress'
-    }
-    result[:custom_fields][:custom_field] = cleaned_custom_fields
-    return result
-  end
 
 
   # Tests for One::EmailDirect::Facade.email_add_with_fields.
@@ -351,7 +361,7 @@ class TestEmailFacade < Test::Unit::TestCase
 
 
     # 1.5
-    assert_raises StandardError do
+    assert_raises One::EmailDirect::EmailDirectException do
       One::EmailDirect::Facade.email_addwithfields(
         @credentials, nil,
         @source1[:element_id], [@publication1[:element_id]], [@list1[:element_id]],

data/test/unit/one/emaildirect/list/facade_test.rb

@@ -62,7 +62,7 @@ class TestListFacade < Test::Unit::TestCase
 
 
     # 2. create a new list with a previously used name
-    assert_raises StandardError do
+    assert_raises One::EmailDirect::EmailDirectException do
       One::EmailDirect::Facade.list_add(@credentials, @list_add[:name], @list_add[:description])
     end
   end

data/test/unit/one/emaildirect/publication/facade_test.rb

@@ -60,7 +60,7 @@ class TestPublicationFacade < Test::Unit::TestCase
 
 
     # 2. create a new publication with a previously used name
-    assert_raises StandardError do
+    assert_raises One::EmailDirect::EmailDirectException do
       One::EmailDirect::Facade.publication_add(@credentials, @publication_add[:name], @publication_add[:description])
     end
   end

data/test/unit/one/emaildirect/source/facade_test.rb

@@ -61,7 +61,7 @@ class TestSourceFacade < Test::Unit::TestCase
 
 
     # 2. create a new source with a previously used name
-    assert_raises StandardError do
+    assert_raises One::EmailDirect::EmailDirectException do
       One::EmailDirect::Facade.source_add(@credentials, @source_add[:name], @source_add[:description])
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: one-email_direct
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Pedro Salgado
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -06:00
+date: 2011-05-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - lib/emaildirect.wsdl
 - lib/one/email_direct/client.rb
 - lib/one/email_direct/credentials.rb
+- lib/one/email_direct/exception.rb
 - lib/one/email_direct/facade.rb
 - lib/one/email_direct/mixins/email.rb
 - lib/one/email_direct/mixins/list.rb