sms_gateway 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8ba39fd167bf8e8b93e8216af71e81b1ed3746
-  data.tar.gz: 8e0aac794101802e67ef1bacc23604dc7a140277
+  metadata.gz: 5da65ee20b61e04afa2d252edb032ef0595a3a2d
+  data.tar.gz: 2457d1ec22f250b82a3a6568532b5ab2136dff12
 SHA512:
-  metadata.gz: b69c19605382533e5be82a70e529e3de488f7c35ffd37f6ff67dbec8a21e5369db0e5da901503a297f0f4381ceca6880d51e03d2615a91cf32ff1923c5ddc195
-  data.tar.gz: 285f6913428fedf61c68435d4136b0c2e306d502b44739cc4750a1ffb32fc561847398d68070b8a8c7cc5c245fee5a217ba015b0f905043b0ed83c954dffb820
+  metadata.gz: 7062407b54906de2506b5a18f430a72c10f0d94bfd7e3fa02386889a9c02124bdd9b8823842e54f3f0379cf4b06dc74acb56df78fad730c5bf77e7ea7a9372c9
+  data.tar.gz: dad6fc449ea60413b949394217be9b9c7599042dfa8d36c46e32a3600a4e043da4ede7bd0bf299d22f470e129b195ae45a424158b38c484cd7c98ccdb15a0919

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.1.2

data/lib/sms_gateway/adapters/sms_trade.rb

@@ -14,6 +14,7 @@ module SmsGateway
 
       def send_sms(sms)
         options = @config.merge({:from => sms.from, :to => sms.to, :message => sms.text, :charset => "UTF-8"}) 
+        options.merge!({:route => sms.route}) if sms.route
         self.class.get('/', :query => options)
       end
 

data/lib/sms_gateway/base.rb

@@ -29,8 +29,8 @@ module SmsGateway
         self.adapter = adapter 
       end
 
-      def deliver(options)
-        self.adapter.send_sms(SmsGateway::Sms.new(options))
+      def deliver(sms)
+        self.adapter.send_sms(sms)
       end
 
       def self.deliver_later(text, to, from=Base.config[:from]) 

data/lib/sms_gateway/sms.rb

@@ -1,21 +1,16 @@
-
 ## The SMS-Object
 module SmsGateway
-  class Sms < Struct.new(:from, :to, :text)
+  class Sms < Struct.new(:from, :to, :text, :route)
 
     def initialize(params)
-      #self.from = params[:from]||SmsGateway::Base.config[:from]
       self.from = params[:from]||SmsGateway::Base.from
       self.to = params[:to]
       self.text = params[:text]
+      self.route = params[:route]
     end
 
     def deliver
-      SmsGateway::Base.deliver(:to=>self.to, :from=>self.from, :text=>self.text)
-    end
-
-    def deliver_later
-      Resque.enqueue(SmsGateway::SmsJob, :to=>self.to, :from=>self.from, :text=>self.text)
+      SmsGateway::Base.deliver(self)
     end
 
     def to_s

data/lib/sms_gateway/version.rb

@@ -1,4 +1,4 @@
 module SmsGateway
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end
 

data/sms_gateway.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('httparty')
-  s.add_dependency('resque')
 
   s.add_development_dependency('rake')
+  s.add_development_dependency('minitest')
+  s.add_development_dependency('pry')
   s.add_development_dependency('webmock')
 
 end

data/test/adapters/sms_global_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+describe SmsGateway::Adapters do
+
+  before do
+    SmsGateway::Base.config = { 
+      :from => '493011111111',
+      :user => 'userid',
+      :password => 'secret',
+      :adapter => 'sms_global'
+    }
+  end
+
+  it 'works with sms global' do
+
+    stub_request(:post, "http://www.smsglobal.com/http-api.php?action=sendsms&from=4930123456&password=secret&text=hello&to=493088888888&user=userid").
+      to_return(:status => 200, :body => "OK: 0;", :headers => {})
+
+    sms = SmsGateway::Sms.new(:from => '4930123456', :to => '493088888888',
+                  :text => "hello")
+
+    sms.deliver
+
+    assert_requested(:post, "http://www.smsglobal.com/http-api.php?action=sendsms&from=4930123456&password=secret&text=hello&to=493088888888&user=userid")
+  end
+
+end
+
+
+
+

data/test/adapters/sms_trade_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+describe SmsGateway::Adapters::SmsGlobal do
+
+  before do
+    SmsGateway::Base.config = {
+      :adapter => 'sms_trade',
+      :route => 'direct',
+      :key => 'KEY',
+      :from => 'SMSTRADE'
+    }
+  end
+
+  it 'works with smstrade' do
+
+    sms = SmsGateway::Sms.new(:to => '491701234567', :text => "Hallö Ümläut.", :from => 'SENDER')
+
+    stub_request(:get, "http://gateway.smstrade.de/?charset=UTF-8&from=SENDER&key=KEY&message=#{URI.encode(sms.text)}&route=direct&to=491701234567").
+        to_return(:status => 200, :body => "", :headers => {})
+
+    sms.deliver
+
+    assert_requested(:get, "http://gateway.smstrade.de/?key=KEY&to=491701234567&message=#{URI.encode(sms.text)}&route=direct&from=SENDER&charset=UTF-8")
+  end
+
+  it 'allows changing the route on the fly' do
+
+    sms = SmsGateway::Sms.new(:to => '491701234567', :text => "SMSTEXT", :from => 'SENDER', :route => 'basic')
+
+    stub_request(:get, "http://gateway.smstrade.de/?charset=UTF-8&from=SENDER&key=KEY&message=#{URI.encode(sms.text)}&route=basic&to=491701234567").
+        to_return(:status => 200, :body => "", :headers => {})
+
+    sms.deliver
+
+    assert_requested(:get, "http://gateway.smstrade.de/?key=KEY&to=491701234567&message=#{URI.encode(sms.text)}&route=basic&from=SENDER&charset=UTF-8")
+
+  end
+
+end
+
+
+
+

