inat-channel 0.9.2.4 → 0.9.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 623fd51e7fb68e6a5cf60d33afe236ce93969d0545a9a551b6be113e0abb8862
-  data.tar.gz: 1ff698139eab88a574cdccf38fb02eb3a80cb5ef283b5a71a0f6073a177374c7
+  metadata.gz: 8ea8a3c1a8d4dacc5ee28e368684aeb64edbaad2690442b04accc0796b25fc45
+  data.tar.gz: 21a0d2a4e7bf352199d8ef39842fc346a09f131d49e6d2a4c5de1a7fdf753c3c
 SHA512:
-  metadata.gz: f7d4bb6755ce7454c056e6d4bcbe57821a8d05bc2441b418272fa1e675a92f7674c6ef6e18fb430a1ef22660a46c41aa51e31ad15700c25edde0957a153ee1ff
-  data.tar.gz: e6d757d644c2c0c42a19a7ba7375594aab14fff6859b311496abeae22b157fadec0d3ba188d7c70065931cd5898ed97896f4fb02a4bc7120a59154e3f60d5846
+  metadata.gz: 103cdba5ca253342d0d42d325201365fd72eb82d4ee91bdcabeeb75b5edc17c4b4bccc6c56c0aaf1b57fa4f3b33d33756158c04ad76dc35aff60b02057cc8aac
+  data.tar.gz: eb19331699bc2af371178ace5589a716a8f52027a65a8460f28ad137df8b832112399cf29c7b6be5360e4062cb09d04a26b227ad5e84a53cd91847d31c8aabfe

data/bin/inat-channel

@@ -19,10 +19,9 @@ if uuid
     logger.warn "Failed to load #{uuid} — returning to pool"
     notify_admin "Failed to load #{uuid} — returning to pool"
   end
-
-  save_data
 else
   notify_admin 'No observation to send.'
   logger.warn 'No observation to send.'
 end
 
+save_data

data/lib/inat-channel/data.rb

@@ -101,9 +101,14 @@ module INatChannel
       end
 
       def save
-        save_pool
-        save_sent
-        save_used
+        cleanup_pool
+        cleanup_sent
+        cleanup_used
+        
+        write_pool
+        write_sent
+        write_used
+        
         IC::logger.info "Saved pool=#{pool.size}, sent=#{sent.size}"
       end
 
@@ -247,7 +252,7 @@ module INatChannel
         raise e
       end
 
-      def save_pool
+      def cleanup_pool
         size = pool.size
 
         # 1. Удаляем отправленные
@@ -265,33 +270,39 @@ module INatChannel
         dead_date = Date.today - IC::CONFIG.dig(:days_back, :pool)
         pool.reject! { |_, value| value['created_at'] < dead_date }
         IC::logger.info "Removed #{size - pool.size} outdated records from pool" if pool.size != size
-
-        file = IC::CONFIG.dig(:data_files, :pool)
-        FileUtils.mkdir_p File.dirname(file)
-        File.write file, JSON.pretty_generate(pool)
       end
 
-      def save_used
+      def cleanup_used
         size = used.size
 
         # Удаляем устаревшие, если актуально
         dead_date = Date.today - IC::CONFIG.dig(:days_back, :used)
         used.reject! { |_, value| value < dead_date }
         IC::logger.info "Removed #{size - used.size} outdated records from used" if used.size != size
-
-        file = IC::CONFIG.dig(:data_files, :used)
-        FileUtils.mkdir_p File.dirname(file)
-        File.write file, JSON.pretty_generate(used)
       end
 
-      def save_sent
+      def cleanup_sent
         size = sent.size
         
         # Удаляем устаревшие 
         dead_date = Date.today - IC::CONFIG.dig(:days_back, :sent)
         sent.reject! { |_, value| value['sent_at'] < dead_date }
         IC::logger.info "Removed #{size - sent.size} outdated records from sent" if sent.size != size
+      end
+
+      def write_pool
+        file = IC::CONFIG.dig(:data_files, :pool)
+        FileUtils.mkdir_p File.dirname(file)
+        File.write file, JSON.pretty_generate(pool)
+      end
+
+      def write_used
+        file = IC::CONFIG.dig(:data_files, :used)
+        FileUtils.mkdir_p File.dirname(file)
+        File.write file, JSON.pretty_generate(used)
+      end
 
+      def write_sent
         file = IC::CONFIG.dig(:data_files, :sent)
         FileUtils.mkdir_p File.dirname(file)
         File.write file, JSON.pretty_generate(sent)

data/lib/inat-channel/version.rb

@@ -1,6 +1,6 @@
 module INatChannel
-  
-  VERSION = '0.9.2.4'
+
+  VERSION = '0.9.2.6'
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inat-channel
 version: !ruby/object:Gem::Version
-  version: 0.9.2.4
+  version: 0.9.2.6
 platform: ruby
 authors:
 - Ivan Shikhalev
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement