torg_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb71fb920515e414148aa83e3dee5abaf885037
-  data.tar.gz: 58db47e949deb2a00fc7c9d78f6446e001e7912d
+  metadata.gz: bc2d2880ced364051026a11139eecb62d0b3f8a3
+  data.tar.gz: 1234974be47f3bbb764b165c53f560da695d0777
 SHA512:
-  metadata.gz: 2b3f96a4c045743cb0e104072a6faad28629b9bafd86e7c2ddc11d6fe3438d5605e35896a75f51624091a4ff12202d5c3cc46e2b8a311bf973569e5f3cc04b13
-  data.tar.gz: b562085823d9e7dae295ad211b07bfbb78444dfe387802597e90d308bd66365e7967ab84044a1bd998c45c538a28329f742b973c9a5e70c38457944b9895bd5b
+  metadata.gz: 341e3be52c54228db2d0bc5dde56c633ef9d78171e579fc75be386e502ddccce871436b1331dfcfe1093894d39b09b6d45ffeef7a34c4f351ba1cd61b57a3267
+  data.tar.gz: 0a119ed6bec8fc4bb6f7d01152cdab5acb5a2c1bd6e617e59973ba38a5825c783824e4663d816e59712aeb487eae63b9ccdfcbe20bbef19ca07c82d22f7e4b11

data/README.md

@@ -25,7 +25,7 @@ require 'logger'
 
 # Пердварительная настройка
 # Параметры подключения к системе Tender Organizer
-TorgApi::Settings.torg_url_configure(host: 'http://login:password@host:port')
+TorgApi::Settings.torg_url_configure(host: 'http://login:password@host:port', ssl: { verify_ssl: OpenSSL::SSL::VERIFY_NONE })
 
 # ИД пользователя в системе Tender Organizer, от имени которого будет работать библиотека
 TorgApi::Settings.service_user_configure(id: user_id)

data/lib/torg_api/api/bidder.rb

@@ -18,8 +18,7 @@ module TorgApi
 
         def create(contractor_id, tender_id, date_offer = nil)
           responce_b = JSON.parse(
-            RestClient.post(
-              [Settings.torg_url[:host], "tenders", tender_id, "bidders"].join('/'),
+            torg_resource["tenders/#{tender_id}/bidders"].post(
               bidder: {
                 tender_id: tender_id,
                 contractor_id: contractor_id,
@@ -55,12 +54,11 @@ module TorgApi
       # return [Boolean]
       def file_exists?(file_name)
         responce = JSON.parse(
-          RestClient.get(
-            [Settings.torg_url[:host], "tenders", tender_id, "bidders", id, "file_exists"].join('/'),
-              params: { file_name: file_name },
-              accept: :json,
-              content_type: :json,
-              format: :json
+          torg_resource["tenders/#{tender_id}/bidders/#{id}/file_exists"].get(
+            params: { file_name: file_name },
+            accept: :json,
+            content_type: :json,
+            format: :json
           ),
           symbolize_names: true
         )
@@ -74,8 +72,7 @@ module TorgApi
       # @return Nothing
       def add_file(file, name = nil, note = nil)
         responce_f = JSON.parse(
-          RestClient.post(
-            [Settings.torg_url[:host], "tender_files"].join('/'),
+          torg_resource["tender_files"].post(
             tender_file: {
               area_id: TenderFileArea::BIDDER,
               year: Date.current.year,
@@ -90,8 +87,7 @@ module TorgApi
         )
 
         responce_bf = JSON.parse(
-          RestClient.patch(
-            [Settings.torg_url[:host], "tenders", tender_id, "bidders", id].join('/'),
+          torg_resource["tenders/#{tender_id}/bidders/#{id}"].patch(
             bidder: {
               bidder_files_attributes: {
                 '0' => {

data/lib/torg_api/api/contractor.rb

@@ -57,12 +57,11 @@ module TorgApi
         # @return [Integer[]] Массив id найденных контрагентов отсортированных по статусу и дате изменения
         def find_by_inn(inn)
           responce = JSON.parse(
-            RestClient.get(
-              [Settings.torg_url[:host], "contractors", "find_by_inn"].join('/'),
-                params: { inn: inn },
-                accept: :json,
-                content_type: :json,
-                format: :json
+            torg_resource["contractors/find_by_inn"].get(
+              params: { inn: inn },
+              accept: :json,
+              content_type: :json,
+              format: :json
             ),
             symbolize_names: true
           )
@@ -115,12 +114,11 @@ module TorgApi
           c.oktmo = 0
 
           responce = JSON.parse(
-            RestClient.post(
-              [Settings.torg_url[:host], "contractors"].join('/'),
-                contractor: c.to_h,
-                accept: :json,
-                content_type: :json,
-                format: :json
+            torg_resource["contractors"].post(
+              contractor: c.to_h,
+              accept: :json,
+              content_type: :json,
+              format: :json
             ),
             symbolize_names: true
           )

data/lib/torg_api/api/lot.rb

@@ -13,11 +13,10 @@ module TorgApi
         # @return [Tender] возвращает объект закупки
         def find(tender_id, num)
           responce = JSON.parse(
-            RestClient.get(
-              [Settings.torg_url[:host], "tenders", tender_id].join('/'),
-                accept: :json,
-                content_type: :json,
-                format: :json
+            torg_resource["tenders/#{tender_id}"].get(
+              accept: :json,
+              content_type: :json,
+              format: :json
             )
           )
           responce['lots'].select { |value| value['num'] == num }.first

data/lib/torg_api/api/tender.rb

@@ -139,8 +139,7 @@ module TorgApi
       # return [Bidder] возвращает объект участника
       def find_bidder(contractor_id)
         responce = JSON.parse(
-          RestClient.get(
-            [Settings.torg_url[:host], "tenders", id, "bidders"].join('/'),
+          torg_resource["tenders/#{id}/bidders"].get(
               accept: :json,
               content_type: :json,
               format: :json
@@ -160,11 +159,10 @@ module TorgApi
         # @return [Tender] возвращает объект закупки
         def find(id)
           responce = JSON.parse(
-            RestClient.get(
-              [Settings.torg_url[:host], "tenders", id].join('/'),
-                accept: :json,
-                content_type: :json,
-                format: :json
+            torg_resource["tenders/#{id}"].get(
+              accept: :json,
+              content_type: :json,
+              format: :json
             ),
             symbolize_names: true
           )

data/lib/torg_api/base.rb

@@ -12,5 +12,9 @@ module TorgApi
       vars.each { |var| hash[var.to_s.delete('@').to_sym] = instance_variable_get(var) }
       hash
     end
+
+    def self.torg_resource
+      @@torg_resource ||= RestClient::Resource.new(Settings.torg_url[:host], Settings.torg_url[:ssl])
+    end
   end
 end

data/lib/torg_api/version.rb

@@ -1,3 +1,3 @@
 module TorgApi
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torg_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Archakov Aleksandr
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler