action_smser 1.0.1 → 1.1.0

data/test/functional/action_smser/delivery_reports_controller_test.rb

@@ -23,6 +23,15 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
 
       return processable_array
     end
+
+    def self.after_gateway_commit(delivery_reports)
+      return true
+    end
+
+  end
+
+  setup do
+    ActionSmser.delivery_options[:gateway_commit_observers] = []
   end
 
   test "gateway_commit with existing dr" do
@@ -30,13 +39,16 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
     @dr = ActionSmser::DeliveryReport.create(:msg_id => @msg_id, :status => 'ORIGINAL_STATUS')
 
     ActionSmser.delivery_options[:gateway_commit] = {'test_gateway' => SmsTestSetup}
+    ActionSmser.gateway_commit_observer_add(SmsTestSetup)
+
+    SmsTestSetup.expects(:after_gateway_commit).once.with(){|var| var.is_a?(Array) && var.first.is_a?(ActionSmser::DeliveryReport)}
 
     get 'gateway_commit', :use_route => :action_smser, :gateway => 'test_gateway',
         "DeliveryReport"=>{"message"=>{"id"=>@msg_id, "donedate"=>"2012/01/03 14:20:45", "sentdate"=>"2012/01/03 14:20:40", "status"=>"DELIVERED"}}
 
 
     assert_response :success
-    assert @response.body.downcase.include?("update"), "should have responed about saving"
+    assert @response.body.downcase.include?("update"), "should have responsed about saving"
     @dr.reload
     assert_equal "DELIVERED", @dr.status
   end
@@ -89,30 +101,43 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
     assert_template nil
   end
 
-  test "index with always enabled admin" do
+  test "index with admin_access lambda with right login info" do
+    default = ActionSmser.delivery_options[:admin_access]
+    ActionSmser.delivery_options[:admin_access] = SmsTestSetup
     2.times do
       ActionSmser::DeliveryReport.create(:msg_id => "idtest_#{rand(10)}")
     end
-    ActionSmser::DeliveryReportsController.any_instance.stubs(:admin_access_only).returns(true)
+    session[:admin_logged] = true
     get 'index', :use_route => :action_smser
+
     assert_response :success
     assert_template :index
+
+    ActionSmser.delivery_options[:admin_access] = default
+
   end
 
-  test "index with admin_access lambda with right login info" do
-    default = ActionSmser.delivery_options[:admin_access]
-    ActionSmser.delivery_options[:admin_access] = SmsTestSetup
+
+  test "index with always enabled admin" do
     2.times do
       ActionSmser::DeliveryReport.create(:msg_id => "idtest_#{rand(10)}")
     end
-    session[:admin_logged] = true
+    ActionSmser::DeliveryReportsController.any_instance.stubs(:admin_access_only).returns(true)
     get 'index', :use_route => :action_smser
-
     assert_response :success
     assert_template :index
+  end
 
-    ActionSmser.delivery_options[:admin_access] = default
-
+  test "list with always enabled admin" do
+    2.times do
+      ActionSmser::DeliveryReport.create(:msg_id => "idtest_#{rand(10)}")
+    end
+    ActionSmser::DeliveryReportsController.any_instance.stubs(:admin_access_only).returns(true)
+    get 'list', :use_route => :action_smser
+    assert_response :success
+    assert_template :list
   end
 
+
+
 end

data/test/unit/action_smser/base_test.rb

@@ -7,9 +7,14 @@ class ActionSmser::BaseTest < ActiveSupport::TestCase
       sms(:to => to, :from => from, :body => body)
     end
 
+    def before_delivery
+      return true
+    end
+
     def after_delivery(result)
-      puts "generic delivery observer, mock this"
+      return true
     end
+
   end
 
   setup do
@@ -65,7 +70,12 @@ class ActionSmser::BaseTest < ActiveSupport::TestCase
     assert_equal ActionSmser::DeliveryMethods::TestArray, @sms.delivery_method
   end
 
-  test "after delivery it should call delivery_observer if it's present" do
+  test "before delivery should be called if it's present" do
+    @sms.expects(:before_delivery).once
+    assert @sms.deliver
+  end
+
+  test "after delivery should be called if it's present" do
     @sms.expects(:after_delivery).once
     assert @sms.deliver
   end

data/test/unit/action_smser/delivery_methods/nexmo_test.rb

@@ -0,0 +1,93 @@
+# encoding: utf-8
+require 'test_helper'
+
+class ActionSmser::NexmoTest < ActiveSupport::TestCase
+  class MockSms<ActionSmser::Base
+    def basic_sms(to, from, body)
+      sms(:to => to, :from => from, :body => body)
+    end
+  end
+
+  setup do
+    @receivers = ["555123555", "123555123"]
+    @sender = "555666"
+    @body = "Body with ääkköset end"
+    @sms = MockSms.basic_sms(@receivers, @sender, @body)
+
+    @sms.delivery_options[:delivery_method] = :nexmo
+    @sms.delivery_options[:nexmo] = {:username => 'user', :password => 'pass'}
+    assert_equal ActionSmser::DeliveryMethods::Nexmo, @sms.delivery_method, "cant run tests, wrong delivery method"
+
+    http_mock = stub(
+        :body => '{"message-count":"1","messages":[{"message-price":"0.02500000","status":"0","message-id":"0778DE88","remaining-balance":"1.77500000"}]}')
+    ActionSmser::DeliveryMethods::Nexmo.stubs(:deliver_http_request).returns(http_mock)
+  end
+
+  test "should be able to deliver" do
+    @sms_delivery = @sms.deliver
+    assert @sms_delivery
+    assert_equal 1, @sms_delivery.count
+  end
+
+  test "with saving delivery_reports" do
+    @sms.delivery_options[:save_delivery_reports] = true
+    @delivery_reports_count = ActionSmser::DeliveryReport.count
+
+    http_mock = stub(
+        :body => '{"message-count":"1","messages":[{"message-price":"0.02500000","status":"0","message-id":"0778DE88","remaining-balance":"1.77500000"},{"error-text":"Message rejected by upstream path","message-price":"0.02500000","status":"6","message-id":"0778D302","remaining-balance":"1.87500000"}]}')
+    ActionSmser::DeliveryMethods::Nexmo.stubs(:deliver_http_request).returns(http_mock)
+
+    @sms_delivery = @sms.deliver
+
+    assert @sms_delivery.is_a?(Array)
+    assert @sms_delivery.first.is_a?(ActionSmser::DeliveryReport), "should return delivery report array"
+
+    assert_equal @delivery_reports_count + 2, ActionSmser::DeliveryReport.count, "should have saved 2 delivery reports"
+
+    @dr1 = @sms_delivery.first
+    assert_equal "nexmo", @dr1.gateway
+    assert_equal "555123555", @dr1.to, "receiver wrong"
+    assert_equal "LOCAL_SENT", @dr1.status
+
+    @dr2 = @sms_delivery.last
+    assert_equal "123555123", @dr2.to, "receiver wrong"
+    assert_equal "0778D302", @dr2.msg_id, "id wrong"
+    assert_equal "SENT_ERROR_6", @dr2.status
+  end
+
+  test "gateway process_delivery_report(params)" do
+    @msg_id = "msg_id_asdf"
+
+    result_array = ActionSmser::DeliveryMethods::Nexmo.process_delivery_report(
+        {"messageId" => @msg_id, "status" => "EXPIRED"} )
+
+    assert_equal @msg_id, result_array.first['msg_id']
+    assert_equal "EXPIRED", result_array.first['status']
+
+  end
+
+
+  # curl -is "http://rest.nexmo.com/sms/json?username=...&password=...&from=ActionSmser&to=...&text=msg"
+  NEXMO_ERROR_RESPONSE_BODY='{"message-count":"1","messages":[{"error-text":"Message rejected by upstream path","message-price":"0.02500000","status":"6","message-id":"0778D302","remaining-balance":"1.87500000"}]}'
+  NEXMO_ERROR_RESPONSE=<<eos
+HTTP/1.1 200 OK
+Cache-Control: max-age=1
+Content-Type: application/json;charset=ISO-8859-1
+Transfer-Encoding: chunked
+Server: Jetty(7.5.1.v20110908)
+
+{"message-count":"1","messages":[{"error-text":"Message rejected by upstream path","message-price":"0.02500000","status":"6","message-id":"0778D302","remaining-balance":"1.87500000"}]}
+eos
+  NEXMO_OK_RESPONSE_BODY='{"message-count":"1","messages":[{"message-price":"0.02500000","status":"0","message-id":"0778DE88","remaining-balance":"1.77500000"}]}'
+  NEXMO_OK_RESPONSE=<<eos
+HTTP/1.1 200 OK
+Cache-Control: max-age=1
+Content-Type: application/json;charset=ISO-8859-1
+Transfer-Encoding: chunked
+Server: Jetty(7.5.1.v20110908)
+
+{"message-count":"1","messages":[{"message-price":"0.02500000","status":"0","message-id":"0778DE88","remaining-balance":"1.77500000"}]}
+eos
+
+
+end

data/test/unit/action_smser/delivery_methods/simple_http_test.rb

@@ -45,8 +45,4 @@ class ActionSmser::SimpleHttpTest < ActiveSupport::TestCase
     assert_equal "id_6666", @dr.msg_id, "id wrong"
   end
 
-  # There are better frameworks for testing http requests
-  # http://railscasts.com/episodes/276-testing-time-web-requests
-  # https://github.com/chrisk/fakeweb
-
 end

data/test/unit/action_smser/delivery_report_test.rb

@@ -10,6 +10,7 @@ class ActionSmser::DeliveryReportTest < ActiveSupport::TestCase
   end
 
   setup do
+    ActionSmser.delivery_options[:save_delivery_reports] = false
     @receivers = ["555123555", "", "123555123"]
     @sender = "555666"
     @body = "Body with ääkköset end"
@@ -51,4 +52,47 @@ class ActionSmser::DeliveryReportTest < ActiveSupport::TestCase
     assert @dr.save
   end
 
+  test "to_sms" do
+    @dr = ActionSmser::DeliveryReport.create_from_sms(@sms, "123", "msg_id_a")
+
+    @dr = ActionSmser::DeliveryReport.find(@dr.id)
+    new_sms = @dr.to_sms
+
+    assert_equal @sender, @dr.from, "from info wrong"
+    assert_equal "123", @dr.to, "to info wrong"
+    assert_equal @body, @dr.body, "body info wrong"
+    assert_equal @sms.sms_type, @dr.sms_type
+  end
+
+  test "re_deliver with simple_http" do
+    ActionSmser.delivery_options[:save_delivery_reports] = true
+
+    @dr = ActionSmser::DeliveryReport.create_from_sms(@sms, "123", "msg_id_a")
+    @dr.gateway = "some_delivery"
+    @dr.save
+
+    @dr = ActionSmser::DeliveryReport.find(@dr.id)
+
+    result = @dr.re_deliver(:test_array)
+
+    assert @dr.re_delivered
+    assert ActionSmser::DeliveryReport.find(@dr.id).re_delivered?
+
+    assert result.is_a?(Array)
+    assert result.first.is_a?(ActionSmser::Base)
+    assert result.second.is_a?(Array)
+    assert result.second.first.is_a?(ActionSmser::DeliveryReport)
+
+    @dr_redelivery = ActionSmser::DeliveryReport.last
+
+    assert_equal @sender, @dr_redelivery.from, "from info wrong"
+    assert_equal "#{@sms.sms_type}.re_delivery", @dr_redelivery.sms_type
+
+    assert_equal @dr.id, @dr_redelivery.re_delivery_of_delivery_report_id, "should set new reports re_delivery_of_delivery_report_id"
+    assert_equal @dr.re_deliveries.first, @dr_redelivery
+    assert_equal @dr, @dr_redelivery.re_delivery_of
+  end
+
+
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: action_smser
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Olli Huotari
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -60,7 +60,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-description: Simple way to use SMS (Short Message Service) in the same way as ActionMailer (ActionSmser == ActionMailer). Includes also delivery reports and easy way to add custom gateways.
+description: ActionSmser == SMS && ActionMailer. Simple way to use SMS (Short Message Service) in the same way as ActionMailer. Includes also delivery reports and easy way to add custom gateways (simple http and nexmo by default).
 email: 
 - olli.huotari@iki.fi
 executables: []
