inat-get 0.8.0.14 → 0.8.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a46d82e846a5e0c461170448eb31b58c2f795d8cc5f8bd5e806dc99e6f4f7d
-  data.tar.gz: d1eebcc7ac633eafbd131e723fa10835ebb11c1c18f2b0d98722936309198be2
+  metadata.gz: 84ded1d7ec6fde12b93015367e36c206932fc25428f6a5b29eacc1a1e619950c
+  data.tar.gz: a48ba5ff5aa245e8a0b1a95e7ce9d40c1cb82788902745fa532dda3a909937de
 SHA512:
-  metadata.gz: a1484827dc6feb2dfa24012bfa9a3b92cd7689084619c381657cb2c8db86060672ef0a0ea0a8ab50105b006d388e1cfb44a02f0f48891c6db183ffa1fab9853a
-  data.tar.gz: a9abd208f1d0795cdbfa5c736d1fe5c26f9b2f7da674520d4af1b81b3d304a40e108acf94ff4b7b57e5a13b274f6a1bab9f3bbbde10e873d2f57e2abc814ea9d
+  metadata.gz: 824425464d52d58478bba5f693e5670dd5728559c67884daef44ca15a9a6aa10361575e61ee5b22239d7a7842eb7b54430531cec29cd001420e20af50080337d
+  data.tar.gz: 6021713b825f56f796b857a6e8e02f5de08e4c628f0460da0916b8379beb6e09c67327f7a6f79aaff4d73be0d5a2390bd199c4cd4d1688f2fd83a720e7846152

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.15"
       HOMEPAGE = "https://github.com/shikhalev/inat-get"
       SOURCE_URL = "https://github.com/shikhalev/inat-get"
 

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 }

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inat-get
 version: !ruby/object:Gem::Version
-  version: 0.8.0.14
+  version: 0.8.0.15
 platform: ruby
 authors:
 - Ivan Shikhalev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Client for iNaturalist API.