inat-channel 0.9.0 → 0.9.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af5a4910d9c67e726bc96582469fb905101392ab37612bff1795e8165d31f53a
-  data.tar.gz: ea75e7e0b0c406666ff502536e6cb9554db7a55ae778c7feec98964110c259a5
+  metadata.gz: 964ecc2ce62a014b72d67591c6f62a6b0ff5767adf4b1c04adadcc3c469e8a28
+  data.tar.gz: f97cded760837e12f0205bd12a2ffcbe5da90eecb229287ebdf2713aec7c658e
 SHA512:
-  metadata.gz: d013cf9b14e8bf324ffa054b3f0a550fa8fe19259d619f227c82f7599e848ab983488c9749eb7a849ef4c75721a27378f00e74e90220bfeb5db8a6d99a345e9d
-  data.tar.gz: f95460b1c54e594e82d638a9e4291024c0f53992a977330f16a6ca864e060b6c6bc52a890bc18fc3e1846c2dca9feaed75cffb3ef2ea4992b2e6f87709f14f2e
+  metadata.gz: f191492900162b0be24425d2d898b646e01362ea616a514f69643443a0d452d7e95df8d7b286d7281460b53850006662ebe8e80b9bbb6f86abbf3114a06ed8bf
+  data.tar.gz: 11af8f6c64a1916756ba3b5d27a3aa01b96be420b38788e13004e38bd6a9d80288a015a43e7759dc4b0fbcdb0feadf5ec5f79325157da96d7f9fe7c600bcd6fb

data/README.md

@@ -4,7 +4,7 @@
 # inat-channel — automatic posting of observations
 
 [![GitHub License](https://img.shields.io/github/license/inat-get/inat-channel)](LICENSE)
-[![Gem Version](https://badge.fury.io/rb/inat-channel.svg?icon=si%3Arubygems&d=6)](https://badge.fury.io/rb/inat-channel)
+[![Gem Version](https://badge.fury.io/rb/inat-channel.svg?icon=si%3Arubygems&d=9)](https://badge.fury.io/rb/inat-channel)
 [![Ruby](https://github.com/inat-get/inat-channel/actions/workflows/ruby.yml/badge.svg)](https://github.com/inat-get/inat-channel/actions/workflows/ruby.yml) 
 ![Coverage](coverage-badge.svg)
 

data/bin/inat-channel

@@ -13,9 +13,9 @@ if uuid
   obs = load_observation(uuid)
   if obs
     msg_id = send_observation(obs)
-    IC::confirm_sending! msg_id
+    confirm_sending! msg_id
   else
-    IC::revert_sending!
+    revert_sending!
     logger.warn "Failed to load #{uuid} — returning to pool"
     notify_admin "Failed to load #{uuid} — returning to pool"
   end

data/lib/inat-channel/api.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'faraday'
 require 'faraday/retry'
 
+require_relative 'facade'
 require_relative 'config'
 require_relative 'logger'
 
@@ -23,7 +24,7 @@ module INatChannel
       private_constant :PER_PAGE, :PAGE_DELAY, :API_ENDPOINT, :LIST_FIELDS, :SINGLE_FIELDS
 
       def load_news 
-        load_list(**IC::CONFIG[:base_query], created_d1: (Date.today - IC::CONFIG.dig(:days_back, :fresh)).to_s)
+        load_list(**IC::CONFIG[:base_query], updated_since: (Date.today - IC::CONFIG.dig(:days_back, :fresh)).to_s)
       end
       
       def load_list **query
@@ -114,19 +115,10 @@ end
 
 module IC
 
-  def load_news
-    INatChannel::API::load_news
-  end
-
-  def load_observation uuid
-    INatChannel::API::load_observation uuid
-  end
-
-  def load_list **query
-    INatChannel::API::load_list(**query)
-  end
+  self >> INatChannel::API
 
-  module_function :load_news, :load_observation
+  encapsulate INatChannel::API, :load_news, :load_observation
+  shadow_encapsulate INatChannel::API, :load_list
 
 end
 

data/lib/inat-channel/config.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'yaml'
 require 'logger'
 
+require_relative 'facade'
 require_relative 'version'
 
 module INatChannel
@@ -86,7 +87,7 @@ module INatChannel
         cfg[:data_files][:used] ||= "#{ cfg[:data_files][:root] }/#{ basename }_used.json"
 
         cfg[:lock_file]        ||= {}
-        cfg[:lock_file][:path] ||= "#{ cfg[:data_files][:root] }/#{ basename }__bot.json"
+        cfg[:lock_file][:path] ||= "#{ cfg[:data_files][:root] }/#{ basename }__bot.lock"
         cfg[:lock_file][:ttl]  ||= 300  # 5 min
 
         cfg[:days_back][:pool] ||= 3 * cfg.dig(:days_back, :fresh)
@@ -121,13 +122,16 @@ module INatChannel
 
     end
 
+    CONFIG = self.config
+
   end
 
 end
 
 module IC
 
-  CONFIG = INatChannel::Config::config
+  self >> INatChannel::Config
 
-end
+  encapsulate INatChannel::Config, :CONFIG
 
+end

data/lib/inat-channel/data.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'fileutils'
 require 'set'
 
+require_relative 'facade'
 require_relative 'config'
 require_relative 'logger'
 require_relative 'lock'
@@ -304,22 +305,8 @@ end
 
 module IC
 
-  def select_uuid fresh
-    INatChannel::Storage::select_uuid fresh
-  end
-
-  def save_data
-    INatChannel::Storage::save
-  end
-
-  def confirm_sending! msg_id
-    INatChannel::Storage::confirm! msg_id
-  end
-
-  def revert_sending!
-    INatChannel::Storage::revert!
-  end
+  self >> INatChannel::Storage
 
-  module_function :select_uuid, :save_data, :confirm_sending!, :revert_sending!
+  encapsulate INatChannel::Storage, :select_uuid, :save => :save_data, :confirm! => :confirm_sending!, :revert! => :revert_sending!
 
 end

data/lib/inat-channel/data_convert.rb

@@ -2,6 +2,7 @@ require 'date'
 require 'time'
 require 'set'
 
+require_relative 'facade'
 require_relative 'data_types'
 
 module INatChannel
@@ -99,10 +100,8 @@ end
 
 module IC 
 
-  def convert_observation source
-    INatChannel::DataConvert::convert_observation source
-  end
+  self >> INatChannel::DataConvert
 
-  module_function :convert_observation
+  shadow_encapsulate INatChannel::DataConvert, :convert_observation
 
 end

data/lib/inat-channel/facade.rb

@@ -0,0 +1,5 @@
+require 'is-dsl'
+
+module IC
+  extend IS::DSL
+end

data/lib/inat-channel/icons.rb

@@ -1,3 +1,5 @@
+require_relative 'facade'
+
 module INatChannel
   module Icons
     TAXA_ICONS = {
@@ -115,21 +117,8 @@ end
 
 module IC
 
-  TAXA_ICONS = INatChannel::Icons::TAXA_ICONS
-  ICONS = INatChannel::Icons::ICONS
-
-  def taxon_icon taxon
-    INatChannel::Icons::taxon_icon taxon
-  end
-
-  def ancestors_icon ancestor_ids
-    INatChannel::Icons::ancestors_icon ancestor_ids
-  end
-
-  def clock_icon time
-    INatChannel::Icons::clock_icon time
-  end
+  self >> INatChannel::Icons
 
-  module_function :taxon_icon, :ancestors_icon, :clock_icon
+  shadow_encapsulate INatChannel::Icons, :ICONS, :TAXA_ICONS, :taxon_icon, :ancestors_icon, :clock_icon
 
 end

data/lib/inat-channel/logger.rb

@@ -1,3 +1,4 @@
+require_relative 'facade'
 require_relative 'config'
 
 module INatChannel
@@ -26,11 +27,9 @@ end
 
 module IC
 
-  def logger
-    INatChannel::Logger::logger
-  end
+  self >> INatChannel::Logger
 
-  module_function :logger
+  encapsulate INatChannel::Logger, :logger
 
 end
 

data/lib/inat-channel/message.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'sanitize'
 
+require_relative 'facade'
 require_relative 'config'
 require_relative 'icons'
 require_relative 'template'
@@ -33,15 +34,9 @@ end
 
 module IC
 
-  def make_message observation
-    INatChannel::Message::make_message observation
-  end
-
-  def list_photos observation
-    INatChannel::Message::list_photos observation
-  end
+  self >> INatChannel::Message
 
-  module_function :make_message, :list_photos
+  shadow_encapsulate INatChannel::Message, :make_message, :list_photos
 
 end
 

data/lib/inat-channel/telegram.rb

@@ -1,3 +1,4 @@
+require_relative 'facade'
 require_relative 'config'
 require_relative 'logger'
 require_relative 'message'
@@ -93,15 +94,8 @@ end
 
 module IC
 
-  def send_observation observation
-    INatChannel::Telegram::send_observation observation
-  end
-
-  def notify_admin text
-    INatChannel::Telegram::notify_admin text
-  end
+  self >> INatChannel::Telegram
 
-  module_function :send_observation, :notify_admin
+  encapsulate INatChannel::Telegram, :send_observation, :notify_admin
 
 end
-

data/lib/inat-channel/template.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'erb'
 
+require_relative 'facade'
 require_relative 'data_types'
 require_relative 'data_convert'
 
@@ -95,12 +96,8 @@ end
 
 module IC
 
-  def load_template path
-    INatChannel::Template::load path
-  end
+  self >> INatChannel::Template
 
-  def default_template
-    INatChannel::Template::default
-  end
+  shadow_encapsulate INatChannel::Template, :load => :load_template, :default => :default_template
 
 end

data/lib/inat-channel/version.rb

@@ -1,11 +1,11 @@
 module INatChannel
   
-  VERSION = '0.9.0'
+  VERSION = '0.9.2.2'
 
 end
 
 module IC
-  
+
   VERSION = INatChannel::VERSION
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inat-channel
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2.2
 platform: ruby
 authors:
 - Ivan Shikhalev
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: is-dsl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +139,7 @@ files:
 - lib/inat-channel/data.rb
 - lib/inat-channel/data_convert.rb
 - lib/inat-channel/data_types.rb
+- lib/inat-channel/facade.rb
 - lib/inat-channel/icons.rb
 - lib/inat-channel/lock.rb
 - lib/inat-channel/logger.rb