st_tools 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2159ed0b18531c0644af292aee0525c26cc9b92
-  data.tar.gz: 035ff3d07ef85f83b603ecdaad6948196376d93c
+  metadata.gz: 67eaf920a767607db3dfe8295a59ba9c4195c4b0
+  data.tar.gz: c3ade73e304da2503d94c096e79b7075f0318460
 SHA512:
-  metadata.gz: 761181420dcff4c027c34966ccd23ebb99e821ba8652e2fe5caec0bcafcb9bfa8294cae76146efff0af9b82d5343d486093444bf9d1e1e1932c8a15e942e2ad2
-  data.tar.gz: 5bfa84ebe8896af349ebb0abf8482e0c7c9dec294282201b579d8550a8e015db12ac4dc541eba505fc06a76b167ad425dd24985e30c0f9f9cb979e44ad1d3776
+  metadata.gz: aeba709f894d04efe22c0a545e9c03bfe4288ae9209cdbd878d71e466a963280cb5dc3784564089502e496923293a9597187c1c1eae4adac6727f8cbeb0591ba
+  data.tar.gz: e65dd5a86d4733729d8731ede634de5f7ad64c7d655243db4f86a4db448748e223798fe9899ea6be3f1ec72f351f704fc2aa7d1bdceb2b7fa1d77addc109b7f0

data/lib/st_tools/countries.rb

@@ -52,7 +52,9 @@ module StTools
         code = ::StTools::Countries::AOGUIDS.keys.include?(id.to_sym) ? id.to_sym : :zz
       end
 
-      ::StTools::Countries::COUNTRIES[code].merge(::StTools::Countries::GEO[code])
+      res = ::StTools::Countries::COUNTRIES[code].merge(::StTools::Countries::GEO[code])
+      res[:aoguid] = ::StTools::Countries::AOGUIDS[code]
+      res
     end
 
 

data/lib/st_tools/progress_bar.rb

@@ -39,7 +39,6 @@ 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
 
@@ -52,6 +51,12 @@ module StTools
       end
     end
 
+    # Метод финализирует значение прогресс-бара
+    #
+    # @return [Object] нет
+    def complete
+      @pbar.progress = @max if @pbar.progress < @max
+    end
 
     private
 

data/lib/st_tools/version.rb

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

data/test/countries_lib_spec.rb

@@ -32,6 +32,7 @@ describe 'Проверка методов StTool::Countries.*' do
   it 'country success by code :ru' do
     test = ::StTools::Countries.country(:ru)
     expect(test[:code]).to eq 'ru'
+    expect(test[:aoguid]).to eq 'ea70abb2-ccc2-46c8-9b15-d42cac1ecd7f'
   end
 
   it 'country success by code ru' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: st_tools
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Stan Zhuravlev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler