inat-get 0.8.0.14 → 0.8.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a46d82e846a5e0c461170448eb31b58c2f795d8cc5f8bd5e806dc99e6f4f7d
-  data.tar.gz: d1eebcc7ac633eafbd131e723fa10835ebb11c1c18f2b0d98722936309198be2
+  metadata.gz: d8f300ef3ec85bd4a168f2d4cbda6cc8ed922bb080c3e7de57685e6d753e58ae
+  data.tar.gz: 9e7cb3ddacd711e9d7b79c273e2f0811f698bb3596ed7421893335d2c525252e
 SHA512:
-  metadata.gz: a1484827dc6feb2dfa24012bfa9a3b92cd7689084619c381657cb2c8db86060672ef0a0ea0a8ab50105b006d388e1cfb44a02f0f48891c6db183ffa1fab9853a
-  data.tar.gz: a9abd208f1d0795cdbfa5c736d1fe5c26f9b2f7da674520d4af1b81b3d304a40e108acf94ff4b7b57e5a13b274f6a1bab9f3bbbde10e873d2f57e2abc814ea9d
+  metadata.gz: 190b1940be2c402d2b5ec8092618276f362b9d8eab8a732aa1dd439bc396240189fbb587dd3d7398fc67183c8d4d2c070ef791137bce967c264176ec0c914c3f
+  data.tar.gz: 8356abb7580c8c43d8dd603eaa6a7e2e7a4b9d0bb72320104cdf699f170cbb7d1fb0938e1a7db350cb5515c9e74dba6237ddfa059f1fd705a1eb411f73dd6c2c

data/lib/inat/app/globals.rb

@@ -1,5 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'logging'
+require_relative 'config'
+
+module INat
+  module App
+  end
+end
+
 module INat::App::Globals
 
   class << self

data/lib/inat/app/info.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
 module INat
-
   module App
-
     module Info
-
       AUTHOR = "Ivan Shikhalev"
       EMAIL = "shkikhalev@gmail.com"
 
-      VERSION = "0.8.0.14"
+      VERSION = "0.8.0.16"
       HOMEPAGE = "https://github.com/shikhalev/inat-get"
       SOURCE_URL = "https://github.com/shikhalev/inat-get"
 

data/lib/inat/app/logging.rb

@@ -2,6 +2,11 @@
 
 require 'logger'
 
+module INat
+  module App
+  end
+end
+
 class INat::App::Logger
 
   def config

data/lib/inat/data/entity/flag.rb

@@ -23,4 +23,6 @@ class INat::Entity::Flag < INat::Data::Entity
   field :resolver, type: User, index: true
   field :comment, type: String
 
+  ignore :flaggable_id
+
 end

data/lib/inat/data/entity/project.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require_relative '../types/std'
-require_relative '../types/extras'
-require_relative '../types/location'
-require_relative '../entity'
-require_relative '../enums/projecttype'
+require_relative "../types/std"
+require_relative "../types/extras"
+require_relative "../types/location"
+require_relative "../entity"
+require_relative "../enums/projecttype"
 
 module INat::Entity
-  autoload :Observation,            'inat/data/entity/observation'
-  autoload :User,                   'inat/data/entity/user'
-  autoload :Place,                  'inat/data/entity/place'
-  autoload :ProjectAdmin,           'inat/data/entity/projectadmin'
-  autoload :ProjectObservationRule, 'inat/data/entity/projectobservationrule'
-  autoload :Flag,                   'inat/data/entity/flag'
-  autoload :Taxon,                  'inat/data/entity/taxon'
+  autoload :Observation, "inat/data/entity/observation"
+  autoload :User, "inat/data/entity/user"
+  autoload :Place, "inat/data/entity/place"
+  autoload :ProjectAdmin, "inat/data/entity/projectadmin"
+  autoload :ProjectObservationRule, "inat/data/entity/projectobservationrule"
+  autoload :Flag, "inat/data/entity/flag"
+  autoload :Taxon, "inat/data/entity/taxon"
 end
 
 class INat::Entity::Project < INat::Data::Entity
-
   include INat::Data::Types
   include INat::Entity
 
@@ -90,11 +89,11 @@ class INat::Entity::Project < INat::Data::Entity
   ignore :terms
   ignore :search_parameters
   ignore :rule_preferences
+  ignore :is_new_style_project
 
   # @!endgroup
 
   def to_s