data/test/{test_adapter_test.rb → adapters/test_adapter_test.rb}

@@ -1,9 +1,8 @@
 require 'test_helper'
 
-class SmsGateway::Adapters::SmsGatewayTest < Test::Unit::TestCase
-  include SmsGateway
+describe SmsGateway::Adapters::Test do
 
-  def test_test_adapter
+  it 'works with the test adapter' do
 
     SmsGateway::Base.config = { 
       :from => '493011111111',
@@ -12,7 +11,7 @@ class SmsGateway::Adapters::SmsGatewayTest < Test::Unit::TestCase
       :adapter => 'test'
     }
 
-    sms = Sms.new(:to => '493088888888', :text => "hello")
+    sms = SmsGateway::Sms.new(:to => '493088888888', :text => "hello")
 
     assert_equal 0, SmsGateway::Base.deliveries.size
     sms.deliver
@@ -20,7 +19,7 @@ class SmsGateway::Adapters::SmsGatewayTest < Test::Unit::TestCase
 
     SmsGateway::Base.deliveries = []
     assert_equal [], SmsGateway::Base.deliveries
-    
+
   end
 
 

data/test/configuration_test.rb

@@ -1,9 +1,8 @@
-
 require 'test_helper'
 
-class SmsGateway::ConfigurationTest < Test::Unit::TestCase
+describe SmsGateway::Base do
 
-  def setup
+  before do
      SmsGateway::Base.configure do |config|
       config.from = '123456789'
       config.user = 'some_user'
@@ -25,23 +24,6 @@ class SmsGateway::ConfigurationTest < Test::Unit::TestCase
     assert_equal '123456789', sms.from
   end
 
-#  def test_parse_adapter
-#    assert_equal SmsGateway::Adapters::Test, SmsGateway::Base.adapter
-#  end
-#
-#  def test_work_config_hash
-#    SmsGateway::Base.config = {
-#      :from => 'new_from',
-#      :user => 'new_user',
-#      :password => 'new_password', 
-#      :adapter => 'sms_global'}
-#    
-#    assert_equal 'new_from', SmsGateway::Base.from
-#    assert_equal 'new_user', SmsGateway::Base.user
-#    assert_equal 'new_password', SmsGateway::Base.password
-#    assert_equal SmsGateway::Adapters::SmsGlobal, SmsGateway::Base.adapter
-#  end
-
 end
 
 

data/test/test_helper.rb

@@ -1,12 +1,7 @@
-
-require 'rubygems'
-require 'test/unit'
-require 'webmock/test_unit'
-require 'debugger'
-
 require 'sms_gateway'
-
-class Test::Unit::TestCase
-end
-
+require 'sms_gateway/adapters/sms_global'
+require 'sms_gateway/adapters/sms_trade'
+require 'minitest/autorun'
+require 'webmock/minitest'
+require 'pry'
 

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: sms_gateway
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides an interface to SMS Gateways. So far it supports smsglobal.com
@@ -74,7 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -91,9 +106,10 @@ files:
 - lib/sms_gateway/sms.rb
 - lib/sms_gateway/version.rb
 - sms_gateway.gemspec
+- test/adapters/sms_global_test.rb
+- test/adapters/sms_trade_test.rb
+- test/adapters/test_adapter_test.rb
 - test/configuration_test.rb
-- test/sms_gateway_test.rb
-- test/test_adapter_test.rb
 - test/test_helper.rb
 homepage: ''
 licenses: []
@@ -104,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sms_gateway
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple and flexible interface to SMS Gateways

data/test/sms_gateway_test.rb

@@ -1,60 +0,0 @@
-# encoding: UTF-8
-
-require 'test_helper'
-
-class SmsGateway::Adapters::SmsGatewayTest < Test::Unit::TestCase
-  include SmsGateway
-
-  def setup
-  end
-
-  def test_sms_gateway
-
-    SmsGateway::Base.config = { 
-      :from => '493011111111',
-      :user => 'userid',
-      :password => 'secret',
-      :adapter => 'sms_global'
-    }
-
-    stub_request(:post, "http://www.smsglobal.com/http-api.php?action=sendsms&from=4930123456&password=secret&text=hello&to=493088888888&user=userid").
-      to_return(:status => 200, :body => "OK: 0;", :headers => {})
-
-    sms = Sms.new(:from => '4930123456', :to => '493088888888',
-                  :text => "hello")
-
-    sms.deliver
-
-    assert_requested(:post, "http://www.smsglobal.com/http-api.php?action=sendsms&from=4930123456&password=secret&text=hello&to=493088888888&user=userid")
-
-
-
-  end
-
-
-  def test_sms_trade
-
-    SmsGateway::Base.config = {
-      :adapter => 'sms_trade',
-      :route => 'direct',
-      :key => 'KEY',
-      :from => 'SMSTRADE'
-    }
-
-    sms = Sms.new(:to => '491701234567', :text => "Hallö Ümläut.", :from => 'SENDER')
-
-    stub_request(:get, "http://gateway.smstrade.de/?charset=UTF-8&from=SENDER&key=KEY&message=#{URI.encode(sms.text)}&route=direct&to=491701234567").
-        to_return(:status => 200, :body => "", :headers => {})
-
-    sms.deliver
-
-    assert_requested(:get, "http://gateway.smstrade.de/?key=KEY&to=491701234567&message=#{URI.encode(sms.text)}&route=direct&from=SENDER&charset=UTF-8")
-  end
-
-
-
-end
-
-
-
-