openmarket 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d796dd642228856036a3f663d3e0f06f2dc2a3b
-  data.tar.gz: c357c5e06508a4bd48ef40c510318d9643ac8712
+  metadata.gz: 54b9aba4acfa0e64ec20936b08ef549c31ff43a8
+  data.tar.gz: 93469bc218fef41e03961c91b6ba06779453c8c5
 SHA512:
-  metadata.gz: 730c8e58fecafed1f735d86a20dd889312670ce0db55978ecc9445d241657a0cbd29980b430ffa2eac837567f42dc44c533dd4d54376b44a62bea02292f4f0cc
-  data.tar.gz: a738abfd4ca912fd379cbbf789b3cc869df1f9b83168ae6ddd932a564b718fe97907b8c7eadda794dd84440452acf2cd0e282e5a064c6d1348d61b8e11215cda
+  metadata.gz: 24b0ac29bbbad26c703340ba07f24b81713af4de914eb5b91f7e49baabc8f87de6f5ac1a5b5a0522b6cfb66d049b57137e43b670231021e96cdb8732b5b12ed4
+  data.tar.gz: 503c709dc284f0046086257389ba5a494d7d3fa3becbb24537859cb3fed3a5357715750c723b5acb7ead87833ee78ec3f2c4bbe53d7b021eb4fa77cdbdabbdba

data/Rakefile

@@ -1,2 +1,17 @@
 require "bundler/gem_tasks"
 
+namespace :openmarket do
+  desc "Get status of a ticket (Usage: TICKET_ID=... rake openmarket:status).  Uses your test credentials."
+  task :status do
+    require "open_market/api"
+    require "logger"
+    SmsValidation.configure do |config|
+      config.logger = ::Logger.new(STDOUT)
+    end
+    OpenMarket.configure do |config|
+      secrets = YAML::load(File.open(File.expand_path("#{__FILE__}/../spec/support/secrets.yml")))
+      config.id, config.password, config.short_code, config.program_id = secrets['id'], secrets['password'], secrets['short_code'], secrets['program_id']
+    end
+    puts OpenMarket::API.status(ENV['TICKET_ID']).inspect
+  end
+end

data/lib/open_market/mo.rb

@@ -31,7 +31,7 @@ module OpenMarket
       end
       if message = xml.elements["message"]
         @udhi = message.attributes["udhi"] == true
-        @data = [message.attributes["data"]].pack("H*")
+        @data = [message.attributes["data"]].pack("H*").unpack("C*").pack("U*")
       end
     end
 

data/lib/open_market/version.rb

@@ -1,3 +1,3 @@
 module OpenMarket
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/api_spec.rb

@@ -34,12 +34,12 @@ describe OpenMarket::Api do
       expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
         expect(args[0]).to eq("/wmp")
         puts args[1][:body].inspect
-        expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"preview\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><destination ton=\"1\" address=\"1#{phone}\"\/><\/request>\z/
+        expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"preview\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><destination ton=\"1\" address=\"1#{phone}\"\/><\/request>\z/
         original.call(*args, &block)
       end
       expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
         expect(args[0]).to eq("/wmp")
-        expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+        expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
         original.call(*args, &block)
       end
       result = subject.send_sms(phone, "Test of OpenMarket API")
@@ -52,7 +52,7 @@ describe OpenMarket::Api do
           SmsValidation.configuration.on_message_too_long = :truncate
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"1\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"1\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", carrier_id: carrier_id)
@@ -64,7 +64,7 @@ describe OpenMarket::Api do
           SmsValidation.configuration.on_message_too_long = :split
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"2\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"2\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", carrier_id: carrier_id)
@@ -76,7 +76,7 @@ describe OpenMarket::Api do
           SmsValidation.configuration.on_message_too_long = :raise_error
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", carrier_id: carrier_id)
@@ -104,7 +104,7 @@ describe OpenMarket::Api do
         it "should be in the XML" do
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", carrier_id: carrier_id)
@@ -116,7 +116,7 @@ describe OpenMarket::Api do
         it "should be in the XML" do
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option note=\"#{note}\" charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option note=\"#{note}\" charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", carrier_id: carrier_id, note: note)
@@ -128,7 +128,7 @@ describe OpenMarket::Api do
         it "should be in the XML" do
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request ticket_id_for_retry=\"#{ticket_id_for_retry}\" version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request ticket_id_for_retry=\"#{ticket_id_for_retry}\" version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", carrier_id: carrier_id, ticket_id_for_retry: ticket_id_for_retry)
@@ -140,7 +140,7 @@ describe OpenMarket::Api do
         it "should be in the XML" do
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><delivery receipt_requested=\"true\" url=\"#{dr_url}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><delivery receipt_requested=\"true\" url=\"#{dr_url}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", dr_url: dr_url, carrier_id: carrier_id)
@@ -151,7 +151,7 @@ describe OpenMarket::Api do
         it "should be in the XML" do
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><delivery receipt_requested=\"true\" url=\"#{dr_url}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message validity_period=\"1080\" text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><delivery receipt_requested=\"true\" url=\"#{dr_url}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message validity_period=\"1080\" text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", dr_url: dr_url, carrier_id: carrier_id, minutes_to_retry: 18)
@@ -163,7 +163,7 @@ describe OpenMarket::Api do
               it "should be in the XML" do
                 expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
                   expect(args[0]).to eq("/wmp")
-                  expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><delivery receipt_requested=\"true\" url=\"#{dr_url}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message validity_period=\"3\" text=\"Test of OpenMarket API\"\/><\/request>\z/
+                  expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><delivery receipt_requested=\"true\" url=\"#{dr_url}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message validity_period=\"3\" text=\"Test of OpenMarket API\"\/><\/request>\z/
                   original.call(*args, &block)
                 end
                 subject.send_sms(phone, "Test of OpenMarket API", dr_url: dr_url, carrier_id: carrier_id, minutes_to_retry: 1.0/divisor )
@@ -178,7 +178,7 @@ describe OpenMarket::Api do
         it "should be in the XML" do
           expect(OpenMarket::Api::Http).to receive(:post).and_wrap_original do |original, *args, &block|
             expect(args[0]).to eq("/wmp")
-            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.1\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
+            expect(args[1][:body]).to match /\A<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><request version=\"3.0\" protocol=\"wmp\" type=\"submit\"><user agent=\"openmarket_rubygem\/SMS\/0\.0\.6\"\/><account id=\"#{id}\" password=\"#{password}\"\/><option charge_type=\"0\" program_id=\"#{program_id}\" mlc=\"0\"\/><source ton=\"3\" address=\"#{short_code}\"\/><destination ton=\"1\" address=\"1#{phone}\" carrier=\"#{carrier_id}\"\/><message text=\"Test of OpenMarket API\"\/><\/request>\z/
             original.call(*args, &block)
           end
           subject.send_sms(phone, "Test of OpenMarket API", carrier_id: carrier_id, short_code: short_code)
@@ -210,7 +210,7 @@ describe OpenMarket::Api do
         status = get_status
         break if 4 == status.status_code
         i += 1
-      end while i < 5
+      end while i < 10
       expect(status.code).to eq(0)
       expect(status.description).to eq("No Error")
       expect(status.status_code).to eq(4)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openmarket
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler