action_smser 1.1.1 → 1.2.0

data/app/helpers/action_smser/application_helper.rb

@@ -0,0 +1,9 @@
+module ActionSmser
+  module ApplicationHelper
+
+    def dr_summary_url(new_params)
+      delivery_reports_url({:time_span => params[:time_span], :gateway => params[:gateway], :redeliveries => params[:redeliveries]}.merge(new_params))
+    end
+
+  end
+end

data/app/models/action_smser/delivery_report.rb

@@ -43,7 +43,8 @@ module ActionSmser
       sms_new
     end
 
-    def re_deliver(gateway = :default)
+    # This updates re_delivered attribute for itself
+    def re_delivarable_sms(changed_delivery_options = {})
       ActionSmser::Logger.info("Re_delivering: #{self.inspect}")
       self.update_attribute(:re_delivered, true)
       
@@ -51,11 +52,7 @@ module ActionSmser
       sms_new.sms_type = "#{sms_new.sms_type}.re_delivery"
       sms_new.re_delivery_of_delivery_report_id = self.id
 
-      unless gateway == :default
-        sms_new.delivery_options[:delivery_method] = gateway
-      end
-
-      [sms_new, sms_new.deliver]
+      sms_new
     end
 
   end

data/app/views/action_smser/delivery_reports/index.html.erb

@@ -1,60 +1,78 @@
 
 <%
-params['time_span'] ||= 'Last Month'
-
-time_span = case params['time_span'].to_s.downcase
-  when 'previous week'
-    2.weeks.ago..1.week.ago
-  when 'last month'
-    1.month.ago..10.minutes.ago
-  when 'last 24 hours'
-    1.day.ago..10.minutes.ago
-  when 'previous 24 hours'
-    2.days.ago..1.day.ago
-  else
-    1.week.ago..10.minutes.ago
-  end
+  params['time_span'] ||= 'Last week'
+  params['redeliveries'] ||= 'Include normally'
+
+  time_span = case params['time_span'].to_s.downcase
+    when 'week before that'
+      2.weeks.ago..1.week.ago
+    when 'last month'
+      1.month.ago..10.minutes.ago
+    when 'last 24 hours'
+      1.day.ago..10.minutes.ago
+    when '24 hours before that'
+      2.days.ago..1.day.ago
+    else
+      1.week.ago..10.minutes.ago
+    end
 
   ar_timespan = ActionSmser::DeliveryReport.where(:created_at => time_span)
 
-  ar_gateway = ar_timespan
+  ar_redeliveries = case params['redeliveries'].to_s.downcase
+    when 'ignore redeliveries'
+      ar_timespan.where("re_delivery_of_delivery_report_id IS NULL")
+    when 'only redeliveries'
+      ar_timespan.where("re_delivery_of_delivery_report_id IS NOT NULL")
+    else
+      ar_timespan
+    end
+
+  ar_gateway = ar_redeliveries
   ar_gateway = ar_gateway.where(:gateway => params[:gateway]) if (params[:gateway] && params[:gateway].to_s != 'all')
 
 %>
 
 
-<h1>Delivery Reports Summary for <%= params['time_span'] %> <%= "for #{params[:gateway]}" unless params[:gateway].blank? %></h1>
+<h1>Delivery Reports Summary for
+  (<span style="font-size: smaller"><%= "#{time_span.first.to_s(:db)} => #{time_span.last.to_s(:db)}" %></span>)
+  <%= "for #{params[:gateway]}" unless params[:gateway].blank? %>
+</h1>
 
-<p>
-Show summary:
-<%= link_to 'Last 24 hours', delivery_reports_path(:time_span => 'Last 24 Hours', :gateway => params[:gateway]) %>,
-<%= link_to '24 hours before that', delivery_reports_path(:time_span => 'Previous 24 Hours', :gateway => params[:gateway]) %>,
-<%= link_to 'Last week', delivery_reports_path(:time_span => 'Last Week', :gateway => params[:gateway]) %>,
-<%= link_to 'Week before that', delivery_reports_path(:time_span => 'Previous Week', :gateway => params[:gateway]) %> or
-<%= link_to 'Last month', delivery_reports_path(:time_span => 'Last Month', :gateway => params[:gateway]) %>.
+<p class="selection_links">
+  <strong>Show summary:</strong>
+  <% ['Last 24 hours', '24 hours before that', 'Last week', 'Week before that', 'Last month'].each do |key| %>
+    <%= link_to key, dr_summary_url(:time_span => key), :class => (key == params['time_span'] ? 'selected' : 'not_selected') %>
+  <% end %>
 </p>
 
-<h2>Select gateway</h2>
+<p class="selection_links">
+  <strong>Redeliveries:</strong>
+  
+  <% ['Include normally', 'Ignore redeliveries', 'Only redeliveries'].each do |key| %>
+    <%= link_to key, dr_summary_url(:redeliveries => key), :class => (key == params['redeliveries'] ? 'selected' : 'not_selected') %>
+  <% end %>
+</p>
 
-<ul>
+<h2>Select gateway</h2>
+<ul class="selection_links" style="width: 500px;">
   <li>
     <strong>
-        <%= link_to('all', delivery_reports_path(:time_span => params[:time_span]) ) %>
+        <%= link_to('all', dr_summary_url(:gateway => nil) ) %>
     </strong>
     &nbsp;&nbsp;
+    <%= total = ar_redeliveries.count %> sms
+    &nbsp;&nbsp;
     (you can select only gateways that have messages in this period)
   </li>
-  <%
-     total = ar_timespan.count
-     grouped_by_status = ar_timespan.group(:gateway).count.each do |key, val| %>
-    <li>
-      <strong>
-        <%= link_to(key, delivery_reports_path(:time_span => params[:time_span], :gateway => key) ) %>
-      </strong>
+  <% ar_redeliveries.group(:gateway).count.each do |key, val| %>
+    <li class="<%= (key == params['gateway'] ? 'selected' : 'not_selected') -%>">
+      <%= link_to(key, dr_summary_url(:gateway => key) ) %>
+
       &nbsp;&nbsp;
       <%= val %> sms
       &nbsp;&nbsp;
       (<strong><%= number_to_percentage(100.0 * val / total, :precision => 2) %></strong>)
+      <% if params[:gateway] == key %><strong style="padding-left: 50px;">(selected)</strong><% end %>
     </li>
   <% end %>
 </ul>
@@ -125,7 +143,7 @@ Show summary:
      <td><strong><%= key %></strong></td>
      <td><%= val %></td>
      <td><strong><%= number_to_percentage(100.0 * val / total, :precision => 2) %></strong></td>
-     <td><%= sms_count = ActionSmser::DeliveryReport.where(:created_at => time_span).where(:sms_type => key).where(:status => 'delivered').count %></td>
+     <td><%= sms_count = ar_gateway.where(:sms_type => key).where(:status => 'delivered').count %></td>
      <td><strong><%= number_to_percentage(100.0 * sms_count / val, :precision => 2) %></strong></td>
    </tr>
 <% end %>

data/app/views/layouts/action_smser/delivery_reports.html.erb

@@ -30,6 +30,12 @@
     }
     hr { margin-top: 20px; margin-bottom: 10px; }
 
+    .selection_links { font-weight: strong; }
+    .selection_links a { font-size: 12px; font-weight: normal; padding-left: 10px; padding-right: 10px;}
+    .selection_links a.selected { font-size: 14px; font-weight: bold; color: black; }
+    li.selected {background-color: #ddd;}
+
+
     .menu { margin-top: 30px; }
     .menu a { margin-right: 20px; font-size: 16px; }
     

data/lib/action_smser/base.rb

@@ -40,7 +40,7 @@ class ActionSmser::Base
   ##################################################################
   ## INSTANCE METHODS
 
-  attr_accessor :body, :to, :from, :sms_type, :re_delivery_of_delivery_report_id
+  attr_accessor :body, :to, :from, :sms_type, :re_delivery_of_delivery_report_id, :ttl
 
   # Initialized to duplicate of ActionSmser.delivery_options
   attr_accessor :delivery_options
@@ -131,6 +131,10 @@ class ActionSmser::Base
     from.to_s.gsub(/^(\+|0)/, "")
   end
 
+  def ttl_to_i
+    ttl.blank? ? ActionSmser.delivery_options[:default_ttl] : ttl.to_i
+  end
+
   def logger
     ActionSmser::Logger
   end

data/lib/action_smser/delivery_methods/nexmo.rb

@@ -12,45 +12,48 @@ module ActionSmser::DeliveryMethods
       logger.info "Delivering sms by https"
 
       options = sms.delivery_options[:nexmo] || {}
+      options = options.dup
 
       options[:server] = 'rest.nexmo.com'
       options[:use_ssl] = true
-      options[:ttl] ||= 60*1000
       options[:status_report_req] ||= sms.delivery_options[:save_delivery_reports]
 
-      deliver_path = self.deliver_path(sms, options)
+      logger.info("Nexmo delivery with #{sms.to_numbers_array.count} recipients")
+      to_original = sms.to
 
-      response = self.deliver_http_request(sms, options, deliver_path)
+      sms.delivery_info = []
+      delivery_reports = []
 
-      logger.info "SimpleHttp delivery ||| #{deliver_path} ||| #{response.inspect}"
-      logger.info response.body if !response.blank?
-      sms.delivery_info = response
+      sms.to_numbers_array.each do |to|
+        deliver_path = self.deliver_path(sms, to, options)
+        response = self.deliver_http_request(sms, options, deliver_path)
 
-      # Results include sms_id or error code in each line
+        logger.info "Nexmo delivery http ||| #{deliver_path} ||| #{response.inspect}"
+        logger.info response.body if !response.blank?
 
-      results = JSON.parse(response.body)["messages"]
-      if sms.delivery_options[:save_delivery_reports]
-        delivery_reports = []
-        sms.to_numbers_array.each_with_index do |to, i|
-          result = results[i]
+        sms.delivery_info.push(response)
+
+        result = JSON.parse(response.body)["messages"].first
+
+        # Results include sms_id or error code in each line
+        if sms.delivery_options[:save_delivery_reports]
           dr = ActionSmser::DeliveryReport.build_from_sms(sms, to, result["message-id"])
           if result["status"].to_i > 0
             dr.status = "SENT_ERROR_#{result["status"]}"
             dr.log += "nexmo_error: #{result["error-text"]}"
           end
           dr.save
-
           delivery_reports << dr
         end
-        return delivery_reports
-      else
-        return results
       end
 
+      sms.to = to_original
+
+      sms.delivery_options[:save_delivery_reports] ? delivery_reports : sms.delivery_info
     end
 
-    def self.deliver_path(sms, options)
-      "/sms/json?username=#{options[:username]}&password=#{options[:password]}&ttl=#{options[:ttl]}&status-report-req=#{options[:status_report_req]}&from=#{sms.from_encoded}&to=#{sms.to_encoded}&text=#{sms.body_escaped}"
+    def self.deliver_path(sms, to, options)
+      "/sms/json?username=#{options[:username]}&password=#{options[:password]}&ttl=#{sms.ttl_to_i*1000}&status-report-req=#{options[:status_report_req]}&from=#{sms.from_encoded}&to=#{to}&text=#{sms.body_escaped}"
     end
 
     # Callback message status handling

data/lib/action_smser/version.rb

@@ -1,3 +1,3 @@
 module ActionSmser
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/action_smser.rb

@@ -8,7 +8,7 @@ require "action_smser/delivery_methods/nexmo"
 module ActionSmser
 
   mattr_accessor :delivery_options
-  self.delivery_options= {:delivery_method => :test_array, :save_delivery_reports => false}
+  self.delivery_options= {:delivery_method => :test_array, :save_delivery_reports => false, :default_ttl => (24*60*60) }
   self.delivery_options[:gateway_commit] = {}
   self.delivery_options[:gateway_commit_observers] = []