apsis-on-steroids 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca260874d9300648caddfb9ca87705a72b17de34
-  data.tar.gz: 246852b83262cce4dd77dba066b5d838eb4e6354
+  metadata.gz: cb74fb8c4341b361e40ced00d058ad1236ee6253
+  data.tar.gz: ae0d1cba397c2a9cf5d5a845fc12deff7eea36e6
 SHA512:
-  metadata.gz: 87aeb2df293b7edb9ecdf3fc1f91127c7693385a2c59f414fc54d24970035ac37153d567654bb2053dda039d03a22073f7c2df8b5f5372309c60680c9660de25
-  data.tar.gz: f481ad7b1a86fc87be112e642e5fe7c2dc84e0189c497ae6e1c8ddbaeb14bebee9a42447dff66a5becbbbb44575a24de00f0480ded150197c561518ac200bc79
+  metadata.gz: 27467b1844923491160b11ef6ecbdf9dc032d7a9e0f6b2f0bb3ca3feb75a94cdaa8c3069c44b9007d7fe3732c06cae156308d77657389b847a478e7660a8d168
+  data.tar.gz: 1a4aa0a9a8a38ba5a67c786f8fc8f20125263428ac09e2adc894aab7cd57293ec53104d7aab9983beb9b9819ad6d2abbd98a58f5904042facda9b037178e76f2

data/README.md

@@ -9,7 +9,7 @@ Library that implements the Apsis API in Ruby in regards to administrating subsc
 ### Connecting
 ```ruby
 aos = ApsisOnSteroids.new(
-  :api_key => "[your api key]"
+  api_key: "[your api key]"
 )
 ```
 
@@ -21,10 +21,10 @@ aos.mailing_lists
 ### Create a mailing list
 ```ruby
 aos.create_mailing_list(
-  :Name => "my_awesome_list",
-  :FromName => "Kasper Johansen",
-  :FromEmail => "kj@naoshi-dev.com",
-  :CharacterSet => "utf-8"
+  Name: "my_awesome_list",
+  FromName: "Kasper Johansen",
+  FromEmail: "kj@naoshi-dev.com",
+  CharacterSet: "utf-8"
 )
 ```
 
@@ -48,11 +48,11 @@ sub = mlist.subscriber_by_email("some@email.com")
 mlist.create_subscribers(
   [
     {
-      :Email => "some@email.com",
-      :Name => "Some Name"
+      Email: "some@email.com",
+      Name: "Some Name"
     },{
-      :Email => "some_other@email.com",
-      :Name => "Some Name"
+      Email: "some_other@email.com",
+      Name: "Some Name"
     }
   ]
 )
@@ -65,7 +65,7 @@ puts "Details: #{sub.details}"
 
 ### Update subscribers.
 ```ruby
-sub.update(:Email => "some_third@email.com")
+sub.update(Email: "some_third@email.com")
 ```
 
 ### Remove subscriber from a mailing list.
@@ -97,6 +97,7 @@ sendings = apsis.sendings_by_date_interval(@date_from, @date_to).to_a
 ```
 
 ### Get data from sendings
+```ruby
 sendings.opens(count: true) #=> 5
 sendings.bounces(count: true) #=> 1
 sendings.clicks(count: true) #=> 3
@@ -105,6 +106,7 @@ sendings.opt_outs(count: true) #=> 1
 sendings.clicks.each do |click|
   puts "ClickData: #{click.data_hash}"
 end
+```
 
 ## Contributing to apsis-on-steroids
 

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/apsis-on-steroids.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: apsis-on-steroids 0.0.9 ruby lib
+# stub: apsis-on-steroids 0.0.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "apsis-on-steroids"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["kaspernj"]
-  s.date = "2014-08-04"
+  s.date = "2014-08-13"
   s.description = "A Ruby API for the Apsis mail service. "
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/include/sending.rb

@@ -1,18 +1,18 @@
 class ApsisOnSteroids::Sending < ApsisOnSteroids::SubBase
   def clicks args = {}
-    list_for("v1/clicks/sendqueues/%{send_queue_id}/page/%{page}/size/%{size}", "Click", args)
+    list_for("v1/clicks/sendqueues/%{send_queue_id}/page/%{page}/size/%{size}", "v1/sendqueues/%{send_queue_id}/clicks", "Click", args)
   end
 
   def opens args = {}
-    list_for("v1/opens/sendqueues/%{send_queue_id}/page/%{page}/size/%{size}", "Open", args)
+    list_for("v1/opens/sendqueues/%{send_queue_id}/page/%{page}/size/%{size}", "v1/sendqueues/%{send_queue_id}/opens", "Open", args)
   end
 
   def bounces args = {}
-    list_for("v1/bounces/sendqueues/%{send_queue_id}/page/%{page}/size/%{size}", "Bounce", args)
+    list_for("v1/bounces/sendqueues/%{send_queue_id}/page/%{page}/size/%{size}", "v1/sendqueues/%{send_queue_id}/bounces", "Bounce", args)
   end
 
   def opt_outs args = {}
-    list_for("v1/optouts/sendqueues/%{send_queue_id}/%{page}/%{size}", "OptOut", args)
+    list_for("v1/optouts/sendqueues/%{send_queue_id}/%{page}/%{size}", "v1/sendqueues/%{send_queue_id}/optouts", "OptOut", args)
   end
 
   def mailing_lists
@@ -26,22 +26,50 @@ class ApsisOnSteroids::Sending < ApsisOnSteroids::SubBase
 
 private
 
-  def list_for resource_url, resource_name, args = {}
+  def list_for_with_dates resource_url, resource_name, args
+    resource_url = resource_url.gsub("%{send_queue_id}", data(:send_queue_id).to_s)
+
+    ub = aos.new_url_builder
+    ub.path = resource_url
+    ub.params["dateFrom"] = args[:date_from].strftime(ApsisOnSteroids::STRFTIME_FORMAT) if args[:date_from]
+    ub.params["dateTo"] = args[:date_to].strftime(ApsisOnSteroids::STRFTIME_FORMAT) if args[:date_to]
+
+    resource_url = ub.build_path_and_params
+
+    queued_res = aos.req_json(resource_url)
+    results = aos.read_queued_response(queued_res["Result"]["PollURL"])
+
+    return results.length if args[:count]
+
+    Enumerator.new do |yielder|
+      aos.read_resources_from_array(resource_name, results).each do |resource|
+        yielder << resource
+      end
+    end
+  end
+
+  def list_for resource_url, resource_url_with_dates, resource_name, args = {}
+    # OptOut counting does not work :-( We will have to do the date request to fix this...
+    # If date-arguments are given, we will have to use the date request.
+    if args[:date_from] || args[:date_to] || resource_name == "OptOut"
+      return list_for_with_dates(resource_url_with_dates, resource_name, args)
+    end
+
     page = 1
     resource_url = resource_url.gsub("%{send_queue_id}", data(:send_queue_id).to_s)
 
     if args[:count]
       resource_url = resource_url.gsub("%{page}", page.to_s).gsub("%{size}", "2")
-      res = aos.req_json("/#{resource_url}")
+      res = aos.req_json(resource_url)
       return res["Result"]["TotalCount"]
     end
 
-    response_url = response_url.gsub("%{size}", "200")
+    resource_url = resource_url.gsub("%{size}", "200")
 
     Enumerator.new do |yielder|
       loop do
         resource_url = resource_url.gsub("%{page}", page.to_s)
-        res = aos.req_json("/#{resource_url}")
+        res = aos.req_json(resource_url)
 
         aos.read_resources_from_array(resource_name, res["Result"]["Items"]).each do |resource|
           yielder << resource

data/spec/apsis-on-steroids_spec.rb

@@ -33,26 +33,20 @@ describe "ApsisOnSteroids" do
   end
 
   it "#sendings_by_date_interval" do
-    date_from = Date.new(2014, 6, 1)
-    date_to = Date.new(2014, 6, 4)
+    date_from = Date.new(2013, 4, 1)
+    date_to = Date.new(2013, 6, 2)
 
     list = aos.sendings_by_date_interval(date_from, date_to).to_a
-    list.empty?.should_not eq true
+    raise "list is empty!?" if list.empty?
 
     sending = list.first
     puts "Sending data: #{sending.data_hash}"
 
-    mlists = sending.mailing_lists.first
-    puts "MList: #{mlists.data_hash}"
-
-    click = sending.clicks.first
-    puts "Click data: #{click.data_hash}"
-
-    open = sending.opens.first
-    puts "Open data: #{open.data_hash}"
-
+    # Test the call doesnt fail.
+    sending.mailing_lists.first
+    sending.clicks.first
+    sending.opens(date_from: date_from, date_to: date_to).first
     bounce = sending.bounces.first
-    puts "Bounce data: #{bounce.data_hash}"
 
     opt_outs_count = sending.opt_outs(count: true)
     puts "Opt outs count: #{opt_outs_count}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apsis-on-steroids
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http2