sms_aero 0.0.11 → 0.1.0

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

@@ -21,7 +21,7 @@ RSpec.describe SmsAero, "#check_balance" 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"
       expect(subject.balance).to eq 99.5
@@ -64,10 +64,8 @@ RSpec.describe SmsAero, "#check_balance" do
     let(:answer) { { result: "rejected" } }
 
     it "returns result" do
-      expect(subject).to be_kind_of SmsAero::Answer
-
+      expect(subject).to be_kind_of SmsAero::Response
       expect(subject.result).to eq "rejected"
-      expect(subject).not_to respond_to :balance
     end
   end
 end

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

@@ -22,8 +22,8 @@ RSpec.describe SmsAero, "#check_senders" do
     end
 
     it "returns success" do
-      expect(subject).to be_kind_of SmsAero::Answer
-      expect(subject.data).to eq %w(peter paul)
+      expect(subject).to be_kind_of SmsAero::Response
+      expect(subject.senders).to eq %w(peter paul)
     end
   end
 
@@ -65,7 +65,7 @@ RSpec.describe SmsAero, "#check_senders" do
     before { params[:sign] = "" }
 
     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, "#check_senders" do
     before { params.delete :sign }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(ArgumentError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 
@@ -81,7 +81,7 @@ RSpec.describe SmsAero, "#check_senders" do
     let(:answer) { { result: "rejected", reason: "wrong request" } }
 
     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 "rejected"
       expect(subject.reason).to eq "wrong request"
     end

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

@@ -22,7 +22,7 @@ RSpec.describe SmsAero, "#check_sending" 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
@@ -65,7 +65,7 @@ RSpec.describe SmsAero, "#check_sending" do
     before { params[:id] = "" }
 
     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, "#check_sending" do
     before { params.delete :id }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(ArgumentError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 end

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

@@ -64,7 +64,7 @@ RSpec.describe SmsAero, "#check_sign" do
     before { params[:sign] = "" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 
@@ -72,7 +72,7 @@ RSpec.describe SmsAero, "#check_sign" do
     before { params.delete :sign }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(ArgumentError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 end

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

@@ -22,7 +22,7 @@ RSpec.describe SmsAero, "#check_status" 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
@@ -65,7 +65,7 @@ RSpec.describe SmsAero, "#check_status" do
     before { params[:id] = "" }
 
     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, "#check_status" do
     before { params.delete :id }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(ArgumentError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 end

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

@@ -22,7 +22,7 @@ RSpec.describe SmsAero, "#check_tariff" do
 
     it "returns statuses" do
       expect(subject.result).to eq "accepted"
-      expect(subject.tariff).to eq direct: 1.75
+      expect(subject.tariff.to_h).to eq direct: 1.75
     end
   end
 

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

@@ -22,7 +22,7 @@ RSpec.describe SmsAero, "#delete_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
@@ -65,7 +65,7 @@ RSpec.describe SmsAero, "#delete_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, "#delete_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)
     end
   end
 end

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

@@ -23,7 +23,7 @@ RSpec.describe SmsAero, "#delete_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
@@ -85,7 +85,7 @@ RSpec.describe SmsAero, "#delete_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
 
@@ -93,7 +93,7 @@ RSpec.describe SmsAero, "#delete_phone" do
     before { params[:phone] = "234" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError, /234/)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /234/)
     end
   end
 
@@ -101,7 +101,7 @@ RSpec.describe SmsAero, "#delete_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, /phone/)
     end
   end
 end

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

@@ -26,22 +26,43 @@ RSpec.describe SmsAero, "#send_sms" do
     end
 
     it "returns successful answer" do
-      expect(subject).to be_kind_of SmsAero::Answer
+      expect(subject).to be_kind_of SmsAero::Response
       expect(subject.result).to eq "accepted"
       expect(subject.id).to eq "3898"
-      expect(subject.success).to eq true
+      expect(subject).to be_success
     end
 
     context "with a failure:" do
       before { stub_request(:any, //).to_return(body: failure.to_json) }
 
       it "returns unsuccessful answer" do
-        expect(subject).to be_kind_of SmsAero::Answer
-        expect(subject.success).to eq false
+        expect(subject).to be_kind_of SmsAero::Response
+        expect(subject).not_to be_success
       end
     end
   end
 
+  context "to group:" do
+    before { params[:group] = "readers" }
+    before { params.delete(:to) }
+
+    let(:url) do
+      "https://gate.smsaero.ru/sendtogroup?" \
+      "answer=json&" \
+      "from=Qux&" \
+      "group=readers&" \
+      "password=9d1e4709d6a41407ab34cf99c7085f79&" \
+      "text=Hi&" \
+      "type=2&" \
+      "user=BAZ"
+    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/send?" \
@@ -86,7 +107,7 @@ RSpec.describe SmsAero, "#send_sms" do
     before { params[:to] = "1324" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError, /1324/)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /1324/)
     end
   end
 
@@ -94,7 +115,24 @@ RSpec.describe SmsAero, "#send_sms" do
     before { params.delete :to }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(ArgumentError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
+    end
+  end
+
+  context "with invalid group:" do
+    before { params[:group] = "" }
+    before { params.delete :to }
+
+    it "raises an exception" do
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
+    end
+  end
+
+  context "with group and phone at once:" do
+    before { params[:group] = "readers" }
+
+    it "raises an exception" do
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 
@@ -123,7 +161,7 @@ RSpec.describe SmsAero, "#send_sms" do
     before { params[:date] = (Date.today - 1) }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError)
+      expect { subject }.to raise_error(Evil::Client::ValidationError)
     end
   end
 
@@ -131,7 +169,7 @@ RSpec.describe SmsAero, "#send_sms" do
     before { params[:date] = "foo" }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError, /foo/)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /foo/)
     end
   end
 
@@ -179,7 +217,7 @@ RSpec.describe SmsAero, "#send_sms" do
     before { params[:type] = 11 }
 
     it "raises an exception" do
-      expect { subject }.to raise_error(TypeError, /11/)
+      expect { subject }.to raise_error(Evil::Client::ValidationError, /11/)
     end
   end
 
@@ -195,7 +233,7 @@ RSpec.describe SmsAero, "#send_sms" do
       "user=BAZ"
     end
 
-    before { params[:test] = true }
+    before { params[:testsend] = true }
 
     it "sends a request" do
       subject
@@ -215,7 +253,7 @@ RSpec.describe SmsAero, "#send_sms" do
       "user=BAZ"
     end
 
-    before { settings[:test] = true }
+    before { settings[:testsend] = true }
 
     it "sends a request" do
       subject

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ rescue LoadError
 end
 
 require "sms_aero"
-require "dry-types"
 require "webmock/rspec"
 
 RSpec.configure do |config|
@@ -18,3 +17,7 @@ RSpec.configure do |config|
     example.run
   end
 end
+
+I18n.available_locales = %i[en]
+I18n.locale = :en
+I18n.load_path = %w[spec/support/en.yml]

data/spec/support/en.yml

@@ -0,0 +1,8 @@
+---
+en:
+  evil:
+    client:
+      errors:
+        sms_aero:
+          send_sms:
+            address_given: "You should send SMS to either a group or a phone (not to both)"

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sms_aero
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: evil-struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: evil-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,55 +99,44 @@ files:
 - README.md
 - Rakefile
 - lib/sms_aero.rb
-- lib/sms_aero/models/answer.rb
-- lib/sms_aero/models/sms.rb
-- lib/sms_aero/models/tariff.rb
-- lib/sms_aero/operations/add_blacklist.rb
-- lib/sms_aero/operations/add_group.rb
-- lib/sms_aero/operations/add_phone.rb
-- lib/sms_aero/operations/check_balance.rb
-- lib/sms_aero/operations/check_groups.rb
-- lib/sms_aero/operations/check_senders.rb
-- lib/sms_aero/operations/check_sending.rb
-- lib/sms_aero/operations/check_sign.rb
-- lib/sms_aero/operations/check_status.rb
-- lib/sms_aero/operations/check_tariff.rb
-- lib/sms_aero/operations/delete_group.rb
-- lib/sms_aero/operations/delete_phone.rb
-- lib/sms_aero/operations/hlr.rb
-- lib/sms_aero/operations/send_sms.rb
-- lib/sms_aero/operations/send_to_group.rb
-- lib/sms_aero/types/birthday.rb
-- lib/sms_aero/types/channel.rb
-- lib/sms_aero/types/digital.rb
-- lib/sms_aero/types/filled_string.rb
-- lib/sms_aero/types/future.rb
-- lib/sms_aero/types/password.rb
-- lib/sms_aero/types/phone.rb
-- lib/sms_aero/types/sign_status.rb
+- lib/sms_aero/birthday.rb
+- lib/sms_aero/callable.rb
+- lib/sms_aero/channel.rb
+- lib/sms_aero/digital.rb
+- lib/sms_aero/filled_string.rb
+- lib/sms_aero/future.rb
+- lib/sms_aero/group.rb
+- lib/sms_aero/optional.rb
+- lib/sms_aero/phone.rb
+- lib/sms_aero/response.rb
+- lib/sms_aero/response/with_balance.rb
+- lib/sms_aero/response/with_groups.rb
+- lib/sms_aero/response/with_id.rb
+- lib/sms_aero/response/with_senders.rb
+- lib/sms_aero/response/with_statuses.rb
+- lib/sms_aero/response/with_tariff.rb
+- lib/sms_aero/tariff.rb
 - sms_aero.gemspec
-- spec/sms_aero/operations/add_blacklist_spec.rb
-- spec/sms_aero/operations/add_group_spec.rb
-- spec/sms_aero/operations/add_phone_spec.rb
-- spec/sms_aero/operations/check_balance_spec.rb
-- spec/sms_aero/operations/check_groups_spec.rb
-- spec/sms_aero/operations/check_senders_spec.rb
-- spec/sms_aero/operations/check_sending_spec.rb
-- spec/sms_aero/operations/check_sign_spec.rb
-- spec/sms_aero/operations/check_status_spec.rb
-- spec/sms_aero/operations/check_tariff_spec.rb
-- spec/sms_aero/operations/delete_group_spec.rb
-- spec/sms_aero/operations/delete_phone_spec.rb
-- spec/sms_aero/operations/hlr_spec.rb
-- spec/sms_aero/operations/send_sms_spec.rb
-- spec/sms_aero/operations/send_to_group_spec.rb
-- spec/sms_aero/types/birthday_spec.rb
-- spec/sms_aero/types/channel_spec.rb
-- spec/sms_aero/types/digital_spec.rb
-- spec/sms_aero/types/future_spec.rb
-- spec/sms_aero/types/phone_spec.rb
-- spec/sms_aero/types/sign_status_spec.rb
+- spec/models/birthday_spec.rb
+- spec/models/channel_spec.rb
+- spec/models/digital_spec.rb
+- spec/models/future_spec.rb
+- spec/models/phone_spec.rb
+- spec/operations/add_blacklist_spec.rb
+- spec/operations/add_group_spec.rb
+- spec/operations/add_phone_spec.rb
+- spec/operations/check_balance_spec.rb
+- spec/operations/check_groups_spec.rb
+- spec/operations/check_senders_spec.rb
+- spec/operations/check_sending_spec.rb
+- spec/operations/check_sign_spec.rb
+- spec/operations/check_status_spec.rb
+- spec/operations/check_tariff_spec.rb
+- spec/operations/delete_group_spec.rb
+- spec/operations/delete_phone_spec.rb
+- spec/operations/send_sms_spec.rb
 - spec/spec_helper.rb
+- spec/support/en.yml
 homepage: https://github.com/nepalez/sms_aero
 licenses:
 - MIT
@@ -196,30 +157,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: HTTP(s) client to SMS Aero API
 test_files:
-- spec/sms_aero/operations/add_blacklist_spec.rb
-- spec/sms_aero/operations/add_group_spec.rb
-- spec/sms_aero/operations/add_phone_spec.rb
-- spec/sms_aero/operations/check_balance_spec.rb
-- spec/sms_aero/operations/check_groups_spec.rb
-- spec/sms_aero/operations/check_senders_spec.rb
-- spec/sms_aero/operations/check_sending_spec.rb
-- spec/sms_aero/operations/check_sign_spec.rb
-- spec/sms_aero/operations/check_status_spec.rb
-- spec/sms_aero/operations/check_tariff_spec.rb
-- spec/sms_aero/operations/delete_group_spec.rb
-- spec/sms_aero/operations/delete_phone_spec.rb
-- spec/sms_aero/operations/hlr_spec.rb
-- spec/sms_aero/operations/send_sms_spec.rb
-- spec/sms_aero/operations/send_to_group_spec.rb
-- spec/sms_aero/types/birthday_spec.rb
-- spec/sms_aero/types/channel_spec.rb
-- spec/sms_aero/types/digital_spec.rb
-- spec/sms_aero/types/future_spec.rb
-- spec/sms_aero/types/phone_spec.rb
-- spec/sms_aero/types/sign_status_spec.rb
+- spec/models/birthday_spec.rb
+- spec/models/channel_spec.rb
+- spec/models/digital_spec.rb
+- spec/models/future_spec.rb
+- spec/models/phone_spec.rb
+- spec/operations/add_blacklist_spec.rb
+- spec/operations/add_group_spec.rb
+- spec/operations/add_phone_spec.rb
+- spec/operations/check_balance_spec.rb
+- spec/operations/check_groups_spec.rb
+- spec/operations/check_senders_spec.rb
+- spec/operations/check_sending_spec.rb
+- spec/operations/check_sign_spec.rb
+- spec/operations/check_status_spec.rb
+- spec/operations/check_tariff_spec.rb
+- spec/operations/delete_group_spec.rb
+- spec/operations/delete_phone_spec.rb
+- spec/operations/send_sms_spec.rb
 - spec/spec_helper.rb
+- spec/support/en.yml
+has_rdoc: