action_smser 1.1.1 → 1.2.0

data/test/unit/action_smser/base_test.rb

@@ -48,6 +48,15 @@ class ActionSmser::BaseTest < ActiveSupport::TestCase
     assert_equal 500, @sms.body_encoded_escaped.size
   end
 
+  test "ttl should be 24 hours by default" do
+    assert_equal 24.hours, @sms.ttl_to_i
+  end
+
+  test "should be able to change ttl" do
+    @sms.ttl = "60"
+    assert_equal 1.minute, @sms.ttl_to_i
+  end
+
   test "should be valid sms" do
     assert @sms.valid?
   end

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

@@ -18,24 +18,23 @@ class ActionSmser::NexmoTest < ActiveSupport::TestCase
     @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(
+    @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)
+    ActionSmser::DeliveryMethods::Nexmo.stubs(:deliver_http_request).returns(@http_mock)
   end
 
   test "should be able to deliver" do
+    ActionSmser::DeliveryMethods::Nexmo.expects(:deliver_http_request).twice().returns(@http_mock)
     @sms_delivery = @sms.deliver
     assert @sms_delivery
-    assert_equal 1, @sms_delivery.count
+    assert_equal 2, @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)
+    ActionSmser::DeliveryMethods::Nexmo.stubs(:deliver_http_request).returns(@http_mock)
 
     @sms_delivery = @sms.deliver
 
@@ -51,8 +50,6 @@ class ActionSmser::NexmoTest < ActiveSupport::TestCase
 
     @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

data/test/unit/action_smser/delivery_report_test.rb

@@ -73,15 +73,15 @@ class ActionSmser::DeliveryReportTest < ActiveSupport::TestCase
 
     @dr = ActionSmser::DeliveryReport.find(@dr.id)
 
-    result = @dr.re_deliver(:test_array)
+    re_delivarable_sms = @dr.re_delivarable_sms()
 
-    assert @dr.re_delivered
+    assert re_delivarable_sms
+    #assert re_delivarable_sms.is_a?(ActionSmser::Base)
     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_result = re_delivarable_sms.deliver
+    assert dr_result.is_a?(Array)
+    assert dr_result.first.is_a?(ActionSmser::DeliveryReport)
 
     @dr_redelivery = ActionSmser::DeliveryReport.last
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: action_smser
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Olli Huotari
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -70,6 +70,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- app/helpers/action_smser/application_helper.rb
 - app/controllers/action_smser/application_controller.rb
 - app/controllers/action_smser/delivery_reports_controller.rb
 - app/views/action_smser/delivery_reports/index.html.erb
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 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).