inat-channel 0.8.0.14 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f68cf20d6a12a86d06bf3fdfbe2f8e61d6890060275e713e3e1ef530404a05d8
-  data.tar.gz: feae77da45b8ae5cc418407e06b3179891764fc9def665b48f8101499029335d
+  metadata.gz: 0c91fbb67ba53ef0148d0c9074551a3c8591cb05b6d3a578858018459213f8c4
+  data.tar.gz: b7cefeea01cf40c26574cee11f8ac62657a57435732ed095b3badeebf5c79709
 SHA512:
-  metadata.gz: 4316d7ba2c98e45666a52b747c3eed6be62a09ca3f18253f09060cdc355f2f4c9c73b16add00481459262cec06290ea984ad6c14a27f2bd238f9d386f565f909
-  data.tar.gz: fdd98d39bb81f9999968a6ab2577ef208eccf9ff847988d1eff07051d39108e3c86b14e17dad40ae58573fcc11b3ba16cb4e357712a9fe01f27f186bf3d1e21c
+  metadata.gz: dc896ae4f4a74f64364d1607aabdf2c6acc3d2a3e86e0d5d82e498f5da491201fba99d4c5f1ab769694365914874d401faa85dae97d951695895adfa074731b8
+  data.tar.gz: 67f3314b776a1352a0451570e9d6589abbe9467cfa44b1a124cf4f4d00ed2c7fda8db6060b2e7d2d0021dfde43858abc6484d87569b33b232300932e6f88dc8d

data/README.md

@@ -1,7 +1,7 @@
 # iNat Telegram Poster
 
 [![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=3)](https://badge.fury.io/rb/inat-channel)
+[![Gem Version](https://badge.fury.io/rb/inat-channel.svg?icon=si%3Arubygems&d=5)](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/lib/inat-channel/api.rb

@@ -17,7 +17,8 @@ module INatChannel
       API_ENDPOINT = 'https://api.inaturalist.org/v2/observations'
       LIST_FIELDS = 'uuid'
       SINGLE_FIELDS = '(id:!t,uuid:!t,uri:!t,geojson:(all:!t),user:(login:!t,name:!t),taxon:(ancestor_ids:!t,preferred_common_name:!t,name:!t),' +
-                      'place_ids:!t,place_guess:!t,observed_on_string:!t,description:!t,photos:(url:!t),identifications:(taxon:(ancestors:(name:!t))))'
+                      'place_ids:!t,place_guess:!t,observed_on_string:!t,description:!t,photos:(url:!t),time_observed_at:!t,' +
+                      'identifications:(taxon:(ancestors:(name:!t))))'
 
       private_constant :PER_PAGE, :PAGE_DELAY, :API_ENDPOINT, :LIST_FIELDS, :SINGLE_FIELDS
 

data/lib/inat-channel/config.rb

@@ -56,7 +56,14 @@ module INatChannel
 
       def load_config path
         raise "Config file not found: #{path}" unless File.exist?(path)
-        YAML.safe_load_file(path, symbolize_names: true)
+        cfg = YAML.safe_load_file path, symbolize_names: true
+        if String === cfg[:places]
+          path = File.expand_path(path)
+          places_path = File.expand_path(cfg[:places], File.dirname(path))
+          places = YAML.safe_load_file places_path, symbolize_names: true
+          cfg[:places] = places
+        end
+        cfg
       end
 
       def load_env

data/lib/inat-channel/data_convert.rb

@@ -0,0 +1,92 @@
+require 'date'
+require 'time'
+require 'set'
+
+require_relative 'data_types'
+
+module INatChannel
+
+  module DataConvert
+
+    class << self
+
+      def convert_observation observation_source
+        id = observation_source[:id]
+        url = observation_source[:uri]
+        uuid = observation_source[:uuid]
+        user = convert_user observation_source[:user]
+        taxon = convert_taxon observation_source[:taxon], observation_source[:identifications]
+        places = convert_places observation_source[:place_ids]
+        datetime = DateTime.parse observation_source[:time_observed_at]
+        location = convert_location observation_source[:geojson]
+        description = convert_description observation_source[:description]
+        place_guess = observation_source[:place_guess]
+        Observation::new id: id, url: url, uuid: uuid, user: user, taxon: taxon, places: places, datetime: datetime, location: location, description: description, place_guess: place_guess
+      end
+
+      private
+
+      def convert_location location_source
+        return nil unless location_source
+        lat = location_source.dig :coordinates, 1
+        lng = location_source.dig :coordinates, 0
+        return nil unless lat && lng
+        Location::new lat: lat, lng: lng
+      end
+
+      def convert_description description_source
+        return nil if description_source.nil? || description_source.empty?
+        Description::new value: description_source
+      end
+
+      def convert_user user_source
+        User::new id: user_source[:id], login: user_source[:login], name: user_source[:name]
+      end
+
+      def convert_taxon taxon_source, identifications
+        id = taxon_source[:id]
+        scientific_name = taxon_source[:name]
+        common_name = taxon_source[:preferred_common_name]
+        source_ancestors = nil
+        identifications.each do |ident|
+          it = ident[:taxon]
+          if it[:id] == id
+            source_ancestors = it[:ancestors]
+            break
+          end
+        end
+        ancestors = if source_ancestors
+          source_ancestors.map do |anc|
+            Ancestor::new id: anc[:id], scientific_name: anc[:name]
+          end
+        else
+          taxon_source[:ancestor_ids].map do |aid|
+            Ancestor::new id: aid
+          end
+          # TODO: load names from API by ancestor_ids
+        end
+        ancestors << Ancestor::new(id: taxon_source[:id], scientific_name: taxon_source[:name])
+        Taxon::new id: id, scientific_name: scientific_name, common_name: common_name, ancestors: ancestors
+      end
+
+      def convert_places place_ids
+        places_config = INatChannel::CONFIG[:places]
+        return nil unless places_config
+        result = []
+        places_config.each do |_, items|
+          items.each do |item|
+            ids = Set[*item[:place_ids]]
+            if ids.intersect?(place_ids)
+              result << Place::new(text: item[:text], link: item[:link], tag: item[:tag])
+              break
+            end
+          end
+        end
+        result
+      end
+
+    end
+
+  end
+
+end

data/lib/inat-channel/data_types.rb

@@ -0,0 +1,229 @@
+require 'date'
+require 'time'
+require 'sanitize'
+
+require_relative 'icons'
+
+module INatChannel
+  FORMATS = {
+    date: '%Y.%m.%d',
+    time: '%H:%M %Z',
+    datetime: '%Y.%m.%d %H:%M %Z',
+    location: :DMS,   # or :decimal
+    zoom: 12,
+    description_limit: 512
+  }
+end
+
+class Date
+  def icon
+    INatChannel::Icons::ICONS[:calendar]
+  end
+  def to_s
+    fmt = INatChannel::FORMATS[:date]
+    if fmt
+      self.strftime fmt
+    else
+      super
+    end
+  end
+end
+
+class Time
+  def icon
+    INatChannel::Icons::clock_icon self
+  end
+  def to_s
+    fmt = INatChannel::FORMATS[:time]
+    if fmt
+      self.strftime fmt
+    else
+      super
+    end
+  end
+end
+
+class DateTime
+  def icon
+    INatChannel::Icons::ICONS[:calendar]
+  end
+  def to_s
+    fmt = INatChannel::FORMATS[:datetime]
+    if fmt
+      self.strftime fmt
+    else
+      super
+    end
+  end
+end
+
+class String
+  def to_tag
+    "\##{self.gsub(/\s+/, '_').gsub(/-/, '_').gsub(/[^a-zA-Zа-яА-ЯёЁ_]/, '')}"
+  end
+  def limit len
+    return self if length <= len
+
+    short = self[0, len]
+    last_space = short.rindex(/\s/)
+    last_sign = short.rindex(/[,.;:!?]/)
+    if last_space
+      if last_sign && last_sign + 1 > last_space
+        return short[0, last_sign + 1] + '...'
+      end
+      return short[0, last_space] + '...'
+    else
+      if last_sign
+        return short[0, last_sign + 1] + '...'
+      end
+      return short + '...'
+    end
+  end
+end
+
+class Array 
+  def to_tags
+    self.map do |item| 
+      if item.respond_to?(:to_tag)
+        item.to_tag 
+      else
+        item&.to_s.to_tag
+      end
+    end.compact
+  end
+end
+
+Observation = Struct::new :taxon, :id, :uuid, :url, :user, :datetime, :places, :place_guess, :description, :location, keyword_init: true do
+  def icon
+    INatChannel::Icons::ICONS[:observation]
+  end
+  def date
+    datetime.to_date
+  end
+  def time
+    datetime.to_time
+  end
+end
+
+Taxon = Struct::new :scientific_name, :common_name, :id, :ancestors, keyword_init: true do
+  def icon
+    INatChannel::Icons::ancestors_icon ancestors.map(&:id)
+  end
+  def title
+    if common_name && !common_name.empty?
+      "<b>#{common_name}</b> <i>(#{scientific_name})</i>"
+    else
+      "<b><i>#{scientific_name}</i></b>"
+    end
+  end
+  def url
+    "https://www.inaturalist.org/taxa/#{id}"
+  end
+  def to_tags
+    ancestors.to_tags
+  end
+end
+
+Ancestor = Struct::new :scientific_name, :id, keyword_init: true do
+  def to_tag
+    scientific_name.to_tag
+  end
+end
+
+Place = Struct::new :ids, :text, :link, :tag, keyword_init: true do
+  def icon
+    INatChannel::Icons::ICONS[:place]
+  end
+  def to_tag
+    tag&.to_tag
+  end
+  def title
+    text
+  end
+  def url
+    link
+  end
+end
+
+User = Struct::new :id, :login, :name, keyword_init: true do
+  def icon
+    INatChannel::Icons::ICONS[:user]
+  end
+  def title
+    if name && !name.empty?
+      name
+    else
+      "@#{login}"
+    end
+  end
+  def url 
+    "https://www.inaturalist.org/people/#{id}"
+  end
+end
+
+SANITIZE_HTML_CONFIG = {
+  elements: [ 'b', 'strong', 'i', 'em', 'u', 's', 'strike', 'del', 'a', 'code', 'pre', 'tg-spoiler', 'blockquote' ],
+  attributes: { 'a' => [ 'href' ] },
+  protocols: { 'a' => { 'href' => [ 'http', 'https', 'mailto', 'tg' ] } },
+  remove_contents: [ 'script', 'style' ]
+}
+
+SANITIZE_TEXT_CONFIG = {
+  elements: [],
+  remove_contents: [ 'script', 'style' ]
+}
+
+Description = Struct::new :value, keyword_init: true do
+  def icon
+    INatChannel::Icons::ICONS[:description]
+  end
+  def text
+    Sanitize.fragment(value, SANITIZE_TEXT_CONFIG).limit(FORMATS[:description_limit])
+  end
+  def html
+    sanitized = Sanitize.fragment value, SANITIZE_HTML_CONFIG
+    if sanitized.length > FORMATS[:description_limit]
+      # В отличие от простого текста, обрезка HTML требует куда более изощренной логики, что неоправданно
+      text
+    else
+      sanitized
+    end
+  end
+end
+
+Location = Struct::new :lat, :lng, keyword_init: true do
+  def icon
+    INatChannel::Icons::ICONS[:location]
+  end
+  def title
+    lat_dir = lat >= 0 ? 'N' : 'S'
+    lng_dir = lng >= 0 ? 'E' : 'W'
+    lat_abs = lat.abs
+    lng_abs = lng.abs
+    if FORMATS[:location] == :DMS
+      lat_d = lat_abs.floor
+      lat_m = ((lat_abs - lat_d) * 60).floor
+      lat_s = ((lat_abs - lat_d - lat_m / 60.0) * 3600).round
+      lng_d = lng_abs.floor
+      lng_m = ((lng_abs - lng_d) * 60).floor
+      lng_s = ((lng_abs - lng_d - lng_m / 60.0) * 3600).round
+      "%d°%02d'%02d\"%s %d°%02d'%02d\"%s" % [ lat_d, lat_m, lat_s, lat_dir, lng_d, lng_m, lng_s, lng_dir ]
+    else
+      "%.4f°%s, %.4f°%s" % [ lat_abs, lat_dir, lng_abs, lng_dir ]
+    end
+  end
+  def google
+    # "https://www.google.com/maps/search/?api=1&query=#{lat},#{lng}&z=#{FORMATS[:zoom]}&ll=#{lat},#{lng}"
+    "https://www.google.com/maps/place/#{lat},#{lng}/@#{lat},#{lng},#{FORMATS[:zoom]}z/"
+  end
+  def yandex
+    "https://yandex.ru/maps/?ll=#{lng},#{lat}&z=#{FORMATS[:zoom]}&pt=#{lng},#{lat},pm2rdm1"
+  end
+  def osm
+     "https://www.openstreetmap.org/?mlat=#{lat}&mlon=#{lng}#map=#{FORMATS[:zoom]}/#{lat}/#{lng}"
+  end
+  def url
+    osm
+  end
+end
+

data/lib/inat-channel/icons.rb

@@ -1,56 +1,112 @@
-
 module INatChannel
-
   module Icons
-
     TAXA_ICONS = {
-      48460  => '🧬',
-      47126  => '🌿',
-      47170  => '🍄',
-      47686  => '🦠',
-      151817 => '🦠',
-      67333  => '🦠',
-      1      => '🐾',
-      136329 => '🌲',
-      47124  => '🌸',
-      47163  => '🍃',
-      47178  => '🐟',
-      196614 => '🦈',
-      47187  => '🦀',
-      47158  => '🪲',
-      47119  => '🕷️',
-      71261  => '🦅',
-      18874  => '🦜',
-      48222  => '🌊',
-      47115  => '🐚',
-      3      => '🐦',
-      40151  => '🦌',
-      26036  => '🐍',
-      20978  => '🐸'
-
-      # TODO: add ALL taxa with iNat icons and some other large group
-    }.freeze
+      48460 => "🧬",
+      47126 => "🌿",
+      47170 => "🍄",
+      47686 => "🦠",
+      151817 => "🦠",
+      67333 => "🦠",
+      1 => "🐾",
+      136329 => "🌲",
+      47124 => "🌸",
+      47163 => "🍃",
+      47178 => "🐟",
+      196614 => "🦈",
+      47187 => "🦀",
+      47158 => "🪲",
+      47119 => "🕷️",
+      71261 => "🦅",
+      18874 => "🦜",
+      48222 => "🌊",
+      47115 => "🐚",
+      3 => "🐦",
+      40151 => "🦌",
+      26036 => "🐍",
+      20978 => "🐸",
+
+    # TODO: add ALL taxa with iNat icons and some other large group
+    }
 
     ICONS = {
-      :user => '👤',
-      :place => '🗺️',
-      :calendar => '📅',
-      :location => '📍',
-      :observation => '📷',
-      :description => '📝',
-      :default_taxon => '🧬'
-      # TODO: add other icons like calendar, place, etc.
-    }.freeze
+      :user => "👤",
+      :place => "🗺️",
+      :calendar => "📅",
+      :location => "📍",
+      :observation => "📷",
+      :description => "📝",
+      :default_taxon => "🧬",
+    # TODO: add other icons like calendar, place, etc.
+    }
 
     class << self
-
       def taxon_icon taxon
-        taxon[:ancestor_ids].reverse_each do |ancestor_id|
-          return TAXA_ICONS[ancestor_id] if TAXA_ICONS[ancestor_id] 
+        ancestors_icon taxon[:ancestor_ids]
+      end
+
+      def ancestors_icon ancestor_ids 
+        ancestor_ids.reverse_each do |ancestor_id|
+          return TAXA_ICONS[ancestor_id] if TAXA_ICONS[ancestor_id]
         end
         return ICONS[:default_taxon]
       end
 
+      def clock_icon time
+        hour = time.hour % 12
+        minute = time.min
+
+        if minute <= 20
+          # ≤20 мин - текущий час
+          case hour
+          when 0, 12 then "🕛"
+          when 1 then "🕐"
+          when 2 then "🕑"
+          when 3 then "🕒"
+          when 4 then "🕓"
+          when 5 then "🕔"
+          when 6 then "🕕"
+          when 7 then "🕖"
+          when 8 then "🕗"
+          when 9 then "🕘"
+          when 10 then "🕙"
+          when 11 then "🕚"
+          end
+        elsif minute < 40
+          # 21-39 мин - полчаса текущего часа
+          case hour
+          when 0, 12 then "🕧"
+          when 1 then "🕜"
+          when 2 then "🕝"
+          when 3 then "🕞"
+          when 4 then "🕟"
+          when 5 then "🕠"
+          when 6 then "🕡"
+          when 7 then "🕢"
+          when 8 then "🕣"
+          when 9 then "🕤"
+          when 10 then "🕥"
+          when 11 then "🕦"
+          end
+        else
+          # ≥40 мин - следующий час
+          next_hour = (hour + 1) % 12
+          case next_hour
+          when 0, 12 then "🕛"
+          when 1 then "🕐"
+          when 2 then "🕑"
+          when 3 then "🕒"
+          when 4 then "🕓"
+          when 5 then "🕔"
+          when 6 then "🕕"
+          when 7 then "🕖"
+          when 8 then "🕗"
+          when 9 then "🕘"
+          when 10 then "🕙"
+          when 11 then "🕚"
+          end
+        end
+      end
+
     end
 
   end

data/lib/inat-channel/message.rb

@@ -1,7 +1,9 @@
 require 'set'
 require 'sanitize'
+
 require_relative 'config'
 require_relative 'icons'
+require_relative 'template'
 
 module INatChannel
 
@@ -10,12 +12,12 @@ module INatChannel
     class << self
 
       def make_message observation
-        [
-          taxon_title(observation[:taxon]),
-          observation_block(observation),
-          "#{INatChannel::Icons::ICONS[:location]} #{geo_link(observation)}\n" + (place_block(observation[:place_ids]) || observation[:place_guess]),
-          ancestors_block(observation)
-        ].join("\n\n")
+        template = if INatChannel::CONFIG[:template]
+          INatChannel::Template::load INatChannel::CONFIG[:template]
+        else
+          INatChannel::Template::default
+        end
+        template.process observation
       end
 
       def list_photos observation
@@ -23,115 +25,6 @@ module INatChannel
         observation[:photos].map { |ph| ph[:url].gsub("square", "large") }
       end
 
-      private
-
-      def taxon_title taxon
-        icon = INatChannel::Icons::taxon_icon taxon
-        link = "https://www.inaturalist.org/taxa/#{taxon[:id]}"
-
-        common_name = taxon[:preferred_common_name]
-        scientific_name = taxon[:name]
-
-        title = if common_name
-            "<b>#{common_name}</b> <i>(#{scientific_name})</i>"
-          else
-            "<b><i>#{scientific_name}</i></b>"
-          end
-
-        "#{icon} <a href='#{link}'>#{title}</a>"
-      end
-
-      def observation_block observation
-        user = observation[:user]
-        user_title = if user[:name] && !user[:name].empty?
-          user[:name] 
-        else
-          "<code>#{user[:login]}</code>"
-        end
-        user_link = "https://www.inaturalist.org/people/#{user[:login]}"
-        observation_part = "#{INatChannel::Icons::ICONS[:observation]} <a href='#{observation[:uri]}'><b>\##{observation[:id]}</b></a>"
-        user_part = "#{INatChannel::Icons::ICONS[:user]} <a href='#{user_link}'>#{user_title}</a>"
-        date_part = "#{INatChannel::Icons::ICONS[:calendar]} #{observation[:observed_on_string]}"
-        description = observation[:description] && Sanitize.fragment(observation[:description])
-        description_part = if description && !description.empty?
-            "\n#{INatChannel::Icons::ICONS[:description]} #{limit_text(description, 500)}"
-          else
-            ""
-          end
-        "#{observation_part}\n#{date_part}\n#{user_part}#{description_part}"
-      end
-
-      def limit_text text, limit
-        return text if text.length <= limit
-        truncated = text[0, limit]
-        last_space = truncated.rindex(/\s/)
-        last_sign = truncated.rindex(/[,.;:!?]/)
-        if last_space
-          if last_sign && last_sign + 1 > last_space
-            return truncated[0, last_sign + 1] + '...'
-          end
-          return truncated[0, last_space] + '...'
-        else
-          if last_sign
-            return truncated[0, last_sign + 1] + '...'
-          end
-          return truncated + '...'
-        end
-      end
-
-      def place_block place_ids
-        return nil unless CONFIG[:places]
-
-        place_ids = Set[*place_ids]
-        found = []
-        CONFIG[:places].each do |_, list|
-          list.each do |item|
-            item_ids = Set[*item[:place_ids]]
-            if place_ids.intersect?(item_ids)
-              found << item
-              break
-            end
-          end
-        end
-
-        if found.empty?
-          nil
-        else
-          found.map { |i| "#{INatChannel::Icons::ICONS[:place]} <a href='#{i[:link]}'>#{i[:text]}</a>" }.join("\n")
-        end
-      end
-
-      def ancestors_block observation
-        taxon_id = observation[:taxon][:id]
-        ancestors = nil
-        observation[:identifications].each do |ident|
-          it = ident[:taxon]
-          if it[:id] == taxon_id
-            ancestors = it[:ancestors]
-            break
-          end
-        end
-
-        if ancestors
-          (ancestors.map { |a| name_to_hashtag(a[:name]) } + [name_to_hashtag(observation[:taxon][:name])]).join(" • ")
-        else
-          # TODO: load ancestors with new query...
-          nil
-        end
-      end
-
-      def name_to_hashtag name
-        "\##{name.gsub(".", "").gsub("-", "").gsub(" ", "_")}"
-      end
-
-      def geo_link observation
-        return nil unless observation[:geojson]&.[](:coordinates) && observation[:geojson][:type] == "Point"
-
-        lon, lat = observation[:geojson][:coordinates]
-        url = "https://maps.google.com/?q=#{lat},#{lon}"
-        "<a href='#{url}'>#{lat.round(4)}°N, #{lon.round(4)}°E</a>"
-      end
-
     end
 
   end

data/lib/inat-channel/template.rb

@@ -0,0 +1,90 @@
+require 'yaml'
+require 'erb'
+
+require_relative 'data_types'
+require_relative 'data_convert'
+
+module INatChannel
+
+  class Template
+
+    attr_reader :template, :data
+
+    def initialize template, data
+      @template = template
+      @data = data
+      @renderer = ERB::new @template, trim_mode: '-'
+      INatChannel::Icons::TAXA_ICONS.merge! data[:taxa_icons] if data[:taxa_icons]
+      INatChannel::Icons::ICONS.merge! data[:icons] if data[:icons]
+      INatChannel::FORMATS.merge! data[:formats] if data[:formats]
+    end
+
+    def process observation_source
+      observation = INatChannel::DataConvert::convert_observation observation_source
+      vars = {
+        observation: observation,
+        datetime: observation.datetime,
+        location: observation.location,
+        places: observation.places,
+        taxon: observation.taxon,
+        user: observation.user,
+        date: observation.date,
+        time: observation.time,
+        icons: INatChannel::Icons::ICONS,
+        taxa_icons: INatChannel::Icons::TAXA_ICONS
+      }
+      @renderer.result_with_hash vars
+    end
+
+    class << self
+
+      def load path
+        content = File.read path
+        if content.lines(chomp: true).first == '---'
+          docs = content.split(/^---\n/m, 3)
+          data = if docs[0].strip.empty? && docs[1]
+            YAML.safe_load docs[1], symbolize_names: true
+          else
+            YAML.safe_load docs[0], symbolize_names: true
+          end || {}
+          template = docs[2] || docs[1] || content
+        else
+          data = {}
+          template = content
+        end
+        new(template, data)
+      end
+
+      DEFAULT_TEMPLATE = <<~ERB
+        <%= taxon.icon %> <a href="<%= taxon.url %>"><%= taxon.title %></a>
+
+        <%= observation.icon %> <a href="<%= observation.url %>">#<%= observation.id %></a>
+        <%= datetime.icon %> <%= datetime %>
+        <%= user.icon %> <a href="<%= user.url %>"><%= user.title %></a>
+        <% if observation.description -%>
+        <blockquote><%= observation.description.text %></blockquote>
+        <% end -%>
+
+        <%= location.icon %> <%= location.title %> • <a href="<%= location.google %>">G</a> <a href="<%= location.osm %>">OSM</a>
+        <% if places && places.size > 0 -%>
+        <%   places.each do |place| -%>
+        <%= place.icon %> <a href="<%= place.link %>"><%= place.text %></a> <%= '• #' + place.tag if place.tag %>
+        <%   end -%>
+        <% else -%>
+        <%= icons[:place] %> <%= observation.place_guess %>
+        <% end -%>
+
+        <%= taxon.to_tags.join(' • ') %>
+      ERB
+
+      def default
+        @default ||= new(DEFAULT_TEMPLATE, {}).freeze
+      end
+
+      private :new
+
+    end
+
+  end
+
+end

data/lib/inat-channel/version.rb

@@ -1,6 +1,6 @@
 
 module INatChannel
 
-  VERSION = '0.8.0.14'
+  VERSION = '0.8.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inat-channel
 version: !ruby/object:Gem::Version
-  version: 0.8.0.14
+  version: 0.8.2
 platform: ruby
 authors:
 - Ivan Shikhalev
@@ -151,11 +151,14 @@ files:
 - lib/inat-channel/api.rb
 - lib/inat-channel/config.rb
 - lib/inat-channel/data.rb
+- lib/inat-channel/data_convert.rb
+- lib/inat-channel/data_types.rb
 - lib/inat-channel/icons.rb
 - lib/inat-channel/lock.rb
 - lib/inat-channel/logger.rb
 - lib/inat-channel/message.rb
 - lib/inat-channel/telegram.rb
+- lib/inat-channel/template.rb
 - lib/inat-channel/version.rb
 homepage: https://github.com/inat-get/inat-channel
 licenses: