elk 0.0.3p0 → 0.0.4

data/README.MD

@@ -1,4 +1,4 @@
-Elk
+Elk - 46elks API-client [![Tested with Travis-CI](https://secure.travis-ci.org/jage/elk.png)](http://travis-ci.org/#!/jage/elk)
 ===
 
 Ruby client for 46elks "Voice, SMS & MMS" service. http://46elks.com/

data/lib/elk.rb

@@ -10,11 +10,13 @@ require 'elk/sms'
 module Elk
   BASE_DOMAIN = 'api.46elks.com'
   API_VERSION = 'a1'
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   class AuthError < RuntimeError; end
   class ServerError < RuntimeError; end
   class BadResponse < RuntimeError; end
+  class BadRequest < RuntimeError; end
+  class MissingParameter < RuntimeError; end
 
   class << self
     attr_accessor :username
@@ -45,6 +47,8 @@ module Elk
       raise AuthError, "Authentication failed"
     rescue RestClient::InternalServerError
       raise ServerError, "Server error"
+    rescue RestClient::Forbidden => e
+      raise BadRequest, e.http_body
     end
 
     def parse_json(body)
@@ -53,4 +57,12 @@ module Elk
       raise BadResponse, "Can't parse JSON"
     end
   end
+end
+
+class Hash
+  def require_keys!(required_keys)
+    unless (missing_parameters = required_keys - self.keys).empty?
+      raise Elk::MissingParameter, "Requires #{missing_parameters.collect {|s| ":#{s}"}.join(', ')} parameters"
+    end
+  end
 end

data/lib/elk/number.rb

@@ -47,6 +47,7 @@ module Elk
 
     class << self
       def allocate(parameters)
+        parameters.require_keys!([:sms_url, :country])
         response = Elk.post('/Numbers', parameters)
         self.new(Elk.parse_json(response.body))
       end

data/lib/elk/sms.rb

@@ -22,15 +22,16 @@ module Elk
     end
 
     class << self
-      def send(settings)
-        parameters = {}.merge(settings)
-        response = Elk.post('/SMS', parameters)
-        self.new(Elk.parse_json(response.body))
-      ensure
+      def send(parameters)
+        parameters.require_keys!([:from, :message, :to])
+
         # Warn if the from string will be capped by the sms gateway
-        if parameters[:from].match(/^(\w{11,})$/)
+        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))
       end
 
       def all

data/spec/elk_spec.rb

@@ -2,6 +2,14 @@ require 'spec_helper'
 require 'elk'
 
 describe Elk do
+  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").
@@ -120,12 +128,12 @@ describe Elk do
       }.to raise_error(Elk::ServerError)
     end
 
-    it 'gets garbage numbers' do
-      bad_response_body = fixture('bad_response_body.txt').read
+    it 'should handle no parameters' do
+      configure_elk
 
       expect {
-        Elk.parse_json(bad_response_body)
-      }.to raise_error(Elk::BadResponse)
+        sms = Elk::Number.allocate({})
+      }.to raise_error(Elk::MissingParameter)
     end
   end
 
@@ -221,5 +229,27 @@ describe Elk do
       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
+
+    it 'should handle no parameters' do
+      configure_elk
+
+      expect {
+        sms = Elk::SMS.send({})
+      }.to raise_error(Elk::MissingParameter)
+    end
   end
 end

data/spec/fixtures/invalid_to_number.txt

@@ -0,0 +1,8 @@
+HTTP/1.1 403 Forbidden
+Server: nginx/0.7.67
+Date: Mon, 18 Jul 2011 09:43:29 GMT
+Content-Type: text/plain
+Connection: keep-alive
+Content-Length: 17
+
+Invalid to number

data/spec/fixtures/no_parameters.txt

@@ -0,0 +1,8 @@
+HTTP/1.1 404 Not Found
+Server: nginx/0.7.67
+Date: Mon, 18 Jul 2011 09:46:48 GMT
+Content-Type: text/plain
+Connection: keep-alive
+Content-Length: 9
+
+Not found

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elk
 version: !ruby/object:Gem::Version 
-  prerelease: 5
-  version: 0.0.3p0
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Johan Eckerstroem
@@ -10,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 Z
+date: 2011-07-18 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -20,6 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
   type: :runtime
   version_requirements: *id001
@@ -31,6 +42,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 6
+        - 3
         version: 1.6.3
   type: :runtime
   version_requirements: *id002
@@ -42,6 +58,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :development
   version_requirements: *id003
@@ -53,6 +74,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
   version_requirements: *id004
@@ -64,10 +90,15 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
   type: :development
   version_requirements: *id005
-description: elk can be used to allocate a phone numbers, manage the numbers and send/recieve messages through these numbers.
+description: Used to configure numbers, send/reciev SMS/MMS/Voice messages at 46elks
 email: johan@duh.se
 executables: []
 
@@ -85,6 +116,8 @@ files:
 - spec/fixtures/bad_response_body.txt
 - spec/fixtures/deallocates_a_number.txt
 - spec/fixtures/gets_allocated_numbers.txt
+- spec/fixtures/invalid_to_number.txt
+- spec/fixtures/no_parameters.txt
 - spec/fixtures/reloads_a_number.txt
 - spec/fixtures/reloads_a_sms.txt
 - spec/fixtures/sends_a_sms.txt
@@ -94,7 +127,8 @@ files:
 - spec/fixtures/updates_a_number.txt
 - spec/spec_helper.rb
 - README.MD
-homepage: https://github.com/jage/elk
+has_rdoc: true
+homepage: 
 licenses: []
 
 post_install_message: 
@@ -107,17 +141,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client library for 46elks SMS/MMS/Voice service.