smster 0.0.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b8fdbd8765029fc596f9e57a805d1a0aa447700
-  data.tar.gz: 05d2aa2be015b4f8c2f3da8a380c78c756ba552f
+  metadata.gz: 0b4a43ae5bd049ae49c9ddcd6eca1dd1478e160b
+  data.tar.gz: 70a88091d388966c6555309f0f49ed1ed63c148d
 SHA512:
-  metadata.gz: 0e9d1c06b35deddab86e0bd9af9f943312507b0470ffb3596685e9ab69427539b65540461eac5c4a7193d9fbf9cc5100878353ea7a94a1df6cbf4966408f34b6
-  data.tar.gz: 6d225c10f117735b82a6a4565117a5b4f89806c24194109aaf3e576e2b1204c495382d92aacc6f3c2d30bcae42e175bc43d484dea09cb5af39ee9ccbec058c6a
+  metadata.gz: e6ba1c25cf27a1ee741ffa9cd2664254a6cada3cf2b36b57f7f7c7701fa86d1f2a2daf993f208c61cbb5c9e97d92c24483608f7f36e9b42bd4c35fab4190097f
+  data.tar.gz: 973c0fac4f1e4a4e6d8e3f752432205098e30f535a1022e3a1b5a659f9e81fded037a57ec4375f32d512573e65fe6ae6634d1d3a00d21c62eb38d206d5c4f03b

data/README.rdoc

@@ -25,7 +25,7 @@ Add to routes, setup provider callbacks and get sms statuses:
   post 'smster/$provider_name/callback'
   
 == Feedback
-Please use the {issue tracker}[https://github.com/IlyaDonskikh/smster/issues].
+Please use the {issue tracker}[https://github.com/IlyaDonskikh/smster/issues] or send mail to {donivrecord@gmail.com}[mailto:donivrecord@gmail.com].
 
 == Thanks
 1. {Mickhail Zelenin}[https://github.com/MioGreen] for the idea for this gem.

data/Rakefile

@@ -14,11 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -30,5 +25,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/controllers/smster/clickatell_controller.rb

@@ -4,6 +4,7 @@ class Smster::ClickatellController < ApplicationController
   def callback
     code = clickatell_params[:apiMessageId]
     description = clickatell_params[:description]
+
     sms = Sms::Clickatell.find_by!(code: code)
 
     sms.status_message = description
@@ -16,7 +17,8 @@ class Smster::ClickatellController < ApplicationController
   end
 
   private
+
     def clickatell_params
       params.require(:data)
     end
-end
+end

data/app/controllers/smster/nexmo_controller.rb

@@ -10,8 +10,8 @@ class Smster::NexmoController < ApplicationController
     sms.save
 
     sms.accept! if status == 'delivered'
-    result = { sms.id => sms.status }
 
+    result = { sms.id => sms.status }
     render json: result.as_json, status: 200
   end
-end
+end

data/app/controllers/smster/smsru_controller.rb

@@ -4,23 +4,24 @@ class Smster::SmsruController < ApplicationController
   def callback
     smsru_params.each do |data|
       data = data.split(/\n/)
-      if data[0] == 'sms_status'
-        code = data[1]
-        status = data[2]
-        @sms = Sms::Smsru.find_by!(code: code)
 
-        @sms.status_message = status
-        @sms.save
+      next unless data[0] == 'sms_status'
 
-        @sms.accept! if status.to_s == '100'
-      end
+      code = data[1]
+      status = data[2]
+      @sms = Sms::Smsru.find_by!(code: code)
+
+      @sms.update(status_message: status)
+
+      @sms.accept! if status.to_s == '100'
     end
 
     render nothing: true, status: 100
   end
 
   private
+
     def smsru_params
       params.require(:data)
     end
-end
+end

data/lib/generators/smster/install/templates/create_smsters.rb

@@ -1,4 +1,4 @@
-class CreateSmsters< ActiveRecord::Migration
+class CreateSmsters < ActiveRecord::Migration
   def up
     create_table :smsters do |t|
       t.string :text
@@ -17,4 +17,4 @@ class CreateSmsters< ActiveRecord::Migration
   def down
     drop_table :smsters
   end
-end
+end

data/lib/generators/smster/install/templates/smster.rb

@@ -1,11 +1,11 @@
 Smster.configure do |config|
   ## Nexmo
-  config.nexmo_key = ""
-  config.nexmo_sekret = ""
+  config.nexmo_key = ''
+  config.nexmo_sekret = ''
 
   ## Clickatell
-  config.clickatell_authorization_code = ""
+  config.clickatell_authorization_code = ''
 
   ## Smsru
-  config.smsru_api_id = ""
-end
+  config.smsru_api_id = ''
+end

data/lib/generators/smster/install_generator.rb

@@ -1,19 +1,19 @@
 require 'rails/generators'
 module Smster
   class InstallGenerator < Rails::Generators::Base
-    desc "Add migration"
+    desc 'Add migration'
     include Rails::Generators::Migration
     source_root File.expand_path('../install/templates', __FILE__)
 
     def copy_migrations
-      copy_migration "create_smsters"
+      copy_migration 'create_smsters'
     end
 
-    def self.next_migration_number(path)
-      unless @prev_migration_nr
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      else
+    def self.next_migration_number(_)
+      if @prev_migration_nr
         @prev_migration_nr += 1
+      else
+        @prev_migration_nr = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
       end
       @prev_migration_nr.to_s
     end
@@ -27,9 +27,10 @@ module Smster
     end
 
     protected
+
       def copy_migration(filename)
-        if self.class.migration_exists?("db/migrate", "#{filename}")
-          say_status("skipped", "Migration #{filename}.rb already exists")
+        if self.class.migration_exists?('db/migrate', "#{filename}")
+          say_status('skipped', "Migration #{filename}.rb already exists")
         else
           migration_template "#{filename}.rb", "db/migrate/#{filename}.rb"
         end

data/lib/smster.rb

@@ -1,13 +1,14 @@
 require 'rest_client'
-require "smster/configuration"
+require 'smster'
+require 'smster/configuration'
 require 'smster/sms'
-require 'smster/sms/clickatell'
-require 'smster/sms/nexmo'
 require 'smster/sms/smsru'
+require 'smster/sms/nexmo'
+require 'smster/sms/clickatell'
 
 module Smster
   class Engine < Rails::Engine; end
-  
+
   class << self
     attr_accessor :configuration
   end

data/lib/smster/sms.rb

@@ -1,32 +1,50 @@
 class Sms < ActiveRecord::Base
-  self.table_name = "smsters"
-  attr_accessor :mode
+  self.table_name = 'smsters'
 
-  ## Codes
-  STATUS_CODES = { created: 0, sent: 1, delivered: 2, failed: 3 }
+  attr_accessor :from, :api_message_id
 
   ## Callbacks
-  after_create :send_sms
+  before_validation :assing_status
 
-  ## Validations
-  validates :type, :to, :text, presence: true
+  ## Codes
+  STATUSES = { created: 0, sent: 1, delivered: 2, failed: 3 }
 
   ## Etc.
-  def initialize(attributes = {})
-    attr_with_defaults = {
-      status: STATUS_CODES[:created]
-    }.merge(attributes)
-    super(attr_with_defaults)
+  def self.create(attrs = {})
+    sms = new(attrs).send_sms
+    sms.assing_code
+    sms.save
+
+    sms
   end
 
-  def mode
-    @mode ||= case Rails.env
-    when 'test' then 'test'
-    else 'production'
-    end
+  def assing_status
+    self.status ||= STATUSES[:created]
+  end
+
+  def send_sms
+    send_to_provider
+
+    status_name = api_message_id ? :sent : :failed
+    self.status = STATUSES[status_name]
+
+    self
   end
 
   def accept!
-    self.update(status: STATUS_CODES[:delivered])
+    update(status: STATUSES[:delivered])
+  end
+
+  def assing_code
+    self.code = api_message_id
   end
-end
+
+  private
+
+    def send_to_provider
+      modify_params
+
+      response = send_request
+      assign_attrs_by(response)
+    end
+end

data/lib/smster/version.rb

@@ -1,3 +1,3 @@
 module Smster
-  VERSION = "0.0.3"
+  VERSION = '0.5.0'
 end

data/test/controller/smster/clickatell_controller_test.rb

@@ -2,26 +2,35 @@ require 'test_helper'
 
 class Smster::ClickatellControllerTest < ActionController::TestCase
   def setup
-    @text = "simple text"
-    @number = (0...7).map { (1..9).to_a.sample }.join  
+    @text = 'simple text'
+    @to = (9_999_999 * rand).to_i
     @provider = Sms::Clickatell
+
+    stub_send_request
   end
 
   test 'callback' do
-    delivered_code = Sms::STATUS_CODES[:delivered]
-    sms = @provider.create(text: @text, to: @number)
-
-    post :callback, { 
-      "data" =>  {
-        "charge" => 1.5,
-        "messageStatus" => 003,
-        "description" => "Received by recipient",
-        "apiMessageId" => sms.code
-      }
+    delivered_code = Sms::STATUSES[:delivered]
+    sms = @provider.create(text: @text, to: @to)
+
+    post :callback, 'data' =>  {
+      'charge' => 1.5,
+      'messageStatus' => 003,
+      'description' => 'Received by recipient',
+      'apiMessageId' => sms.code
     }
 
     response = JSON.parse(@response.body)
     result = { sms.id => delivered_code }
     assert_equal result.as_json, response
   end
-end
+
+  private
+
+    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/controller/smster/nexmo_controller_test.rb

@@ -2,18 +2,31 @@ require 'test_helper'
 
 class Smster::NexmoControllerTest < ActionController::TestCase
   def setup
-    @text = "simple text"
-    @number = (0...7).map { (1..9).to_a.sample }.join  
+    @text = 'simple text'
+    @number = (9_999_999 * rand).to_i
     @provider = Sms::Nexmo
+
+    stub_send_request
   end
 
   test 'callback' do
-    delivered_code = Sms::STATUS_CODES[:delivered]
+    delivered_code = Sms::STATUSES[:delivered]
     sms = @provider.create(text: @text, to: @number)
 
-    post :callback, { "messageId" => sms.code, "status" => 'delivered' }
+    post :callback, 'messageId' => sms.code, 'status' => 'delivered'
+
     response = JSON.parse(@response.body)
     result = { sms.id => delivered_code }
+
     assert_equal result.as_json, response
   end
-end
+
+  private
+
+    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/controller/smster/smsru_controller_test.rb

@@ -2,22 +2,30 @@ require 'test_helper'
 
 class Smster::SmsruControllerTest < ActionController::TestCase
   def setup
-    @text = "simple text"
-    @number = (0...7).map { (1..9).to_a.sample }.join  
+    @text = 'simple text'
+    @to = (9_999_999 * rand).to_i
     @provider = Sms::Smsru
+
+    stub_send_request
   end
 
   test 'callback' do
-    delivered_code = Sms::STATUS_CODES[:delivered]
-    sms = @provider.create(text: @text, to: @number)
+    delivered_code = Sms::STATUSES[:delivered]
+    sms = @provider.create(text: @text, to: @to)
 
-    post :callback, { 
-      "data" =>  ["sms_status\n#{sms.code}\n100"]
-    }
+    post :callback, 'data' =>  ["sms_status\n#{sms.code}\n100"]
 
-    response = @response.status
     sms = assigns(:sms)
     assert_equal 100, @response.status
     assert_equal delivered_code, sms.status
   end
-end
+
+  private
+
+    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/dummy/Rakefile

@@ -1,6 +1,3 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
 require File.expand_path('../config/application', __FILE__)
 
 Rails.application.load_tasks

data/test/dummy/config/initializers/smster.rb

@@ -7,5 +7,5 @@ Smster.configure do |config|
   config.clickatell_authorization_code = "I._aJiuBBZW6K8A_V6jh34tJLt7eghOlMrgsiCrK3ze63hxFpe8n5.7PY1PNStxLIn"
 
   ## Smsru
-  config.smsru_api_id = "1b9812ac9-c035-04f4-45e6-2ad22d375cb9"
+  config.smsru_api_id = "b9812ac9-c035-04f4-45e6-2ad22d375cb9"
 end

data/test/dummy/log/development.log

@@ -269,3 +269,52 @@ Error Unroutable message - rejected
   SQL (0.4ms)  INSERT INTO "smsters" ("type", "status", "to", "text", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["type", "Sms::Nexmo"], ["status", 0], ["to", "79050958806"], ["text", "privet1"], ["created_at", "2015-04-01 05:17:32.611427"], ["updated_at", "2015-04-01 05:17:32.611427"]]
   SQL (0.4ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "to" = ?, "text" = ?, "created_at" = ?, "updated_at" = ?, "id" = ?, "code" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Nexmo"], ["status", 1], ["to", "79050958806"], ["text", "privet1"], ["created_at", "2015-04-01 05:17:32.611427"], ["updated_at", "2015-04-01 05:17:32.611427"], ["id", 53], ["code", "0200000059FADD5B"], ["id", 53]]
    (2.6ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (1.4ms)  INSERT INTO "smsters" ("type", "status", "text", "to", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["status", 0], ["text", "Hello"], ["to", "+79050958806"], ["created_at", "2015-05-31 12:09:45.034566"], ["updated_at", "2015-05-31 12:09:45.034566"]]
+Error 200
+  SQL (0.5ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "text" = ?, "to" = ?, "created_at" = ?, "updated_at" = ?, "id" = ?, "status_message" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["created_at", "2015-05-31 12:09:45.034566"], ["updated_at", "2015-05-31 12:09:45.034566"], ["id", 54], ["status_message", "200"], ["id", 54]]
+   (2.7ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.4ms)  INSERT INTO "smsters" ("type", "status", "text", "to", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["status", 0], ["text", "Hello"], ["to", "79050958806"], ["created_at", "2015-05-31 12:10:16.078787"], ["updated_at", "2015-05-31 12:10:16.078787"]]
+Error 200
+  SQL (0.4ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "text" = ?, "to" = ?, "created_at" = ?, "updated_at" = ?, "id" = ?, "status_message" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "79050958806"], ["created_at", "2015-05-31 12:10:16.078787"], ["updated_at", "2015-05-31 12:10:16.078787"], ["id", 55], ["status_message", "200"], ["id", 55]]
+   (2.8ms)  commit transaction
+Error 200
+   (0.1ms)  begin transaction
+  SQL (0.4ms)  INSERT INTO "smsters" ("type", "status", "text", "to", "status_message", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:10:28.340706"], ["updated_at", "2015-05-31 12:10:28.340706"]]
+Error 200
+  SQL (0.5ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "text" = ?, "to" = ?, "status_message" = ?, "created_at" = ?, "updated_at" = ?, "id" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:10:28.340706"], ["updated_at", "2015-05-31 12:10:28.340706"], ["id", 56], ["id", 56]]
+   (2.8ms)  commit transaction
+Error 200
+   (0.1ms)  begin transaction
+  SQL (0.3ms)  INSERT INTO "smsters" ("type", "status", "text", "to", "status_message", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:11:01.823444"], ["updated_at", "2015-05-31 12:11:01.823444"]]
+Error 200
+  SQL (0.3ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "text" = ?, "to" = ?, "status_message" = ?, "created_at" = ?, "updated_at" = ?, "id" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:11:01.823444"], ["updated_at", "2015-05-31 12:11:01.823444"], ["id", 57], ["id", 57]]
+   (0.9ms)  commit transaction
+Error 200
+   (0.1ms)  begin transaction
+  SQL (0.4ms)  INSERT INTO "smsters" ("type", "status", "text", "to", "status_message", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:11:28.359710"], ["updated_at", "2015-05-31 12:11:28.359710"]]
+Error 200
+  SQL (0.4ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "text" = ?, "to" = ?, "status_message" = ?, "created_at" = ?, "updated_at" = ?, "id" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:11:28.359710"], ["updated_at", "2015-05-31 12:11:28.359710"], ["id", 58], ["id", 58]]
+   (2.7ms)  commit transaction
+Error 200
+   (0.1ms)  begin transaction
+  SQL (2.0ms)  INSERT INTO "smsters" ("type", "status", "text", "to", "status_message", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:12:05.400871"], ["updated_at", "2015-05-31 12:12:05.400871"]]
+Error 200
+  SQL (2.2ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "text" = ?, "to" = ?, "status_message" = ?, "created_at" = ?, "updated_at" = ?, "id" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:12:05.400871"], ["updated_at", "2015-05-31 12:12:05.400871"], ["id", 59], ["id", 59]]
+   (1.3ms)  commit transaction
+Error 200
+   (0.1ms)  begin transaction
+  SQL (0.6ms)  INSERT INTO "smsters" ("type", "status", "text", "to", "status_message", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:12:18.887816"], ["updated_at", "2015-05-31 12:12:18.887816"]]
+Error 200
+  SQL (0.6ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "text" = ?, "to" = ?, "status_message" = ?, "created_at" = ?, "updated_at" = ?, "id" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Smsru"], ["status", 3], ["text", "Hello"], ["to", "+79050958806"], ["status_message", "200"], ["created_at", "2015-05-31 12:12:18.887816"], ["updated_at", "2015-05-31 12:12:18.887816"], ["id", 60], ["id", 60]]
+   (1.1ms)  commit transaction
+Mode: production. To: 79050958806, text: Hello
+   (0.2ms)  begin transaction
+  SQL (0.5ms)  INSERT INTO "smsters" ("type", "status", "text", "to", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["status", 0], ["text", "Hello"], ["to", "+79050958806"], ["created_at", "2015-05-31 12:15:32.722614"], ["updated_at", "2015-05-31 12:15:32.722614"]]
+Mode: production. To: 79050958806, text: Hello
+  SQL (0.6ms)  UPDATE "smsters" SET "type" = ?, "status" = ?, "text" = ?, "to" = ?, "created_at" = ?, "updated_at" = ?, "id" = ? WHERE "smsters"."id" = ?  [["type", "Sms::Smsru"], ["status", 0], ["text", "Hello"], ["to", "+79050958806"], ["created_at", "2015-05-31 12:15:32.722614"], ["updated_at", "2015-05-31 12:15:32.722614"], ["id", 61], ["id", 61]]
+   (0.9ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (1.7ms)  INSERT INTO "smsters" ("type", "to", "text", "status", "code", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["type", "Sms::Smsru"], ["to", "79050958806"], ["text", "test rails gem"], ["status", 1], ["code", "201525-1000000"], ["created_at", "2015-06-15 17:01:55.748243"], ["updated_at", "2015-06-15 17:01:55.748243"]]
+   (0.9ms)  commit transaction