elk 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cec2cf51647b89d4639431b5e6cad98a4eb1c3ac
-  data.tar.gz: 311eb1055230e2545f94fa5e194ff99d6815fdaf
+  metadata.gz: ffe981763600225095d75aaf6c9906060fca7be7
+  data.tar.gz: 411313ddbd7e12b1b2fd8b78f2135e9bfd1ab425
 SHA512:
-  metadata.gz: e34f77bae51ddfefbb3750df28fa56fe89910a081a6ff872775d2a928dccabca2be5b44ec0ae28e27b5014496825303ace5eb1b9ffe48bdd95a1913f08c925b1
-  data.tar.gz: 93c31cf0651316835a997c01ccb688e7b5c1ee6f5321a9ffeeecbfa51ea4758498632e4a1491a921d375db74884f84f74730b7466d8acc78c88de1537c32f847
+  metadata.gz: f504ba330456a3d3b9ebd292d0baf0b0eacd07d2b4d1fa213f9431cd5d4f97879f9ff10ffcd128dae87ddfa4e8176a0dbb9cb9b64149a7818e886d4ff3542aad
+  data.tar.gz: 878e51be0a7383459fbf04aff9a259c837a7866c249f9ae6c11953c80a8c4e816cdf76921caaf6a6b5d107d5cbd910485b2eca301b8ef5dd555bddb8cc05f0f5

data/README.MD

@@ -29,60 +29,76 @@ elk can be used to allocate a phone numbers, manage the numbers and send/recieve
 
 First thing when using elk is to set the authentication parameters
 
-    require 'elk'
+```Ruby
+require 'elk'
 
-    Elk.configure do |config|
-      config.username = 'USERNAME'
-      config.password = 'PASSWORD'
-    end
+Elk.configure do |config|
+  config.username = 'USERNAME'
+  config.password = 'PASSWORD'
+end
+```
 
 ### Numbers
 
 To be able to send and recieve messages, a number is needed. Several numbers can be allocated.
 
-    number = Elk::Number.allocate(:sms_url => 'http://myservice.se/callback/newsms.php', :country => 'se')
-    # => #<Elk::Number:0x0000010282aa70 @country="se", @sms_url="http://myservice.se/callback/newsms.php", @status="yes", @number_id="n03e7db70cc06c1ff85e09a2b3f86dd62", @number="+46766861034", @capabilities=[:sms], @loaded_at=2011-07-17 15:23:55 +0200>
+```Ruby
+number = Elk::Number.allocate(:sms_url => 'http://myservice.se/callback/newsms.php', :country => 'se')
+# => #<Elk::Number:0x0000010282aa70 @country="se", @sms_url="http://myservice.se/callback/newsms.php", @status="yes", @number_id="n03e7db70cc06c1ff85e09a2b3f86dd62", @number="+46766861034", @capabilities=[:sms], @loaded_at=2011-07-17 15:23:55 +0200>
+```
 
 Get all numbers
 
-    numbers = Elk::Number.all
-    # => [#<Elk::Number ...>, #<Elk::Number ...>]
+```Ruby
+numbers = Elk::Number.all
+# => [#<Elk::Number ...>, #<Elk::Number ...>]
+```
 
 Change number settings
 
-    number.sms_url = 'http://myservice.se/callback/newsms.php'
-    number.save
-    # => true
+```Ruby
+number.sms_url = 'http://myservice.se/callback/newsms.php'
+number.save
+# => true
+```
 
 Deallocate a number.
 Beware that there is no way to get your number back once it has been deallocated!
 
-    number.deallocate!
-    # => true
-    number.status
-    # => :deallocated
+```Ruby
+number.deallocate!
+# => true
+number.status
+# => :deallocated
+```
 
 ### SMS
 
 Send SMS. Messages can be sent from one of the allocated numbers or an arbitrary alphanumeric string of at most 11 characters.
 
-    Elk::SMS.send(:from => 'MyService', :to => '+46704508449', :message => 'Your order #171 has now been sent!')
-    # => #<Elk::SMS:0x0000010179d7e8 @from="MyService", @to="+46704508449", @message="Your order #171 has now been sent!", @message_id="sdc39a7926d37159b6985283e32f43251", @created_at=2011-07-17 16:21:13 +0200, @loaded_at=2011-07-17 16:21:13 +0200>
+```Ruby
+Elk::SMS.send(:from => 'MyService', :to => '+46704508449', :message => 'Your order #171 has now been sent!')
+# => #<Elk::SMS:0x0000010179d7e8 @from="MyService", @to="+46704508449", @message="Your order #171 has now been sent!", @message_id="sdc39a7926d37159b6985283e32f43251", @created_at=2011-07-17 16:21:13 +0200, @loaded_at=2011-07-17 16:21:13 +0200>
+```
 
 Receiving SMS does not require Elk, but should be of interest anyway.
 Example with Sinatra:
 
-    post '/receive' do
-      if request.params['message'] == 'Hello'
-        # Sends a return SMS with message "world!"
-        "world!"
-      end
-    end
+```Ruby
+post '/receive' do
+  if request.params['message'] == 'Hello'
+    # Sends a return SMS with message "world!"
+    "world!"
+  end
+end
+```
 
 SMS history
 
-    Elk::SMS.all
-    # => [#<Elk::SMS ...>, #<Elk::SMS ...>, <Elk::SMS ...>]
+```Ruby
+Elk::SMS.all
+# => [#<Elk::SMS ...>, #<Elk::SMS ...>, <Elk::SMS ...>]
+```
 
 ## Copyright
 

data/lib/elk/sms.rb

@@ -33,13 +33,22 @@ module Elk
       # Required parameters
       #
       # * :from - Either the one of the allocated numbers or arbitrary alphanumeric string of at most 11 characters
-      # * :to - Any phone number capable of receiving SMS
+      # * :to - Any phone number capable of receiving SMS. Multiple numbers can be given as Array or comma separated String
       # * :message - Any UTF-8 text Splitting and joining multi-part SMS messages are automatically handled by the API
+      # 
+      # Optional parameters
+      # * :flash - if set to non-false value SMS is sent as a "Flash SMS"
+      #
       def send(parameters)
         verify_parameters(parameters, [:from, :message, :to])
 
         parameters[:to] = Array(parameters[:to]).join(',')
         
+        if parameters[:flash]
+          parameters.delete(:flash)
+          parameters[:flashsms] = 'yes'
+        end
+
         # 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"

data/lib/elk/version.rb

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

data/spec/elk/number_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+require 'elk'
+
+describe Elk::Number do
+  before { configure_elk }
+
+  it 'allocates a number' do
+    stub_request(:post, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
+      with(:body => {"country" => "se", "sms_url" => "http://localhost/receive"},
+           :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(fixture('allocates_a_number.txt'))
+
+    number = described_class.allocate(:sms_url => 'http://localhost/receive', :country => 'se')
+    number.status.should == :active
+    number.sms_url.should == 'http://localhost/receive'
+    number.country.should == 'se'
+    number.number.should == '+46766861012'
+    number.capabilities.should == [:sms]
+  end
+
+  it 'gets allocated numbers' do
+    stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('gets_allocated_numbers.txt'))
+
+    numbers = described_class.all
+    numbers.size.should == 2
+    numbers[0].number_id.should == 'nea19c8e291676fb7003fa1d63bba7899'
+    numbers[0].number.should == '+46704508449'
+    numbers[0].sms_url == 'http://localhost/receive1'
+
+    numbers[1].number_id.should == 'nea19c8e291676fb7003fa1d63bba789A'
+    numbers[1].number.should == '+46761042247'
+    numbers[0].sms_url == 'http://localhost/receive2'
+  end
+
+  it 'updates a number' do
+    stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('gets_allocated_numbers.txt'))
+    stub_request(:post, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers/nea19c8e291676fb7003fa1d63bba7899").
+      with(:body => {"sms_url" => "http://otherhost/receive", "voice_start" => ""},
+      :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(fixture('updates_a_number.txt'))
+
+    number = described_class.all[0]
+    number.country = 'no'
+    number.sms_url = 'http://otherhost/receive'
+    number.save.should == true
+    number.country.should == 'no'
+    number.sms_url.should == 'http://otherhost/receive'
+  end
+
+  it 'deallocates a number' do
+    stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('gets_allocated_numbers.txt'))
+    stub_request(:post, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers/nea19c8e291676fb7003fa1d63bba7899").
+      with(:body => {"active" => "no"},
+      :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(fixture('deallocates_a_number.txt'))
+
+    number = described_class.all[0]
+    number.status.should == :active
+    number.deallocate!.should == true
+    number.status.should == :deallocated
+  end
+
+  it 'reloads a number' do
+    stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('gets_allocated_numbers.txt'))
+    stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers/nea19c8e291676fb7003fa1d63bba7899").
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('reloads_a_number.txt'))
+
+    number = described_class.all[0]
+    object_id = number.object_id
+    loaded_at = number.loaded_at
+    number.country = 'blah'
+    number.reload.should == true
+    number.country.should == 'se'
+    number.object_id.should == object_id
+    number.loaded_at.should_not == loaded_at
+  end
+
+  it 'has wrong password' do
+    stub_request(:get, "https://USERNAME:WRONG@api.46elks.com/a1/Numbers").
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('auth_error.txt'))
+
+    Elk.configure do |config|
+      config.username = 'USERNAME'
+      config.password = 'WRONG'
+    end
+
+    expect {
+      described_class.all
+    }.to raise_error(Elk::AuthError)
+  end
+
+  it 'gets server error when looking for all numbers' do
+    stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('server_error.txt'))
+
+    expect {
+      described_class.all
+    }.to raise_error(Elk::ServerError)
+  end
+
+  it 'should handle no parameters' do
+    expect {
+      sms = described_class.allocate({})
+    }.to raise_error(Elk::MissingParameter)
+  end
+end

data/spec/elk/sms_spec.rb

@@ -0,0 +1,168 @@
+require 'spec_helper'
+require 'elk'
+
+describe Elk::SMS do
+  before { configure_elk }
+  let(:url) { "https://USERNAME:PASSWORD@api.46elks.com/a1/SMS" }
+
+  it 'sends a SMS' do
+    stub_request(:post, url).
+      with(:body => {:from => "+46761042247", :message => "Your order #171 has now been sent!", :to => "+46704508449"},
+           :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(fixture('sends_a_sms.txt'))
+
+    # Fake $stderr to check warnings
+    begin
+      old_stderr, $stderr = $stderr, StringIO.new
+
+      sms = described_class.send(:from => '+46761042247',
+        :to => '+46704508449',
+        :message => 'Your order #171 has now been sent!')
+
+      $stderr.string.should == ""
+    ensure
+      $stderr = old_stderr
+    end
+
+    sms.class.should == described_class
+    sms.from.should == '+46761042247'
+    sms.to.should == '+46704508449'
+    sms.message.should == 'Your order #171 has now been sent!'
+    sms.direction.should == 'outgoing'
+    sms.status.should == 'delivered'
+  end
+
+  it "sends a flash SMS" do
+    stub = stub_request(:post, url).
+      to_return(fixture('sends_a_sms.txt'))
+
+    described_class.send(
+      :from => '+46761042247',
+      :to => '+46704508449',
+      :message => 'Your order #171 has now been sent!',
+      :flash => true
+    )
+
+    stub.with(
+      :body => {
+        :from => '+46761042247',
+        :to => '+46704508449',
+        :message => 'Your order #171 has now been sent!',
+        :flashsms => 'yes'
+      },
+      :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      should have_been_made
+  end
+
+  context 'when sending a SMS to multiple recipients' do
+    before do
+      stub_request(:post, url).
+        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'))
+    end
+
+    it "sends the SMS when passing `to` as comma separated string" do
+      smses = described_class.send(:from => '+46761042247',
+        :to => '+46704508449,+46704508449',
+        :message => 'Your order #171 has now been sent!')
+
+      smses.size.should == 2
+      smses[0].class.should == described_class
+      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 = described_class.send(:from => '+46761042247',
+        :to => ['+46704508449', '+46704508449'],
+        :message => 'Your order #171 has now been sent!')
+
+      smses.size.should == 2
+      smses[0].class.should == described_class
+      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, url).
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('sms_history.txt'))
+
+    sms_history = described_class.all
+
+    sms_history.size.should == 3
+    sms_history[0].class.should == described_class
+    sms_history[0].created_at.class.should == Time
+
+    sms_history[0].message.should == "Your order #171 has now been sent!"
+    sms_history[1].message.should == "I'd like to order a pair of elks!"
+    sms_history[2].message.should == "Want an elk?"
+  end
+
+  it 'reloads a SMS' do
+    stub_request(:get, url).
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('sms_history.txt'))
+    stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/SMS/s8952031bb83bf3e64f8e13b071c131c0").
+      with(:headers => {'Accept'=>'application/json'}).
+      to_return(fixture('reloads_a_sms.txt'))
+
+    sms_history = described_class.all
+    sms = sms_history[0]
+    loaded_at = sms.loaded_at
+    object_id = sms.object_id
+    sms.reload.should == true
+    sms.object_id.should == object_id
+    sms.loaded_at.should_not == loaded_at
+  end
+
+  it 'should warn about capped sms sender' do
+    stub_request(:post, url).
+      with(:body => {:from => "VeryVeryVeryVeryLongSenderName", :message => "Your order #171 has now been sent!", :to => "+46704508449"},
+           :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(fixture('sends_a_sms_with_long_sender.txt'))
+
+    # Fake $stderr to check warnings
+    begin
+      old_stderr, $stderr = $stderr, StringIO.new
+
+      sms = described_class.send(:from => 'VeryVeryVeryVeryLongSenderName',
+        :to => '+46704508449',
+        :message => 'Your order #171 has now been sent!')
+
+      $stderr.string.should == "SMS 'from' value VeryVeryVeryVeryLongSenderName will be capped at 11 chars\n"
+    ensure
+      $stderr = old_stderr
+    end
+
+    sms.class.should == described_class
+    sms.from.should == 'VeryVeryVeryVeryLongSenderName'
+    sms.to.should == '+46704508449'
+    sms.message.should == 'Your order #171 has now been sent!'
+  end
+
+  it 'should handle invalid to number' do
+    stub_request(:post, url).
+      with(:body => {:from => "+46761042247", :message => "Your order #171 has now been sent!", :to => "monkey"},
+           :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(fixture('invalid_to_number.txt'))
+
+    expect {
+      sms = described_class.send(:from => '+46761042247',
+        :to => 'monkey',
+        :message => 'Your order #171 has now been sent!')
+    }.to raise_error(Elk::BadRequest, 'Invalid to number')
+  end
+
+  it 'should handle no parameters' do
+    expect {
+      sms = described_class.send({})
+    }.to raise_error(Elk::MissingParameter)
+  end
+end

data/spec/elk_spec.rb

@@ -2,319 +2,57 @@ require 'spec_helper'
 require 'elk'
 
 describe Elk do
-  it 'should detect missing username and/or password' do
-    expect { Elk.base_url }.to raise_error(Elk::AuthError)
-
-    Elk.configure do |config|
-      config.username = nil
-      config.password = 'PASSWORD'
-    end
-
-    expect { Elk.base_url }.to raise_error(Elk::AuthError)
-
-    Elk.configure do |config|
-      config.username = 'USERNAME'
-      config.password = nil
-    end
-
-    expect { Elk.base_url }.to raise_error(Elk::AuthError)
-
-    Elk.configure do |config|
-      config.username = 'USERNAME'
-      config.password = 'PASSWORD'
-    end
-
-    expect { Elk.base_url }.to_not raise_error(Elk::AuthError)
-  end
-
-  it 'should handle garbage json' do
-    bad_response_body = fixture('bad_response_body.txt').read
-
-    expect {
-      Elk.parse_json(bad_response_body)
-    }.to raise_error(Elk::BadResponse)
-  end
-
-  describe Elk::Number do
-    it 'allocates a number' do
-      stub_request(:post, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
-        with(:body => {"country" => "se", "sms_url" => "http://localhost/receive"},
-             :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
-        to_return(fixture('allocates_a_number.txt'))
-
-      configure_elk
-
-      number = Elk::Number.allocate(:sms_url => 'http://localhost/receive', :country => 'se')
-      number.status.should == :active
-      number.sms_url.should == 'http://localhost/receive'
-      number.country.should == 'se'
-      number.number.should == '+46766861012'
-      number.capabilities.should == [:sms]
-    end
-
-    it 'gets allocated numbers' do
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('gets_allocated_numbers.txt'))
-
-      configure_elk
-
-      numbers = Elk::Number.all
-      numbers.size.should == 2
-      numbers[0].number_id.should == 'nea19c8e291676fb7003fa1d63bba7899'
-      numbers[0].number.should == '+46704508449'
-      numbers[0].sms_url == 'http://localhost/receive1'
-
-      numbers[1].number_id.should == 'nea19c8e291676fb7003fa1d63bba789A'
-      numbers[1].number.should == '+46761042247'
-      numbers[0].sms_url == 'http://localhost/receive2'
-    end
-
-    it 'updates a number' do
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('gets_allocated_numbers.txt'))
-      stub_request(:post, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers/nea19c8e291676fb7003fa1d63bba7899").
-        with(:body => {"sms_url" => "http://otherhost/receive", "voice_start" => ""},
-        :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
-        to_return(fixture('updates_a_number.txt'))
-
-      configure_elk
-
-      number = Elk::Number.all[0]
-      number.country = 'no'
-      number.sms_url = 'http://otherhost/receive'
-      number.save.should == true
-      number.country.should == 'no'
-      number.sms_url.should == 'http://otherhost/receive'
-    end
-
-    it 'deallocates a number' do
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('gets_allocated_numbers.txt'))
-      stub_request(:post, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers/nea19c8e291676fb7003fa1d63bba7899").
-        with(:body => {"active" => "no"},
-        :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
-        to_return(fixture('deallocates_a_number.txt'))
-
-      configure_elk
-
-      number = Elk::Number.all[0]
-      number.status.should == :active
-      number.deallocate!.should == true
-      number.status.should == :deallocated
-    end
-
-    it 'reloads a number' do
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('gets_allocated_numbers.txt'))
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers/nea19c8e291676fb7003fa1d63bba7899").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('reloads_a_number.txt'))
-
-      configure_elk
-
-      number = Elk::Number.all[0]
-      object_id = number.object_id
-      loaded_at = number.loaded_at
-      number.country = 'blah'
-      number.reload.should == true
-      number.country.should == 'se'
-      number.object_id.should == object_id
-      number.loaded_at.should_not == loaded_at
-    end
-
-    it 'has wrong password' do
-      stub_request(:get, "https://USERNAME:WRONG@api.46elks.com/a1/Numbers").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('auth_error.txt'))
-
-      Elk.configure do |config|
-        config.username = 'USERNAME'
-        config.password = 'WRONG'
+  context "detect missing username and/or password" do
+    context "when nothing is configured" do
+      specify do
+        Elk.configure do |config|
+          config.username = nil
+          config.password = nil
+        end
+
+        expect { Elk.base_url }.to raise_error(Elk::AuthError)
       end
-
-      expect {
-        Elk::Number.all
-      }.to raise_error(Elk::AuthError)
     end
 
-    it 'gets server error when looking for all numbers' do
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/Numbers").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('server_error.txt'))
+    context "when username is missing" do
+      specify do
+        Elk.configure do |config|
+          config.username = nil
+          config.password = 'PASSWORD'
+        end
 
-      configure_elk
-
-      expect {
-        Elk::Number.all
-      }.to raise_error(Elk::ServerError)
-    end
-
-    it 'should handle no parameters' do
-      configure_elk
-
-      expect {
-        sms = Elk::Number.allocate({})
-      }.to raise_error(Elk::MissingParameter)
-    end
-  end
-
-  describe Elk::SMS do
-    it 'sends a SMS' 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"},
-             :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
-        to_return(fixture('sends_a_sms.txt'))
-
-      configure_elk
-
-      # Fake $stderr to check warnings
-      begin
-        old_stderr, $stderr = $stderr, StringIO.new
-
-        sms = Elk::SMS.send(:from => '+46761042247',
-          :to => '+46704508449',
-          :message => 'Your order #171 has now been sent!')
-
-        $stderr.string.should == ""
-      ensure
-        $stderr = old_stderr
+        expect { Elk.base_url }.to raise_error(Elk::AuthError)
       end
-
-      sms.class.should == Elk::SMS
-      sms.from.should == '+46761042247'
-      sms.to.should == '+46704508449'
-      sms.message.should == 'Your order #171 has now been sent!'
-      sms.direction.should == 'outgoing'
-      sms.status.should == 'delivered'
     end
 
+    context "when password is missing" do
+      specify do
+        Elk.configure do |config|
+          config.username = 'USERNAME'
+          config.password = nil
+        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"
+        expect { Elk.base_url }.to raise_error(Elk::AuthError)
       end
     end
 
-    it 'gets SMS-history' do
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/SMS").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('sms_history.txt'))
-
-      configure_elk
-
-      sms_history = Elk::SMS.all
+    context "when all is configured" do
+      specify do
+        Elk.configure do |config|
+          config.username = 'USERNAME'
+          config.password = 'PASSWORD'
+        end
 
-      sms_history.size.should == 3
-      sms_history[0].class.should == Elk::SMS
-      sms_history[0].created_at.class.should == Time
-
-      sms_history[0].message.should == "Your order #171 has now been sent!"
-      sms_history[1].message.should == "I'd like to order a pair of elks!"
-      sms_history[2].message.should == "Want an elk?"
-    end
-
-    it 'reloads a SMS' do
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/SMS").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('sms_history.txt'))
-      stub_request(:get, "https://USERNAME:PASSWORD@api.46elks.com/a1/SMS/s8952031bb83bf3e64f8e13b071c131c0").
-        with(:headers => {'Accept'=>'application/json'}).
-        to_return(fixture('reloads_a_sms.txt'))
-
-      configure_elk
-
-      sms_history = Elk::SMS.all
-      sms = sms_history[0]
-      loaded_at = sms.loaded_at
-      object_id = sms.object_id
-      sms.reload.should == true
-      sms.object_id.should == object_id
-      sms.loaded_at.should_not == loaded_at
-    end
-
-    it 'should warn about capped sms sender' do
-      stub_request(:post, "https://USERNAME:PASSWORD@api.46elks.com/a1/SMS").
-        with(:body => {"from" => "VeryVeryVeryVeryLongSenderName", :message => "Your order #171 has now been sent!", :to => "+46704508449"},
-             :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
-        to_return(fixture('sends_a_sms_with_long_sender.txt'))
-
-      configure_elk
-
-      # Fake $stderr to check warnings
-      begin
-        old_stderr, $stderr = $stderr, StringIO.new
-
-        sms = Elk::SMS.send(:from => 'VeryVeryVeryVeryLongSenderName',
-          :to => '+46704508449',
-          :message => 'Your order #171 has now been sent!')
-
-        $stderr.string.should == "SMS 'from' value VeryVeryVeryVeryLongSenderName will be capped at 11 chars\n"
-      ensure
-        $stderr = old_stderr
+        expect { Elk.base_url }.to_not raise_error(Elk::AuthError)
       end
-
-      sms.class.should == Elk::SMS
-      sms.from.should == 'VeryVeryVeryVeryLongSenderName'
-      sms.to.should == '+46704508449'
-      sms.message.should == 'Your order #171 has now been sent!'
-    end
-
-    it 'should handle invalid to number' 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 => "monkey"},
-             :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded'}).
-        to_return(fixture('invalid_to_number.txt'))
-
-      configure_elk
-
-      expect {
-        sms = Elk::SMS.send(:from => '+46761042247',
-          :to => 'monkey',
-          :message => 'Your order #171 has now been sent!')
-      }.to raise_error(Elk::BadRequest, 'Invalid to number')
     end
+  end
 
-    it 'should handle no parameters' do
-      configure_elk
+  it 'should handle garbage json' do
+    bad_response_body = fixture('bad_response_body.txt').read
 
-      expect {
-        sms = Elk::SMS.send({})
-      }.to raise_error(Elk::MissingParameter)
-    end
+    expect {
+      Elk.parse_json(bad_response_body)
+    }.to raise_error(Elk::BadResponse)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elk
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Johan Eckerstroem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '1.0'
 description: Elk can be used to allocate a phone numbers, manage the numbers and send
   SMS through these numbers.
 email: johan@duh.se
@@ -96,6 +96,8 @@ files:
 - lib/elk/util.rb
 - lib/elk/version.rb
 - lib/elk.rb
+- spec/elk/number_spec.rb
+- spec/elk/sms_spec.rb
 - spec/elk_spec.rb
 - spec/fixtures/allocates_a_number.txt
 - spec/fixtures/auth_error.txt
@@ -135,8 +137,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - API account at 46elks.com
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Client library for 46elks SMS/MMS/Voice service.
 test_files: []
+has_rdoc: true