inat-get 0.9.0.18 → 0.9.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4755573543862b68a12f01b319807ec43826ec16fa4ce875d7b241b4b9d19a50
-  data.tar.gz: aae527530c9c0a04017254eb86fb591dc43a53cfac2f3b17809e351fd0cdedd5
+  metadata.gz: 487c7043dbfd21d4d899bc1caf56dba18247b3d75564d96b7ef4dc3d8b797b53
+  data.tar.gz: 98de0f57594b65c2a7cd4d965221a0df4ef8052368cdd0e1d9c396db4d641fdc
 SHA512:
-  metadata.gz: fc75d5593af48b7f1518577afb26ecf4dbc6dc3e2ccea894aa3acee2394b9a5246fe6726f5a4217c10688ac0789485c670a6d5604e913570e3316d316edc2b3b
-  data.tar.gz: 86ba6085e4964c0d8e57e96c2b1ae6117d616f69b95a56b7fd144549ce991311980745142a6219d9a45b776e1429980bfe97f5362eb8f71a8a92617f3fb16b0e
+  metadata.gz: 9719c87ce41e33bf89bb0798ce030400c51fc9f8e7c37c5106ef091df8e3224dc3e61cb22a7875c7983f13a0559ed0daaf4b0b970970e2ea43706c90edf4698d
+  data.tar.gz: c2020ceb08590396257cead8a80c32f7255f8677b35dbedc6d57dbc813e88113ae5687ec4bae455e2aeb38a77454c594252c08b1f030cd9d25ae16a8428d97e6

data/lib/inat-get/app/application.rb

@@ -34,7 +34,13 @@ class INatGet::App::Main
     api = nil
     api = INatGet::App::Server::API::create api_socket, console: console if !@config[:offline]
 
-    tasks = @config[:tasks].map { |path| INatGet::App::Task::new path, @config, console: console, api: api }
+    tasks = @config[:tasks].map do |path|
+      if path.end_with?('.erb')
+        INatGet::App::Task::ERB::new path, @config, console: console, api: api
+      else
+        INatGet::App::Task::new path, @config, console: console, api: api
+      end
+    end
     Process::warmup
     INatGet::App::Worker::enqueue @config, *tasks, console: console, api: api
     console.quit

data/lib/inat-get/app/core/api.rb

@@ -9,7 +9,7 @@ require 'is-duration'
 
 require_relative 'server'
 require_relative 'console_logger'
-require_relative 'api_cache'
+# require_relative 'api_cache'
 
 class INatGet::App::Server::API < INatGet::App::Server
 
@@ -57,6 +57,10 @@ class INatGet::App::Server::API < INatGet::App::Server
 
   def faraday
     @faraday ||= Faraday::new do |f|
+      if (proxy_url = @config.dig(:api, :proxy))
+        f.proxy = proxy_url
+      end
+
       f.request :retry,
                 max: @config.dig(:api, :retry, :max),
                 interval: IS::Duration::parse(@config.dig(:api, :retry, :interval)),

data/lib/inat-get/app/core/task.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'erb'
+
 require 'sequel'
 Sequel.extension :core_extensions
 Sequel.datetime_class = Time
@@ -8,6 +10,7 @@ Sequel.application_timezone = :local
 
 require_relative '../../info'
 require_relative '../../data/dsl/dsl'
+require_relative '../../data/dsl/reports'
 require_relative 'console_logger'
 
 class INatGet::App::Task
@@ -67,7 +70,7 @@ class INatGet::App::Task
     Sequel::Model.strict_param_setting = false
     Sequel::Model.raise_on_save_failure = true
     Sequel::Model.db = @db
-    # Sequel::Model.db.loggers << ::Logger::new("common.log", level: :info)
+    Sequel::Model.db.loggers << ::Logger::new("sequel.log", level: :info)
     require_relative '../../data/models'
     require_relative '../../data/managers'
     # # ... etc
@@ -80,3 +83,15 @@ class INatGet::App::Task
   end
 
 end
+
+
+class INatGet::App::Task::ERB < INatGet::App::Task
+
+  TRIM_MODE = ''
+
+  def execute
+    report = INatGet::Data::DSL::Report::ERB::new file: @path, trim_mode: TRIM_MODE
+    report.save
+  end
+
+end

data/lib/inat-get/app/setup.rb

@@ -36,11 +36,11 @@ module INatGet::App::Setup
     caching: {
       api: 100,
       update: '4h',
-      refresh: { 
+      refresh: {
         interval: '4d',
         depth: '40d'
       },
-      recache: { 
+      recache: {
         count: 200,
         method: 'oldest'          # oldest by cached, newest by updated, sample — random
       },
@@ -160,6 +160,11 @@ module INatGet::App::Setup
           options[:config] = value
         end
 
+        o.on '-p', '--proxy URI', String, 'Use proxy by URI.' do |value|
+          options[:api] ||= {}
+          options[:proxy] ||= value
+        end
+
         o.on '-l', '--log-level LEVEL', [ 'fatal', 'error', 'warn', 'info', 'debug' ], 'Log level (fatal, error, warn, info or debug).' do |value|
           options[:logs] ||= {}
           options[:logs][:screen] ||= {}
@@ -192,7 +197,7 @@ module INatGet::App::Setup
           options[:logs][:file][:wrk] = 'debug'
         end
 
-        o.on '-o', '--offline', 'Offline mode: no updates, use local database only.' do 
+        o.on '-o', '--offline', 'Offline mode: no updates, use local database only.' do
           options[:offline] = true
         end
 
@@ -267,7 +272,7 @@ module INatGet::App::Setup
           if File.exist?(list_file)
             unwrap_file_list File.readlines(list_file, chomp: true)
           else
-            $stderr.puts "❌ \e[1mList file not found:\e[0m #{ list_file }\e[1m. Stopped!\e[0m" 
+            $stderr.puts "❌ \e[1mList file not found:\e[0m #{ list_file }\e[1m. Stopped!\e[0m"
             exit Errno::ENOENT::Errno
           end
         else
@@ -277,6 +282,14 @@ module INatGet::App::Setup
             "#{ file }.inat"
           elsif File.exist?("#{ file }.rb")
             "#{ file }.rb"
+          elsif File.exist?("#{ file }.erb")
+            "#{ file }.erb"
+          elsif File.exist?("#{ file }.md.erb")
+            "#{ file }.md.erb"
+          elsif File.exist?("#{ file }.html.erb")
+            "#{ file }.html.erb"
+          elsif File.exist?("#{ file }.htm.erb")
+            "#{ file }.htm.erb"
           else
             $stderr.puts "❌ \e[1mTask file not found:\e[0m #{ file }\e[1m. Stopped!\e[0m"
             exit Errno::ENOENT::Errno
@@ -288,4 +301,3 @@ module INatGet::App::Setup
   end
 
 end
-

data/lib/inat-get/data/dsl/dataset.rb

@@ -213,7 +213,7 @@ class INatGet::Data::DSL::Dataset
 
       case reflection[:type]
       when :many_to_one
-        ids = query.distinct.select_map(reflection[:key])
+        ids = query.select(reflection[:key]).distinct.select_map(reflection[:key])
         target.where(id: ids)
       when :one_to_many, :many_to_many
         # Для всех типов "много" используем ассоциативный датасет

data/lib/inat-get/data/dsl/reports/base.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_relative '../../../info.rb'
+require_relative '../dsl'
+
+class INatGet::Data::DSL::Report
+
+  include INatGet::Data::DSL
+
+  def initialize mode: nil, suffix: nil, **data
+    @mode = mode
+    @data = data
+    @suffix = suffix
+    yield self if block_given?
+  end
+
+  # @return [String]
+  def basename suffix = nil
+    suffix ||= @suffix
+    if suffix
+      self.name + ' -- ' + suffix
+    else
+      self.name
+    end
+  end
+
+  # @return [String]
+  def ext mode: nil
+    (mode || @mode)&.to_s
+  end
+
+  # @return [String]
+  def filename suffix: nil, mode: nil
+    if self.ext(mode: mode)
+      self.basename(suffix) + '.' + self.ext(mode: mode)
+    else
+      self.basename(suffix)
+    end
+  end
+
+  # @return [String]
+  def render mode: nil
+    raise NotImplementedError, "Not implemented method 'render' for abstract Report", caller_locations
+  end
+
+  # @return [void]
+  def save filename = nil, suffix: nil, mode: nil
+    filename ||= self.filename(suffix: suffix, mode: mode)
+    File.write filename, self.render(mode: mode)
+  end
+
+  def [] key
+    @data[key]
+  end
+
+  def []= key, value
+    @data[key] = value
+  end
+
+end

data/lib/inat-get/data/dsl/reports/erb.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'erb'
+
+require_relative 'base'
+
+class INatGet::Data::DSL::Report::ERB < INatGet::Data::DSL::Report
+
+  def initialize code = nil, file: nil, ext: nil, trim_mode: nil, suffix: nil, **data, &block
+    @code = code
+    @code ||= File.read(file) if file
+    raise ArgumentError, "Source not specified", caller_locations unless @code
+    @ext = ext
+    @ext ||= File.extname(File.basename(file, '.erb')) if file
+    @erb = ::ERB::new @code, trim_mode: trim_mode
+    @erb.filename = file || '(erb)'
+    suffix ||= File.basename(File.basename(file, '.erb'), '.*') if file
+    super(mode: nil, suffix: suffix, **data, &block)
+  end
+
+  # @return [Hash]
+  attr_reader :data
+
+  # @return [String]
+  def ext mode: nil
+    @ext
+  end
+
+  # @return [String]
+  def render
+    @erb.result binding
+  end
+
+end
+
+module INatGet::Data::DSL
+
+  def erb_report code = nil, file: nil, ext: nil, trim_mode: nil, suffix: nil, **data, &block
+    INatGet::Data::DSL::Report::ERB::new(code, file: file, ext: ext, trim_mode: trim_mode, suffix: suffix, **data, &block)
+  end
+
+end

data/lib/inat-get/data/dsl/reports.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'reports/erb'

data/lib/inat-get/data/parsers/defs/fromtaxon.rb

@@ -6,12 +6,12 @@ class INatGet::Data::Parser::Part::FromTaxon < INatGet::Data::Parser::Part::Copy
     taxon = value[:taxon]
     if taxon
       if @name == :introduced
-        @taxon[:native]
+        !taxon[:native]
       else
         super(taxon)
       end
     else
-      nil
+      {}
     end
   end
 

data/lib/inat-get/data/parsers/defs.rb

@@ -105,7 +105,8 @@ class INatGet::Data::Parser
     end
     associations, attributes = rest.partition { |p| p.is_a?(Part::Assoc) }
     attributes.each do |a|
-      fields.merge! a.parse(source)
+      res = a.parse source
+      fields.merge! res if res
     end
     record = nil
     model.db.transaction(isolation: :committed, mode: :immediate) do

data/lib/inat-get/info.rb

@@ -5,8 +5,8 @@ module INatGet; end
 module INatGet::Info
 
   NAME = 'inat-get'
-  VERSION = '0.9.0.18'
-  VERSION_ALIAS = 'Carduelis carduelis'
+  VERSION = '0.9.2.4'
+  VERSION_ALIAS = 'Parus major'
 
   AUTHOR = 'Ivan Shikhalev'
   AUTHOR_URL = 'https://github.com/shikhalev'
@@ -19,5 +19,5 @@ module INatGet::Info
   DESCRIPTION = 'iNaturalist API query builder and analytics tool'
 
   HOMEPAGE = 'https://github.com/inat-get/inat-get'
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inat-get
 version: !ruby/object:Gem::Version
-  version: 0.9.0.18
+  version: 0.9.2.4
 platform: ruby
 authors:
 - Ivan Shikhalev
@@ -296,6 +296,9 @@ files:
 - lib/inat-get/data/dsl/dataset.rb
 - lib/inat-get/data/dsl/dsl.rb
 - lib/inat-get/data/dsl/list.rb
+- lib/inat-get/data/dsl/reports.rb
+- lib/inat-get/data/dsl/reports/base.rb
+- lib/inat-get/data/dsl/reports/erb.rb
 - lib/inat-get/data/helpers/base.rb
 - lib/inat-get/data/helpers/defs.rb
 - lib/inat-get/data/helpers/defs/accuracy.rb