wialon_api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1f2372df434ce1202f05083b2a3606a017f86d
-  data.tar.gz: 7a37dc7747a65a15caf5be756e66e9823a80030e
+  metadata.gz: b3696f2c16f7126835bd10c13a5f533b72b07a00
+  data.tar.gz: 84af7147d2315e1d17c3b4ce349c7383aa90d5b7
 SHA512:
-  metadata.gz: bb75849edbbc416f4578cfc1e032ee43a9c763747c1e221948a58d3ab57c7fc9206c428d73e3ec043c2fe7710f78954597c3629a7b073a2132e2d9897bcc3552
-  data.tar.gz: 3544eb2e08c42b5aeebf88ada6a6cdf4c73dd24956ab29d979001684d86d4ef539ba465c5c5a89dc2dcac5fe3bb16ebd925710bdb649a25955432d8f47ecf2af
+  metadata.gz: f11002df1f7a104c1427c03ee96367e3951b89a82a1595f7ed99ecc8f04bd016cc296de8644c39b769475598d9d608d3b954281e0f8c491d1ee8a0064a44fc81
+  data.tar.gz: f71918769c4d9e04f5453133bad5d2c7f8bfda94a1c16b125c9f9e03b49f775f470bffa08d88e33ebb314f79a19b689877cac6169cd65569d98d87b636b995a3

data/lib/wialon_api/authorization.rb

@@ -3,7 +3,11 @@ module WialonApi
     def authorize(user, password)
       response = WialonApi::Api.call('core/login', user: user, password: password)
       result = WialonApi::Result.process(response)
-      WialonApi::Client.new(result.ssid)
+      if WialonApi.wialon_edition == :pro
+        WialonApi::Client.new(result.ssid)
+      else
+        WialonApi::Client.new(result.eid)
+      end
     end
   end
 end

data/lib/wialon_api/configuration.rb

@@ -4,6 +4,7 @@ module WialonApi
   module Configuration
     OPTION_NAMES = [
       :wialon_host,
+      :wialon_edition,
       :http_verb,
       :max_retries,
       :faraday_options,
@@ -21,6 +22,7 @@ module WialonApi
     alias_method :log_responses?, :log_responses
 
     DEFAULT_WIALON_HOST = 'https://hst-api.wialon.com/wialon/ajax.html'
+    DEFAULT_WIALON_EDITION = :hosting
     DEFAULT_HTTP_VERB = :post
     DEFAULT_MAX_RETRIES = 1
     DEFAULT_ADAPTER = Faraday.default_adapter
@@ -37,6 +39,7 @@ module WialonApi
 
     def reset
       @wialon_host = DEFAULT_WIALON_HOST
+      @wialon_edition = DEFAULT_WIALON_EDITION
       @http_verb   = DEFAULT_HTTP_VERB
       @max_retries = DEFAULT_MAX_RETRIES
       @faraday_options = {}

data/lib/wialon_api/version.rb

@@ -1,3 +1,3 @@
 module WialonApi
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/wialon_api/authorization_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe WialonApi::Authorization do
   describe '.authorize' do
-    let(:success) { Hashie::Mash.new(ssid: 'sid') }
+    let(:success) { Hashie::Mash.new(eid: 'sid') }
     let(:error) { Hashie::Mash.new(error: '8') }
     let(:credentials) { ['user', 'password'] }
 
@@ -12,6 +12,16 @@ describe WialonApi::Authorization do
       WialonApi.authorize(*credentials)
     end
 
+    it "uses ssid with wialon pro edition" do
+      success = Hashie::Mash.new(ssid: 'sid')
+      allow(WialonApi::Api).to receive(:call).and_return(success)
+      WialonApi.configure do |config|
+        config.wialon_edition = :pro
+      end
+      expect(WialonApi::Client).to receive(:new).with('sid')
+      WialonApi.authorize(*credentials)
+    end
+
     it 'raises an error if password or login do not match' do
       allow(WialonApi::Api).to receive(:call).and_return(error)
       expect { WialonApi.authorize(*credentials) }.to raise_error(WialonApi::Error)

data/spec/wialon_api/configuration_spec.rb

@@ -21,6 +21,7 @@ describe WialonApi::Configuration do
     it 'resets all the values to their default values' do
       TestConfiguration.reset
       expect(TestConfiguration.wialon_host).to eq('https://hst-api.wialon.com/wialon/ajax.html')
+      expect(TestConfiguration.wialon_edition).to eq(:hosting)
       expect(TestConfiguration.http_verb).to eq(:post)
       expect(TestConfiguration.max_retries).to eq(1)
       expect(TestConfiguration.faraday_options).to eq({})

data/spec/wialon_api_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
 
 describe WialonApi do
-  it 'should return current version' do
-    expect(WialonApi::VERSION).to eq('0.0.3')
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wialon_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Arsen Shamkhalov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake