createsend.rb in createsend-0.2.0

- old
+ new
@@ -19,96 +19,110 @@
 require 'list'
 require 'segment'
 require 'subscriber'
 require 'template'
 
-# Represents a CreateSend API error and contains specific data about the error.
-class CreateSendError < StandardError
-  attr_reader :data
-  def initialize(data)
-    @data = data
-    # @data should contain Code, Message and optionally ResultData
-    extra = @data.ResultData ? "\nExtra result data: #{@data.ResultData}" : ""
-    super "The CreateSend API responded with the following error - #{@data.Code}: #{@data.Message}#{extra}"
+module CreateSend
+  VERSION = "0.2.0" unless defined?(CreateSend::VERSION)
+
+  # Just allows callers to do CreateSend.api_key "..." rather than CreateSend::CreateSend.api_key "..." etc
+  class << self
+    def api_key(api_key=nil)
+      r = CreateSend.api_key api_key
+    end
+    
+    def base_uri(uri)
+      r = CreateSend.base_uri uri
+    end
   end
-end
 
-class ClientError < StandardError; end
-class ServerError < StandardError; end
-class BadRequest < CreateSendError; end
-class Unauthorized < CreateSendError; end
-class NotFound < ClientError; end
-class Unavailable < StandardError; end
+  # Represents a CreateSend API error and contains specific data about the error.
+  class CreateSendError < StandardError
+    attr_reader :data
+    def initialize(data)
+      @data = data
+      # @data should contain Code, Message and optionally ResultData
+      extra = @data.ResultData ? "\nExtra result data: #{@data.ResultData}" : ""
+      super "The CreateSend API responded with the following error - #{@data.Code}: #{@data.Message}#{extra}"
+    end
+  end
 
-# Provides high level CreateSend functionality/data you'll probably need.
-class CreateSend
-  include HTTParty
+  class ClientError < StandardError; end
+  class ServerError < StandardError; end
+  class BadRequest < CreateSendError; end
+  class Unauthorized < CreateSendError; end
+  class NotFound < ClientError; end
+  class Unavailable < StandardError; end
 
-  VER = "0.1.1" unless defined?(CreateSend::VER)
-  headers({ 'User-Agent' => "createsend-ruby-#{CreateSend::VER}", 'Content-Type' => 'application/json' })
-  base_uri CreateSendOptions['base_uri']
-  basic_auth CreateSendOptions['api_key'], 'x'
+  # Provides high level CreateSend functionality/data you'll probably need.
+  class CreateSend
+    include HTTParty
 
-  # Sets the API key which will be used to make calls to the CreateSend API.
-  def self.api_key(api_key=nil)
-    return @@api_key unless api_key
-    CreateSendOptions['api_key'] = api_key
-    @@api_key = api_key
-    basic_auth @@api_key, 'x'
-  end
+    headers({ 'User-Agent' => "createsend-ruby-#{CreateSend::VERSION}", 'Content-Type' => 'application/json' })
+    base_uri CreateSendOptions['base_uri']
+    basic_auth CreateSendOptions['api_key'], 'x'
 
-  # Gets your CreateSend API key, given your site url, username and password.
-  def apikey(site_url, username, password) 
-    site_url = CGI.escape(site_url)
-    self.class.basic_auth username, password
-    response = CreateSend.get("/apikey.json?SiteUrl=#{site_url}")
-    # Revert basic_auth to use @@api_key, 'x'
-    self.class.basic_auth @@api_key, 'x'
-    Hashie::Mash.new(response)
-  end
+    # Sets the API key which will be used to make calls to the CreateSend API.
+    def self.api_key(api_key=nil)
+      return @@api_key unless api_key
+      CreateSendOptions['api_key'] = api_key
+      @@api_key = api_key
+      basic_auth @@api_key, 'x'
+    end
 
-  # Gets your clients.
-  def clients
-    response = CreateSend.get('/clients.json')
-    response.map{|item| Hashie::Mash.new(item)}
-  end
+    # Gets your CreateSend API key, given your site url, username and password.
+    def apikey(site_url, username, password) 
+      site_url = CGI.escape(site_url)
+      self.class.basic_auth username, password
+      response = CreateSend.get("/apikey.json?SiteUrl=#{site_url}")
+      # Revert basic_auth to use @@api_key, 'x'
+      self.class.basic_auth @@api_key, 'x'
+      Hashie::Mash.new(response)
+    end
 
-  # Gets valid countries.
-  def countries
-    response = CreateSend.get('/countries.json')
-    response.parsed_response
-  end
+    # Gets your clients.
+    def clients
+      response = CreateSend.get('/clients.json')
+      response.map{|item| Hashie::Mash.new(item)}
+    end
 
-  # Gets the current date in your account's timezone.
-  def systemdate
-    response = CreateSend.get('/systemdate.json')
-    Hashie::Mash.new(response)
-  end
+    # Gets valid countries.
+    def countries
+      response = CreateSend.get('/countries.json')
+      response.parsed_response
+    end
 
-  # Gets valid timezones.
-  def timezones
-    response = CreateSend.get('/timezones.json')
-    response.parsed_response
-  end
+    # Gets the current date in your account's timezone.
+    def systemdate
+      response = CreateSend.get('/systemdate.json')
+      Hashie::Mash.new(response)
+    end
 
-  def self.get(*args); handle_response super end
-  def self.post(*args); handle_response super end
-  def self.put(*args); handle_response super end
-  def self.delete(*args); handle_response super end
+    # Gets valid timezones.
+    def timezones
+      response = CreateSend.get('/timezones.json')
+      response.parsed_response
+    end
 
-  def self.handle_response(response) # :nodoc:
-    case response.code
-    when 400
-      raise BadRequest.new(Hashie::Mash.new response)
-    when 401
-      raise Unauthorized.new(Hashie::Mash.new response)
-    when 404
-      raise NotFound.new
-    when 400...500
-      raise ClientError.new
-    when 500...600
-      raise ServerError.new
-    else
-      response
+    def self.get(*args); handle_response super end
+    def self.post(*args); handle_response super end
+    def self.put(*args); handle_response super end
+    def self.delete(*args); handle_response super end
+
+    def self.handle_response(response) # :nodoc:
+      case response.code
+      when 400
+        raise BadRequest.new(Hashie::Mash.new response)
+      when 401
+        raise Unauthorized.new(Hashie::Mash.new response)
+      when 404
+        raise NotFound.new
+      when 400...500
+        raise ClientError.new
+      when 500...600
+        raise ServerError.new
+      else
+        response
+      end
     end
   end
-end
+end
\ No newline at end of file