torg_api 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e8eb286873d0e3ccd6b770d9663731630b5fe34
-  data.tar.gz: 5c71f056cc08b95d4edf7c2942c3ad56c9c43486
+  metadata.gz: b925da3f0f40233b8c98961e83ad8dd8ae2b5536
+  data.tar.gz: 0eca135c5ae8534992563720f26b1c97ffda8607
 SHA512:
-  metadata.gz: 4dbb6dd0a1ae388b1e5a42ba14165967f7729d8938817cb1486d58622ae29d552a72d83250c9fef894ecc9fdb4551fa3fb2ca675a01748f8b72264d11d5ec9ed
-  data.tar.gz: fedf35960687a89a6e1345d17b0e84c461b7d297951bf40b619cc9b8306492ea0afd064ffbf022b60802959fb99f0941c94e0f4cf30c0cc5d453fe76fc09c8b2
+  metadata.gz: e3b92f977978cae095037a3882a6a0fe22920b7a7b590c4d6040ddcf0af3667b11b6b233b76c8b623de4fa6bd11fe469ac5397d4b91b219ae40c6799b72c6994
+  data.tar.gz: 9a1b04fd80d0971d03d844dfd9c1127169d3536f41213d0305ac082231a5724bdf87335a004ced4a0fc213336f00e2d960052d961b26cc120cf2aeed0a1b4317

data/README.md

@@ -23,19 +23,18 @@ require 'torg_api'
 require 'awesome_print'
 require 'logger'
 
-# Параметры подключения к БД
-TorgApi.establish_connection(
-  adapter: 'oracle_enhanced',
-  database: 'ksazd_backup',
-  username: 'user',
-  password: 'pass'
-)
+# Пердварительная настройка
+# Параметры подключения к системе Tender Organizer
+TorgApi::Settings.torg_url_configure(host: 'http://login:password@host:port')
 
-# Логгер если нужен
-TorgApi.logger = Logger.new('queries.log')
+# ИД пользователя в системе Tender Organizer, от имени которого будет работать библиотека
+TorgApi::Settings.service_user_configure(id: user_id)
+
+
+# Пример использования
 
 # Пример поиска по ИНН контрагентов
-ids = TorgApi::Api::Contractor.find_by_inn('7707083893')
+ids = TorgApi::Api::Contractor.find_by_inn('2721124655')
 ap ids
 
 # Пример создания контрагента
@@ -68,8 +67,10 @@ firm_info = {
   is_smb: false
 }
 
-contractor_id = TorgApi::Api::Contractor.create_from_b2b(firm_info, 555)
-ap contractor_id
+b2b_hash = {:firm_id=>"277550", :date_lastedit=>nil, :org_name=>"Общество с ограниченной ответственностью \"АГЕНТСТВО ИНТЕЛЛЕКТУАЛЬНОЙ СОБСТВЕННОСТИ \"ИНСО - ЭНЕРГО\"", :org_name_short=>"ООО \"АИС \"ИНСО - ЭНЕРГО\"", :code_okpo=>"51257002", :bank_name=>nil, :bank_inn=>"7728194072", :ogrn=>"1037739581197", :ogrn_given=>nil, :ogrn_date_given=>nil, :bank_kpp=>"772401001", :bank_bik=>nil, :bank_r_account=>nil, :bank_c_account=>nil, :bank_comments=>nil, :jury_address=>"115201, Россия, г. Москва, Каширское ш., д. 22, корп. 3", :post_address=>"115201, Россия, г. Москва, Каширское ш., д. 22, корп. 3", :fact_address=>"115201, Россия, г. Москва, Каширское ш., д. 22, корп. 3", :site_url=>nil, :certification=>nil, :org_details=>nil, :bank_details=>nil, :country=>643, :is_smb=>false}
+
+# c = TorgApi::Api::Contractor.create_from_b2b(b2b_hash)
+ap с
 ```
 
 ## Documentation

data/lib/torg_api/api/bidder.rb

@@ -15,33 +15,56 @@ module TorgApi
         # @param tender_id [Integer] id закупки
         # @param date_offer [Time] Дата и время регистрации конверта участника
         # @return [Bidder]
-        def create(contractor_id, tender_id, date_offer = nil)
-          b = nil
-          TorgApi::Models::Bidder.transaction do
-            b = TorgApi::Models::Bidder.create!(
-              tender_id: tender_id,
-              contractor_id: contractor_id
-            )
 
-            TorgApi::Models::Cover.create!(
-              bidder_id: b.id,
-              register_time: date_offer,
-              type_id: CoverLabels::REQUEST,
-              delegate: 'B2B-Center',
-              provision: 'Электронный конверт'
-            )
-          end
+        def create(contractor_id, tender_id, date_offer = nil)
+          responce_b = JSON.parse(
+            RestClient.post(
+              [Settings.torg_url[:host], "tenders", tender_id, "bidders"].join('/'),
+              bidder: {
+                tender_id: tender_id,
+                contractor_id: contractor_id,
+                covers_attributes: {
+                  '0' => {
+                    _destroy: false,
+                    compound_register_time_attributes: {
+                      date: date_offer && date_offer.strftime('%d.%m.%Y'),
+                      time: date_offer && date_offer.strftime('%H:%M')
+                    },
+                    type_id: CoverLabels::REQUEST,
+                    delegate: 'B2B-Center',
+                    provision: 'Электронный конверт'
+                  }
+                }
+              },
+              accept: :json,
+              content_type: :json,
+              format: :json
+            ),
+            symbolize_names: true
+          )
 
-          b.to_api
+          b = new
+          b.tender_id = responce_b[:tender_id]
+          b.contractor_id = responce_b[:contractor_id]
+          b.id = responce_b[:id]
+          b
         end
       end
-
       # Проверяет, есть ли файл с таким именем у данного участника
       # @param file_name [String] Имя файла во внешней системе
       # return [Boolean]
       def file_exists?(file_name)
-        bidder = TorgApi::Models::Bidder.find(id)
-        bidder.bidder_files.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
+          ),
+          symbolize_names: true
+        )
+        responce[:exists]
       end
 
       # Добавляет файл предложения участника к нему
@@ -50,20 +73,41 @@ module TorgApi
       # @param note [String] Комментарии
       # @return Nothing
       def add_file(file, name = nil, note = nil)
-        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: Settings.service_user[:id],
-            external_filename: name
-          )
-          TorgApi::Models::BidderFile.create!(
-            bidder_id: id,
-            tender_file_id: tender_file.id,
-            note: note
-          )
-        end
+        responce_f = JSON.parse(
+          RestClient.post(
+            [Settings.torg_url[:host], "tender_files"].join('/'),
+            tender_file: {
+              area_id: TenderFileArea::BIDDER,
+              year: Date.current.year,
+              document: File.open(file),
+              external_filename: name
+            },
+            accept: :json,
+            content_type: :json,
+            format: :json
+          ),
+          symbolize_names: true
+        )
+
+        responce_bf = JSON.parse(
+          RestClient.patch(
+            [Settings.torg_url[:host], "tenders", tender_id, "bidders", id].join('/'),
+            bidder: {
+              bidder_files_attributes: {
+                '0' => {
+                  note: note,
+                  tender_file_id: responce_f[:id],
+                  bidder_id: id
+                }
+              }
+            },
+            accept: :json,
+            content_type: :json,
+            format: :json
+          ),
+          symbolize_names: true
+        )
+        responce_bf
       end
     end
   end

data/lib/torg_api/api/contractor.rb

@@ -46,18 +46,47 @@ module TorgApi
       attr_accessor :jsc_form_id
       # @return [Integer] Малое или среднее предпринимательство
       attr_accessor :sme_type_id
+      # @return [String] ОКТМО
+      attr_accessor :oktmo
+      # @return [String] Дата регистрации юр. лица
+      attr_accessor :reg_date
 
       class << self
         # Поиск id контрагентов по ИНН
         # @param inn [String] ИНН
         # @return [Integer[]] Массив id найденных контрагентов отсортированных по статусу и дате изменения
         def find_by_inn(inn)
-          TorgApi::Models::Contractor
-            .where(inn: inn)
-            .where(next_id: nil)
-            .order("#{DECODE_STATUS_ORDER}, updated_at desc")
-            .first
-            .try(:to_api)
+          responce = JSON.parse(
+            RestClient.get(
+              [Settings.torg_url[:host], "contractors", "find_by_inn"].join('/'),
+                params: { inn: inn },
+                accept: :json,
+                content_type: :json,
+                format: :json
+            ),
+            symbolize_names: true
+          )
+
+          c = new
+          c.name = responce[:name]
+          c.fullname = responce[:fullname]
+          c.ownership = responce[:ownership]
+          c.inn = responce[:inn]
+          c.kpp = responce[:kpp]
+          c.ogrn = responce[:ogrn]
+          c.okpo = responce[:okpo]
+          c.status = responce[:status]
+          c.form = responce[:form]
+          c.legal_addr = responce[:legal_addr]
+          c.user_id = responce[:user_id]
+          c.is_resident = responce[:is_resident]
+          c.is_dzo = responce[:is_dzo]
+          c.is_sme = responce[:is_sme]
+          c.jsc_form_id = responce[:jsc_form_id]
+          c.sme_type_id = responce[:sme_type_id]
+          c.oktmo = responce[:oktmo]
+          c.reg_date = responce[:reg_date]
+          c
         end
 
         # Создаёт контрагента
@@ -66,14 +95,14 @@ module TorgApi
         # @return Contractor
         def create_from_b2b(hash)
           c = Contractor.new
-          c.name = hash[:org_name_short]
+          c.name = hash[:org_name_short].gsub('"','')
           c.fullname = hash[:org_name]
-          c.ownership = extract_ownership(hash[:org_name_short])
           c.inn = hash[:bank_inn]
           c.kpp = hash[:bank_kpp]
           c.ogrn = hash[:ogrn]
           c.okpo = hash[:code_okpo]
-          c.status = 0 # enum status: { orig: 0, active: 1, old: 2, inactive: 3 }
+          c.ownership = extract_ownership(hash[:org_name_short])
+          c.status = 0
           c.form = extract_form(hash[:bank_inn])
           c.legal_addr = hash[:jury_address]
           c.user_id = Settings.service_user[:id]
@@ -82,8 +111,19 @@ module TorgApi
           c.is_sme = hash[:is_smb]
           c.jsc_form_id = nil
           c.sme_type_id = nil
+          c.oktmo = 0
 
-          c.id = TorgApi::Models::Contractor.create(c.to_h).id
+          responce = JSON.parse(
+            RestClient.post(
+              [Settings.torg_url[:host], "contractors"].join('/'),
+                contractor: c.to_h,
+                accept: :json,
+                content_type: :json,
+                format: :json
+            ),
+            symbolize_names: true
+          )
+          c.id = responce[:id]
           c
         end
 
@@ -92,11 +132,10 @@ module TorgApi
         end
 
         def extract_form(bank_inn)
-          # enum form: { businessman: 0, company: 1, foreign: 2, person: 3 }
           case bank_inn.size
-          when 12 then 0
-          when 10 then 1
-          else 2
+          when 12 then "businessman"
+          when 10 then "company"
+          else "foreign"
           end
         end
 

data/lib/torg_api/api/lot.rb

@@ -12,7 +12,15 @@ module TorgApi
         # @param id [Integer] id закупки
         # @return [Tender] возвращает объект закупки
         def find(tender_id, num)
-          TorgApi::Models::Lot.where(tender_id: tender_id, num: num).take.to_api
+          responce = JSON.parse(
+            RestClient.get(
+              [Settings.torg_url[:host], "tenders", tender_id].join('/'),
+                accept: :json,
+                content_type: :json,
+                format: :json
+            )
+          )
+          responce['lots'].select { |value| value['num'] == num }.first
         end
       end
     end

data/lib/torg_api/api/tender.rb

@@ -134,12 +134,20 @@ module TorgApi
       attr_accessor :offer_reception_place
       # @return [Integer] Часовой пояс проведения закупки
       attr_accessor :local_time_zone_id
-
       # Поиск участника по его идентификатору в справочнике
       # @param contractor_id [Integer] Идентификатор котрагента в справочнике
       # return [Bidder] возвращает объект участника
       def find_bidder(contractor_id)
-        TorgApi::Models::Bidder.where(tender_id: id, contractor_id: contractor_id).first.try(:to_api)
+        responce = JSON.parse(
+          RestClient.get(
+            [Settings.torg_url[:host], "tenders", id, "bidders"].join('/'),
+              accept: :json,
+              content_type: :json,
+              format: :json
+          )
+        )
+        bidder = responce.select { |value| value['contractor_id'] == contractor_id }
+        bidder[0]
       end
 
       def find_lot(num)
@@ -151,7 +159,38 @@ module TorgApi
         # @param id [Integer] id закупки
         # @return [Tender] возвращает объект закупки
         def find(id)
-          TorgApi::Models::Tender.find(id).to_api
+          responce = JSON.parse(
+            RestClient.get(
+              [Settings.torg_url[:host], "tenders", id].join('/'),
+                accept: :json,
+                content_type: :json,
+                format: :json
+            ),
+            symbolize_names: true
+          )
+
+          t = Tender.new
+          t.id = responce[:id]
+          t.num = responce[:num]
+          t.name = responce[:name]
+          t.tender_type_id = responce[:tender_type_id]
+          t.tender_type_explanations = responce[:tender_type_explanations]
+          t.etp_address_id = responce[:etp_address_id]
+          t.commission_id = responce[:commission_id]
+          t.department_id = responce[:department_id]
+          t.announce_date = responce[:announce_date]
+          t.announce_place = responce[:announce_place]
+          t.bid_date = responce[:bid_date]
+          t.bid_place = responce[:bid_place]
+          t.user_id = responce[:user_id]
+          t.oos_num = responce[:oos_num]
+          t.oos_id = responce[:oos_id]
+          t.etp_num = responce[:etp_num]
+          t.order_num = responce[:order_num]
+          t.order_date = responce[:order_date]
+          t.contact_id = responce[:contact_id]
+          t.confirm_place = responce[:confirm_place]
+          t
         end
       end
     end

data/lib/torg_api/base.rb

@@ -1,8 +1,3 @@
-require 'carrierwave'
-require 'carrierwave/orm/activerecord'
-require 'torg_api/torg_database'
-require 'torg_api/models'
-
 module TorgApi
   class Base
     include TorgApi::Constants

data/lib/torg_api/settings.rb

@@ -1,14 +1,20 @@
 module TorgApi
   class Settings
     @service_user = {}
+    @torg_url = {}
 
     # Configure through hash
     def self.service_user_configure(opts = {})
       opts.each { |k, v| @service_user[k.to_sym] = v }
     end
 
+    def self.torg_url_configure(opts = {})
+      opts.each { |k,v| @torg_url[k.to_sym] = v }
+    end
+
     class << self
       attr_reader :service_user
+      attr_reader :torg_url
     end
   end
 end

data/lib/torg_api/version.rb

@@ -1,3 +1,3 @@
 module TorgApi
-  VERSION = '0.0.13'
+  VERSION = '0.1.0'
 end

data/lib/torg_api.rb

@@ -1,14 +1,6 @@
+require 'rest-client'
 require 'torg_api/settings'
-require 'active_record'
 require 'torg_api/version'
 require 'torg_api/constants'
 require 'torg_api/base'
 require 'torg_api/api'
-
-CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
-
-module TorgApi
-  def self.logger=(logger)
-    ActiveRecord::Base.logger = logger
-  end
-end

data/torg_api.gemspec

@@ -6,7 +6,7 @@ require 'torg_api/version'
 Gem::Specification.new do |spec|
   spec.name          = 'torg_api'
   spec.version       = TorgApi::VERSION
-  spec.authors       = ['Archakov Aleksandr']
+  spec.authors       = ['Archakov Aleksandr', 'Andrew Ageev', 'Dmitrii Bodakov']
   spec.email         = ['archakov@gmail.com']
   spec.description   = %q{API for Torg system}
   spec.summary       = %q{Torg API}
@@ -21,6 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.4'
 
-  spec.add_dependency 'activerecord', '~> 4.2'
-  spec.add_dependency 'carrierwave'
+  spec.add_dependency 'rest-client'
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: torg_api
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - Archakov Aleksandr
+- Andrew Ageev
+- Dmitrii Bodakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,21 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.4'
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,25 +74,9 @@ 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/dictionary.rb
-- lib/torg_api/models/lot.rb
-- lib/torg_api/models/offer.rb
-- 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/models/user.rb
 - lib/torg_api/settings.rb
-- lib/torg_api/torg_database.rb
 - lib/torg_api/version.rb
 - torg_api.gemspec
 homepage: https://github.com/kodram/torg_api

data/lib/torg_api/api/tender_file.rb

@@ -1,38 +0,0 @@
-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)
-          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 = Settings.service_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/models/bidder.rb

@@ -1,16 +0,0 @@
-module TorgApi
-  module Models
-    class Bidder < TorgDatabase
-      has_many :bidder_files
-
-      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

@@ -1,11 +0,0 @@
-module TorgApi
-  module Models
-    class BidderFile < TorgDatabase
-      belongs_to :tender_file
-
-      def self.file_exists?(file_name)
-        joins(:tender_file).where(tender_files: { external_filename: file_name }).exists?
-      end
-    end
-  end
-end

data/lib/torg_api/models/contractor.rb

@@ -1,27 +0,0 @@
-module TorgApi
-  module Models
-    class Contractor < TorgDatabase
-      def to_api
-        c = TorgApi::Api::Contractor.new
-        c.id = id
-        c.name = name
-        c.fullname = fullname
-        c.ownership = ownership
-        c.inn = inn
-        c.kpp = kpp
-        c.ogrn = ogrn
-        c.okpo = okpo
-        c.status = status
-        c.form = form
-        c.legal_addr = legal_addr
-        c.user_id = user_id
-        c.is_resident = is_resident
-        c.is_dzo = is_dzo
-        c.is_sme = is_sme
-        c.jsc_form_id = jsc_form_id
-        c.sme_type_id = sme_type_id
-        c
-      end
-    end
-  end
-end

data/lib/torg_api/models/cover.rb

@@ -1,6 +0,0 @@
-module TorgApi
-  module Models
-    class Cover < TorgDatabase
-    end
-  end
-end

data/lib/torg_api/models/dictionary.rb

@@ -1,6 +0,0 @@
-module TorgApi
-  module Models
-    class Dictionary < TorgDatabase
-    end
-  end
-end

data/lib/torg_api/models/lot.rb

@@ -1,13 +0,0 @@
-module TorgApi
-  module Models
-    # Лот
-    class Lot < TorgDatabase
-      def to_api
-        t = TorgApi::Api::Lot.new
-        t.id = id
-        t.num = num
-        t
-      end
-    end
-  end
-end

data/lib/torg_api/models/offer.rb

@@ -1,12 +0,0 @@
-module TorgApi
-  module Models
-    # TORG Offer model
-    class Offer < TorgDatabase
-      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,9 +0,0 @@
-module TorgApi
-  module Models
-    class OfferSpecification < TorgDatabase
-      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/specification.rb

@@ -1,6 +0,0 @@
-module TorgApi
-  module Models
-    class Specification < TorgDatabase
-    end
-  end
-end

data/lib/torg_api/models/tender.rb

@@ -1,38 +0,0 @@
-module TorgApi
-  module Models
-    class Tender < TorgDatabase
-      belongs_to :tender_type, class_name: 'Dictionary'
-      belongs_to :user
-
-      delegate :name, to: :tender_type, prefix: true
-      delegate :email, to: :user, prefix: true
-
-      def to_api
-        t = TorgApi::Api::Tender.new
-        t.id = id
-        t.num = num
-        t.name = name
-        t.tender_type_id = tender_type_id
-        t.tender_type_name = tender_type_name
-        t.tender_type_explanations = tender_type_explanations
-        t.etp_address_id = etp_address_id
-        t.commission_id = commission_id
-        t.department_id = department_id
-        t.announce_date = announce_date
-        t.announce_place = announce_place
-        t.bid_date = bid_date
-        t.bid_place = bid_place
-        t.user_id = user_id
-        t.user_email = user_email
-        t.oos_num = oos_num
-        t.oos_id = oos_id
-        t.etp_num = etp_num
-        t.order_num = order_num
-        t.order_date = order_date
-        t.contact_id = contact_id
-        t.confirm_place = confirm_place
-        t
-      end
-    end
-  end
-end

data/lib/torg_api/models/tender_file.rb

@@ -1,18 +0,0 @@
-require 'torg_api/models/tender_file_uploader'
-module TorgApi
-  module Models
-    class TenderFile < TorgDatabase
-      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

@@ -1,66 +0,0 @@
-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
-
-  def move_to_store
-    true
-  end
-
-  def move_to_cache
-    true
-  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/models/user.rb

@@ -1,6 +0,0 @@
-module TorgApi
-  module Models
-    class User < TorgDatabase
-    end
-  end
-end

data/lib/torg_api/models.rb

@@ -1 +0,0 @@
-Dir[File.dirname(__FILE__) + '/models/*.rb'].each { |file| require file }

data/lib/torg_api/torg_database.rb

@@ -1,5 +0,0 @@
-module TorgApi
-  class TorgDatabase < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end