messagebird 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240689840887a7c3b612574550238b5533abc55d
-  data.tar.gz: 7b2fa0ea5944c30fd8ee66ef14ecd94645c3c756
+  metadata.gz: f5884d21d68ea0f75197081e449a185b223de84c
+  data.tar.gz: 08c4d01e03dc0a66ecf52546faa44be8269995d9
 SHA512:
-  metadata.gz: 567700f37be1dc95e5acb310a1cf625404c0719a1dfd5caea4a56e1dfed2240bbef53109f85213361020740db8fe22cf1b290d1801d2005a6913513607a9f3b6
-  data.tar.gz: f4c0029181bdee661cc75726a00dec082d96e8933e4f10fade190137a8e26630fd1cfc05d76e20296683bcb7180e10936f26df89b109048bd309cff9e2a9e9a8
+  metadata.gz: 88c3936162b49a6c835abfa08a5f733e12ed4b95311a364ceec1979fd730851444a8c948921f6922e20400ee8ec96d9d7ffde9ed2a71b64d66800845e6a70ad0
+  data.tar.gz: a03a8b13286a27194aed77f4556d9657caa6cfccc9bf6fe418d79f54bca27619e69a0cc498831ea4c1a7e7d5cf7063ff6d89ac4a7a2df6f8f53f9598e3f0d0a4

data/.travis.yml

@@ -8,22 +8,6 @@ rvm:
   - 2.0.0
   - 2.1.0
 
-gemfile:
-  - Gemfile
-  - Gemfile.1.8.7
-
 matrix:
-  fast_finish: true
-
   allow_failures:
     - rvm: 2.1.0
-
-  exclude:
-    - rvm: 1.8.7
-      gemfile: Gemfile
-    - rvm: 1.9.3
-      gemfile: Gemfile.1.8.7
-    - rvm: 2.0.0
-      gemfile: Gemfile.1.8.7
-    - rvm: 2.1.0
-      gemfile: Gemfile.1.8.7

data/CHANGES.md

@@ -0,0 +1,20 @@
+0.1.3
+-----------
+- Sender_ID is now validated. Valid formats are:
+  - 11 alphanumeric characters
+  - telephone number string consisting of "+" + 11 numbers, e.g. "+31612345678"
+
+
+0.1.2
+-----------
+- Ensure 1.8.7 compatibility
+
+
+0.1.1
+-----------
+- Various small fixes
+
+
+0.1.0
+-----------
+- First release

data/Gemfile

@@ -1,13 +1,19 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem 'bundler', '~> 1.0'
+  gem 'bundler',  '~> 1.0'
   gem 'rake'
-  gem 'minitest',   :require => false
-  gem 'rr',         :require => false
-  gem 'coveralls',  :require => false
+  gem 'minitest', :require => false
+  gem 'rr',       :require => false
 end
 
-group :development do
-  gem 'jeweler', '~> 2.0.0',  :require => false
+platform :ruby_19, :ruby_20, :ruby_21 do
+  group :test do
+    gem 'coveralls', :require => false
+  end
+
+  group :development do
+    gem 'jeweler', '~> 2.0.0', :require => false
+  end
 end
+

data/README.md

@@ -1,7 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/messagebird.png)](http://badge.fury.io/rb/messagebird)
-[![Code Climate](https://codeclimate.com/github/nedap/messagebird-sms-api-ruby.png)](https://codeclimate.com/github/nedap/messagebird-sms-api-ruby)
-[![Coverage Status](https://coveralls.io/repos/nedap/messagebird-sms-api-ruby/badge.png?branch=master)](https://coveralls.io/r/nedap/messagebird-sms-api-ruby?branch=master)
-[![Build Status](https://travis-ci.org/nedap/messagebird-sms-api-ruby.png?branch=master)](https://travis-ci.org/nedap/messagebird-sms-api-ruby)
+[![Code Climate](https://codeclimate.com/github/blaet/messagebird-sms-api-ruby.png)](https://codeclimate.com/github/blaet/messagebird-sms-api-ruby)
+[![Coverage Status](https://coveralls.io/repos/blaet/messagebird-sms-api-ruby/badge.png?branch=master)](https://coveralls.io/r/blaet/messagebird-sms-api-ruby?branch=master)
+[![Build Status](https://travis-ci.org/blaet/messagebird-sms-api-ruby.png?branch=master)](https://travis-ci.org/blaet/messagebird-sms-api-ruby)
 
 # MessageBird SMS API for Ruby
 Implementation of the MessageBird SMS API for Ruby.

data/Rakefile

@@ -17,13 +17,12 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
     gem.name = "messagebird"
-    gem.homepage = "http://github.com/nedap/messagebird-sms-api-ruby"
+    gem.homepage = "http://github.com/blaet/messagebird-sms-api-ruby"
     gem.license = "MIT"
     gem.summary = %Q{MessageBird API for Ruby}
-    gem.description = %Q{Implementation of the MessageBird text (sms) service API}
-    gem.email = "bram.devries@nedap.com"
+    gem.description = %Q{Implementation of the MessageBird SMS API for Ruby}
+    gem.email = "dev@blaet.net"
     gem.authors = ["Bram de Vries"]
     # dependencies defined in Gemfile
   end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/messagebird/config.rb

@@ -1,4 +1,4 @@
-# Based on https://github.com/jwkoelewijn/batsir/blob/master/lib/batsir/config.rb
+# Config class based on https://github.com/jwkoelewijn/batsir/blob/master/lib/batsir/config.rb
 
 module MessageBird
   class Config

data/lib/messagebird/http/sms.rb

@@ -2,11 +2,11 @@ module MessageBird::HTTP
   class SMS < MessageBird::Deliverable
     include MessageBird::Helpers
 
-    attr_reader :originator, :recipients, :message
+    attr_reader :sender, :recipients, :message
     attr_writer :username, :api_url
 
-    def initialize(originator, recipients, message, options = {}, &block)
-      @originator = originator
+    def initialize(sender_name, recipients, message, options = {}, &block)
+      self.sender = sender_name
       @recipients = format_recipients(recipients)
       @message    = URI.escape(message)
       @callback   = block
@@ -27,7 +27,7 @@ module MessageBird::HTTP
     end
 
     def url
-      @url ||= "#{api_url}?username=#{username}&password=#{password}&sender=#{originator}&test=#{test_mode}&destination=#{recipients}&body=#{message}"
+      @url ||= "#{api_url}?username=#{username}&password=#{password}&sender=#{sender}&test=#{test_mode}&destination=#{recipients}&body=#{message}"
     end
 
     def username
@@ -73,5 +73,27 @@ module MessageBird::HTTP
       @test_mode = bool ? 1 : 0
     end
 
+    def sender=(str)
+      ensure_valid_sender!(str)
+      @sender = str
+    end
+
+    def ensure_valid_sender!(input)
+      raise SenderInvalid.new(input) unless sender_valid?(input)
+    end
+
+    def sender_valid?(input)
+      sender_telephone_number?(input) || sender_string?(input)
+    end
+
+    def sender_string?(input)
+      input =~ /^[a-zA-Z0-9]{1,11}$/
+    end
+
+    def sender_telephone_number?(input)
+      input =~ /^\+(\d{11})$/
+    end
+
+    class SenderInvalid < ArgumentError; end
   end
 end

data/messagebird.gemspec

@@ -2,17 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: messagebird 0.1.2 ruby lib
+# stub: messagebird 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "messagebird"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Bram de Vries"]
-  s.date = "2014-01-27"
-  s.description = "Implementation of the MessageBird text (sms) service API"
-  s.email = "bram.devries@nedap.com"
+  s.date = "2014-01-30"
+  s.description = "Implementation of the MessageBird SMS API for Ruby"
+  s.email = "dev@blaet.net"
   s.executables = ["messagebird_test_connection"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,8 +21,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".travis.yml",
+    "CHANGES.md",
     "Gemfile",
-    "Gemfile.1.8.7",
     "LICENSE",
     "README.md",
     "Rakefile",
@@ -48,10 +49,9 @@ Gem::Specification.new do |s|
     "test/messagebird/sms_test.rb",
     "test/messagebird_test.rb"
   ]
-  s.homepage = "http://github.com/nedap/messagebird-sms-api-ruby"
+  s.homepage = "http://github.com/blaet/messagebird-sms-api-ruby"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.2.0"
   s.summary = "MessageBird API for Ruby"
 
   if s.respond_to? :specification_version then

data/test/messagebird/http/sms_test.rb

@@ -4,12 +4,31 @@ module MessageBirdHTTPSMSHelper
   def format_recipients(input)
     subject.send :format_recipients, input
   end
+
+  def sender_telephone_number?(input)
+    subject.send :sender_telephone_number?, input
+  end
+
+  def sender_string?(input)
+    subject.send :sender_string?, input
+  end
 end
 
 describe MessageBird::HTTP::SMS do
   include MessageBirdHTTPSMSHelper
 
-  subject{ MessageBird::HTTP::SMS.new('sender',3154447100,'message',{}) }
+  let(:subject_class){ MessageBird::HTTP::SMS }
+
+  subject{ subject_class.new('sender',3154447100,'message') }
+
+  describe '#initialize' do
+    it 'delegates setting sender to a setter method' do
+      any_instance_of(MessageBird::HTTP::SMS) do |klass|
+        mock.proxy(klass).sender=('footest')
+      end
+      subject_class.new('footest',3154447100,'message')
+    end
+  end
 
   describe '#api_url' do
     it 'retrieves the api_url from the Config object' do
@@ -31,6 +50,18 @@ describe MessageBird::HTTP::SMS do
     end
   end
 
+  describe '#ensure_valid_sender!' do
+    it 'works as designed' do
+      stub(subject).sender_valid?{true}
+      subject.send :ensure_valid_sender!, 'test'
+
+      stub(subject).sender_valid?{false}
+      assert_raises(MessageBird::HTTP::SMS::SenderInvalid){
+        subject.send :ensure_valid_sender!, 'test'
+      }
+    end
+  end
+
   describe '#format_recipients' do
     it 'converts an integer to string' do
       format_recipients(31541471696).must_equal "31541471696"
@@ -42,6 +73,76 @@ describe MessageBird::HTTP::SMS do
     end
   end
 
+  describe '#sender=' do
+    it 'sets the sender when valid' do
+      subject.send :sender=, 'footest'
+      subject.sender.must_equal 'footest'
+    end
+
+    it 'throws an exception if sender not valid' do
+      assert_raises(MessageBird::HTTP::SMS::SenderInvalid){
+        subject.send :sender=, 'garbledeegook'
+      }
+    end
+  end
+
+  describe '#sender_telephone_number?' do
+    it 'detects valid numbers' do
+      assert sender_telephone_number?('+31571000000')
+      assert sender_telephone_number?('+31671000000')
+      assert sender_telephone_number?('+15551234567')
+    end
+
+    it 'detects invalid numbers by length' do
+      refute sender_telephone_number?('+315710000001') # too long
+      refute sender_telephone_number?('+3157100001') # too short
+    end
+
+    it 'detects invalid numbers by spaces' do
+      refute sender_telephone_number?('+31571000 00')
+      refute sender_telephone_number?(' +31571000 0')
+      refute sender_telephone_number?('+3157100000 ')
+    end
+  end
+
+  describe '#sender_string?' do
+    it 'detects valid strings' do
+      assert sender_string?('A')
+      assert sender_string?('MessageBird')
+    end
+
+    it 'detects invalid strings by length' do
+      refute sender_string?('thiswillbreak')
+      refute sender_string?('')
+    end
+
+    it 'detects invalid strings by characters' do
+      refute sender_string?('blaet test')
+      refute sender_string?(' blaet')
+      refute sender_string?('blaet ')
+    end
+  end
+
+  describe '#sender_valid?' do
+    it 'works as designed' do
+      stub(subject).sender_string?{true}
+      stub(subject).sender_telephone_number?{true}
+      assert subject.send(:sender_valid?, 'test')
+
+      stub(subject).sender_string?{false}
+      stub(subject).sender_telephone_number?{true}
+      assert subject.send(:sender_valid?, 'test')
+
+      stub(subject).sender_string?{true}
+      stub(subject).sender_telephone_number?{false}
+      assert subject.send(:sender_valid?, 'test')
+
+      stub(subject).sender_string?{false}
+      stub(subject).sender_telephone_number?{false}
+      refute subject.send(:sender_valid?, 'test')
+    end
+  end
+
   describe '#password' do
     it 'retrieves the password from the Config object' do
       mock(MessageBird::Config).password{'test'}

data/test/messagebird/sms_test.rb

@@ -26,6 +26,9 @@ describe MessageBird::SMS do
     end
 
     it 'returns a new SMS object of the appropriate module' do
+      any_instance_of(MessageBird::HTTP::SMS) do |klass|
+        stub(klass).ensure_valid_sender!
+      end
       subject.new(1,2,'message',{:module => :http}).class.must_equal MessageBird::HTTP::SMS
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: messagebird
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Bram de Vries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -24,8 +24,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
-description: Implementation of the MessageBird text (sms) service API
-email: bram.devries@nedap.com
+description: Implementation of the MessageBird SMS API for Ruby
+email: dev@blaet.net
 executables:
 - messagebird_test_connection
 extensions: []
@@ -34,8 +34,8 @@ extra_rdoc_files:
 - README.md
 files:
 - .travis.yml
+- CHANGES.md
 - Gemfile
-- Gemfile.1.8.7
 - LICENSE
 - README.md
 - Rakefile
@@ -61,7 +61,7 @@ files:
 - test/messagebird/http/sms_test.rb
 - test/messagebird/sms_test.rb
 - test/messagebird_test.rb
-homepage: http://github.com/nedap/messagebird-sms-api-ruby
+homepage: http://github.com/blaet/messagebird-sms-api-ruby
 licenses:
 - MIT
 metadata: {}
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: MessageBird API for Ruby

data/Gemfile.1.8.7

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'bundler', '~> 1.0'
-  gem 'rake'
-  gem 'minitest',   :require => false
-  gem 'rr',         :require => false
-end