sms_gateway 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a54a6eeddebf3a65ff4cbcc689f7516332bd0f
-  data.tar.gz: d22ce1156c432c0fe8a44df5696911c6d60cb0b3
+  metadata.gz: 226fdbc0abcf8fcd5939ffb73aa5cc2285875867
+  data.tar.gz: a15faae3f38a8e0aed2bfae92770592299f369d4
 SHA512:
-  metadata.gz: cbd74262c9f4396b08d34e725da84a4919f78f850e97e42881555659a601e808c3afca681b7dd0c967c4602608515059f5c343e475fdcc1ae7e9e0d9d459eb46
-  data.tar.gz: 228739afcdaa6b13a52e91edc3b3ad298a8f259ef879e601c9bf73881e80bbe199da50f47ca48186f916d252023fe09b2243c2d4fd75ba3be8841342d977effd
+  metadata.gz: 5e9c1f059505b190e5f9241280ce860a3edbcc63d27100c7fb5fdba76c18a5ef79de4f858c1363ba777916cf2a13cd8945f73eb09b0908b1d35816ec7680abeb
+  data.tar.gz: 4e587f03217d8ebb0dec302a5c6d49be87aefca34b504bf0f04e919b95be4280d5015e3ab2f13b8ad825f19ac760560ba18e88170de2fcc20751a3a44f313119

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in sms_gateway.gemspec
 gemspec

data/Rakefile

@@ -4,7 +4,7 @@ require 'rdoc/task'
 
 Bundler::GemHelper.install_tasks
 
-task :default => :test
+task default: :test
 
 desc 'Run unit tests'
 Rake::TestTask.new(:test) do |test|
@@ -21,6 +21,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-
-

data/lib/sms_gateway.rb

@@ -7,6 +7,3 @@ require 'sms_gateway/jobs/sms_job'
 
 module SmsGateway
 end
-
-
-

data/lib/sms_gateway/adapters/better_opener.rb

@@ -1,23 +1,15 @@
 module SmsGateway
-
   module Adapters
-
     class BetterOpener
-
-      def initialize(config={})
-        @config = {:from => SmsGateway::Base.from}
+      def initialize(config = {})
+        @config = { from: SmsGateway::Base.from }
         @config.merge!(config)
       end
 
       def send_sms(sms)
-        options = @config.merge({:to => sms.to, :message => sms.text}) 
-        BetterOpener.add_notification("sms", sms.text, sms.text)
+        options = @config.merge(to: sms.to, message: sms.text)
+        BetterOpener.add_notification('sms', sms.text, sms.text)
       end
-
     end
-
   end
-
 end
-
-

data/lib/sms_gateway/adapters/sms_global.rb

@@ -1,27 +1,20 @@
 module SmsGateway
-
   module Adapters
-
     class SmsGlobal
       require 'httparty'
       include HTTParty
       base_uri 'http://www.smsglobal.com'
 
-      def initialize(config={})
-        @config = {:user => SmsGateway::Base.user, :password => SmsGateway::Base.password,
-          :from => SmsGateway::Base.from}
+      def initialize(config = {})
+        @config = { user: SmsGateway::Base.user, password: SmsGateway::Base.password,
+                    from: SmsGateway::Base.from }
         @config.merge!(config)
       end
 
       def send_sms(sms)
-        options = @config.merge({:action => "sendsms", :from => sms.from, :to => sms.to, :text => sms.text})
-        self.class.post('/http-api.php', :query => options)
+        options = @config.merge(action: 'sendsms', from: sms.from, to: sms.to, text: sms.text)
+        self.class.post('/http-api.php', query: options)
       end
-
     end
-
   end
-
 end
-
-

data/lib/sms_gateway/adapters/sms_trade.rb

@@ -1,28 +1,22 @@
 module SmsGateway
-
   module Adapters
-
     class SmsTrade
       require 'httparty'
       include HTTParty
       base_uri 'http://gateway.smstrade.de'
 
-      def initialize(config={})
-        @config = {:key => SmsGateway::Base.key, :from => SmsGateway::Base.from, :route => SmsGateway::Base.route}
+      def initialize(config = {})
+        @config = { key: SmsGateway::Base.key, from: SmsGateway::Base.from, route: SmsGateway::Base.route }
         @config.merge!(config)
         self.class.base_uri SmsGateway::Base.base_uri
       end
 
       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)
+        options = @config.merge(from: sms.from, to: sms.to, message: sms.text, charset: 'UTF-8')
+        options.merge!(route: sms.route) if sms.route
+        options.merge!(dlr: 1) if sms.delivery_report
+        self.class.get('/', query: options)
       end
-
     end
-
   end
-
 end
-
-

data/lib/sms_gateway/adapters/test.rb

@@ -1,8 +1,6 @@
 
 module SmsGateway
-
   class Base
-
     class << self
       attr_accessor :deliveries
     end
@@ -10,23 +8,17 @@ module SmsGateway
     @deliveries = []
   end
 
-
   module Adapters
-
     class Test
-
       attr_accessor :deliveries
 
-      def initialize(config={})
-        #@logger = Logger.new(STDOUT)
+      def initialize(_config = {})
+        # @logger = Logger.new(STDOUT)
       end
 
       def send_sms(sms)
         SmsGateway::Base.deliveries << sms
       end
-
     end
   end
 end
-
-

data/lib/sms_gateway/base.rb

@@ -1,7 +1,5 @@
 module SmsGateway
-
   class Base
-
     class << self
       attr_accessor :from, :user, :password, :key, :route, :base_uri
       attr_reader :adapter
@@ -11,36 +9,29 @@ module SmsGateway
       end
 
       def adapter=(underscore_name)
-         klassname = underscore_name.split("_").map(&:capitalize).join
-         klass = SmsGateway::Adapters.const_get(klassname)
-         @adapter = klass.new
+        klassname = underscore_name.split('_').map(&:capitalize).join
+        klass = SmsGateway::Adapters.const_get(klassname)
+        @adapter = klass.new
       end
 
-      def config
-        @config
-      end
+      attr_reader :config
 
       def config=(options)
         @config = options
         adapter = @config.delete(:adapter)
-        @config.each do |k,v|
-          self.send "#{k}=", v
+        @config.each do |k, v|
+          send "#{k}=", v
         end
-        self.adapter = adapter 
+        self.adapter = adapter
       end
 
       def deliver(sms)
-        self.adapter.send_sms(sms)
+        adapter.send_sms(sms)
       end
 
-      def self.deliver_later(text, to, from=Base.config[:from]) 
-        Resque.enqueue(SmsGateway::Workers::SmsJob, text, to, from) 
+      def self.deliver_later(text, to, from = Base.config[:from])
+        Resque.enqueue(SmsGateway::Workers::SmsJob, text, to, from)
       end
-
     end
   end
-
 end
-
-
-

data/lib/sms_gateway/generators/install/install_generator.rb

@@ -2,26 +2,19 @@ require 'rails'
 require 'rails/generators'
 
 module SmsGateway
-
   module Generators
-
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc 'Creates the initializer and config file template.'
 
-      desc "Creates the initializer and config file template."  
-      
       def copy_initializer_file
-        copy_file "initializer.rb", "config/initializers/setup_sms_gateway.rb"
+        copy_file 'initializer.rb', 'config/initializers/setup_sms_gateway.rb'
       end
 
       def copy_config_file
-        copy_file "setup.yml", "config/sms_gateway.yml"
+        copy_file 'setup.yml', 'config/sms_gateway.yml'
       end
-
     end
-
   end
-
 end
-
-

data/lib/sms_gateway/generators/install/templates/initializer.rb

@@ -1,6 +1,4 @@
-SMS_SETTINGS = 
+SMS_SETTINGS =
   YAML.load(File.open(File.join(Rails.root, 'config', 'sms_gateway.yml')))[Rails.env].symbolize_keys
 
 SmsGateway::Base.config = SMS_SETTINGS.symbolize_keys
-
-

data/lib/sms_gateway/jobs/sms_job.rb

@@ -1,16 +1,9 @@
 
 module SmsGateway
-
   class SmsJob
-
     @queue = :sms_queue
     def self.perform(options)
       SmsGateway::Sms.new(options.symbolize_keys).deliver
     end
-
   end
-
 end
-
-
-

data/lib/sms_gateway/sms.rb

@@ -1,12 +1,12 @@
 ## The SMS-Object
 module SmsGateway
-  class Sms < Struct.new(:from, :to, :text, :route)
-
+  class Sms < Struct.new(:from, :to, :text, :route, :delivery_report)
     def initialize(params)
-      self.from = params[:from]||SmsGateway::Base.from
+      self.from = params[:from] || SmsGateway::Base.from
       self.to = params[:to]
       self.text = params[:text]
       self.route = params[:route]
+      self.delivery_report = params[:delivery_report]
     end
 
     def deliver
@@ -14,11 +14,7 @@ module SmsGateway
     end
 
     def to_s
-      "SMS: from:#{self.from}, to:#{self.to}, text:#{self.text}"
+      "SMS: from:#{from}, to:#{to}, text:#{text}"
     end
-
   end
 end
-
-
-

data/lib/sms_gateway/version.rb

@@ -1,4 +1,3 @@
 module SmsGateway
-  VERSION = "0.2.1"
+  VERSION = '0.3.0'
 end
-

data/sms_gateway.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "sms_gateway/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'sms_gateway/version'
 
 Gem::Specification.new do |s|
-  s.name        = "sms_gateway"
+  s.name        = 'sms_gateway'
   s.version     = SmsGateway::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Kai Rubarth"]
-  s.email       = ["kai@doxter.de"]
-  s.homepage    = ""
-  s.summary     = %q{Simple and flexible interface to SMS Gateways}
-  s.description = %q{Provides an interface to SMS Gateways. So far it supports smsglobal.com and smstrade.de}
+  s.authors     = ['Kai Rubarth']
+  s.email       = ['kai@doxter.de']
+  s.homepage    = ''
+  s.summary     = 'Simple and flexible interface to SMS Gateways'
+  s.description = 'Provides an interface to SMS Gateways. So far it supports smsglobal.com and smstrade.de'
 
-  s.rubyforge_project = "sms_gateway"
+  s.rubyforge_project = 'sms_gateway'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.add_dependency('httparty')
 
@@ -25,7 +25,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency('minitest')
   s.add_development_dependency('pry')
   s.add_development_dependency('webmock')
-
 end
-
-

data/test/adapters/sms_global_test.rb

@@ -1,31 +1,24 @@
 require 'test_helper'
 
 describe SmsGateway::Adapters do
-
   before do
-    SmsGateway::Base.config = { 
-      :from => '493011111111',
-      :user => 'userid',
-      :password => 'secret',
-      :adapter => 'sms_global'
+    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: {})
 
-    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 = 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")
+    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

@@ -1,23 +1,21 @@
 require 'test_helper'
 
 describe SmsGateway::Adapters::SmsGlobal do
-
   before do
     SmsGateway::Base.config = {
-      :adapter => 'sms_trade',
-      :route => 'direct',
-      :key => 'KEY',
-      :from => 'SMSTRADE',
-      :base_uri => 'http://gateway.smspromote.de'
+      adapter: 'sms_trade',
+      route: 'direct',
+      key: 'KEY',
+      from: 'SMSTRADE',
+      base_uri: 'http://gateway.smspromote.de'
     }
   end
 
   it 'works with smstrade' do
+    sms = SmsGateway::Sms.new(to: '491701234567', text: 'Hallö Ümläut.', from: 'SENDER')
 
-    sms = SmsGateway::Sms.new(:to => '491701234567', :text => "Hallö Ümläut.", :from => 'SENDER')
-
-    stub_request(:get, "http://gateway.smspromote.de/?charset=UTF-8&from=SENDER&key=KEY&message=#{URI.encode(sms.text)}&route=direct&to=491701234567").
-        to_return(:status => 200, :body => "", :headers => {})
+    stub_request(:get, "http://gateway.smspromote.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
 
@@ -25,20 +23,24 @@ describe SmsGateway::Adapters::SmsGlobal do
   end
 
   it 'allows changing the route on the fly' do
+    sms = SmsGateway::Sms.new(to: '491701234567', text: 'SMSTEXT', from: 'SENDER', route: 'basic')
 
-    sms = SmsGateway::Sms.new(:to => '491701234567', :text => "SMSTEXT", :from => 'SENDER', :route => 'basic')
-
-    stub_request(:get, "http://gateway.smspromote.de/?charset=UTF-8&from=SENDER&key=KEY&message=#{URI.encode(sms.text)}&route=basic&to=491701234567").
-        to_return(:status => 200, :body => "", :headers => {})
+    stub_request(:get, "http://gateway.smspromote.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.smspromote.de/?key=KEY&to=491701234567&message=#{URI.encode(sms.text)}&route=basic&from=SENDER&charset=UTF-8")
-
   end
 
-end
-
+  it 'request reports when configured' do
+    sms = SmsGateway::Sms.new(to: '491701234567', text: 'SMSTEXT', from: 'SENDER', route: 'basic', delivery_report: true)
 
+    stub_request(:get, 'http://gateway.smspromote.de/?charset=UTF-8&dlr=1&from=SENDER&key=KEY&message=SMSTEXT&route=basic&to=491701234567')
+      .to_return(status: 200, body: '', headers: {})
 
+    sms.deliver
 
+    assert_requested(:get, "http://gateway.smspromote.de/?key=KEY&to=491701234567&message=#{URI.encode(sms.text)}&route=basic&from=SENDER&charset=UTF-8&dlr=1")
+  end
+end

data/test/adapters/test_adapter_test.rb

@@ -1,17 +1,15 @@
 require 'test_helper'
 
 describe SmsGateway::Adapters::Test do
-
   it 'works with the test adapter' do
-
-    SmsGateway::Base.config = { 
-      :from => '493011111111',
-      :user => 'userid',
-      :password => 'secret',
-      :adapter => 'test'
+    SmsGateway::Base.config = {
+      from: '493011111111',
+      user: 'userid',
+      password: 'secret',
+      adapter: 'test'
     }
 
-    sms = SmsGateway::Sms.new(:to => '493088888888', :text => "hello")
+    sms = SmsGateway::Sms.new(to: '493088888888', text: 'hello')
 
     assert_equal 0, SmsGateway::Base.deliveries.size
     sms.deliver
@@ -19,12 +17,5 @@ describe SmsGateway::Adapters::Test do
 
     SmsGateway::Base.deliveries = []
     assert_equal [], SmsGateway::Base.deliveries
-
   end
-
-
 end
-
-
-
-

data/test/configuration_test.rb

@@ -1,13 +1,12 @@
 require 'test_helper'
 
 describe SmsGateway::Base do
-
   before do
-     SmsGateway::Base.configure do |config|
+    SmsGateway::Base.configure do |config|
       config.from = '123456789'
       config.user = 'some_user'
       config.password = 'secret'
-      config.adapter = 'test' 
+      config.adapter = 'test'
     end
   end
 
@@ -20,13 +19,7 @@ describe SmsGateway::Base do
   end
 
   def test_parse_from
-    sms = SmsGateway::Sms.new(:text => 'test')
+    sms = SmsGateway::Sms.new(text: 'test')
     assert_equal '123456789', sms.from
   end
-
 end
-
-
-
-
-

data/test/test_helper.rb

@@ -5,3 +5,4 @@ require 'minitest/autorun'
 require 'webmock/minitest'
 require 'pry'
 
+include WebMock::API

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sms_gateway
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sms_gateway
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Simple and flexible interface to SMS Gateways
@@ -140,3 +140,4 @@ test_files:
 - test/adapters/test_adapter_test.rb
 - test/configuration_test.rb
 - test/test_helper.rb
+has_rdoc: