inat-get 0.8.0.12 → 0.8.0.14

data/lib/inat/data/types/std.rb

@@ -1,170 +1,186 @@
 # frozen_string_literal: true
 
-require 'time'
-require 'date'
-require 'uri'
+require "time"
+require "date"
+require "uri"
 
-class Integer
+module INat::Types; end
 
-  def self.parse src
-    return nil if src == nil
-    return src if Integer === src
-    return src.to_i if String === src
-    raise TypeError, "Source must be a String!", caller
-  end
-
-  def self.ddl
-    :INTEGER
-  end
-
-  def self.from_db src
-    return nil if src == nil
-    return src if Integer === src
-    raise TypeError, "Source must be an Integer!", caller
-  end
-
-  def to_db
-    self
-  end
+module Boolean
+end
 
-  def to_query
-    to_s
-  end
+class TrueClass
+  include Boolean
+end
 
+class FalseClass
+  include Boolean
 end
 
-class String
+# TODO: возможно, разбить по функционалу
 
-  def self.parse src
-    return nil if src == nil
-    return src if String === src
-    raise TypeError, "Source must be a String!", caller
-  end
+module INat::Types::Std
+  refine Boolean do
+    def to_db
+      self && 1 || 0
+    end
 
-  def self.ddl
-    :TEXT
+    def to_query
+      inspect
+    end
   end
 
-  def self.from_db src
-    return nil if src == nil
-    return src if String === src
-    raise TypeError, "Source must be a String!", caller
-  end
+  refine Boolean.singleton_class do
+    def parse(src)
+      return nil if src == nil
+      return src if Boolean === src
+      raise TypeError, "Source must be a Boolean!", caller
+    end
 
-  def to_db
-    self
-  end
+    def ddl
+      :INTEGER
+    end
 
-  def to_query
-    self
+    def from_db(src)
+      return nil if src == nil
+      return src if Boolean === src
+      return src != 0 if Integer === src
+      raise TypeError, "Source must be an Integer!", caller
+    end
   end
 
-end
-
-class Symbol
+  refine Integer do
+    def to_db
+      self
+    end
 
-  def self.parse src
-    return nil if src == nil
-    return src if Symbol === src
-    return src.intern if String === src
-    raise TypeError, "Source must be a String!", caller
+    def to_query
+      to_s
+    end
   end
 
-  def self.ddl
-    :TEXT
-  end
+  refine Integer.singleton_class do
+    def parse(src)
+      return nil if src == nil
+      return src if Integer === src
+      return src.to_i if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
 
-  def self.from_db src
-    return nil if src == nil
-    return src if Symbol === src
-    return src.intern if String === src
-    raise TypeError, "Source must be a String!", caller
-  end
+    def ddl
+      :INTEGER
+    end
 
-  def to_db
-    self.to_s
+    def from_db(src)
+      return nil if src == nil
+      return src if Integer === src
+      raise TypeError, "Source must be an Integer!", caller
+    end
   end
 
-  def to_query
-    to_s
-  end
+  refine String do
+    def to_db
+      self
+    end
 
-end
+    def to_query
+      self
+    end
+  end
 
-class Float
+  refine String.singleton_class do
+    def parse(src)
+      return nil if src == nil
+      return src if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
 
-  def self.parse src
-    return nil if src == nil
-    return src if Float === src
-    return src.to_f if String === src || Integer === src
-    raise TypeError, "Source must be a String!", caller
-  end
+    def ddl
+      :TEXT
+    end
 
-  def self.ddl
-    :REAL
+    def from_db(src)
+      return nil if src == nil
+      return src if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
   end
 
-  def self.from_db src
-    return nil if src == nil
-    return src if Float === src
-    raise TypeError, "Source must be a Float!", caller
-  end
+  refine Symbol do
+    def to_db
+      self.to_s
+    end
 
-  def to_db
-    self
+    def to_query
+      to_s
+    end
   end
 
-  def to_query
-    to_s
-  end
+  refine Symbol.singleton_class do
+    def parse(src)
+      return nil if src == nil
+      return src if Symbol === src
+      return src.intern if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
 
-end
+    def ddl
+      :TEXT
+    end
 
-class Time
+    def from_db(src)
+      return nil if src == nil
+      return src if Symbol === src
+      return src.intern if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
+  end
 
-  class << self
+  refine Float do
+    def to_db
+      self
+    end
 
-    alias :std_parse :parse
+    def to_query
+      to_s
+    end
+  end
 
-    def parse src
+  refine Float.singleton_class do
+    def parse(src)
       return nil if src == nil
-      return src if Time === src
-      return std_parse(src) if String === src
+      return src if Float === src
+      return src.to_f if String === src || Integer === src
       raise TypeError, "Source must be a String!", caller
     end
 
     def ddl
-      :INTEGER
+      :REAL
     end
 
-    def from_db src
+    def from_db(src)
       return nil if src == nil
-      return src if Time === src
-      return Time::at(src) if Integer === src
-      raise TypeError, "Source must be an Integer!", caller
+      return src if Float === src
+      raise TypeError, "Source must be a Float!", caller
     end
-
   end
 
-  def to_db
-    to_i
-  end
+  refine Time do
+    def to_db
+      to_i
+    end
 
-  def to_query
-    xmlschema
+    def to_query
+      xmlschema
+    end
   end
 
-end
-
-class Date
-
-  class << self
-
+  refine Time.singleton_class do
     alias :std_parse :parse
 
-    def parse src
+    def parse(src)
       return nil if src == nil
-      return src if Date === src
+      return src if Time === src
       return std_parse(src) if String === src
       raise TypeError, "Source must be a String!", caller
     end
@@ -173,79 +189,62 @@ class Date
       :INTEGER
     end
 
-    def from_db src
+    def from_db(src)
       return nil if src == nil
-      return src if Date === src
-      return Time::at(src).to_date if Integer === src
+      return src if Time === src
+      return Time::at(src) if Integer === src
       raise TypeError, "Source must be an Integer!", caller
     end
-
   end
 
-  def to_db
-    to_time.to_i
-  end
+  refine Date do
+    def to_db
+      to_time.to_i
+    end
 
-  def to_query
-    xmlschema
+    def to_query
+      xmlschema
+    end
   end
 
-end
-
-module Boolean
-
-  class << self
+  refine Date.singleton_class do
+    alias :std_parse :parse
 
-    def parse src
+    def parse(src)
       return nil if src == nil
-      return src if Boolean === src
-      raise TypeError, "Source must be a Boolean!", caller
+      return src if Date === src
+      return std_parse(src) if String === src
+      raise TypeError, "Source must be a String!", caller
     end
 
     def ddl
       :INTEGER
     end
 
-    def from_db src
+    def from_db(src)
       return nil if src == nil
-      return src if Boolean === src
-      return src != 0 if Integer === src
+      return src if Date === src
+      return Time::at(src).to_date if Integer === src
       raise TypeError, "Source must be an Integer!", caller
     end
-
   end
 
-  def to_db
-    self && 1 || 0
-  end
-
-  def to_query
-    inspect
+  refine URI do
+    def to_db
+      to_s
+    end
   end
 
-end
-
-class TrueClass
-  include Boolean
-end
-
-class FalseClass
-  include Boolean
-end
-
-module URI
-
-  class << self
-
+  refine URI.singleton_class do
     pre_verbose = $VERBOSE
     $VERBOSE = nil
 
     alias :std_parse :parse
 
-    def parse src
+    def parse(src)
       return nil if src == nil
       return src if URI === src
-      url = URI::DEFAULT_PARSER.escape(src).gsub('+', '%2B')
+      url = URI::DEFAULT_PARSER.escape(src).gsub("+", "%2B")
       return std_parse(url) if String === src
       raise TypeError, "Source must be a String!", caller
     end
@@ -256,38 +255,34 @@ module URI
       :TEXT
     end
 
-    def from_db src
+    def from_db(src)
       parse src
       # return nil if src == nil
       # return src if URI === src
       # return URI(URI::DEFAULT_PARSER.escape(src)) if String === src
       # raise TypeError, "Source must be a String!", caller
     end
-
-  end
-
-  def to_db
-    to_s
   end
 
-end
-
-class NilClass
+  refine NilClass do
+    def self.parse(src)
+      nil
+    end
 
-  def self.parse src
-    nil
+    def to_db
+      nil
+    end
   end
 
-  def to_db
-    nil
+  refine Array do
+    def to_query
+      map { |i| i.to_query }.join(",")
+    end
   end
 
-end
-
-class Array
-
-  def to_query
-    map { |i| i.to_query }.join(',')
+  refine Module do
+    def short_name
+      name.split("::").last
+    end
   end
-
 end

data/lib/inat/report/report_dsl.rb

@@ -2,25 +2,27 @@
 
 require_relative 'table'
 
-module ReportDSL
+module INat::Report::DSL
 
-  include TableDSL
+  include INat
+  include INat::Report
+  include INat::Report::Table::DSL
 
-  def class_title object, is_observer: true
+  private def class_title object, is_observer: true
     case object
-    when Taxon
+    when Entity::Taxon
       'Таксон'
-    when Place
+    when Entity::Place
       'Территория'
-    when Project
+    when Entity::Project
       'Проект'
-    when User
+    when Entity::User
       if is_observer
         'Наблюдатель'
       else
         'Пользователь'
       end
-    when Calendarian
+    when Report::Period
       'Период'
     else
       'Объект'
@@ -45,7 +47,7 @@ module ReportDSL
       @@prefix ||= 0
       @@prefix += 1
       users = table do
-        column '#', width: 3, align: :right, data: :line_no
+        column '#', width: 3, align: :right, data: :line_no, marker: true
         column 'Наблюдатель', data: :user
         column 'Виды', width: 6, align: :right, data: :species
         column 'Наблюдения', width: 6, align: :right, data: :observations
@@ -63,9 +65,13 @@ module ReportDSL
     list.each do |ds|
       observations = if details
         if observers
-          ds.observations.map { |o| "#{ o }<sup><a href=\"\##{ @@prefix }-user-#{ o.user.id }\">#{ user_rows.index { |row| row[:user] == o.user } }</a></sup>" }
+          ds.observations.map { |o| "#{ o }<sup><a href=\"\##{ @@prefix }-user-#{ o.user.id }\">#{ user_rows.index { |row| row[:user] == o.user } + 1 }</a></sup>" }
         else
-          ds.observations.map(&:to_s)
+          if ds.count > 10
+            [ 'Более 10 наблюдений' ]
+          else
+            ds.observations.map(&:to_s)
+          end
         end
       else
         [ ds.count.to_s ]
@@ -155,7 +161,7 @@ module ReportDSL
 
   # TODO: разобраться с разными count в разных контекстах.
   def rating_table list, limit: 1, count: 3, details: true, key: :species, summary: false
-    object_title = class_title list.first.object
+    object_title = class_title list.first&.object
     rating = table do
       column '#', width: 3, align: :right, data: :line_no
       column object_title, data: :object

data/lib/inat/report/table.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Table
+class INat::Report::Table
 
   attr_reader :columns
 
@@ -128,12 +128,16 @@ class Table
 
 end
 
-module TableDSL
+module INat::Report::Table::DSL
 
-  private def table &block
+  include INat::Report
+
+  def table &block
     tbl = Table::new
     tbl.instance_eval(&block) if block_given?
     tbl
   end
 
+  module_function :table
+
 end

data/lib/inat/utils/deep.rb

@@ -1,30 +1,36 @@
 # frozen_string_literal: true
 
-class Hash
-
-  def deep_merge! other
-    other.each do |key, value|
-      if has_key?(key) && self[key].respond_to?(:deep_merge!)
-        self[key].deep_merge! value
-      else
-        self[key] = value
+# TODO: убрать, все равно конфиг надо парсить нормально
+
+module DeepMerge
+
+  refine Hash do
+
+    def deep_merge! other
+      other.each do |key, value|
+        if has_key?(key) && self[key].respond_to?(:deep_merge!)
+          self[key].deep_merge! value
+        else
+          self[key] = value
+        end
       end
+      self
     end
-    self
-  end
 
-end
+  end
 
-class Array
+  refine Array do
 
-  def deep_merge! other
-    other.each do |value|
-      next if self.include?(value)
-      next if String === value && self.include?(value.intern)
-      next if Symbol === value && self.include?(value.to_s)
-      self << value
+    def deep_merge! other
+      other.each do |value|
+        next if self.include?(value)
+        next if String === value && self.include?(value.intern)
+        next if Symbol === value && self.include?(value.to_s)
+        self << value
+      end
+      self
     end
-    self
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inat-get
 version: !ruby/object:Gem::Version
-  version: 0.8.0.12
+  version: 0.8.0.14
 platform: ruby
 authors:
 - Ivan Shikhalev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -46,6 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - LICENSE
 - README.md
 - Rakefile
@@ -69,7 +70,6 @@ files:
 - lib/inat/app/task/context.rb
 - lib/inat/app/task/dsl.rb
 - lib/inat/data/api.rb
-- lib/inat/data/cache.rb
 - lib/inat/data/db.rb
 - lib/inat/data/ddl.rb
 - lib/inat/data/entity.rb
@@ -112,7 +112,7 @@ files:
 - lib/inat/utils/deep.rb
 homepage: https://github.com/shikhalev/inat-get
 licenses:
-- GPL-3.0
+- GPL-3.0-or-later
 metadata:
   homepage_uri: https://github.com/shikhalev/inat-get
   source_code_uri: https://github.com/shikhalev/inat-get
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Client for iNaturalist API.

data/lib/inat/data/cache.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# class Cache
-
-#   class << self
-
-#   end
-
-# end