ox-tender-abstract 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dfb0556afbbe98cebec1fbb413fbe4408d5258e6fbd79d090c99df94dc718d6
-  data.tar.gz: 7d3308d579e05d7c651848f2cd2d1459562ab85d9f3991c2ef4784637803df99
+  metadata.gz: 9924cb49a0b35703d8e0093b3ae40b8b8556f7da398990b3ff5f84f185c7d944
+  data.tar.gz: 2598c2bb4af463aa3cbf1bde9c1cc76aac352f8e58a193152305dccc4a2cef8a
 SHA512:
-  metadata.gz: aa20e0eeebbdebebc3cba7c36112db12a8bbc63bffffe9d6ce79f762520a9f28be0afc587fb47f22e9358facf118e6e80093fbe1b9a9387c356fecc43efcaacf
-  data.tar.gz: 3437061cb5eaa5c84de842c4d57056ef3fa5d080a0f972708db210c48081a807faa866aeb4b9296d759c4855b4c95c4b541f22ba4be924def0ce64a8afea1348
+  metadata.gz: 3c0a783ab40ca1f45be2d0d5c32db63345a40502bdf6140b446018686b73482afba84ce3097d7ab7afe821b106915e06ba32b03b66a35a19adf95fdc4ad2c404
+  data.tar.gz: 53a15a50dad376969b8ff1869e88197a669288bdd57b3931ce59105c8288b25f6f9a9768e03b9211f8284570e4bbf219daa98f2702270c39c967c5e1737c4ead

data/.rspec_status

@@ -49,26 +49,26 @@ example_id                                                 | status | run_time
 ./spec/oxtenderabstract/result_spec.rb[1:3:2]              | passed | 0.00002 seconds |
 ./spec/oxtenderabstract/result_spec.rb[1:4:1]              | passed | 0.00002 seconds |
 ./spec/oxtenderabstract/result_spec.rb[1:4:2]              | passed | 0.00002 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:1:1]        | passed | 0.00012 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:2:1]        | passed | 0.00004 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:3:1]        | failed | 0.00122 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:3:2]        | passed | 0.00162 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:3:3]        | failed | 0.00097 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:4:1]        | passed | 0.00336 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:4:2]        | passed | 0.00176 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:4:3]        | passed | 0.0009 seconds  |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:5:1]        | passed | 0.00012 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:6:1]        | passed | 0.00008 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:1:7:1]        | passed | 0.00008 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:2:1:1]        | failed | 0.0001 seconds  |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:2:2:1]        | failed | 0.00007 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:2:3:1]        | failed | 0.00012 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:1:1]        | passed | 0.00192 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:2:1]        | passed | 0.00007 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:3:1]        | failed | 0.00615 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:3:2]        | passed | 0.00098 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:3:3]        | failed | 0.00089 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:4:1]        | passed | 0.00194 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:4:2]        | passed | 0.00168 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:4:3]        | passed | 0.00086 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:5:1]        | passed | 0.00008 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:6:1]        | passed | 0.00007 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:1:7:1]        | passed | 0.00007 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:2:1:1]        | failed | 0.00016 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:2:2:1]        | failed | 0.00011 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:2:3:1]        | failed | 0.00015 seconds |
 ./spec/oxtenderabstract/xml_parser_spec.rb[1:3:1]          | passed | 0.00005 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:3:2]          | passed | 0.00005 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:3:2]          | passed | 0.00004 seconds |
 ./spec/oxtenderabstract/xml_parser_spec.rb[1:3:3]          | passed | 0.00004 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:3:4]          | passed | 0.00005 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:4:1:1]        | failed | 0.00045 seconds |
-./spec/oxtenderabstract/xml_parser_spec.rb[1:4:2:1]        | failed | 0.00007 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:3:4]          | passed | 0.00006 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:4:1:1]        | failed | 0.00131 seconds |
+./spec/oxtenderabstract/xml_parser_spec.rb[1:4:2:1]        | passed | 0.00015 seconds |
 ./spec/oxtenderabstract_spec.rb[1:1:1]                     | passed | 0.00053 seconds |
 ./spec/oxtenderabstract_spec.rb[1:2:1]                     | passed | 0.00003 seconds |
 ./spec/oxtenderabstract_spec.rb[1:3:1]                     | passed | 0.00003 seconds |

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.9.3] - 2025-07-27
+
+- Added support for parsing tender documents
+- Added support for parsing contract documents
+- Added support for parsing organization documents
+- Added support for parsing generic documents
+- Added support for parsing attachments
+- Added support for parsing tender documents
+- Added support for parsing contract documents
+- Added support for parsing organization documents
+
 ## [0.9.0] - 2025-07-15
 
 - Initial release

