emailvision 2.1.19 → 2.1.20

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjNmNWYyZDRlZjNkZWFhYmIwOGM5NmJkOThiN2EwNzUwMmNkM2FmYg==
+  data.tar.gz: !binary |-
+    ODJhYzFlMDU4YTBkN2VmZTkwNDhkNmU3N2JlNmIyZTIyNmMzMTg1OQ==
+SHA512:
+  metadata.gz: !binary |-
+    MGI4ZTQ4NzViZmE1ZjQ3MTIyNGRiZjNmMWJiNjU4MzJiMWQ1MzgzYmFkMDI1
+    MjNkODk2MGMxMWY5ZmU1MzUwOWFhYjQ3NTdmYzE3ODRiNGI1NWI2YWI2Nzk5
+    YzQ1YzMyMzBhYjM3YmFlOTVmMDdkYmJkZTgyZGYzZWFjOTNiMDY=
+  data.tar.gz: !binary |-
+    MzI1MDEwNDYxZDQxMTg5MTJhZWE2NTI2MjE1ZjVmMTE3YTlmZWRlYWM4ZmM2
+    M2IzNGExNDIyMDY5NjNjZDZlZjg3Nzg2ODI1NzJhOTFlNTFkMjVjYWFlMTAz
+    MWNhYzVkN2IwZGQ3NGI4YmEzNDk4NTdkMTA4MjM4ZjAxMDQxY2I=

data/lib/emailvision.rb

@@ -13,9 +13,9 @@ module Emailvision
   autoload :Relation, 'emailvision/relation'
   autoload :Tools, 'emailvision/tools'
   autoload :Notification, 'emailvision/notification'
-  
+
   if defined?(Rails)
-	  require 'emailvision/railtie'
-	  require 'generators/install'
-	end
+    require 'emailvision/railtie'
+    require 'generators/install'
+  end
 end

data/lib/emailvision/api.rb

@@ -1,31 +1,25 @@
 module Emailvision
-  class Api    
+  class Api
     include HTTParty
     default_timeout 30
     format :xml
     headers 'Content-Type' => 'text/xml'
-    
+
     # HTTP verbs allowed to trigger a call-chain
-    HTTP_VERBS = [:get, :post].freeze  
+    HTTP_VERBS = [:get, :post].freeze
+    ATTRIBUTES = [:token, :server_name, :endpoint, :login, :password, :key, :debug].freeze
 
     # Attributes
     class << self
-      attr_accessor :token, :server_name, :endpoint, :login, :password, :key, :debug
+      attr_accessor *ATTRIBUTES
     end
-    attr_accessor :token, :server_name, :endpoint, :login, :password, :key, :debug
-
-    def initialize(params = {})      
-      yield(self) if block_given?      
-      
-      self.server_name ||= params[:server_name]  || self.class.server_name
-      self.endpoint    ||= params[:endpoint]     || self.class.endpoint
-      self.login       ||= params[:login]        || self.class.login
-      self.password    ||= params[:password]     || self.class.password
-      self.key         ||= params[:key]          || self.class.key
-      self.token       ||= params[:token]        || self.class.token
-      self.debug       ||= params[:debug]        || self.class.debug      
-    end   
-    
+    attr_accessor *ATTRIBUTES
+
+    def initialize(params = {})
+      yield(self) if block_given?
+      assign_attributes(params)
+    end
+
     # ----------------- BEGIN Pre-configured methods -----------------
 
     # Login to Emailvision API
@@ -69,7 +63,7 @@ module Emailvision
     # method = Method to call
     # parameters = Parameters to send (optionnal)
     def call(http_verb, method, parameters = {})
-      params ||= {}      
+      params ||= {}
 
       # == Check presence of these essential attributes ==
       unless server_name and endpoint
@@ -81,111 +75,123 @@ module Emailvision
 
       retries = 2
       begin
-        # == Build uri ==
-        uri = base_uri + method
-        if parameters[:uri]
-          uri += token ? "/#{token}/" : '/'
-          uri += (parameters[:uri].respond_to?(:join) ? parameters[:uri] : [parameters[:uri]]).compact.join '/'
-          parameters.delete :uri
-        elsif parameters[:body]
-          uri += token ? "/#{token}/" : '/'
-        else
-          parameters[:token] = token
-        end
-        
-        # == Build body ==
-        # 1. Extract body from parameters
-        body = parameters[:body] || {}
-        parameters.delete :body
-        # 2. Camelize all keys
-        body = Emailvision::Tools.r_camelize body
-        # 3. Convert to xml
-        body_xml = Emailvision::Tools.to_xml_as_is body
-      
-        # == Send request ==      
-        logger.send "#{uri} with query : #{parameters} and body : #{body}"
-        response = self.class.send http_verb, uri, :query => parameters, :body => body_xml, :timeout => 30      
-      
-        # == Parse response ==
-        http_code = response.header.code
-        content = {}
-        begin
-          content = Crack::XML.parse response.body
-        rescue MultiXml::ParseError => e
-          logger.send "#{uri} Error when parsing response body (#{e.to_s})"
-        end
-        logger.receive content.inspect
+        uri = prepare_uri(method, parameters)
+        body = prepare_body(parameters)
 
-        # Return response or raise an exception if request failed
-        if (http_code == "200") and (content and content["response"])
-          response = content["response"]["result"] || content["response"] 
-        else        
-          raise Emailvision::Exception.new "#{http_code} - #{content}"
-        end
+        logger.send "#{uri} with query : #{parameters} and body : #{body}"
 
-      return response
+        response = perform_request(http_verb, uri, parameters, body)
 
+        extract_response(response)
       rescue Emailvision::Exception => e
         if e.message =~ /Your session has expired/ or e.message =~ /The maximum number of connection allowed per session has been reached/
-          self.close_connection          
+          self.close_connection
           self.open_connection
           if((retries -= 1) >= 0)
             retry
           else
             raise e
           end
-        else
-          raise e          
-        end
-      rescue Errno::ECONNRESET => e
-        if((retries -= 1) >= 0)
-          retry
         else
           raise e
         end
-      rescue Timeout::Error => e
+      rescue Errno::ECONNRESET, Timeout::Error => e
         if((retries -= 1) >= 0)
           retry
         else
           raise e
         end
       end
-    end    
+    end
 
-		# Set token
+    # Set token
     # Override
     def token=(value)
       @token = value
     end
-    
+
     # Set endpoint
     # Override
     def endpoint=(value)
-	    invalidate_token!	    
-	  	@endpoint = value	  	
-	  end
+      close_connection
+      @endpoint = value
+    end
 
     # Base uri
     def base_uri
       "http://#{server_name}/#{endpoint}/services/rest/"
     end
-    
+
     # Generate call-chain triggers
     HTTP_VERBS.each do |http_verb|
       define_method(http_verb) do
         Emailvision::Relation.new(self, http_verb)
       end
-    end    
-    
-	  private
-	
-	  def logger      
-	    if @logger.nil?
-	      @logger = Emailvision::Logger.new(STDOUT)
-	      @logger.level = (debug ? Logger::DEBUG : Logger::WARN)
-	    end
-	    @logger
-	  end    
-    
-  end    
+    end
+
+    private
+
+      def prepare_uri(method, parameters)
+        uri = base_uri + method
+        if parameters[:uri]
+          uri += token ? "/#{token}/" : '/'
+          uri += (parameters[:uri].respond_to?(:join) ? parameters[:uri] : [parameters[:uri]]).compact.join '/'
+          parameters.delete :uri
+        elsif parameters[:body]
+          uri += token ? "/#{token}/" : '/'
+        else
+          parameters[:token] = token
+        end
+        uri
+      end
+
+      def prepare_body(parameters)
+        body = parameters[:body] || {}
+        parameters.delete :body
+        # 2. Camelize all keys
+        body = Emailvision::Tools.r_camelize body
+        # 3. Convert to xml
+        Emailvision::Tools.to_xml_as_is body
+      end
+
+      def perform_request(http_verb, uri, parameters, body)
+        self.class.send http_verb, uri, :query => parameters, :body => body, :timeout => 30
+      end
+
+      def extract_response(response)
+        http_code = response.header.code
+        content = {}
+        begin
+          content = Crack::XML.parse response.body
+        rescue MultiXml::ParseError => e
+          logger.send "#{uri} Error when parsing response body (#{e.to_s})"
+        end
+        logger.receive content.inspect
+
+        if (http_code == "200") and (content and content["response"])
+          response = content["response"]["result"] || content["response"] 
+        else
+          raise Emailvision::Exception.new "#{http_code} - #{content}"
+        end
+      end
+
+      def format_response()
+      end
+
+      def assign_attributes(parameters)
+        parameters or return
+        ATTRIBUTES.each do |attribute|
+          public_send("#{attribute}=", (parameters[attribute] || self.class.public_send(attribute)))
+        end
+      end
+
+      def logger
+        if @logger.nil?
+          @logger = Emailvision::Logger.new(STDOUT)
+          @logger.level = (debug ? Logger::DEBUG : Logger::WARN)
+        end
+        @logger
+      end
+
+  end
 end

data/lib/emailvision/exception.rb

@@ -1,14 +1,14 @@
 module Emailvision
-  class Exception < ::Exception 
-    
+  class Exception < ::Exception
+
     attr_accessor :http_status, :error
-    
+
     def initializer(http_status, error)
       self.http_status = http_status
       self.error = error
-      
+
       super("EMV API returns #{http_status} status code")
     end
-       
+
   end
 end

data/lib/emailvision/logger.rb

@@ -1,22 +1,22 @@
 module Emailvision
   class Logger < ::Logger
-    
+
     attr_accessor :debug
-    
+
     def initializer(*args)
-	    debug = false
-	    super args
-	  end
-    
+      debug = false
+      super args
+    end
+
     # Log a message sent to emailvision
     def send(message)
       info("[Emailvision] Send -> #{message}")
     end
-    
+
     # Log a message received from emailvision
     def receive(message)
       info("[Emailvision] Receive -> #{message}")
     end
-    
+
   end
 end

data/lib/emailvision/notification.rb

@@ -4,45 +4,45 @@ module Emailvision
     default_timeout 30
     format :xml
     headers 'Content-Type' => 'application/xml;charset=utf-8', 'encoding' => 'UTF-8', 'Accept' => '*/*'
-    
+
     class << self
       attr_accessor :debug
-    end    
+    end
     attr_accessor :debug
-    
-    def initialize(params = {})      
-      yield(self) if block_given?      
-      
-      self.debug ||= params[:debug] || self.class.debug      
-    end    
-    
-    def send(body, params = {})      
+
+    def initialize(params = {})
+      yield(self) if block_given?
+
+      self.debug ||= params[:debug] || self.class.debug
+    end
+
+    def send(body, params = {})
       # == Processing body ==
       body_xml = Emailvision::Tools.to_xml_as_is body
-      
+
       # == Send request ==
       logger.send "#{base_uri} with body : #{body_xml}"
       response = self.class.send :post, base_uri, :body => body_xml
       logger.receive "#{base_uri} with status : #{response.header.inspect}"
-      
+
       # == Check result ==
-      response.header.code == '200'      
-    end    
-    
+      response.header.code == '200'
+    end
+
     # Base uri
     def base_uri
       'http://api.notificationmessaging.com/NMSXML'
     end
-    
-	  private
-	
-	  def logger      
-	    if @logger.nil?
-	      @logger = Emailvision::Logger.new(STDOUT)
-	      @logger.level = (debug ? Logger::DEBUG : Logger::WARN)
-	    end
-	    @logger
-	  end    
-     
-  end    
+
+    private
+
+    def logger
+      if @logger.nil?
+        @logger = Emailvision::Logger.new(STDOUT)
+        @logger.level = (debug ? Logger::DEBUG : Logger::WARN)
+      end
+      @logger
+    end
+
+  end
 end

data/lib/emailvision/railtie.rb

@@ -1,28 +1,24 @@
 require 'rails'
 
 module Emailvision
-	class Railtie < Rails::Railtie
-		
-		generators do
-		  require 'generators/install'
-		end		
-	
-	  config.to_prepare do
-	    file = "#{Rails.root}/config/emailvision.yml"
-	    
-	    if File.exist?(file)
-	      config = YAML.load_file(file)[Rails.env] || {}
-	      
-  	    Emailvision::Api.server_name  = config['server_name']
-  	    Emailvision::Api.endpoint     = config['endpoint']
-  	    Emailvision::Api.login        = config['login']
-  	    Emailvision::Api.password     = config['password']
-  	    Emailvision::Api.key          = config['key']	      
-  	    Emailvision::Api.debug        = config['debug']  	    
-  	    
-  	    Emailvision::Notification.debug = config['debug']
-	    end	    
-	  end		
-	
-	end
+  class Railtie < Rails::Railtie
+
+    generators do
+      require 'generators/install'
+    end
+
+    config.to_prepare do  
+      file = "#{Rails.root}/config/emailvision.yml"
+      if File.exist?(file)
+        config = YAML.load_file(file)[Rails.env] || {}
+        Emailvision::Api.server_name    = config['server_name']
+        Emailvision::Api.endpoint       = config['endpoint']
+        Emailvision::Api.login          = config['login']
+        Emailvision::Api.password       = config['password']
+        Emailvision::Api.key            = config['key']
+        Emailvision::Api.debug          = config['debug']
+        Emailvision::Notification.debug = config['debug']
+      end
+    end
+  end
 end

data/lib/emailvision/relation.rb

@@ -1,29 +1,29 @@
 module Emailvision
   class Relation
-    
+
     def initialize(instance, http_verb)
       @instance = instance
       @http_verb = http_verb
       @uri = []
       @options = {}
     end
-    
+
     def call(*args)
       @options.merge! extract_args(args)
       @instance.call @http_verb, @uri.join('/'), @options
     end
-  
+
     def method_missing(method, *args)
       @uri << method.to_s.camelize(:lower)
       @options.merge! extract_args(args)
-      self            
-    end    
-    
+      self
+    end
+
     private
-    
+
     def extract_args(args)
       (args[0] and args[0].kind_of? Hash) ? args[0] : {}
     end
-  
+
   end
 end

data/lib/emailvision/tools.rb

@@ -1,20 +1,12 @@
-module Emailvision  
+module Emailvision
   class Tools
 
     def self.sanitize_parameters(parameters)
-      r_each(parameters) do |value|        
-        if value.respond_to?(:to_datetime)
-          begin
-            date_time_format(value.to_datetime) 
-          rescue StandardError
-            value
-          end
-        elsif value.respond_to?(:to_date)
-          begin
-            date_time_format(value.to_date) 
-          rescue StandardError
-            value
-          end
+      r_each(parameters) do |value|
+        if value.kind_of?(DateTime) or value.kind_of?(Time)
+          date_time_format(value.to_datetime)
+        elsif value.kind_of?(Date)
+          date_format(value.to_date)
         else
           value
         end
@@ -28,7 +20,7 @@ module Emailvision
     def self.date_format(date)
       date.strftime('%d/%m/%Y')
     end
-    
+
     def self.r_camelize(obj)
       if obj.is_a?(Hash)
         new_obj = {}
@@ -46,16 +38,16 @@ module Emailvision
         obj
       end
     end
-    
+
     def self.to_xml_as_is(obj)
-      obj_xml = ""      
-      
+      obj_xml = ""
+
       unless obj.nil? or obj.empty?
         xml = ::Builder::XmlMarkup.new(:target=> obj_xml)
-        xml.instruct! :xml, :version=> "1.0"            
+        xml.instruct! :xml, :version=> "1.0"
         tag_obj xml, obj
       end
-      
+
       obj_xml
     end
 
@@ -80,35 +72,35 @@ module Emailvision
       end
 
       result
-    end    
-    
+    end
+
     private
-    
-    def self.tag_obj(xml, obj)
-      if obj.is_a? Hash
-        obj.each do |key, value|
-          if value.is_a?(Hash)            
-            eval(%{
-              xml.#{key} do
-                tag_obj(xml, value)
-              end
-            })
-          elsif value.is_a?(Array)
-            value.each do |item|
+
+      def self.tag_obj(xml, obj)
+        if obj.is_a? Hash
+          obj.each do |key, value|
+            if value.is_a?(Hash)
               eval(%{
                 xml.#{key} do
-                  tag_obj(xml, item)
+                  tag_obj(xml, value)
                 end
               })
+            elsif value.is_a?(Array)
+              value.each do |item|
+                eval(%{
+                  xml.#{key} do
+                    tag_obj(xml, item)
+                  end
+                })
+              end
+            else
+              eval %{xml.#{key}(%{#{value}})}
             end
-          else
-            eval %{xml.#{key}(%{#{value}})}
           end
+        else
+          obj
         end
-      else
-        obj
       end
-    end
-    
-  end    
+
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: emailvision
 version: !ruby/object:Gem::Version
-  version: 2.1.19
-  prerelease: 
+  version: 2.1.20
 platform: ruby
 authors:
 - Bastien Gysler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,11 +48,30 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: REST API wrapper interacting with Emailvision
 email: basgys@gmail.com
 executables: []
@@ -77,27 +90,25 @@ files:
 - lib/generators/templates/emailvision.yml
 homepage: http://github.com/basgys/emailvision
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Emailvision
 test_files: []
-has_rdoc: