smster 0.0.3 → 0.5.0

data/test/smster/sms/clickatell_test.rb

@@ -2,20 +2,26 @@ require 'test_helper'
 
 class Sms::ClickatellTest < ActiveSupport::TestCase
   def setup
-    @text = "simple text"
-    @number = (0...7).map { (1..9).to_a.sample }.join   
     @provider = Sms::Clickatell
+
+    @to = (99_999_999 * rand).to_i.to_s
+    @text = 'i am rails smster!'
+
+    stub_send_request
   end
 
-  test "create" do
-    sms = @provider.create(text: @text, to: @number)
+  test 'create' do
+    sms = @provider.create(text: @text, to: @to)
+
     assert_equal false, sms.new_record?
   end
 
-  test "format to" do
-    to = "+#{@number}"
-    sms = @provider.create(text: @text, to: to)
+  private
 
-    assert_equal to, sms.to
-  end
-end
+    def stub_send_request
+      body = { data: { message: ['apiMessageId' => 15] } }.to_json
+
+      stub_request(:post, 'https://api.clickatell.com/rest/message')
+        .to_return(status: 200, body: body, headers: {})
+    end
+end

data/test/smster/sms/nexmo_test.rb

@@ -2,21 +2,26 @@ require 'test_helper'
 
 class Sms::NexmoTest < ActiveSupport::TestCase
   def setup
-    @text = "simple text"
-    @number = (0...7).map { (1..9).to_a.sample }.join  
     @provider = Sms::Nexmo
+
+    @to = (99_999_999 * rand).to_i.to_s
+    @text = 'i am rails smster!'
+
+    stub_send_request
   end
 
-  test "create" do
-    sms = @provider.create(text: @text, to: @number)
+  test 'create' do
+    sms = @provider.create(text: @text, to: @to)
 
     assert_equal false, sms.new_record?
   end
 
-  test "format to" do
-    to = "+#{@number}"
-    sms = @provider.create(text: @text, to: to)
+  private
 
-    assert_equal to, sms.to
-  end
-end
+    def stub_send_request
+      body = { messages: ['message-id' => 15] }.to_json
+
+      stub_request(:post, 'https://rest.nexmo.com/sms/json')
+        .to_return(status: 200, body: body, headers: {})
+    end
+end

data/test/smster/sms/smsru_test.rb

@@ -2,21 +2,24 @@ require 'test_helper'
 
 class Sms::SmsRuTest < ActiveSupport::TestCase
   def setup
-    @text = "simple text"
-    @number = (0...7).map { (1..9).to_a.sample }.join  
     @provider = Sms::Smsru
+
+    set_sms_params
+    stub_send_request
   end
 
-  test "create" do
-    sms = @provider.create(text: @text, to: @number)
+  test 'create' do
+    sms = @provider.create(text: @text, to: @to)
 
     assert_equal false, sms.new_record?
   end
 
-  test "format to" do
-    to = "+#{@number}"
-    sms = @provider.create(text: @text, to: to)
+  private
 
-    assert_equal to, sms.to
-  end
-end
+    def stub_send_request
+      body = "100\n201523-1000007\nbalance=52.54"
+
+      stub_request(:post, 'http://sms.ru/sms/send')
+        .to_return(status: 200, body: body, headers: {})
+    end
+end

data/test/smster_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 class SmsterTest < ActiveSupport::TestCase
-  test "confirguration" do
-    nexmo_key = "123"
+  test 'confirguration' do
+    nexmo_key = '123'
 
     Smster.configure do |config|
       config.nexmo_key = nexmo_key

data/test/test_helper.rb

@@ -1,19 +1,26 @@
 # Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] = 'test'
 
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-require "rails/test_help"
+require File.expand_path('../../test/dummy/config/environment.rb',  __FILE__)
+ActiveRecord::Migrator.migrations_paths = [File.expand_path('../../test/dummy/db/migrate', __FILE__)]
+
+require 'rails/test_help'
+require 'webmock/minitest'
 
 # Filter out Minitest backtrace while allowing backtrace from other libraries
 # to be shown.
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir['#{File.dirname(__FILE__)}/support/**/*.rb'].each { |f| require f }
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+  ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
   ActiveSupport::TestCase.fixtures :all
 end
+
+def set_sms_params
+  @to = (99_999_999 * rand).to_i.to_s
+  @text = 'i am rails smster!'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smster
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.5.0
 platform: ruby
 authors:
 - doniv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: smster_ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -69,11 +83,7 @@ files:
 - lib/generators/smster/install/templates/smster.rb
 - lib/generators/smster/install_generator.rb
 - lib/smster.rb
-- lib/smster/configuration.rb
 - lib/smster/sms.rb
-- lib/smster/sms/clickatell.rb
-- lib/smster/sms/nexmo.rb
-- lib/smster/sms/smsru.rb
 - lib/smster/version.rb
 - lib/tasks/smster_tasks.rake
 - test/controller/smster/clickatell_controller_test.rb

data/lib/smster/configuration.rb

@@ -1,12 +0,0 @@
-module Smster
-  class Configuration
-    attr_accessor :nexmo_key, :nexmo_sekret, :clickatell_authorization_code, :smsru_api_id
-
-    def initialize
-      @nexmo_key = ""
-      @nexmo_sekret = ""
-      @clickatell_authorization_code = ""
-      @smsru_api_id = ""
-    end
-  end
-end

data/lib/smster/sms/clickatell.rb

@@ -1,34 +0,0 @@
-class Sms::Clickatell < Sms
-  def send_sms
-    config = Smster.configuration
-    authorization_code = config.clickatell_authorization_code
-
-    text = self.text.tr(" ", "+")
-    phone = to.gsub(/\D/, '') 
-
-    api_message_id = if self.mode == 'test'
-      logger.debug("Mode: #{mode}. To: #{phone}, text: #{text}")
-      self.id
-    else
-      response = RestClient.post('https://api.clickatell.com/rest/message',
-        { "text" => text, "to" => [phone.to_s] }.to_json, 
-        :content_type => :json, 
-        :accept => :json, 
-        'X-Version' => 1, 
-        'Authorization' => "bearer #{authorization_code}")
-      response = JSON.parse(response)
-      response['data']['message'][0]['apiMessageId']
-    end
-
-    if api_message_id.present?
-      self.code = api_message_id
-      self.status = STATUS_CODES[:sent]
-      self.save
-    end
-  rescue => e
-    logger.debug("Error #{e}")
-    self.status = STATUS_CODES[:failed]
-    self.status_message = e.to_s
-    self.save
-  end
-end

data/lib/smster/sms/nexmo.rb

@@ -1,43 +0,0 @@
-class Sms::Nexmo < Sms
-  def send_sms
-    config = Smster.configuration
-    api_key = config.nexmo_key
-    api_secret = config.nexmo_sekret
-
-    text = self.text.tr(" ", "+")
-    phone = to.gsub(/\D/, '') 
-    current_status = STATUS_CODES[:sent]
-
-    api_message_id = if self.mode == 'test'
-      logger.debug("Mode: #{mode}. To: #{phone}, text: #{text}")
-      self.id
-    else
-      response = RestClient.post('https://rest.nexmo.com/sms/json', 
-        "text" => text, 
-        "to" => phone.to_s, 
-        :content_type => :json,
-        :from => 'OnlinePay',
-        :api_key => api_key,
-        :api_secret => api_secret)
-
-      json_response = JSON.parse(response)
-
-      error_text = json_response['messages'][0]['error-text']
-      raise error_text if error_text
-
-      json_response['messages'][0]['message-id']
-    end
-
-    if api_message_id.present?
-      self.code = api_message_id
-      self.status = STATUS_CODES[:sent]
-    end
-
-    self.save
-  rescue => e
-    logger.debug("Error #{e}")
-    self.status = STATUS_CODES[:failed]
-    self.status_message = e.to_s
-    self.save
-  end
-end

data/lib/smster/sms/smsru.rb

@@ -1,40 +0,0 @@
-class Sms::Smsru < Sms
-  def send_sms
-    config = Smster.configuration
-    api_id = config.smsru_api_id
-
-    text = self.text.tr(" ", "+")
-    phone = to.gsub(/\D/, '') 
-
-    api_message_id = if self.mode == 'test'
-      logger.debug("Mode: #{mode}. To: #{phone}, text: #{text}")
-      self.id
-    else
-      response = RestClient.post('http://sms.ru/sms/send', 
-        "api_id" => api_id, 
-        "text" => text, 
-        "to" => phone.to_s, 
-        "from" => name
-      )
-
-      case response.include?('100')
-      when true then result = (/\n(.*)\n/).match(response)[1]
-      else raise response
-      end
-
-      result
-    end
-
-    if api_message_id.present?
-      self.code = api_message_id
-      self.status = STATUS_CODES[:sent]
-    end
-
-    self.save
-  rescue => e
-    logger.debug("Error #{e}")
-    self.status = STATUS_CODES[:failed]
-    self.status_message = e.to_s
-    self.save
-  end
-end