-    "<a href=\"https://www.inaturalist.org/projects/#{ id }\"><i class=\"fa fa-briefcase\"></i>  #{ title }</a>"
+    "<a href=\"https://www.inaturalist.org/projects/#{id}\"><i class=\"fa fa-briefcase\"></i>  #{title}</a>"
   end
-
 end

data/lib/inat/data/entity/user.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require_relative '../types/std'
-require_relative '../types/extras'
-require_relative '../entity'
+require_relative "../types/std"
+require_relative "../types/extras"
+require_relative "../entity"
 
 module INat::Entity
-  autoload :Observation, 'inat/data/entity/observation'
+  autoload :Observation, "inat/data/entity/observation"
 end
 
 class INat::Entity::User < INat::Data::Entity
-
   include INat::Entity
 
   api_path :users
@@ -39,12 +38,13 @@ class INat::Entity::User < INat::Data::Entity
 
   ignore :roles                   # TODO: разобраться
   ignore :preferences
+  ignore :annotated_observations_count
 
   def sort_key
     login
   end
 
-  def self.by_login login
+  def self.by_login(login)
     @entities ||= {}
     results = @entities.values.select { |e| e.login == login.to_s }
     if results.empty?
@@ -52,8 +52,8 @@ class INat::Entity::User < INat::Data::Entity
       results = from_db_rows data
     end
     if results.empty?
-      data = INat::API.query 'users/autocomplete', first_only: true, q: login
-      results = data.select { |u| u['login'] == login.to_s }.map { |d| parse(d) }
+      data = INat::API.query "users/autocomplete", first_only: true, q: login
+      results = data.select { |u| u["login"] == login.to_s }.map { |d| parse(d) }
     end
     if results.empty?
       nil
@@ -63,9 +63,8 @@ class INat::Entity::User < INat::Data::Entity
   end
 
   def to_s
-    title = ''
-    title = " title=\"#{ name }\"" if name
-    "<a#{ title } href=\"https://www.inaturalist.org/people/#{ id }\"><i class=\"glyphicon glyphicon-user\"></i></a> @#{ login }"
+    title = ""
+    title = " title=\"#{name}\"" if name
+    "<a#{title} href=\"https://www.inaturalist.org/people/#{id}\"><i class=\"glyphicon glyphicon-user\"></i></a> @#{login}"
   end
-
 end

data/lib/inat/data/entity.rb

@@ -123,6 +123,12 @@ class INat::Data::Entity < INat::Data::Model
       data.map { |obj| parse obj }
     end
 
+    def query **params
+      return [] if @api_path.nil?
+      data = INat::API.query @api_path, **params
+      data.map { |obj| parse obj }
+    end
+
     def load_file filename
       data = API.load_file filename
       data.map { |obj| parse obj }
@@ -143,7 +149,8 @@ class INat::Data::Entity < INat::Data::Model
         src.each do |key, value|
           key = key.intern if String === key
           field = fields[key] || fields.values.find { |f| f.id_field == key }
-          raise ArgumentError, "Field not found in #{ self.name }: '#{ key }'!", caller unless field
+          # raise ArgumentError, "Field not found in #{ self.name }: '#{ key }'!", caller unless field
+          next unless field
           if field.write?
             unless (field.type === value) || (field.id_field == key && Integer === value)
               if field.id_field == key

data/lib/inat/data/query.rb

@@ -23,6 +23,8 @@ class INat::Query
   include INat::App::Logger::DSL
   include INat::Data::Types
 
+  Place = INat::Entity::Place
+
   private def parse_accuracy value
     case value
     when true, false

data/lib/inat/report/report_dsl.rb

@@ -67,6 +67,7 @@ module INat::Report::DSL
         if observers
           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
+          # TODO: вынеести в константу
           if ds.count > 10
             [ 'Более 10 наблюдений' ]
           else

data/lib/inat/report/table.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+module INat
+  module Report
+  end
+end
+
 class INat::Report::Table
 
   attr_reader :columns

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: inat-get
 version: !ruby/object:Gem::Version
-  version: 0.8.0.14
+  version: 0.8.0.16
 platform: ruby
 authors:
 - Ivan Shikhalev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2025-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -38,7 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.6
-description:
 email:
 - shkikhalev@gmail.com
 executables:
@@ -116,7 +114,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/shikhalev/inat-get
   source_code_uri: https://github.com/shikhalev/inat-get
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Client for iNaturalist API.
 test_files: []