rus_bank_rails 1.4.4 → 1.5.1

data/README.md

@@ -23,7 +23,7 @@ Rails-обертка вокруг гема rus_bank - https://github.com/wildDAl
     $ rails generate rus_bank_rails Bank
 
 , где Bank - имя генерируемой модели.
-Генератор создаст файл миграции и файл модели.
+Генератор создаст файлы миграции и файлы модели, для банков и для регионов.
 
 Выполняем миграцию:
 
@@ -45,6 +45,10 @@ Rails-обертка вокруг гема rus_bank - https://github.com/wildDAl
 
 Кроме того, следует иметь в виду, что часть методов при каждом вызове "дергает" внешнее API(о чем упомянуто в описании соответствующего метода) и при этом сохраняет результат в базу, что может сказаться на отклике вашего приложения. Например, `search_by_name("")` вернет все банки из API и при этом добавит/обновит их в базе, что крайне накладно(на каждый банк, что требуется обновить, вызов внешнего сервиса). Потому стоит использовать подобные методы с осторожностью, как вариант выполнять их отложенно.
 
+Также стоит упомянуть, что актуализация списка регионов не ведется при работе с методами банков(отдельно регионы не представлены в API ЦБ, а запрос полного списка регионов накладен). Необходимо самостоятельно иногда обновлять список регионов:
+
+    BankRegion.update_regions      #, где BankRegion - имя модели, сгенерированное генератором для регионов
+
 Описание доступных методов тут - http://rubydoc.info/gems/rus_bank_rails/frames/RusBankRails/ActsAsBank
 
 ## Copyright

data/lib/generators/rus_bank_rails_generator/templates/banks_model.rb

@@ -0,0 +1,8 @@
+class ModelName < ActiveRecord::Base
+  acts_as_bank
+
+  belongs_to _belongs_to_model_, foreign_key: 'reg_code', primary_key: 'reg_code'
+
+  serialize :licences, Array
+
+end

data/lib/generators/rus_bank_rails_generator/templates/{migration.rb → create_banks.rb}

@@ -1,4 +1,4 @@
-class CreateMigration < ActiveRecord::Migration
+class CreateBanks < ActiveRecord::Migration
   def change
     create_table table_name, force: true do |t|
       t.integer  "reg_number"
@@ -13,12 +13,15 @@ class CreateMigration < ActiveRecord::Migration
       t.string   "ustav_adr"
       t.string   "fact_adr"
       t.string   "director"
-      t.string  "ust_money"
+      t.string   "ust_money"
       t.string   "org_status"
       t.integer  "reg_code"
       t.date     "ssv_date"
       t.text     "licences"
       t.timestamps
     end
+    add_index table_name, :reg_code
+    add_index table_name, :internal_code
+    add_index table_name, :bic
   end
 end

data/lib/generators/rus_bank_rails_generator/templates/create_regions.rb

@@ -0,0 +1,10 @@
+class CreateRegions < ActiveRecord::Migration
+  def change
+    create_table table_name, force: true do |t|
+      t.integer  "reg_code"
+      t.string   "cname"
+      t.timestamps
+    end
+    add_index table_name, :reg_code, :unique => true
+  end
+end

data/lib/generators/rus_bank_rails_generator/templates/regions_model.rb

@@ -0,0 +1,7 @@
+class ModelName < ActiveRecord::Base
+  has_many _has_many_model_, foreign_key: 'reg_code', primary_key: 'reg_code'
+
+  def to_s
+    self.cname
+  end
+end

data/lib/generators/rus_bank_rails_generator.rb

@@ -2,16 +2,34 @@ class RusBankRailsGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('../rus_bank_rails_generator', __FILE__)
 
   def generate
-    migration_file_name = "db/migrate/#{Time.now.strftime("%Y%m%d%H%M%S")}_create_#{plural_name.parameterize.underscore}.rb"
-    model_file_name = "app/models/#{file_name.parameterize.underscore}.rb"
+    # Banks
+    banks_migration_file_name = "db/migrate/#{Time.now.strftime("%Y%m%d%H%M%S")}_create_#{plural_name.parameterize.underscore}.rb"
+    banks_model_file_name = "app/models/#{file_name.parameterize.underscore}.rb"
 
-    copy_file "templates/migration.rb", migration_file_name
-    copy_file "templates/model.rb", model_file_name
+    copy_file "templates/create_banks.rb", banks_migration_file_name
+    copy_file "templates/banks_model.rb", banks_model_file_name
 
-    gsub_file migration_file_name, 'CreateMigration', "create_#{plural_name.parameterize.underscore}".camelize
-    gsub_file migration_file_name, 'table_name', ":#{plural_name.parameterize.underscore}"
+    gsub_file banks_migration_file_name, 'CreateBanks', "create_#{plural_name.parameterize.underscore}".camelize
+    gsub_file banks_migration_file_name, 'table_name', ":#{plural_name.parameterize.underscore}"
 
-    gsub_file model_file_name, 'ModelName', "#{file_name.parameterize.underscore.camelize}"
+    gsub_file banks_model_file_name, 'ModelName', "#{file_name.parameterize.underscore.camelize}"
+
+    gsub_file banks_model_file_name, '_belongs_to_model_', ":#{file_name.parameterize.underscore}_region"
+
+    # Regions
+    sleep(1.second)  # Sleep to avoid two files with the same timestamp
+    regions_migration_file_name = "db/migrate/#{Time.now.strftime("%Y%m%d%H%M%S")}_create_#{file_name.parameterize.underscore}_regions.rb"
+    regions_model_file_name = "app/models/#{file_name.parameterize.underscore}_region.rb"
+
+    copy_file "templates/create_regions.rb", regions_migration_file_name
+    copy_file "templates/regions_model.rb", regions_model_file_name
+
+    gsub_file regions_migration_file_name, 'CreateRegions', "create_#{file_name.parameterize.underscore}_regions".camelize
+    gsub_file regions_migration_file_name, 'table_name', ":#{file_name.parameterize.underscore}_regions"
+
+    gsub_file regions_model_file_name, 'ModelName', "#{file_name.parameterize.underscore.camelize}Region"
+
+    gsub_file regions_model_file_name, '_has_many_model_', ":#{plural_name.parameterize.underscore}"
   end
 
 

data/lib/rus_bank_rails/acts_as_bank.rb

@@ -370,7 +370,7 @@ module RusBankRails
       def expire?
         time = Time.now.in_time_zone("Moscow")
         updated_at = self.updated_at.in_time_zone("Moscow")
-        not( (updated_at.day == time.day) && (updated_at.month == time.month) && (updated_at.year == time.year) )
+        not( (updated_at.day == time.day) && (updated_at.month == time.month) && (updated_at.year == time.year) )  # wtf?
       end
 
       ##

data/lib/rus_bank_rails/acts_as_region.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+require 'savon'
+require 'rus_bank'
+
+module RusBankRails
+  module ActsAsRegion
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+    module ClassMethods
+
+      ##
+      # Список регионов.
+      # Метод делегирует вызов к соответствующему методу RusBank.
+      # В базу не сохраняет, все результаты онлайн из API ЦБ.
+      # == Returns:
+      # Возвращает массив хэшей вида {:reg_code=>"Внутренний код региона", :cname=>"Название региона"}
+
+      def regions_enum
+        cbr = RusBank.new
+        cbr.RegionsEnum
+      end
+
+      ##
+      # Обновляет список регионов в базе.
+
+      def update_regions
+        regions = regions_enum
+        regions.each do |region|
+          db_region = self.where(reg_code: region[:reg_code]).first
+          if db_region
+            db_region.update(region)
+          else
+            new_region = self.new(region)
+            new_region.save
+          end
+        end
+      end
+
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, RusBankRails::ActsAsRegion

data/lib/rus_bank_rails/version.rb

@@ -1,3 +1,3 @@
 module RusBankRails
-  VERSION = "1.4.4"
+  VERSION = "1.5.1"
 end

data/lib/rus_bank_rails.rb

@@ -1,4 +1,5 @@
 require "rus_bank_rails/acts_as_bank"
+require "rus_bank_rails/acts_as_region"
 
 module RusBankRails
 end

data/test/dummy/app/models/bank_region.rb

@@ -0,0 +1,3 @@
+class BankRegion < ActiveRecord::Base
+  has_many :banks, foreign_key: 'reg_code', primary_key: 'reg_code'
+end

data/test/dummy/db/migrate/20140426210540_create_regions.rb

@@ -0,0 +1,9 @@
+class CreateRegions < ActiveRecord::Migration
+  def change
+    create_table :bank_regions do |t|
+      t.integer  "reg_code"
+      t.string   "cname"
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/migrate/20140426220130_add_indexes.rb

@@ -0,0 +1,9 @@
+class AddIndexes < ActiveRecord::Migration
+  def change
+    add_index :banks, :reg_code
+    add_index :banks, :internal_code
+    add_index :banks, :bic
+
+    add_index :bank_regions, :reg_code, :unique => true
+  end
+end

data/test/dummy/db/migrate/20140426220515_create_bank_regions.rb

@@ -0,0 +1,8 @@
+class CreateBankRegions < ActiveRecord::Migration
+  def change
+    create_table :bank_regions do |t|
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,16 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140310145403) do
+ActiveRecord::Schema.define(version: 20140426220130) do
+
+  create_table "bank_regions", force: true do |t|
+    t.integer  "reg_code"
+    t.string   "cname"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "bank_regions", ["reg_code"], name: "index_bank_regions_on_reg_code", unique: true
 
   create_table "banks", force: true do |t|
     t.datetime "created_at"
@@ -35,4 +44,8 @@ ActiveRecord::Schema.define(version: 20140310145403) do
     t.string   "ust_money"
   end
 
+  add_index "banks", ["bic"], name: "index_banks_on_bic"
+  add_index "banks", ["internal_code"], name: "index_banks_on_internal_code"
+  add_index "banks", ["reg_code"], name: "index_banks_on_reg_code"
+
 end

data/test/dummy/log/development.log

@@ -8910,3 +8910,165 @@ Migrating to ChangeUstMoneyDatatype (20140310145403)
    (0.1ms)  begin transaction
   SQL (0.4ms)  INSERT INTO "banks" ("created_at", "date_kgr_registration", "fact_adr", "internal_code", "licences", "org_full_name", "org_name", "org_status", "reg_code", "reg_number", "updated_at", "ust_money", "ustav_adr") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", "2014-04-15 19:01:05.518560"], ["date_kgr_registration", "1990-12-12"], ["fact_adr", "103780,  г. Москва, ул. Кузнецкий мост, 15"], ["internal_code", 350000012], ["licences", "--- []\n"], ["org_full_name", "Московский акционерный банк содействия предпринимательству (открытое акционерное общество)"], ["org_name", "МОСБИЗНЕСБАНК"], ["org_status", "ликвидирована"], ["reg_code", 16], ["reg_number", 999], ["updated_at", "2014-04-15 19:01:05.518560"], ["ust_money", "123000000"], ["ustav_adr", "103780,  г. Москва, ул. Кузнецкий мост, 15"]]
    (1.7ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateRegions (20140426210540)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "regions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "reg_code" integer, "cname" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (2.6ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140426210540"]]
+   (0.4ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddIndexes (20140426220130)
+   (0.0ms)  begin transaction
+   (0.0ms)  select sqlite_version(*)
+   (0.3ms)  CREATE  INDEX "index_banks_on_reg_code" ON "banks" ("reg_code")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_banks_on_internal_code" ON "banks" ("internal_code")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_internal_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_internal_code' AND type='index'
+
+   (0.0ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_banks_on_bic" ON "banks" ("bic")
+   (0.1ms)  CREATE UNIQUE INDEX "index_bank_regions_on_reg_code" ON "bank_regions" ("reg_code")
+SQLite3::SQLException: no such table: main.bank_regions: CREATE UNIQUE INDEX "index_bank_regions_on_reg_code" ON "bank_regions" ("reg_code")
+   (0.2ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateRegions (20140426210540)
+   (0.0ms)  begin transaction
+   (0.3ms)  DROP TABLE "regions"
+  SQL (2.4ms)  DELETE FROM "schema_migrations" WHERE "schema_migrations"."version" = '20140426210540'
+   (0.4ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateRegions (20140426210540)
+   (0.0ms)  begin transaction
+   (0.4ms)  CREATE TABLE "bank_regions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "reg_code" integer, "cname" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (1.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140426210540"]]
+   (0.5ms)  commit transaction
+Migrating to AddIndexes (20140426220130)
+   (0.0ms)  begin transaction
+   (0.0ms)  select sqlite_version(*)
+   (0.2ms)  CREATE  INDEX "index_banks_on_reg_code" ON "banks" ("reg_code")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_banks_on_internal_code" ON "banks" ("internal_code")
+   (0.0ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_internal_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_internal_code' AND type='index'
+
+   (0.0ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_banks_on_bic" ON "banks" ("bic")
+   (0.6ms)  CREATE UNIQUE INDEX "index_bank_regions_on_reg_code" ON "bank_regions" ("reg_code")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140426220130"]]
+   (7.4ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_bank_regions_on_reg_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_bank_regions_on_reg_code' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_bic' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_bic' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_internal_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_internal_code' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_reg_code' AND type='index'
+
+   (0.7ms)  CREATE TABLE "bank_regions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "reg_code" integer, "cname" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.2ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "index_bank_regions_on_reg_code" ON "bank_regions" ("reg_code")
+   (0.5ms)  CREATE TABLE "banks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime, "reg_number" integer, "internal_code" integer, "bic" varchar(255), "org_name" varchar(255), "org_full_name" varchar(255), "phones" varchar(255), "date_kgr_registration" date, "main_reg_number" varchar(255), "main_date_reg" date, "ustav_adr" varchar(255), "fact_adr" varchar(255), "director" varchar(255), "org_status" varchar(255), "reg_code" integer, "ssv_date" date, "licences" text, "ust_money" varchar(255)) 
+   (0.5ms)  CREATE  INDEX "index_banks_on_bic" ON "banks" ("bic")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_bic' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_bic' AND type='index'
+
+   (0.5ms)  CREATE  INDEX "index_banks_on_internal_code" ON "banks" ("internal_code")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_internal_code' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_internal_code' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_banks_on_bic' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_banks_on_bic' AND type='index'
+
+   (0.5ms)  CREATE  INDEX "index_banks_on_reg_code" ON "banks" ("reg_code")
+   (0.6ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140426220130')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140126153450')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140126171627')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140208103744')
+   (0.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140208123404')
+   (0.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140310145403')
+   (0.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140426210540')