sms_aero 0.0.11 → 0.1.0

data/lib/sms_aero/phone.rb

@@ -0,0 +1,11 @@
+class SmsAero::Phone < String
+  extend SmsAero::Callable
+
+  private
+
+  def initialize(value)
+    phone = value.to_s.scan(/\d/).join[/[^0].*/].to_s
+    raise "'#{value}' is not a valid phone" unless phone[/^\d{11,13}$/]
+    super phone
+  end
+end

data/lib/sms_aero/response.rb

@@ -0,0 +1,30 @@
+class SmsAero::Response
+  extend Dry::Initializer
+  extend SmsAero::Optional
+  option :reason, proc(&:to_s),    default: proc { nil }
+  option :result, proc(&:strip),   default: -> { "accepted" }
+
+  def success?
+    result == "accepted"
+  end
+
+  class << self
+    def build(*res)
+      body = res.last
+      new JSON.parse(body.first)
+    end
+
+    def new(opts)
+      super \
+        opts.each_with_object({}) { |(key, val), obj| obj[key.to_sym] = val }
+    end
+  end
+
+  # Operation-specific responses
+  require_relative "response/with_balance"
+  require_relative "response/with_groups"
+  require_relative "response/with_id"
+  require_relative "response/with_senders"
+  require_relative "response/with_statuses"
+  require_relative "response/with_tariff"
+end

data/lib/sms_aero/response/with_balance.rb

@@ -0,0 +1,5 @@
+class SmsAero
+  class Response::WithBalance < Response
+    option :balance, proc(&:to_f), optional: true
+  end
+end

data/lib/sms_aero/response/with_groups.rb

@@ -0,0 +1,5 @@
+class SmsAero
+  class Response::WithGroups < Response
+    option :reason, method(:Array), as: :channels, optional: true
+  end
+end

data/lib/sms_aero/response/with_id.rb

@@ -0,0 +1,9 @@
+class SmsAero
+  class Response::WithId < Response
+    option :id, proc(&:to_s), optional: true
+
+    def success?
+      id.to_s != ""
+    end
+  end
+end

data/lib/sms_aero/response/with_senders.rb

@@ -0,0 +1,5 @@
+class SmsAero
+  class Response::WithSenders < Response
+    option :data, method(:Array), optional: true, as: :senders
+  end
+end

data/lib/sms_aero/response/with_statuses.rb

@@ -0,0 +1,5 @@
+class SmsAero
+  class Response::WithStatuses < Response
+    option :data, method(:Array), optional: true, as: :statuses
+  end
+end

data/lib/sms_aero/response/with_tariff.rb

@@ -0,0 +1,5 @@
+class SmsAero
+  class Response::WithTariff < Response
+    option :reason, SmsAero::Tariff, optional: true, as: :tariff
+  end
+end

data/lib/sms_aero/tariff.rb

@@ -0,0 +1,8 @@
+class SmsAero::Tariff
+  extend  Dry::Initializer
+  extend  SmsAero::Callable
+  include SmsAero::Optional
+
+  option :"Direct channel",  proc(&:to_f), optional: true, as: :direct
+  option :"Digital channel", proc(&:to_f), optional: true, as: :digital
+end

data/sms_aero.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "sms_aero"
-  gem.version  = "0.0.11"
+  gem.version  = "0.1.0"
   gem.author   = "Andrew Kozin (nepalez)"
   gem.email    = "andrew.kozin@gmail.com"
   gem.homepage = "https://github.com/nepalez/sms_aero"
@@ -13,9 +13,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.2"
 
-  gem.add_runtime_dependency "dry-types",   ">= 0.9"
-  gem.add_runtime_dependency "evil-struct", ">= 0.0.4"
-  gem.add_runtime_dependency "evil-client", "~> 0.3.2"
+  gem.add_runtime_dependency "evil-client", "~> 1.1"
 
   gem.add_development_dependency "rake", ">= 10"
   gem.add_development_dependency "rspec", "~> 3.0"

data/spec/{sms_aero/types → models}/birthday_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe SmsAero::Types::Birthday do
+RSpec.describe SmsAero::Birthday do
   subject { described_class[source] }
 
   context "date:" do
@@ -27,7 +27,7 @@ RSpec.describe SmsAero::Types::Birthday do
     let(:source) { "Foobar" }
 
     it "fails" do
-      expect { subject }.to raise_error(TypeError, /Foobar/)
+      expect { subject }.to raise_error(StandardError, /Foobar/)
     end
   end
 end

data/spec/{sms_aero/types → models}/channel_spec.rb

@@ -1,11 +1,11 @@
 require "spec_helper"
 
-RSpec.describe SmsAero::Types::Channel do
+RSpec.describe SmsAero::Channel do
   context "valid code:" do
     let(:codes) { [1, 2, 3, 4, 6] }
 
     it "returns a code" do
-      codes.each { |code| expect(described_class[code]).to eq code }
+      codes.each { |code| expect(described_class[code]).to eq code.to_s }
     end
   end
 

data/spec/{sms_aero/types → models}/digital_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe SmsAero::Types::Digital do
+RSpec.describe SmsAero::Digital do
   subject { described_class[source] }
 
   context "false:" do

data/spec/{sms_aero/types → models}/future_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
 
-RSpec.describe SmsAero::Types::Future do
+RSpec.describe SmsAero::Future do
   subject { described_class[source] }
 
   context "time in future:" do
     let(:source) { Time.now + 3600 }
 
     it "returns UNIX time in seconds" do
-      expect(subject).to eq source.to_i
+      expect(subject).to eq source.to_i.to_s
     end
   end
 
@@ -16,7 +16,7 @@ RSpec.describe SmsAero::Types::Future do
     let(:source) { time.strftime "%Y-%m-%d %H:%M:%S" }
 
     it "returns UNIX time in seconds" do
-      expect(subject).to eq time.to_i
+      expect(subject).to eq time.to_i.to_s
     end
   end
 
@@ -24,7 +24,7 @@ RSpec.describe SmsAero::Types::Future do
     let(:source) { Time.now - 3600 }
 
     it "fails" do
-      expect { subject }.to raise_error(TypeError)
+      expect { subject }.to raise_error(StandardError)
     end
   end
 
@@ -32,7 +32,7 @@ RSpec.describe SmsAero::Types::Future do
     let(:source) { "foobar" }
 
     it "fails" do
-      expect { subject }.to raise_error(TypeError, /foobar/)
+      expect { subject }.to raise_error(StandardError, /foobar/)
     end
   end
 end

data/spec/{sms_aero/types → models}/phone_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe SmsAero::Types::Phone do
+RSpec.describe SmsAero::Phone do
   subject { described_class[source] }
 
   context "valid phone:" do

data/spec/{sms_aero/operations → operations}/add_blacklist_spec.rb

@@ -22,11 +22,27 @@ RSpec.describe SmsAero, "#add_blacklist" do
     end
 
     it "returns success" do
-      expect(subject).to be_kind_of SmsAero::Answer
+      expect(subject).to be_kind_of SmsAero::Response
       expect(subject.result).to eq "accepted"
     end
   end
 
+  context "by token:" do
+    let(:settings) { { user: "LOGIN", token: "PASSWORD" } }
+    let(:url) do
+      "https://gate.smsaero.ru/addblacklist?" \
+      "answer=json&" \
+      "password=PASSWORD&" \
+      "phone=70181324388&" \
+      "user=LOGIN"
+    end
+
+    it "sends a request" do
+      subject
+      expect(a_request(:post, url)).to have_been_made
+    end
+  end
+
   context "via GET:" do
     let(:url) do
       "https://gate.smsaero.ru/addblacklist?" \
@@ -65,7 +81,7 @@ RSpec.describe SmsAero, "#add_blacklist" do
     before { params[:phone] = "foobar23" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError, /23/)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /23/)
     end
   end
 
@@ -73,7 +89,7 @@ RSpec.describe SmsAero, "#add_blacklist" do
     before { params.delete :phone }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(ArgumentError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /phone/)
     end
   end
 end

data/spec/{sms_aero/operations → operations}/add_group_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe SmsAero, "#add_group" do
     end
 
     it "returns success" do
-      expect(subject).to be_kind_of SmsAero::Answer
+      expect(subject).to be_kind_of SmsAero::Response
       expect(subject.result).to eq "accepted"
     end
   end
@@ -56,7 +56,7 @@ RSpec.describe SmsAero, "#add_group" do
     before { settings[:use_ssl] = false }
 
     it "returns success" do
-      expect(subject).to be_kind_of SmsAero::Answer
+      expect(subject).to be_kind_of SmsAero::Response
       expect(subject.result).to eq "accepted"
     end
   end
@@ -65,7 +65,7 @@ RSpec.describe SmsAero, "#add_group" do
     before { params[:group] = "" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 
@@ -73,7 +73,7 @@ RSpec.describe SmsAero, "#add_group" do
     before { params.delete :group }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(ArgumentError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /group/)
     end
   end
 end

data/spec/{sms_aero/operations → operations}/add_phone_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe SmsAero, "#add_phone" do
-  let(:settings) { { user: "LOGIN", password: "PASSWORD" } }
+  let(:settings) { { user: "LOGIN", token: "TOKEN" } }
   let(:client)   { described_class.new(settings) }
   let(:params)   { { phone:  "+7 (909) 382-84-45" } }
   let(:answer)   { { result: "accepted" } }
@@ -10,10 +10,7 @@ RSpec.describe SmsAero, "#add_phone" do
   context "using ssl via POST:" do
     let(:url) do
       "https://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "user=LOGIN"
+      "answer=json&password=TOKEN&phone=79093828445&user=LOGIN"
     end
 
     it "sends a request" do
@@ -22,7 +19,7 @@ RSpec.describe SmsAero, "#add_phone" do
     end
 
     it "returns success" do
-      expect(subject).to be_kind_of SmsAero::Answer
+      expect(subject).to be_kind_of SmsAero::Response
       expect(subject.result).to eq "accepted"
     end
   end
@@ -30,10 +27,7 @@ RSpec.describe SmsAero, "#add_phone" do
   context "via GET:" do
     let(:url) do
       "https://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "user=LOGIN"
+      "answer=json&password=TOKEN&phone=79093828445&user=LOGIN"
     end
 
     before { settings[:use_post] = false }
@@ -47,10 +41,7 @@ RSpec.describe SmsAero, "#add_phone" do
   context "not using ssl:" do
     let(:url) do
       "http://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "user=LOGIN"
+      "answer=json&password=TOKEN&phone=79093828445&user=LOGIN"
     end
 
     before { settings[:use_ssl] = false }
@@ -65,7 +56,7 @@ RSpec.describe SmsAero, "#add_phone" do
     before { params[:phone] = "1324" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError, /1324/)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /1324/)
     end
   end
 
@@ -73,18 +64,14 @@ RSpec.describe SmsAero, "#add_phone" do
     before { params.delete :phone }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(ArgumentError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 
   context "with valid fname:" do
     let(:url) do
       "https://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "fname=joe&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "user=LOGIN"
+      "answer=json&fname=joe&password=TOKEN&phone=79093828445&user=LOGIN"
     end
 
     before { params[:fname] = "joe" }
@@ -95,22 +82,10 @@ RSpec.describe SmsAero, "#add_phone" do
     end
   end
 
-  context "with invalid fname:" do
-    before { params[:fname] = "" }
-
-    it "raises an exception" do
-      expect { subject }.to raise_error(TypeError)
-    end
-  end
-
   context "with valid sname:" do
     let(:url) do
       "https://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "sname=joe&" \
-      "user=LOGIN"
+      "answer=json&password=TOKEN&phone=79093828445&sname=joe&user=LOGIN"
     end
 
     before { params[:sname] = "joe" }
@@ -121,22 +96,10 @@ RSpec.describe SmsAero, "#add_phone" do
     end
   end
 
-  context "with invalid sname:" do
-    before { params[:sname] = "" }
-
-    it "raises an exception" do
-      expect { subject }.to raise_error(TypeError)
-    end
-  end
-
   context "with valid lname:" do
     let(:url) do
       "https://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "lname=smith&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "user=LOGIN"
+      "answer=json&lname=smith&password=TOKEN&phone=79093828445&user=LOGIN"
     end
 
     before { params[:lname] = "smith" }
@@ -147,22 +110,10 @@ RSpec.describe SmsAero, "#add_phone" do
     end
   end
 
-  context "with invalid lname:" do
-    before { params[:lname] = "" }
-
-    it "raises an exception" do
-      expect { subject }.to raise_error(TypeError)
-    end
-  end
-
   context "with valid group:" do
     let(:url) do
       "https://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "group=qux&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "user=LOGIN"
+      "answer=json&group=qux&password=TOKEN&phone=79093828445&user=LOGIN"
     end
 
     before { params[:group] = "qux" }
@@ -177,18 +128,14 @@ RSpec.describe SmsAero, "#add_phone" do
     before { params[:group] = "" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 
   context "with valid param:" do
     let(:url) do
       "https://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "param=qux&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "user=LOGIN"
+      "answer=json&param=qux&password=TOKEN&phone=79093828445&user=LOGIN"
     end
 
     before { params[:param] = "qux" }
@@ -199,22 +146,38 @@ RSpec.describe SmsAero, "#add_phone" do
     end
   end
 
-  context "with invalid param:" do
-    before { params[:param] = "" }
+  context "with valid param2:" do
+    let(:url) do
+      "https://gate.smsaero.ru/addphone?" \
+      "answer=json&param2=qux&password=TOKEN&phone=79093828445&user=LOGIN"
+    end
+
+    before { params[:param2] = "qux" }
+
+    it "sends a request" do
+      subject
+      expect(a_request(:post, url)).to have_been_made
+    end
+  end
+
+  context "with valid param3:" do
+    let(:url) do
+      "https://gate.smsaero.ru/addphone?" \
+      "answer=json&param3=qux&password=TOKEN&phone=79093828445&user=LOGIN"
+    end
 
-    it "raises an exception" do
-      expect { subject }.to raise_error(TypeError)
+    before { params[:param3] = "qux" }
+
+    it "sends a request" do
+      subject
+      expect(a_request(:post, url)).to have_been_made
     end
   end
 
   context "with valid bday:" do
     let(:url) do
       "https://gate.smsaero.ru/addphone?" \
-      "answer=json&" \
-      "bday=1901-08-17&" \
-      "password=319f4d26e3c536b5dd871bb2c52e3178&" \
-      "phone=79093828445&" \
-      "user=LOGIN"
+      "answer=json&bday=1901-08-17&password=TOKEN&phone=79093828445&user=LOGIN"
     end
 
     before { params[:bday] = Date.parse("1901-08-17") }
@@ -229,7 +192,7 @@ RSpec.describe SmsAero, "#add_phone" do
     before { params[:bday] = "foo" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError, /foo/)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /foo/)
     end
   end
 end