st_tools 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83397a6c2d69184286fbc9f97a11039115380d2c
-  data.tar.gz: dc4150faa007de0563d7d499d247e3466c4298e9
+  metadata.gz: f2159ed0b18531c0644af292aee0525c26cc9b92
+  data.tar.gz: 035ff3d07ef85f83b603ecdaad6948196376d93c
 SHA512:
-  metadata.gz: e2ef6827fcdf47f95eac4ad0b05e545cc35480511fe79497214d9aba0915d48cb96ecd69da9b78ecedc9531667ff2916eda92bd41d4ec7c5e1cc072762a55b22
-  data.tar.gz: 2e2253e11334b98793a8fc7a29393155e334c753a01353490202d36aaad4a009f0d1687a3e6b9960d2f5d9e87d6b64c877f19de06e5bf21e72ec4e2a4b8d827f
+  metadata.gz: 761181420dcff4c027c34966ccd23ebb99e821ba8652e2fe5caec0bcafcb9bfa8294cae76146efff0af9b82d5343d486093444bf9d1e1e1932c8a15e942e2ad2
+  data.tar.gz: 5bfa84ebe8896af349ebb0abf8482e0c7c9dec294282201b579d8550a8e015db12ac4dc541eba505fc06a76b167ad425dd24985e30c0f9f9cb979e44ad1d3776

data/lib/st_tools/countries.rb

@@ -0,0 +1,60 @@
+module StTools
+  class Countries
+    AOGUIDS = {
+        zz: '',
+        ru: 'ea70abb2-ccc2-46c8-9b15-d42cac1ecd7f',
+        ua: 'e6a4a903-01e6-43f0-9bad-e57c2eb4a9c7',
+        kz: 'e501ac67-d26a-40c9-ad43-f1628807fdc0',
+        by: 'ff26f2dc-759e-4196-9e28-4d6338c8e863'
+    }
+
+    COUNTRIES = {
+        zz: {code: '', shortname: '', fullname: ''},
+        ru: {code: 'ru', shortname: 'Россия', fullname: 'Российская Федерация'},
+        ua: {code: 'ua', shortname: 'Украина', fullname: 'Украина'},
+        kz: {code: 'kz', shortname: 'Казахстан', fullname: 'Республика Казахстан'},
+        by: {code: 'by', shortname: 'Беларусь', fullname: 'Республика Беларусь'}
+    }
+
+    GEO = {
+        zz: {location: [0.0, 0.0], upper: [0.0, 0.0], lower: [0.0, 0.0]},
+        ru: {location: [99.505405, 61.698653], upper: [191.128003, 81.886117], lower: [19.484764, 41.18599]},
+        ua: {location: [0.0, 0.0], upper: [0.0, 0.0], lower: [0.0, 0.0]},
+        kz: {location: [0.0, 0.0], upper: [0.0, 0.0], lower: [0.0, 0.0]},
+        by: {location: [0.0, 0.0], upper: [0.0, 0.0], lower: [0.0, 0.0]},
+    }
+
+    # Метод проверяет, яаляется ли UUID страной
+    #
+    # @param [String] uuid идентификатор страны
+    # @return [Boolean] true, если идентификатор является идентификатором страны
+    # @example Примеры использования
+    #   StTools::Countries.country?('e6a4a903-01e6-43f0-9bad-e57c2eb4a9c7') #=> true
+    #   StTools::Countries.country?('f5eea12d-e601-f043-9bad-e5789eefa9aa') #=> false
+    #   StTools::Countries.country?('Hello') #=> false
+    def self.country?(uuid)
+      ::StTools::Countries::AOGUIDS.values.include?(uuid)
+    end
+
+    # Метод возвращает информацию о стране по ее идентификатору
+    #
+    # @param [String] id идентификатор страны (в виде aoguid, :ru, 'ru')
+    # @return [Hash] hash описание страны
+    # @example Примеры использования
+    #   StTools::Countries.country('e6a4a903-01e6-43f0-9bad-e57c2eb4a9c7') #=> Hash
+    #   StTools::Countries.country(:ru) #=> Hash
+    #   StTools::Countries.country('ru') #=> Hash
+    #   StTools::Countries.country('??') #=> Empty Hash
+    def self.country(id)
+      if ::StTools::Fias.uuid?(id)
+        code = ::StTools::Countries::AOGUIDS.invert[id] || :zz
+      else
+        code = ::StTools::Countries::AOGUIDS.keys.include?(id.to_sym) ? id.to_sym : :zz
+      end
+
+      ::StTools::Countries::COUNTRIES[code].merge(::StTools::Countries::GEO[code])
+    end
+
+
+  end
+end

data/lib/st_tools/fias.rb

@@ -154,6 +154,7 @@ module StTools
     end
 
 
+
     private
 
     # noinspection RubyClassVariableUsageInspection
@@ -168,5 +169,6 @@ module StTools
       return self_federal_cities
     end
 
+
   end
 end

data/lib/st_tools/progress_bar.rb

@@ -39,6 +39,7 @@ module StTools
     # @return [Object] нет
     def progress=(val)
       return if val > @max
+      return if val == @max
       return if val == @value
       return if val % @step != 0 && (@max - val) >= @step
 
@@ -46,7 +47,7 @@ module StTools
       @pbar.progress = val
       @usage += 1
 
-      if val > @max - 1
+      if val >= @max
         puts_footer
       end
     end

data/lib/st_tools/system.rb

@@ -38,5 +38,8 @@ module StTools
       res.split(' ').first
     end
 
+    # todo: расчет размера папки
+    # todo: свободное место
+
   end
 end

data/lib/st_tools/version.rb

@@ -1,3 +1,3 @@
 module StTools
-  VERSION = '0.3.13'
+  VERSION = '0.3.14'
 end

data/lib/st_tools.rb

@@ -10,6 +10,7 @@ module StTools
   require 'st_tools/system'
   require 'st_tools/human'
   require 'st_tools/fias'
+  require 'st_tools/countries'
   require 'st_tools/string'
   require 'st_tools/progress_bar'
 

data/test/countries_lib_spec.rb

@@ -0,0 +1,48 @@
+require 'rspec'
+require 'st_tools'
+
+
+describe 'Проверка методов StTool::Countries.*' do
+
+  #-----------------------------------------------------
+  #
+  # Тесты проверки страны
+  #
+  #-----------------------------------------------------
+  it '.country? success' do
+    test = ::StTools::Countries.country?('e6a4a903-01e6-43f0-9bad-e57c2eb4a9c7')
+    expect(test).to eq true
+  end
+
+  it '.country? fail' do
+    test = ::StTools::Countries.country?('0c5b2444-70a0-4932-980c-b4dc0d3f02b5')
+    expect(test).to eq false
+  end
+
+  #-----------------------------------------------------
+  #
+  # Тесты получения информации о стране
+  #
+  #-----------------------------------------------------
+  it 'country success by aoguid' do
+    test = ::StTools::Countries.country('e6a4a903-01e6-43f0-9bad-e57c2eb4a9c7')
+    expect(test[:code]).to eq 'ua'
+  end
+
+  it 'country success by code :ru' do
+    test = ::StTools::Countries.country(:ru)
+    expect(test[:code]).to eq 'ru'
+  end
+
+  it 'country success by code ru' do
+    test = ::StTools::Countries.country('kz')
+    expect(test[:code]).to eq 'kz'
+  end
+
+  it 'country success by code ru' do
+    test = ::StTools::Countries.country('us')
+    expect(test[:code]).to eq ''
+  end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: st_tools
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Stan Zhuravlev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - lib/socr/geo.yml
 - lib/st_tools.rb
 - lib/st_tools/common.rb
+- lib/st_tools/countries.rb
 - lib/st_tools/fias.rb
 - lib/st_tools/human.rb
 - lib/st_tools/progress_bar.rb
@@ -97,6 +98,7 @@ files:
 - lib/st_tools/system.rb
 - lib/st_tools/tokenizer.rb
 - lib/st_tools/version.rb
+- test/countries_lib_spec.rb
 - test/fias_lib_spec.rb
 - test/human_lib_spec.rb
 - test/progress_bar_lib_spec.rb