mote_sms 1.0.0 → 1.0.1

data/.travis.yml

@@ -2,5 +2,4 @@ language: ruby
 rvm:
   - jruby-19mode
   - rbx-19mode
-  - 1.9.2
   - 1.9.3

data/lib/mote_sms/number.rb

@@ -38,9 +38,10 @@ module MoteSMS
     #
     def parse_raw_number
       unless vanity?
-        raise ArgumentError, "Unable to parse #{@raw_number} as number" unless Phony.plausible?(@raw_number)
+        raise ArgumentError, "Unable to parse #{@raw_number} as number" unless @raw_number.to_s =~ /\A[\d\.\/\-\s\(\)\+]+\z/
+        cc = @options[:cc]
         normalized = Phony.normalize(@raw_number)
-        normalized = "#{@options[:cc]}#{normalized}" unless @options[:cc] && normalized.start_with?(@options[:cc])
+        normalized = "#{cc}#{normalized}" unless cc && normalized.start_with?(cc)
         raise ArgumentError, "Wrong national destination code #{@raw_number}" unless Phony.plausible?(normalized, @options)
 
         @number = Phony.normalize normalized
@@ -48,6 +49,8 @@ module MoteSMS
         @number = @raw_number.gsub(/[^A-Z0-9]/i, '').upcase.strip
         raise ArgumentError, "Invalid vanity number #{@raw_number}" if @number.length == 0 || @number.length > 11
       end
+    rescue NoMethodError
+      raise ArgumentError, "Unable to parse #{@raw_number} using phony"
     end
   end
 end

data/lib/mote_sms/transports/action_mailer_transport.rb

@@ -0,0 +1,48 @@
+require 'action_mailer'
+
+module MoteSMS
+
+  # Internal: ActionMailer class to forward SMS to recipient.
+  class ActionMailerSMSMailer < ::ActionMailer::Base
+    def forward_sms(recipient, sms)
+      subject = "SMS to #{sms.to.map(&:to_s).join(', ')}"
+      mail to: recipient, from: "#{sms.from} <#{recipient}>", subject: subject, body: sms.body
+    end
+  end
+
+  # MoteSMS::ActionMailerTransport provides a transport implementation which
+  # can be used in development to forward SMS as e-mails. This allows to test
+  # sending SMSes to an e-mail endpoint.
+  #
+  # Examples:
+  #
+  #    # => forwards all SMS to sms@example.com
+  #    MoteSMS.transport = MoteSMS::ActionMailerTransport.new "sms@example.com"
+  #
+  #    # => also accepts a Proc as recipient
+  #    MoteSMS.transport = MoteSMS::ActionMailerTransport.new ->(msg) { "#{msg.from}@example.com" }
+  #
+  class ActionMailerTransport
+
+    # Public: Read/change the recipient used when delivering the message.
+    # Also accepts a Proc.
+    attr_accessor :recipient
+
+    # Public: Create a new ActionMailerTransport instance
+    def initialize(recipient)
+      self.recipient = recipient
+    end
+
+    # Public: Sends message using ActionMailer to recipient.
+    #
+    # message - The MoteSMS::Message instance to deliver.
+    # options - The Hash with additional, transport specific options,
+    #           currently ignored.
+    #
+    # Returns nothing.
+    def deliver(message, options = {})
+      to = self.recipient.respond_to?(:call) ? self.recipient.call(message) : self.recipient
+      ActionMailerSMSMailer.forward_sms(to, message).deliver
+    end
+  end
+end

data/lib/mote_sms/transports.rb

@@ -4,4 +4,5 @@ module MoteSMS
   # available in ruby as `MoteSMS::<Some>Transport`.
   autoload :TestTransport, 'mote_sms/transports/test_transport'
   autoload :MobileTechnicsTransport, 'mote_sms/transports/mobile_technics_transport'
+  autoload :ActionMailerTransport, 'mote_sms/transports/action_mailer_transport'
 end

data/lib/mote_sms/version.rb

@@ -1,3 +1,3 @@
 module MoteSMS
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/mote_sms.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', ['~> 2.10']
   gem.add_development_dependency 'webmock', ['~> 1.8.0']
+  gem.add_development_dependency 'actionmailer', ['>= 3.2']
 end

data/spec/mote_sms/number_spec.rb

@@ -18,14 +18,6 @@ describe MoteSMS::Number do
     its(:to_number) { should == '41443643533' }
   end
 
-  context 'E164 conforming number with name' do
-    subject { described_class.new('Frank: +41 44 3643533', cc: '41') }
-
-    its(:to_s) { should == '+41 44 364 35 33' }
-    its(:number) { should == '41443643533' }
-    its(:to_number) { should == '41443643533' }
-  end
-
   context 'handles local numbers' do
     subject { described_class.new('079 700 50 90', cc: '41') }
 
@@ -34,11 +26,19 @@ describe MoteSMS::Number do
     its(:to_number) { should == '41797005090' }
   end
 
+  context 'handles numbers with NDC regexp' do
+    subject { described_class.new('079 700 50 90', cc: '41', ndc: /(44|79)/) }
+
+    its(:to_s) { should == '+41 79 700 50 90' }
+    its(:number) { should == '41797005090' }
+    its(:to_number) { should == '41797005090' }
+  end
+
   context 'non conforming number' do
     it 'raises error when creating' do
       Proc.new { described_class.new('what ever?') }.should raise_error(ArgumentError, /unable to parse/i)
-      Proc.new { described_class.new('0000') }.should raise_error(ArgumentError, /unable to parse/i)
-      Proc.new { described_class.new('123456789012345678901') }.should raise_error(ArgumentError, /unable to parse/i)
+      Proc.new { described_class.new('0000') }.should raise_error(ArgumentError)
+      Proc.new { described_class.new('123456789012345678901') }.should raise_error(ArgumentError)
     end
   end
 

data/spec/mote_sms/transports/action_mailer_transport_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'mote_sms/message'
+require 'mote_sms/transports/action_mailer_transport'
+
+describe MoteSMS::ActionMailerTransport do
+  subject { described_class.new "sms@example.com" }
+  let(:message) { MoteSMS::Message.new do
+      from 'Sender'
+      to '+41 79 123 12 12'
+      body 'This is the SMS content'
+    end
+  }
+  let(:email) { ActionMailer::Base.deliveries.last }
+
+  before do
+    ActionMailer::Base.deliveries.clear
+    ActionMailer::Base.delivery_method = :test
+  end
+
+  it 'sends SMS as e-mail' do
+    subject.deliver message
+    email.to.should == ["sms@example.com"]
+    email.from.should == ["sms@example.com"]
+    email.subject.should == "SMS to +41 79 123 12 12"
+    email.body.should == "This is the SMS content"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mote_sms
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: ! "Unofficial ruby adapter for MobileTechnics HTTP Bulk SMS API.\n                         Tries
   to mimick mail API, so users can switch e.g. ActionMailer\n                         with
   this SMS provider."
@@ -96,6 +112,7 @@ files:
 - lib/mote_sms/number_list.rb
 - lib/mote_sms/transports.rb
 - lib/mote_sms/transports/.gitkeep
+- lib/mote_sms/transports/action_mailer_transport.rb
 - lib/mote_sms/transports/mobile_technics_transport.rb
 - lib/mote_sms/transports/test_transport.rb
 - lib/mote_sms/version.rb
@@ -103,6 +120,7 @@ files:
 - spec/mote_sms/message_spec.rb
 - spec/mote_sms/number_list_spec.rb
 - spec/mote_sms/number_spec.rb
+- spec/mote_sms/transports/action_mailer_transport_spec.rb
 - spec/mote_sms/transports/mobile_technics_transport_spec.rb
 - spec/mote_sms/transports/test_transport_spec.rb
 - spec/mote_sms_spec.rb
@@ -127,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3261538551323079383
+      hash: -686134082126475921
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -138,6 +156,7 @@ test_files:
 - spec/mote_sms/message_spec.rb
 - spec/mote_sms/number_list_spec.rb
 - spec/mote_sms/number_spec.rb
+- spec/mote_sms/transports/action_mailer_transport_spec.rb
 - spec/mote_sms/transports/mobile_technics_transport_spec.rb
 - spec/mote_sms/transports/test_transport_spec.rb
 - spec/mote_sms_spec.rb