data/README.md

@@ -273,6 +273,41 @@ puts result.data[:total_archives] # => 6
 # Processing typically takes 10-15 seconds for a full day's data
 ```
 
+## Error Handling
+
+The library uses the `Result` pattern for error handling:
+
+```ruby
+result = OxTenderAbstract.search_tenders(org_region: '77', exact_date: '2024-01-01')
+
+if result.success?
+  puts "Found tenders: #{result.data[:tenders].size}"
+else
+  puts "Error: #{result.error}"
+  
+  # Check error type for special handling
+  if result.metadata[:error_type] == :blocked
+    retry_after = result.metadata[:retry_after] || 600
+    puts "API blocked for #{retry_after} seconds"
+  end
+end
+```
+
+### Handling API Blocks
+
+When making frequent requests, the API may block archive downloads for 10 minutes. The library automatically detects such blocks:
+
+```ruby
+result = OxTenderAbstract.search_tenders(org_region: '77', exact_date: '2024-01-01')
+
+if result.failure? && result.metadata[:error_type] == :blocked
+  retry_after = result.metadata[:retry_after] # 600 seconds (10 minutes)
+  puts "Download blocked, retry in #{retry_after} seconds"
+end
+```
+
+For detailed guidance on using with Sidekiq background jobs, see [SIDEKIQ_USAGE.md](SIDEKIQ_USAGE.md).
+
 ## Requirements
 
 - Ruby >= 3.0.0

data/lib/ox-tender-abstract.rb

@@ -1,39 +1,172 @@
 # frozen_string_literal: true
 
 require_relative 'oxtenderabstract/version'
-require_relative 'oxtenderabstract/logger'
+require_relative 'oxtenderabstract/configuration'
 require_relative 'oxtenderabstract/errors'
+require_relative 'oxtenderabstract/logger'
 require_relative 'oxtenderabstract/result'
 require_relative 'oxtenderabstract/document_types'
-require_relative 'oxtenderabstract/configuration'
-require_relative 'oxtenderabstract/xml_parser'
 require_relative 'oxtenderabstract/archive_processor'
+require_relative 'oxtenderabstract/xml_parser'
 require_relative 'oxtenderabstract/client'
 
 # Main module for OxTenderAbstract library
 module OxTenderAbstract
   class Error < StandardError; end
 
-  # Convenience method to create a new client
-  def self.client(token: nil)
-    Client.new(token: token)
-  end
+  class << self
+    def configure
+      yield(configuration)
+    end
 
-  # Search tenders by region and date (convenience method)
-  def self.search_tenders(org_region:, exact_date:, token: nil, **options)
-    client = Client.new(token: token)
-    client.search_tenders(org_region: org_region, exact_date: exact_date, **options)
-  end
+    def configuration
+      @configuration ||= Configuration.new
+    end
 
-  # Enhanced search tenders with detailed information (convenience method)
-  def self.enhanced_search_tenders(org_region:, exact_date:, token: nil, **options)
-    client = Client.new(token: token)
-    client.enhanced_search_tenders(org_region: org_region, exact_date: exact_date, **options)
-  end
+    def reset_configuration!
+      @configuration = nil
+    end
+
+    # Convenience method for searching tenders in specific subsystem
+    def search_tenders(org_region:, exact_date:, subsystem_type: DocumentTypes::DEFAULT_SUBSYSTEM,
+                       document_type: DocumentTypes::DEFAULT_DOCUMENT_TYPE)
+      client = Client.new
+      client.search_tenders(
+        org_region: org_region,
+        exact_date: exact_date,
+        subsystem_type: subsystem_type,
+        document_type: document_type
+      )
+    end
+
+    # Enhanced method for searching tenders across multiple subsystems
+    def search_all_tenders(org_region:, exact_date:, subsystems: nil, document_types: nil)
+      # Default subsystems to search
+      subsystems ||= %w[PRIZ RPEC RPGZ BTK UR RGK OD223 RD223]
+
+      client = Client.new
+      all_results = {}
+      total_tenders = []
+      total_archives = 0
+
+      subsystems.each do |subsystem_type|
+        # Get appropriate document types for this subsystem
+        available_types = DocumentTypes.document_types_for_subsystem(subsystem_type)
+        test_types = document_types || [available_types.first] # Test first type by default
+
+        subsystem_results = {
+          subsystem: subsystem_type,
+          description: DocumentTypes.description_for_subsystem(subsystem_type),
+          tenders: [],
+          archives: 0,
+          errors: []
+        }
+
+        test_types.each do |doc_type|
+          result = client.search_tenders(
+            org_region: org_region,
+            exact_date: exact_date,
+            subsystem_type: subsystem_type,
+            document_type: doc_type
+          )
+
+          if result.success?
+            tenders = result.data[:tenders] || []
+            archives = result.data[:total_archives] || 0
+
+            subsystem_results[:tenders].concat(tenders)
+            subsystem_results[:archives] += archives
+            total_archives += archives
+
+            # Add subsystem info to each tender
+            tenders.each do |tender|
+              tender[:subsystem_type] = subsystem_type
+              tender[:subsystem_description] = DocumentTypes.description_for_subsystem(subsystem_type)
+              tender[:document_type_used] = doc_type
+            end
+
+            total_tenders.concat(tenders)
+          else
+            subsystem_results[:errors] << "#{doc_type}: #{result.error}"
+          end
+        rescue StandardError => e
+          subsystem_results[:errors] << "#{doc_type}: #{e.message}"
+        end
+
+        all_results[subsystem_type] = subsystem_results
+      end
+
+      Result.success({
+                       tenders: total_tenders,
+                       total_archives: total_archives,
+                       subsystem_results: all_results,
+                       search_params: {
+                         org_region: org_region,
+                         exact_date: exact_date,
+                         subsystems_searched: subsystems.size
+                       },
+                       processed_at: Time.now
+                     })
+    end
+
+    # Get documents by registry number across subsystems
+    def get_docs_by_reestr_number(reestr_number:, subsystem_type: DocumentTypes::DEFAULT_SUBSYSTEM)
+      client = Client.new
+      client.get_docs_by_reestr_number(
+        reestr_number: reestr_number,
+        subsystem_type: subsystem_type
+      )
+    end
+
+    # Enhanced search with detailed information extraction
+    def enhanced_search_tenders(org_region:, exact_date:, subsystem_type: DocumentTypes::DEFAULT_SUBSYSTEM,
+                                document_type: DocumentTypes::DEFAULT_DOCUMENT_TYPE,
+                                include_attachments: true)
+      client = Client.new
+      client.enhanced_search_tenders(
+        org_region: org_region,
+        exact_date: exact_date,
+        subsystem_type: subsystem_type,
+        document_type: document_type,
+        include_attachments: include_attachments
+      )
+    end
 
-  # Get documents by registry number (convenience method)
-  def self.get_docs_by_reestr_number(reestr_number:, token: nil, **options)
-    client = Client.new(token: token)
-    client.get_docs_by_reestr_number(reestr_number: reestr_number, **options)
+    # Search tenders with automatic wait on API blocks and resume capability
+    def search_tenders_with_auto_wait(org_region:, exact_date:, subsystem_type: DocumentTypes::DEFAULT_SUBSYSTEM,
+                                      document_type: DocumentTypes::DEFAULT_DOCUMENT_TYPE, resume_state: nil)
+      client = Client.new
+      
+      # Если есть состояние для продолжения
+      if resume_state
+        start_from = resume_state[:next_archive_index] || 0
+        client.search_tenders_with_resume(
+          org_region: org_region,
+          exact_date: exact_date,
+          subsystem_type: subsystem_type,
+          document_type: document_type,
+          start_from_archive: start_from,
+          resume_state: resume_state
+        )
+      else
+        # Используем обычный метод если авто-ожидание включено
+        if configuration.auto_wait_on_block
+          client.search_tenders(
+            org_region: org_region,
+            exact_date: exact_date,
+            subsystem_type: subsystem_type,
+            document_type: document_type
+          )
+        else
+          # Используем метод с возможностью продолжения
+          client.search_tenders_with_resume(
+            org_region: org_region,
+            exact_date: exact_date,
+            subsystem_type: subsystem_type,
+            document_type: document_type
+          )
+        end
+      end
+    end
   end
 end