emailvision 2.0.0 → 2.1.1

data/lib/emailvision.rb

@@ -10,6 +10,7 @@ module Emailvision
   autoload :Exception, 'emailvision/exception'
   autoload :Logger, 'emailvision/logger'
   autoload :Relation, 'emailvision/relation'
+  autoload :Tools, 'emailvision/tools'
   
   if defined?(Rails)
 	  require 'emailvision/railtie'

data/lib/emailvision/api.rb

@@ -3,6 +3,7 @@ module Emailvision
     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  
@@ -61,25 +62,41 @@ module Emailvision
     # Perform the API call
     # http_verb = (get, post, ...)
     # method = Method to call
-    # content = Content to send (optionnal)
-    def call(http_verb, method, content = {})
+    # parameters = Parameters to send (optionnal)
+    def call(http_verb, method, parameters = {})
       params ||= {}      
 
-      # Check presence of these essential attributes
+      # == Check presence of these essential attributes ==
       unless server_name and endpoint
         raise Emailvision::Exception.new "Cannot make an API call without a server name and an endpoint !"
       end
 
-      # Build uri and parameters
+      # == Build uri ==
       uri = base_uri + method
-      query = token ? {:token => token} : {}
-      query.merge! content
+      if parameters[:uri]
+        uri += token ? "/#{token}/" : '/'
+        uri += (parameters[:uri].respond_to?(:join) ? parameters[:uri] : [parameters[:uri]]).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 content : #{content}"
-      response = self.class.send http_verb, uri, :query => query
+      # == 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
+      # == Parse response ==
       http_code = response.header.code
       content = Crack::XML.parse response.body
       logger.receive content.inspect

data/lib/emailvision/tools.rb

@@ -0,0 +1,63 @@
+module Emailvision  
+  class Tools
+    
+    def self.r_camelize(obj)
+      if obj.is_a?(Hash)
+        new_obj = {}
+        obj.each do |key, value|
+          new_obj[key.to_s.camelize(:lower).to_sym] = r_camelize value
+        end
+        new_obj
+      elsif obj.is_a?(Array)
+        new_obj = []
+        obj.each_with_index do |item, index|
+          new_obj[index] = r_camelize item
+        end
+        new_obj
+      else
+        obj
+      end
+    end
+    
+    def self.to_xml_as_is(obj)
+      obj_xml = ""
+      xml = Builder::XmlMarkup.new(:target=> obj_xml)
+      xml.instruct! :xml, :version=> "1.0"
+            
+      tag_obj xml, obj
+      
+      obj_xml
+    end
+    
+    private
+    
+    def self.tag_obj(xml, obj)
+      if obj.is_a? Hash
+        obj.each do |key, value|
+          if value.is_a?(Hash)
+            eval <<-EOS
+              xml.#{key} do
+                tag_obj xml, value
+              end
+            EOS
+          elsif value.is_a?(Array)
+            value.each do |item|
+              eval <<-EOS
+                xml.#{key} do
+                  tag_obj xml, item
+                end
+              EOS
+            end
+          else
+            eval <<-EOS
+              xml.#{key} '#{value}'
+            EOS
+          end
+        end
+      else
+        obj
+      end
+    end
+    
+  end    
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emailvision
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2164271140 !ruby/object:Gem::Requirement
+  requirement: &2155649020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164271140
+  version_requirements: *2155649020
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2164270660 !ruby/object:Gem::Requirement
+  requirement: &2155648280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164270660
+  version_requirements: *2155648280
 description: REST API wrapper interacting with Emailvision
 email: basgys@gmail.com
 executables: []
@@ -44,6 +44,7 @@ files:
 - lib/emailvision/logger.rb
 - lib/emailvision/railtie.rb
 - lib/emailvision/relation.rb
+- lib/emailvision/tools.rb
 - lib/emailvision.rb
 - lib/generators/install.rb
 - lib/generators/templates/emailvision.yml