@@ -73,6 +73,7 @@ files:
 - app/controllers/action_smser/application_controller.rb
 - app/controllers/action_smser/delivery_reports_controller.rb
 - app/views/action_smser/delivery_reports/index.html.erb
+- app/views/action_smser/delivery_reports/list.html.erb
 - app/views/layouts/action_smser/delivery_reports.html.erb
 - app/models/action_smser/delivery_report.rb
 - app/assets/javascripts/action_smser/delivery_reports.js
@@ -85,6 +86,7 @@ files:
 - lib/action_smser/engine.rb
 - lib/action_smser/delivery_methods/simple_http.rb
 - lib/action_smser/delivery_methods/test_array.rb
+- lib/action_smser/delivery_methods/nexmo.rb
 - lib/action_smser/version.rb
 - lib/action_smser/base.rb
 - lib/action_smser.rb
@@ -95,12 +97,14 @@ files:
 - test/action_smser_test.rb
 - test/dummy/script/rails
 - test/dummy/db/development.sqlite3
+- test/dummy/db/production.sqlite3
 - test/dummy/db/test.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/action_smser.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
@@ -120,6 +124,7 @@ files:
 - test/dummy/public/404.html
 - test/dummy/log/development.log
 - test/dummy/log/test.log
+- test/dummy/log/production.log
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/mailers/hello_smser.rb
 - test/dummy/app/controllers/application_controller.rb
@@ -130,6 +135,7 @@ files:
 - test/test_helper.rb
 - test/unit/action_smser/delivery_methods/simple_http_test.rb
 - test/unit/action_smser/delivery_methods/test_array_test.rb
+- test/unit/action_smser/delivery_methods/nexmo_test.rb
 - test/unit/action_smser/base_test.rb
 - test/unit/action_smser/delivery_report_test.rb
 - test/functional/action_smser/delivery_reports_controller_test.rb
@@ -165,18 +171,20 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Simple way to use SMS (Short Message Service) in the same way as ActionMailer (ActionSmser == ActionMailer). Includes also delivery reports and easy way to add custom gateways.
+summary: ActionSmser == SMS && ActionMailer. Simple way to use SMS (Short Message Service) in the same way as ActionMailer. Includes also delivery reports and easy way to add custom gateways (simple http and nexmo by default).
 test_files: 
 - test/integration/navigation_test.rb
 - test/action_smser_test.rb
 - test/dummy/script/rails
 - test/dummy/db/development.sqlite3
+- test/dummy/db/production.sqlite3
 - test/dummy/db/test.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/action_smser.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
@@ -196,6 +204,7 @@ test_files:
 - test/dummy/public/404.html
 - test/dummy/log/development.log
 - test/dummy/log/test.log
+- test/dummy/log/production.log
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/mailers/hello_smser.rb
 - test/dummy/app/controllers/application_controller.rb
@@ -206,6 +215,7 @@ test_files:
 - test/test_helper.rb
 - test/unit/action_smser/delivery_methods/simple_http_test.rb
 - test/unit/action_smser/delivery_methods/test_array_test.rb
+- test/unit/action_smser/delivery_methods/nexmo_test.rb
 - test/unit/action_smser/base_test.rb
 - test/unit/action_smser/delivery_report_test.rb
 - test/functional/action_smser/delivery_reports_controller_test.rb