apsis-on-steroids 0.0.0 → 0.0.1

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "http2", ">= 0.0.15"
+gem "http2", ">= 0.0.16"
 gem "string-cases"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     diff-lcs (1.1.3)
     git (1.2.5)
-    http2 (0.0.15)
+    http2 (0.0.16)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -28,7 +28,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  http2 (>= 0.0.15)
+  http2 (>= 0.0.16)
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/README.rdoc

@@ -10,10 +10,23 @@ Library that implements the Apsis API in Ruby in regards to administrating subsc
     :api_key => "[your api key]"
   )
 
+=== Create a mailing list
+
+  aos.create_mailing_list(
+    :Name => "my_awesome_list",
+    :FromName => "Kasper Johansen",
+    :FromEmail => "kj@naoshi-dev.com",
+    :CharacterSet => "utf-8"
+  )
+
 === Get a mailing list.
 
   mlist = aos.mailing_list_by_name("test_list")
 
+=== Delete a mailing list.
+
+  mlist.delete
+
 === Get a subscriber from a mailing list.
 
   sub = mlist.subscriber_by_email("some@email.com")

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/apsis-on-steroids.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "apsis-on-steroids"
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kaspernj"]
@@ -43,14 +43,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<http2>, [">= 0.0.15"])
+      s.add_runtime_dependency(%q<http2>, [">= 0.0.16"])
       s.add_runtime_dependency(%q<string-cases>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
-      s.add_dependency(%q<http2>, [">= 0.0.15"])
+      s.add_dependency(%q<http2>, [">= 0.0.16"])
       s.add_dependency(%q<string-cases>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
-    s.add_dependency(%q<http2>, [">= 0.0.15"])
+    s.add_dependency(%q<http2>, [">= 0.0.16"])
     s.add_dependency(%q<string-cases>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

data/include/mailing_list.rb

@@ -36,4 +36,28 @@ class ApsisOnSteroids::MailingList < ApsisOnSteroids::SubBase
       raise "Unexpected result: '#{res["Result"]}'."
     end
   end
+  
+  def delete
+    res = aos.req_json("v1/mailinglists/", :delete, :json => [data(:id)])
+    
+    url = URI.parse(res["Result"]["PollURL"])
+    data = nil
+    
+    Timeout.timeout(30) do
+      loop do
+        sleep 0.5
+        res = aos.req_json(url.path)
+        
+        if res["State"] == "2"
+          data_url = URI.parse(res["DataUrl"])
+          data = aos.req_json(data_url.path)
+          break
+        end
+      end
+    end
+    
+    data.each do |element|
+      raise "Unexpected result: '#{data}'." if element["Value"] != "Succefully deleted"
+    end
+  end
 end

data/include/subscriber.rb

@@ -14,36 +14,29 @@ class ApsisOnSteroids::Subscriber < ApsisOnSteroids::SubBase
   # Returns true if the subscriber is active.
   def active?
     details = self.details
-    
-    if details[:pending]
-      return false
-    end
-    
+    return false if details[:pending]
     return true
   end
   
   # Update one or more details on the subscriber.
   def update(data)
-    res = aos.req_json("v1/subscribers/queue", :post, :json => [
-      {
-        :Id => data(:id)
-      }.merge(data)
-    ])
-    
+    res = aos.req_json("v1/subscribers/queue", :post, :json => [data.merge(:Id => self.data(:id))])
     url = URI.parse(res["Result"]["PollURL"])
     data = nil
     
-    loop do
-      res = aos.req_json(url.path)
-      
-      if res["State"] == "2"
-        url_data = URI.parse(res["DataUrl"])
-        data = aos.req_json(url_data.path)
-        break
+    Timeout.timeout(30) do
+      loop do
+        res = aos.req_json(url.path)
+        
+        if res["State"] == "2"
+          url_data = URI.parse(res["DataUrl"])
+          data = aos.req_json(url_data.path)
+          break
+        end
       end
     end
     
     raise data["FailedUpdatedSubscribers"].to_s if data["FailedUpdatedSubscribers"] && data["FailedUpdatedSubscribers"].any?
     return nil
   end
-end
+end

data/lib/apsis-on-steroids.rb

@@ -14,6 +14,8 @@ class ApsisOnSteroids
   end
   
   def initialize(args)
+    raise "Invalid API key: '#{args[:api_key]}' from: '#{args}'." if args[:api_key].to_s.strip.empty?
+    
     @args = args
     @http = Http2.new(
       :host => "se.api.anpdm.com",
@@ -41,7 +43,7 @@ class ApsisOnSteroids
   end
   
   def mailing_lists
-    res = req_json("v1/mailinglists/1/10")
+    res = req_json("v1/mailinglists/1/999")
     
     ret = []
     res["Result"]["Items"].each do |mlist|
@@ -54,6 +56,15 @@ class ApsisOnSteroids
     return ret
   end
   
+  def create_mailing_list(data)
+    res = req_json("v1/mailinglists/", :post, :json => data)
+    if res["Code"] == 1
+      # Success!
+    else
+      raise "Unexpected result: '#{res}'."
+    end
+  end
+  
   def mailing_list_by_name(name)
     self.mailing_lists.each do |mlist|
       return mlist if name.to_s == mlist.name.to_s
@@ -127,7 +138,12 @@ class ApsisOnSteroids
     # Parse arguments, send and parse the result.
     args = {:url => url}.merge(method_args)
     http_res = @http.__send__(type, args)
-    res = JSON.parse(http_res.body)
+    
+    begin
+      res = JSON.parse(http_res.body)
+    rescue JSON::ParserError
+      raise "Invalid JSON given: '#{http_res.body}'."
+    end
     
     # Check for various kind of server errors and raise them as Ruby errors if present.
     raise "Failed on server with code #{res["Code"]}: #{res["Message"]}" if res.is_a?(Hash) && res.key?("Code") && res["Code"] < 0
@@ -136,4 +152,4 @@ class ApsisOnSteroids
     # Return the result.
     return res
   end
-end
+end

data/spec/apsis-on-steroids_spec.rb

@@ -8,14 +8,30 @@ describe "ApsisOnSteroids" do
     )
   end
   
+  it "should create and delete a mailing list" do
+    name = "create-mlist-#{Time.now.to_f.to_s}"
+    
+    $aos.create_mailing_list(
+      :Name => name,
+      :FromName => "Kasper Johansen",
+      :FromEmail => "kj@naoshi-dev.com",
+      :CharacterSet => "utf-8"
+    )
+    
+    mlist = $aos.mailing_list_by_name(name)
+    
+    sleep 1
+    mlist.delete
+  end
+  
   it "can get a mailing list" do
     $mlist = $aos.mailing_list_by_name("kj")
   end
   
   it "can create subscribers" do
     $mlist.create_subscribers([{
-      "Email" => "kj@gfish.com",
-      "Name" => "Kasper Johansen"
+      :Email => "kj@gfish.com",
+      :Name => "Kasper Johansen"
     }])
   end
   
@@ -23,23 +39,26 @@ describe "ApsisOnSteroids" do
     $sub = $aos.subscriber_by_email("kj@gfish.com")
     details = $sub.details
     details.is_a?(Hash).should eql(true)
-    details.key?(:pending).should eql(true)
+    details.key?(:pending).should eql(false)
   end
   
   it "can update subscribers" do
     new_email = "kaspernj#{Time.now.to_f}@naoshi-dev.com"
     $sub.update(:Email => new_email)
     $sub.details[:Email].should eql(new_email)
+    $sub.details[:Name].should eql("Kasper Johansen")
   end
   
   it "should not overwrite data when updating" do
-    addr = Time.now.to_f.to_s
-    $sub.update(:Address => addr)
+    phone = Time.now.to_i.to_s
+    $sub.update(:PhoneNumber => phone)
+    $sub.details[:PhoneNumber].should eql(phone)
     
     new_email = "kaspernj#{Time.now.to_f}@naoshi-dev.com"
     $sub.update(:Email => new_email)
+    $sub.details[:Email].should eql(new_email)
     
-    $sub.details[:Address].should eql(addr)
+    $sub.details[:PhoneNumber].should eql(phone)
   end
   
   it "can remove subscribers from lists" do

metadata

@@ -2,7 +2,7 @@
 name: apsis-on-steroids
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - kaspernj
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.0.16
   name: http2
   type: :runtime
   prerelease: false
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.0.16
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -1005707843598481402
+      hash: -2130577314090490558
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false