elk 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2794c48c93bfb328ac04cb5d91e5342810dbc001
-  data.tar.gz: 6aa4c6506326eb8b54d0c3b4d7069e212be7382c
+  metadata.gz: cec2cf51647b89d4639431b5e6cad98a4eb1c3ac
+  data.tar.gz: 311eb1055230e2545f94fa5e194ff99d6815fdaf
 SHA512:
-  metadata.gz: c18b3adef719bf84274a1015460eb93b06108c08ab48efc34598ac571c0330ecf8ecbbeb706ec464608b62739114e6ea79709d3ee876a44cc95a05b8c7d958b8
-  data.tar.gz: 3b1543b1366eec044563a67e5579e8c76125957b419967cebeac0194160b9b7a81c7f6d13c330fa002f50955a9cab331214415d8b676c3634388d1cccedc82b4
+  metadata.gz: e34f77bae51ddfefbb3750df28fa56fe89910a081a6ff872775d2a928dccabca2be5b44ec0ae28e27b5014496825303ace5eb1b9ffe48bdd95a1913f08c925b1
+  data.tar.gz: 93c31cf0651316835a997c01ccb688e7b5c1ee6f5321a9ffeeecbfa51ea4758498632e4a1491a921d375db74884f84f74730b7466d8acc78c88de1537c32f847

data/lib/elk/sms.rb

@@ -13,7 +13,7 @@ module Elk
       @to         = parameters[:to]
       @message    = parameters[:message]
       @message_id = parameters[:id]      
-      @created_at = Time.parse(parameters[:created])
+      @created_at = Time.parse(parameters[:created]) if parameters[:created]
       @loaded_at  = Time.now
       @direction  = parameters[:direction]
       @status     = parameters[:status]
@@ -38,21 +38,36 @@ module Elk
       def send(parameters)
         verify_parameters(parameters, [:from, :message, :to])
 
+        parameters[:to] = Array(parameters[:to]).join(',')
+        
         # Warn if the from string will be capped by the sms gateway
         if parameters[:from] && parameters[:from].match(/^(\w{11,})$/)
           warn "SMS 'from' value #{parameters[:from]} will be capped at 11 chars"
         end
 
         response = Elk.post('/SMS', parameters)
-        self.new(Elk.parse_json(response.body))
+        parsed_response = Elk.parse_json(response.body)
+        
+        if multiple_recipients?(parameters[:to])
+          instantiate_multiple(parsed_response)
+        else
+          self.new(parsed_response)
+        end
       end
 
       # Get outgoing and incomming messages. Limited by the API to 100 latest
       def all
         response = Elk.get('/SMS')
-        Elk.parse_json(response.body)[:data].collect do |n|
-          self.new(n)
-        end
+        instantiate_multiple(Elk.parse_json(response.body)[:data])
+      end
+
+      private
+      def instantiate_multiple(multiple)
+        multiple.collect { |n| self.new(n) }
+      end
+
+      def multiple_recipients?(to)
+        to.split(',').length > 1
       end
     end
   end

data/lib/elk/version.rb

@@ -1,3 +1,3 @@
 module Elk
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/spec/elk_spec.rb

@@ -192,6 +192,44 @@ describe Elk do
       sms.status.should == 'delivered'
     end
 
+
+    context 'when sending a SMS to multiple recipients' do
+      before do
+        stub_request(:post, "https://USERNAME:PASSWORD@api.46elks.com/a1/SMS").
+          with(:body => {"from" => "+46761042247", :message => "Your order #171 has now been sent!", :to => "+46704508449,+46704508449"},
+               :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+          to_return(fixture('sends_a_sms_to_multiple_recipients.txt'))
+
+        configure_elk
+      end        
+
+      it "sends the SMS when passing `to` as comma separated string" do
+        smses = Elk::SMS.send(:from => '+46761042247',
+          :to => '+46704508449,+46704508449',
+          :message => 'Your order #171 has now been sent!')
+
+        smses.size.should == 2
+        smses[0].class.should == Elk::SMS
+        smses[0].to.should == "+46704508449"
+
+        smses[0].message_id.should == "sb326c7a214f9f4abc90a11bd36d6abc3"
+        smses[1].message_id.should == "s47a89d6cc51d8db395d45ae7e16e86b7"
+      end
+
+      it "sends the SMS when passing `to` as array" do
+        smses = Elk::SMS.send(:from => '+46761042247',
+          :to => ['+46704508449', '+46704508449'],
+          :message => 'Your order #171 has now been sent!')
+
+        smses.size.should == 2
+        smses[0].class.should == Elk::SMS
+        smses[0].to.should == "+46704508449"
+
+        smses[0].message_id.should == "sb326c7a214f9f4abc90a11bd36d6abc3"
+        smses[1].message_id.should == "s47a89d6cc51d8db395d45ae7e16e86b7"
+      end
+    end
+
     it 'gets SMS-history' do
       stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/SMS").
         with(:headers => {'Accept'=>'application/json'}).

data/spec/fixtures/sends_a_sms_to_multiple_recipients.txt

@@ -0,0 +1,8 @@
+HTTP/1.1 200 OK
+Server: nginx/0.7.67
+Date: Tue, 05 Jul 2011 15:32:45 GMT
+Content-Type: application/json
+Connection: keep-alive
+Content-Length: 135
+
+[{"to": "+46704508449", "id": "sb326c7a214f9f4abc90a11bd36d6abc3"}, { "to": "+46704508449", "id": "s47a89d6cc51d8db395d45ae7e16e86b7"}]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elk
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Johan Eckerstroem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -107,6 +107,7 @@ files:
 - spec/fixtures/reloads_a_number.txt
 - spec/fixtures/reloads_a_sms.txt
 - spec/fixtures/sends_a_sms.txt
+- spec/fixtures/sends_a_sms_to_multiple_recipients.txt
 - spec/fixtures/sends_a_sms_with_long_sender.txt
 - spec/fixtures/server_error.txt
 - spec/fixtures/sms_history.txt