sms-uslugi-api 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7d9972a10733a9ae3759a98fec77ef17864308f
-  data.tar.gz: 49197600a75a451e071c5b3fb362c4aa2007b5a9
+  metadata.gz: d1b3b17eee515c26c879c1cbc63a5ee49293df14
+  data.tar.gz: 63767ff5c4b7c92b7c8297296681b63878909893
 SHA512:
-  metadata.gz: 4a71eb34154afb98849e924f57528bccb538e72810dcec8011b0898d124d4d44bf66da45d9fe45028927148443608d02d62f4a7df105aae88d7d986756888adb
-  data.tar.gz: f1598f3cbb674fdef3f63ae0bc8f5664a86e13ea5de1a8bf3f9faba4f66c8ec4a4fdb69cba4c39fc617ad1aa8de58cff97f4acd5ba93a20b49b23ba86c5bf0a5
+  metadata.gz: cc20661d9fc3044b1fd997e482ef63ca7e90f222de41a1dc4f35b6b2834f4f966eded4b4209a25589c23dbc827455cac6326eefa15e40b272e832aabedf9b9a9
+  data.tar.gz: ab1e2dfa6b7156cec356ff1fb245da5fa4fc03ea660ffce6e6a1684504c16bf4e4f5e6f7291f1b70f53ba9437087087c0d0dfbd55f47c2e50a84139835f15ab5

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--format doc

data/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
+    json (1.8.3)
     jwt (0.1.8)
       multi_json (>= 1.5)
     metaclass (0.0.1)
@@ -118,3 +118,6 @@ DEPENDENCIES
   simplecov
   vcr
   webmock
+
+BUNDLED WITH
+   1.12.5

data/README.md

@@ -52,7 +52,17 @@ sms.send 'message in utf8', '81112223333' # отправка SMS получат
 }
 ```
 
-### send(txt, to, idGroup = nil, source = nil, flash = 0, dateTimeSend = nil, onlydelivery = 0, use_alfasource = nil, discountID = nil)
+### send(txt, to, options)
+
+`options` может содержать следующие параметры:
+
+* idGroup
+* source
+* flash
+* dateTimeSend
+* onlydelivery
+* use_alfasource
+* discountID
 
 Отправляет SMS с текстом `txt` (должен быть в кодировке utf8) на номер `to`. Остальные параметры идентичны аналогичным из официальной документации: https://lcab.sms-uslugi.ru/send/smsApi#main/lcabApi/send
 
@@ -87,6 +97,15 @@ Pull-реквесты приветствуются. Чтобы добавить
 
 PS. При смене информации для авторизации все старые тесты не пройдут, это нормальное поведение. После замены логина и пароля обратно на `demo:demo` всё станет нормально.
 
+### Что делать, если не работает подстановка своего номера отправителя
+
+Для того, чтобы использовать своё имя отправителя, требуется сначала зарегистрировать его в личном кабинете и дождаться подтверждения, после чего высылать СМС с использованием прямого канала:
+
+```ruby
+@sms.send("teset message", PHONE_NUMBER, source: SOURCE, use_alfasource: 1)
+# важен последний параметр (1), он отвечает за использование прямого канала
+```
+
 ## Copyright
 
-Copyright (c) 2014 Alexander Maslov. See LICENSE.txt for further details.
+Copyright (c) 2014-2016 Alexander Maslov, Oleg Bobok. See LICENSE.txt for further details.

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
@@ -18,23 +18,23 @@ RSpec::Core::RakeTask.new(:spec)
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "sms-uslugi-api"
-  gem.homepage = "http://github.com/drakmail/sms-uslugi-api"
-  gem.license = "MIT"
-  gem.summary = %Q{API for sms-uslugi service}
-  gem.description = %Q{Simple gem for send SMS through sms-uslugi service}
-  gem.email = "drakmail@delta.pm"
-  gem.authors = ["Alexander Maslov"]
+  gem.name = 'sms-uslugi-api'
+  gem.homepage = 'http://github.com/drakmail/sms-uslugi-api'
+  gem.license = 'MIT'
+  gem.summary = 'API for sms-uslugi service'
+  gem.description = 'Sms-uslugi.ru API gem'
+  gem.email = 'drakmail@gmail.com'
+  gem.authors = ['Alexander Maslov']
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?('VERSION') ? File.read('VERSION') : ''
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "sms-uslugi-api #{version}"
+  rdoc.title = 'sms-uslugi-api #{version}'
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/sms-uslugi-api.rb

@@ -20,17 +20,20 @@ class SmsUslugiApi
 
   # https://lcab.sms-uslugi.ru/integration/lcabApi#main/pager/send
   # txt must be in UTF-8 encoding!
-  def send(txt, to, idGroup = nil, source = nil, flash = 0, dateTimeSend = nil, onlydelivery = 0, use_alfasource = nil, discountID = nil)
+  #def send(txt, to, idGroup = nil, source = nil, flash = 0, dateTimeSend = nil, onlydelivery = 0, use_alfasource = nil, discountID = nil)
+  def send(txt, to, options = {})
+    options.default = nil
     api_request("sendSms.php", {
       txt: txt,
       to: to,
-      idGroup: idGroup,
-      source: source,
-      flash: flash,
-      dateTimeSend: dateTimeSend,
-      onlydelivery: onlydelivery,
-      use_alfasource: use_alfasource,
-      discountID: discountID
+      idGroup: options[:idGroup],
+      source: options[:source],
+      flash: options[:flash],
+      dateTimeSend: options[:dateTimeSend],
+      onlydelivery: options[:onlydelivery],
+      use_alfasource: options[:use_alfasource],
+      discountID: options[:discountID],
+      channel: options[:channel]
     })
   end
 

data/sms-uslugi-api.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "sms-uslugi-api"
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Maslov"]
-  s.date = "2014-02-23"
+  s.date = "2016-06-15"
   s.description = "Simple gem for send SMS through sms-uslugi service"
-  s.email = "drakmail@delta.pm"
+  s.email = "drakmail@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -26,9 +26,6 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "fixtures/vcr_cassettes/getPhoneInfo.yml",
-    "fixtures/vcr_cassettes/info.yml",
-    "fixtures/vcr_cassettes/send.yml",
     "lib/sms-uslugi-api.rb",
     "sms-uslugi-api.gemspec",
     "spec/sms_uslugi_api_spec.rb",
@@ -82,4 +79,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<coveralls>, [">= 0"])
   end
 end
-

data/spec/sms_uslugi_api_spec.rb

@@ -1,9 +1,13 @@
 # encoding: UTF-8
 require "spec_helper"
 
+file_path = File.join(File.expand_path(File.dirname(__FILE__)), 'settings.yml')
+settings = YAML.load_file(file_path)['settings'] if File.file?(file_path)
+settings ||= {}
+
 describe SmsUslugiApi do
   before do
-    @sms = SmsUslugiApi.new("demo", "demo") # Changed in VCR
+    @sms = SmsUslugiApi.new("#{settings['login']}", "#{settings['password']}") # Changed in VCR
   end
 
   describe "minimal functionality" do
@@ -19,14 +23,13 @@ describe SmsUslugiApi do
         expect(info).to include(
           code: 1,
           descr: "Операция завершена успешно",
-          account: "583.12",
-          ocode: "80009999999",
-          tarif: "Аванс::50",
-          price: "0.50",
-          source: ["systemTest", "Ded Moroz"],
+          account: "30.99",
+          ocode: "#{settings['source']}",
+          tarif: "Аванс::67",
+          price: "0.67",
+          source: ["systemTest"],
           receive_numbers: [
-            "79029999999",
-            "79028888888"
+
           ]
         )
       end
@@ -34,14 +37,38 @@ describe SmsUslugiApi do
   end
 
   describe "sms sending" do
-    it "should send sms" do
-      VCR.use_cassette("send") do
-        status = @sms.send("Тестовое сообщение", "81111111111", nil, "79021111111")
+    it "should send sms to me" do
+      VCR.use_cassette("send_me") do
+        status = @sms.send("Тестовое сообщение", "#{settings['phone_me']}", idGroup: nil, source: nil, onlydelivery: '1')
+        expect(status).to include(
+          code: 1,
+          descr: "Успешно обработано",
+          colsmsOfSending: 1,
+          priceOfSending: "0.67"
+        )
+      end
+    end
+
+    it "should send sms to nw" do
+      VCR.use_cassette("send_nw") do
+        status = @sms.send("Тестовое сообщение", "#{settings['phone_nw']}", idGroup: nil, source: nil, onlydelivery: '1')
+        expect(status).to include(
+          code: 1,
+          descr: "Успешно обработано",
+          colsmsOfSending: 1,
+          priceOfSending: "0.67"
+        )
+      end
+    end
+
+    it "should send sms to pr" do
+      VCR.use_cassette("send_pr") do
+        status = @sms.send("Тестовое сообщение", "#{settings['phone_pr']}", idGroup: nil, source: nil, onlydelivery: '1')
         expect(status).to include(
           code: 1,
           descr: "Успешно обработано",
           colsmsOfSending: 1,
-          priceOfSending: "0.50"
+          priceOfSending: "0.67"
         )
       end
     end
@@ -50,14 +77,14 @@ describe SmsUslugiApi do
   describe "phone number info" do
     it "should reveice phone number info" do
       VCR.use_cassette("getPhoneInfo") do
-        phone_info = @sms.get_phone_info("79000000000")
+        phone_info = @sms.get_phone_info("#{settings['phone_me']}")
         expect(phone_info).to include(
           code: 1,
           descr: "Операция завершена успешно",
-          phone: "79000000000",
+          phone: "#{settings['phone_me']}",
           country: "Россия",
-          district: "Краснодарский край",
-          opsos: "Теле 2 (цифровая подпись)"
+          district: "#{settings['my_region']}",
+          opsos: "#{settings['my_operator']} (цифровая подпись)"
         )
       end
     end

metadata

@@ -1,189 +1,186 @@
 --- !ruby/object:Gem::Specification
 name: sms-uslugi-api
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Alexander Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple gem for send SMS through sms-uslugi service
-email: drakmail@delta.pm
+email: drakmail@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
-- .travis.yml
+- ".document"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
-- fixtures/vcr_cassettes/getPhoneInfo.yml
-- fixtures/vcr_cassettes/info.yml
-- fixtures/vcr_cassettes/send.yml
 - lib/sms-uslugi-api.rb
 - sms-uslugi-api.gemspec
 - spec/sms_uslugi_api_spec.rb
@@ -198,18 +195,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: API for sms-uslugi service
 test_files: []
+has_rdoc: 

data/fixtures/vcr_cassettes/getPhoneInfo.yml

@@ -1,45 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://lcab.sms-uslugi.ru/lcabApi/getPhoneInfo.php?login=demo&password=demo&phone=79000000000
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      User-Agent:
-      - Faraday v0.8.8
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - '*/*'
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx
-      Date:
-      - Sat, 22 Feb 2014 19:05:48 GMT
-      Content-Type:
-      - text/json; charset:utf-8;
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      X-Powered-By:
-      - PHP/5.5.9
-      X-Content-Type-Options:
-      - nosniff
-      X-Xss-Protection:
-      - 1; mode=block;
-    body:
-      encoding: UTF-8
-      string: '{"code":1,"descr":"\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f
-        \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e","phone":"79000000000","district":"\u041a\u0440\u0430\u0441\u043d\u043e\u0434\u0430\u0440\u0441\u043a\u0438\u0439
-        \u043a\u0440\u0430\u0439","country":"\u0420\u043e\u0441\u0441\u0438\u044f","opsos":"\u0422\u0435\u043b\u0435
-        2 (\u0446\u0438\u0444\u0440\u043e\u0432\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u044c)"}'
-    http_version: 
-  recorded_at: Sat, 22 Feb 2014 19:05:47 GMT
-recorded_with: VCR 2.6.0

data/fixtures/vcr_cassettes/info.yml

@@ -1,43 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://lcab.sms-uslugi.ru/lcabApi/info.php?login=demo&password=demo
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      User-Agent:
-      - Faraday v0.8.8
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - '*/*'
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx
-      Date:
-      - Sat, 22 Feb 2014 11:06:49 GMT
-      Content-Type:
-      - text/json; charset:utf-8;
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      X-Powered-By:
-      - PHP/5.5.9
-      X-Content-Type-Options:
-      - nosniff
-      X-Xss-Protection:
-      - 1; mode=block;
-    body:
-      encoding: UTF-8
-      string: '{"code":1,"descr":"\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f
-        \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e","account":"583.12","ocode":"80009999999","tarif":"\u0410\u0432\u0430\u043d\u0441::50","price":"0.50","source":["systemTest","Ded Moroz"],"receive_numbers":["79029999999","79028888888"],"userAccess":{"canExportContacts":"1","canDeleteGroups":"1","canDeleteContacts":"1","canConfig":"1","canViewReportNums":"1","canViewNumbersInPhonebook":"1","canEditPhonebook":"1","canEditContacts":"1","canUseAllGroups":"1","canModifyContent":"1","canDealerConfig":"1","canTarifConfig":"1","canManageAllOrgs":"1","canReportsCenter":"1","canViewAllReports":"1","canTarifInfo":"1","canChangeTarif":"1","canManageInputNumbers":"1","canManageClientLoginPassword":"1","canSendSMS":"1","canDopModules":"1","canOnline":"1","canMakePayment":"1","canChangeUseAlfaSourceAll":"1","canPm":"1","canOrgList":"1","canDutyAndSkipped":"0","canUseAllSmsTemplates":"1","canPager":"1","canMyFinReports":"1","canDoc":"1"}}'
-    http_version: 
-  recorded_at: Sat, 22 Feb 2014 11:06:49 GMT
-recorded_with: VCR 2.6.0

data/fixtures/vcr_cassettes/send.yml

@@ -1,42 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://lcab.sms-uslugi.ru/lcabApi/sendSms.php?dateTimeSend&discountID&flash=0&idGroup&login=demo&onlydelivery=0&password=demo&source=79021111111&to=81111111111&txt=%D0%A2%D0%B5%D1%81%D1%82%D0%BE%D0%B2%D0%BE%D0%B5%20%D1%81%D0%BE%D0%BE%D0%B1%D1%89%D0%B5%D0%BD%D0%B8%D0%B5&use_alfasource
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      User-Agent:
-      - Faraday v0.8.8
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - '*/*'
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx
-      Date:
-      - Sat, 22 Feb 2014 11:37:20 GMT
-      Content-Type:
-      - text/json; charset:utf-8;
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      X-Powered-By:
-      - PHP/5.5.9
-      X-Content-Type-Options:
-      - nosniff
-      X-Xss-Protection:
-      - 1; mode=block;
-    body:
-      encoding: UTF-8
-      string: '{"code":1,"descr":"\u0423\u0441\u043f\u0435\u0448\u043d\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u043d\u043e","smsid":"0d46ec94e6ed10c91c66737dbf12e910","colsmsOfSending":1,"priceOfSending":"0.50","colAbonentSend":1}'
-    http_version: 
-  recorded_at: Sat, 22 Feb 2014 11:37:20 GMT
-recorded_with: VCR 2.6.0