smspilot 0.0.3 → 0.0.4

data/README.md

@@ -23,7 +23,9 @@ Or install it yourself as:
 create
 
 ```ruby
-client = Smspilot.new api_token
+client = Smspilot.new api_key
+#or
+client = Smspilot.new (api_key: "yourkey", login: "yourlogin", password: "yourpass")
 ```
 
 api methods

data/lib/smspilot/configuration.rb

@@ -3,13 +3,15 @@ require 'smspilot/version'
 
 module Smspilot
   module Configuration
-    VALID_OPTIONS_KEYS = [:endpoint, :user_agent, :adapter, :timeout, :api_key, :logger]
+    VALID_OPTIONS_KEYS = [:endpoint, :user_agent, :adapter, :timeout, :api_key, :logger, :login, :password]
 
     DEFAULT_ADAPTER     = :net_http
     DEFAULT_ENDPOINT    = 'http://smspilot.ru/api2.php'
     DEFAULT_USER_AGENT  = "smspilot gem #{Smspilot::VERSION}".freeze
     DEFAULT_TIMEOUT     = 5
     DEFAILT_API_KEY     = nil
+    DEFAILT_LOGIN       = nil
+    DEFAILT_PASSWORD    = nil
     DEFAILT_LOGGER      = Logger.new("log/smspilot.log")
 
     attr_accessor *VALID_OPTIONS_KEYS
@@ -33,8 +35,10 @@ module Smspilot
       self.endpoint   = DEFAULT_ENDPOINT
       self.user_agent = DEFAULT_USER_AGENT
       self.timeout    = DEFAULT_TIMEOUT
-      self.api_key = DEFAILT_API_KEY
-      self.logger = DEFAILT_LOGGER
+      self.api_key    = DEFAILT_API_KEY
+      self.login      = DEFAILT_LOGIN
+      self.password   = DEFAILT_PASSWORD
+      self.logger     = DEFAILT_LOGGER
       self
     end
 

data/lib/smspilot/request.rb

@@ -7,22 +7,22 @@ module Smspilot
   module Request
 
     def send_request(body)
-      json_body = {"apikey" => api_key}.merge(body).to_json
+      json_body = request_json body
       begin
         response = connection.post do |req|
           req.body = json_body
           logger.info("--------\n" + req.body)
         end
-        
+
         response_error = (response.status == 200) ? Smspilot::Error::WrongStatusError : nil
 
-      rescue Exception => e 
+      rescue Exception => e
         if e.kind_of? Faraday::Error::TimeoutError
           response_error = Smspilot::Error::TimeoutError
         elsif e.kind_of? Faraday::Error::ParsingError
-          response_error = Smspilot::Error::ParsingError      
-        end 
-      end 
+          response_error = Smspilot::Error::ParsingError
+        end
+      end
 
       unless response.body["error"].nil?
         response_error = Error::ApiError.get_by_code(response.body["error"]["code"]).new()
@@ -34,5 +34,13 @@ module Smspilot
 
       response
     end
+
+    def request_json body
+      if login.nil?
+       {"apikey" => api_key}.merge(body).to_json
+      else
+        {"apikey" => api_key, "login" => login, "password" => password}.merge(body).to_json
+      end
+    end
   end
 end

data/lib/smspilot/version.rb

@@ -1,3 +1,3 @@
 module Smspilot
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/smspilot_spec.rb

@@ -14,108 +14,130 @@ describe Smspilot do
 
 #TODO add specs for sms delivery statuses
 #TODO add specs for parameter validations
-
-
-  before do
-    @client = Smspilot.new "XXXXXXXXXXXXYYYYYYYYYYYYZZZZZZZZXXXXXXXXXXXXYYYYYYYYYYYYZZZZZZZZ"
+  describe "Request" do
+    let(:test_body) { {test: "test"} }
+    let(:login) {"log"}
+    let(:password) {"pass"}
+
+    describe "#request_json" do
+
+      it "should add login and password to request if present" do
+        @client = Smspilot.new(api_key: "XXXXXXXXXXXXYYYYYYYYYYYYZZZZZZZZXXXXXXXXXXXXYYYYYYYYYYYYZZZZZZZZ", login: login, password: password)
+        req = JSON.parse(@client.request_json(test_body))
+        req["login"].should == login
+        req["password"].should == password
+      end
+
+      it "should not add login and password to request if not present" do
+        @client = Smspilot.new "XXXXXXXXXXXXYYYYYYYYYYYYZZZZZZZZXXXXXXXXXXXXYYYYYYYYYYYYZZZZZZZZ"
+        req = JSON.parse(@client.request_json(test_body))
+        req["login"].should == nil
+        req["password"].should == nil
+      end
+    end
   end
 
-  describe "#send_sms" do 
-    
-    let(:json_send_response) { {"send"=> [{"id"=>"12345", "server_id"=>"10005", "from"=>"SMSPILOT", "to"=>"79091112233", "text"=>"Тест", "zone"=>"1", "parts"=>"1", "credits"=>"1", "status"=>"0", "error"=>"0"}], "server_packet_id"=>"1234", "balance"=>"10000"}.to_json}
-
-    it "should return correct result when succeeded" do
-      stub_normal_request(json_send_response)
-      result = @client.send_sms(sms_id, sms_from, sms_to, message_text)
-      result.body.should == {"send"=> [{"id"=>"12345", "server_id"=>"10005", "from"=>"SMSPILOT", "to"=>"79091112233", "text"=>"Тест", "zone"=>"1", "parts"=>"1", "credits"=>"1", "status"=>"0", "error"=>"0"}], "server_packet_id"=>"1234", "balance"=>"10000"}
-      result.status.should eql(200)
+  describe "Api" do
+    before do
+      @client = Smspilot.new "XXXXXXXXXXXXYYYYYYYYYYYYZZZZZZZZXXXXXXXXXXXXYYYYYYYYYYYYZZZZZZZZ"
     end
 
-  end
+    describe "#send_sms" do
 
+      let(:json_send_response) { {"send"=> [{"id"=>"12345", "server_id"=>"10005", "from"=>"SMSPILOT", "to"=>"79091112233", "text"=>"Тест", "zone"=>"1", "parts"=>"1", "credits"=>"1", "status"=>"0", "error"=>"0"}], "server_packet_id"=>"1234", "balance"=>"10000"}.to_json}
 
-  describe "#check_sms_status" do 
-    
-    let (:check_response_hash) { {"check"=> [{"id"=>"12345", "server_id"=>"10005", "status"=>"1", "modified"=>"2011-08-11 14:35:00"}]} }
+      it "should return correct result when succeeded" do
+        stub_normal_request(json_send_response)
+        result = @client.send_sms(sms_id, sms_from, sms_to, message_text)
+        result.body.should == {"send"=> [{"id"=>"12345", "server_id"=>"10005", "from"=>"SMSPILOT", "to"=>"79091112233", "text"=>"Тест", "zone"=>"1", "parts"=>"1", "credits"=>"1", "status"=>"0", "error"=>"0"}], "server_packet_id"=>"1234", "balance"=>"10000"}
+        result.status.should eql(200)
+      end
 
-    it "should return correct hash when succeeded" do
-      stub_normal_request(check_response_hash.to_json)      
-      
-      result = @client.check_sms_status(sms_server_id)
-      result.body.should == {"check"=> [{"id"=>"12345", "server_id"=>"10005", "status"=>"1", "modified"=>"2011-08-11 14:35:00"}]} 
-      result.status.should eql(200)    
-    end
-    it "should return correct sms status when succeeded" do
-      check_response_hash["check"].first["status"] = Smspilot::Api::NOT_FOUND_STATUS
-      stub_normal_request(check_response_hash.to_json)      
-      
-      result = @client.check_sms_status(sms_server_id)
-      result.not_found?.should be_true
-    end
-    it "should return correct sms status when succeeded" do
-      check_response_hash["check"].first["status"] = Smspilot::Api::NOT_DELIVERED_STATUS
-      stub_normal_request(check_response_hash.to_json)      
-      
-      result = @client.check_sms_status(sms_server_id)
-      result.not_delivered?.should be_true   
-    end
-    it "should return correct sms status when succeeded" do
-      check_response_hash["check"].first["status"] = Smspilot::Api::ACCEPTED_STATUS
-      stub_normal_request(check_response_hash.to_json)      
-      
-      result = @client.check_sms_status(sms_server_id)
-      result.accepted?.should be_true   
-    end
-    it "should return correct sms status when succeeded" do
-      check_response_hash["check"].first["status"] = Smspilot::Api::AT_OPERATOR_STATUS
-      stub_normal_request(check_response_hash.to_json)      
-      
-      result = @client.check_sms_status(sms_server_id)
-      result.at_operator?.should be_true   
-    end
-    it "should return correct sms status when succeeded" do
-      check_response_hash["check"].first["status"] = Smspilot::Api::DELIVERED_STATUS
-      stub_normal_request(check_response_hash.to_json)      
-      
-      result = @client.check_sms_status(sms_server_id)
-      result.delivered?.should be_true   
     end
 
-  end
 
-  describe "#check_balance" do 
-    
-    let(:json_balance_response) {'{"balance":31337}'}
+    describe "#check_sms_status" do
+
+      let (:check_response_hash) { {"check"=> [{"id"=>"12345", "server_id"=>"10005", "status"=>"1", "modified"=>"2011-08-11 14:35:00"}]} }
+
+      it "should return correct hash when succeeded" do
+        stub_normal_request(check_response_hash.to_json)
+
+        result = @client.check_sms_status(sms_server_id)
+        result.body.should == {"check"=> [{"id"=>"12345", "server_id"=>"10005", "status"=>"1", "modified"=>"2011-08-11 14:35:00"}]}
+        result.status.should eql(200)
+      end
+      it "should return correct sms status when succeeded" do
+        check_response_hash["check"].first["status"] = Smspilot::Api::NOT_FOUND_STATUS
+        stub_normal_request(check_response_hash.to_json)
+
+        result = @client.check_sms_status(sms_server_id)
+        result.not_found?.should be_true
+      end
+      it "should return correct sms status when succeeded" do
+        check_response_hash["check"].first["status"] = Smspilot::Api::NOT_DELIVERED_STATUS
+        stub_normal_request(check_response_hash.to_json)
+
+        result = @client.check_sms_status(sms_server_id)
+        result.not_delivered?.should be_true
+      end
+      it "should return correct sms status when succeeded" do
+        check_response_hash["check"].first["status"] = Smspilot::Api::ACCEPTED_STATUS
+        stub_normal_request(check_response_hash.to_json)
+
+        result = @client.check_sms_status(sms_server_id)
+        result.accepted?.should be_true
+      end
+      it "should return correct sms status when succeeded" do
+        check_response_hash["check"].first["status"] = Smspilot::Api::AT_OPERATOR_STATUS
+        stub_normal_request(check_response_hash.to_json)
+
+        result = @client.check_sms_status(sms_server_id)
+        result.at_operator?.should be_true
+      end
+      it "should return correct sms status when succeeded" do
+        check_response_hash["check"].first["status"] = Smspilot::Api::DELIVERED_STATUS
+        stub_normal_request(check_response_hash.to_json)
+
+        result = @client.check_sms_status(sms_server_id)
+        result.delivered?.should be_true
+      end
 
-    it "should return correct hash when succeeded" do
-      stub_normal_request(json_balance_response)
-      
-      result = @client.check_balance
-      result.body.should == {"balance"=> 31337} 
-      result.status.should eql(200)    
     end
 
-  end
+    describe "#check_balance" do
 
-  describe "send_request errors" do
+      let(:json_balance_response) {'{"balance":31337}'}
+
+      it "should return correct hash when succeeded" do
+        stub_normal_request(json_balance_response)
+
+        result = @client.check_balance
+        result.body.should == {"balance"=> 31337}
+        result.status.should eql(200)
+      end
 
-    before do
-      stub_normal_request(json_failure_response)
     end
 
-    it "should be unknown apierror when there is correct error response" do
-      result = @client.send_request({})
-      result.error.should eql(Smspilot::Error::UnknownApiError)
-    end 
+    describe "send_request errors" do
 
-    it "should be correct apierror type when there is correct error response" do
-      Smspilot::Error::API_ERROR_CODES["1337"] = "LeetError"
-      class Smspilot::Error::LeetError < Smspilot::Error::ApiError; end    
-      
-      result = @client.send_request({})
-      result.error.should eql(Smspilot::Error::LeetError)
-    end 
+      before do
+        stub_normal_request(json_failure_response)
+      end
 
-  end
+      it "should be unknown apierror when there is correct error response" do
+        result = @client.send_request({})
+        result.error.should eql(Smspilot::Error::UnknownApiError)
+      end
+
+      it "should be correct apierror type when there is correct error response" do
+        Smspilot::Error::API_ERROR_CODES["1337"] = "LeetError"
+        class Smspilot::Error::LeetError < Smspilot::Error::ApiError; end
+
+        result = @client.send_request({})
+        result.error.should eql(Smspilot::Error::LeetError)
+      end
 
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smspilot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday