torg_api 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488581134aa036b0d5cda63dcf269bdbd222aec0
-  data.tar.gz: d96799c73e1ff9c94ad4af630e7aad91d0d409e5
+  metadata.gz: efd006e0cb72f83fb2a1ccf7df3ab6bc00a78e8d
+  data.tar.gz: 92a1bc93d2874484f3c02c1893f79cdf42475ea9
 SHA512:
-  metadata.gz: 1a86cc50448cddbff2896e54dc88ca560f13dfb3972ff70965cbd7efda08d93d09f9f9bd6b04e54b699e605e2a144249ac8deb96d477bd7b5aac916264b10e71
-  data.tar.gz: d1bb738fa67ed620cbef2794aaba2430ac8c6acf20b3ea753355ba7cedc91c81ee87c601548e6ca2e857ab9cd0feb558f2b452ebb9a472c9552e9e2cead56189
+  metadata.gz: 8dc6704a2be054bdba3ec4b530b849589b095912e6fa5f653248a4f008362ca7c559fe9a704e311a15cba0b050f9af652a9a4216c7a1b2a88f2ee2b33ef4117d
+  data.tar.gz: d8348e65eee37b357dadf8cdcbeaa24b8110a5b9df2237bf35fdd548cf2d4083e35500c6e9ce4e0aa3ef80ee5601c69cf6cdb8784ef09a6674a5685a20890809

data/.rubocop.yml

@@ -1,10 +1,19 @@
+AllCops:
+  RunRailsCops: false
+
 AsciiComments:
   Enabled: false
 
-PercentLiteralDelimiters:
+StringLiterals:
+  Enabled: false
+
+ClassLength:
+  Enabled: false
+
+MethodLength:
   Enabled: false
 
-UnneededPercentQ:
+Documentation:
   Enabled: false
 
 LineLength:

data/lib/torg_api/api/bidder.rb

@@ -2,6 +2,13 @@ module TorgApi
   module Api
     # Участник закупки
     class Bidder < TorgApi::Base
+      # @return [Integer] id
+      attr_accessor :id
+      # @return [Integer] ID участника
+      attr_accessor :contractor_id
+      # @return [Integer] ID закупки
+      attr_accessor :tender_id
+
       class << self
         # Создаёт участника в системе и возвращает его id
         # @param contractor_id [Integer] id контрагента
@@ -28,6 +35,26 @@ module TorgApi
           b.id
         end
       end
+
+      # Добавляет файл предложения участника к нему
+      # @param file [String] имя файла и путь к нему
+      # @param note [String] Комментарии
+      # @return Nothing
+      def add_file(file, note)
+        TorgApi::Models::BidderFile.transaction do
+          tender_file = TorgApi::Models::TenderFile.create(
+            area_id: TenderFileArea::BIDDER,
+            year: Date.current.year,
+            document: File.open(file),
+            user_id: EtpUsers::B2B_CENTER
+          )
+          TorgApi::Models::BidderFile.create!(
+            bidder_id: id,
+            tender_file_id: tender_file.id,
+            note: note
+          )
+        end
+      end
     end
   end
 end

data/lib/torg_api/api/offer.rb

@@ -35,6 +35,30 @@ module TorgApi
           o.id
         end
 
+        def save(bidder_id, lot_id, hash)
+          offer = TorgApi::Models::Offer.for_bid_lot_num(bidder_id, lot_id, hash[:alternate_num]) ||
+                  TorgApi::Models::Offer.new(bidder_id: bidder_id, lot_id: lot_id, num: hash[:alternate_num], version: 0)
+          TorgApi::Models::Offer.transaction do
+            offer.type_id = CoverLabels::REQUEST
+            offer.status_id = hash[:result] == 'reject' ? OfferStatuses::REJECT : OfferStatuses::NEW
+            offer.rank = hash[:rank]
+            offer.conditions = hash[:essential]
+
+            TorgApi::Models::Specification.where(lot_id: lot_id).each_with_index do |spec, index|
+              offer_spec = offer.offer_specifications.for_offer_spec(offer.id, spec.id) ||
+                           offer.offer_specifications.build(specification_id: spec.id)
+              offer_spec.cost = index == 0 ? hash[:price_notax] : 0
+              offer_spec.cost_nds = index == 0 ? hash[:price] : 0
+              offer_spec.final_cost = index == 0 ? hash[:final_price_notax] : 0
+              offer_spec.final_cost_nds = index == 0 ? hash[:final_price] : 0
+            end
+
+            offer.save
+          end
+
+          offer.id
+        end
+
         def extract_status(winner)
           winner ? OfferStatuses::WIN : OfferStatuses::NEW
         end

data/lib/torg_api/api/tender_file.rb

@@ -0,0 +1,38 @@
+module TorgApi
+  module Api
+    # Файл
+    class TenderFile < TorgApi::Base
+      # @return [Integer] id
+      attr_accessor :id
+      # @return [Integer] Область использования
+      attr_accessor :area_id
+      # @return [Integer] Год
+      attr_accessor :year
+      # @return [String] Имя файла документа
+      attr_accessor :document
+      # @return [Integer] Владелец
+      attr_accessor :user_id
+      # @return [String] Имя файла во внешних системах
+      attr_accessor :external_filename
+      # @return [String] Content Type
+      attr_accessor :content_type
+      # @return [Integer] FileSize
+      attr_accessor :file_size
+      class << self
+        def create_from_b2b(hash, area, file_size, user_id)
+          mime_types = MIME::Types.type_for(hash[:name])
+          file = TenderFile.new
+          file.area_id = area
+          file.year = Date.current.year
+          file.document = hash[:title]
+          file.user_id = user_id
+          file.external_filename = hash[:name]
+          file.content_type = mime_types.empty? ? 'text/plain' : mime_types.first.content_type
+          file.file_size = file_size
+
+          TorgApi::Models::TenderFile.create!(file.to_h).id
+        end
+      end
+    end
+  end
+end

data/lib/torg_api/base.rb

@@ -1,3 +1,5 @@
+require 'carrierwave'
+require 'carrierwave/orm/activerecord'
 require 'torg_api/models'
 
 module TorgApi

data/lib/torg_api/constants.rb

@@ -10,5 +10,14 @@ module TorgApi
       REJECT = 26_003 # Отклонена
       WIN = 26_004 # Победила
     end
+
+    module TenderFileArea
+      TENDER = 2
+      BIDDER = 3
+    end
+
+    module EtpUsers
+      B2B_CENTER = 411
+    end
   end
 end

data/lib/torg_api/models/bidder.rb

@@ -1,6 +1,14 @@
 module TorgApi
   module Models
     class Bidder < ActiveRecord::Base
+      def to_api
+        bidder = TorgApi::Api::Bidder.new
+        bidder.id = id
+        bidder.contractor_id = contractor_id
+        bidder.tender_id = tender_id
+
+        bidder
+      end
     end
   end
 end

data/lib/torg_api/models/bidder_file.rb

@@ -0,0 +1,6 @@
+module TorgApi
+  module Models
+    class BidderFile < ActiveRecord::Base
+    end
+  end
+end

data/lib/torg_api/models/offer.rb

@@ -1,6 +1,12 @@
 module TorgApi
   module Models
+    # TORG Offer model
     class Offer < ActiveRecord::Base
+      has_many :offer_specifications
+
+      def self.for_bid_lot_num(bidder_id, lot_id, num)
+        where(bidder_id: bidder_id).where(lot_id: lot_id).where(num: num).where(version: 0).take
+      end
     end
   end
 end

data/lib/torg_api/models/offer_specification.rb

@@ -1,6 +1,9 @@
 module TorgApi
   module Models
     class OfferSpecification < ActiveRecord::Base
+      def self.for_offer_spec(offer_id, spec_id)
+        where(offer_id: offer_id).where(specification_id: spec_id).take
+      end
     end
   end
 end

data/lib/torg_api/models/tender_file.rb

@@ -0,0 +1,17 @@
+module TorgApi
+  module Models
+    class TenderFile < ActiveRecord::Base
+      mount_uploader :document, TenderFileUploader
+
+      before_save :update_file_attributes
+
+      private
+
+      def update_file_attributes
+        return unless document.present? || document_changed?
+        self.content_type = document.file.content_type
+        self.file_size = document.file.size
+      end
+    end
+  end
+end

data/lib/torg_api/models/tender_file_uploader.rb

@@ -0,0 +1,58 @@
+require 'carrierwave/processing/mime_types'
+
+class TenderFileUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MimeTypes
+
+  process :set_content_type
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+
+  # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility:
+  # include Sprockets::Helpers::RailsHelper
+  # include Sprockets::Helpers::IsolatedHelper
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.year}/#{model.area_id}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process :scale => [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  # def extension_white_list
+  #   %w(docx doc rtf xlsx xls pdf jpg jpeg tif tiff eml rar zip txt 7z)
+  #   # if update this, then update app/assets/javascripts/tender_files.js.coffee
+  # end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+end

data/lib/torg_api/version.rb

@@ -1,3 +1,3 @@
 module TorgApi
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/torg_api.rb

@@ -4,6 +4,8 @@ require 'torg_api/constants'
 require 'torg_api/base'
 require 'torg_api/api'
 
+CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
+
 module TorgApi
   def self.establish_connection(spec = nil)
     ActiveRecord::Base.establish_connection(spec)

data/torg_api.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.4'
 
   spec.add_dependency 'activerecord', '~> 4.2'
+  spec.add_dependency 'carrierwave'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torg_api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Archakov Aleksandr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: API for Torg system
 email:
 - archakov@gmail.com
@@ -72,10 +86,12 @@ files:
 - lib/torg_api/api/lot.rb
 - lib/torg_api/api/offer.rb
 - lib/torg_api/api/tender.rb
+- lib/torg_api/api/tender_file.rb
 - lib/torg_api/base.rb
 - lib/torg_api/constants.rb
 - lib/torg_api/models.rb
 - lib/torg_api/models/bidder.rb
+- lib/torg_api/models/bidder_file.rb
 - lib/torg_api/models/contractor.rb
 - lib/torg_api/models/cover.rb
 - lib/torg_api/models/lot.rb
@@ -83,6 +99,8 @@ files:
 - lib/torg_api/models/offer_specification.rb
 - lib/torg_api/models/specification.rb
 - lib/torg_api/models/tender.rb
+- lib/torg_api/models/tender_file.rb
+- lib/torg_api/models/tender_file_uploader.rb
 - lib/torg_api/version.rb
 - torg_api.gemspec
 homepage: https://github.com/kodram/torg_api