edm 0.0.3 → 0.0.4

data/lib/edm/version.rb

@@ -1,3 +1,3 @@
 module Edm
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/edm.rb

@@ -2,76 +2,37 @@ require "edm/version"
 require "net/http"
 
 module Edm
-  def self.batch_create_contacts(key, options = {})
-    unless key.present?
-      raise "access key can not be blank."
+  class EdmClient
+    def initialize(account, key)
+      @account = account
+      @key = key
     end
-    unless options[:account_key].present?
-      raise "account key can not be blank."
-    end
-    
-    unless options[:data].present?
-      raise "data can not be blank and must be an array."
-    end
-    sign = generate_sign(key, options)
-    options["sign"] = sign
 
-    result = remote_request('post', 'http://0.0.0.0:3000/api/contacts/batch_create.json', options)
-    return result.body
-  end
-  
-  def self.create_report(key, options = {})
-    unless options[:title].present?
-      raise "page title can not be blank."
-    end
-    
-    unless options[:subject].present?
-      raise "mail subject can not be blank."
-    end
-    
-    unless options[:account_key].present?
-      raise "account key can not be blank."
-    end
-    
-    unless options[:sender_email].present?
-      raise "sender email can not be blank."
-    end
-    
-    unless options[:send_to].present? or !["all", "groups", "contacts"].include?(options[:send_to])
-      raise 'send_to must be "all", "groups" or "contacts".'
+    attr_accessor :account, :key
+
+    def api_request(url, http_method, options = {})
+      sign = generate_sign(options)
+      options["sign"] = sign
+      Rails.logger.debug "-------------"
+      result = remote_request(http_method, 'http://0.0.0.0:3000' + url, options)
+      return result.body
     end
-    
-    if options[:send_to] != 'all'
-      unless options[:contacts_info].present?
-        raise "For send_to is #{options[:send_to]}, you must pass contacts_info"
+
+    def generate_sign(options = {})
+      if options.length > 0
+        str = options.to_a.sort.map { |c| "#{c[0]}=#{c[1]}" }.join('&')
+        sign = Digest::SHA1.hexdigest("#{str}#{key}")
       end
     end
-    
-    unless options[:data].present?
-      raise "data can not be blank."
-    end
-    
-    unless options[:template_id].present?
-      raise "template_id can not be blank."
-    end
-    sign = generate_sign(key, options)
-    options["sign"] = sign
 
-    result = remote_request('post', 'http://0.0.0.0:3000/api/reports.json', options)
-    return result.body
-  end
-  
-  def self.generate_sign(key, options = {})
-    if options.length > 0
-      str = options.to_a.sort.map { |c| "#{c[0]}=#{c[1]}" }.join('&')
-      sign = Digest::SHA1.hexdigest("#{str}#{key}")
-    end
-  end
-  
-  def self.remote_request(http_method, url, options = {})
-    case http_method
-    when 'post'
-      Net::HTTP.post_form(URI.parse(url), options)
+    def remote_request(http_method, url, options = {})
+      case http_method
+      when 'post'
+        Net::HTTP.post_form(URI.parse(url), options)
+      when 'get'
+        Net::HTTP.get(URI.parse(url))
+      end
     end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spec
-  requirement: &70287170582780 !ruby/object:Gem::Requirement
+  requirement: &70333222890760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287170582780
+  version_requirements: *70333222890760
 description: demohour edm api
 email:
 - lijiping@demohour.com