Merge pull request #233 from razorpay/release/1.6.0

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. The format
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [UNRELEASED][unreleased]
+
+## [1.6.0][1.6.0]
+- Support PHP8
+- Fix for some invalid IFSCs being marked as valid. Ex: `PUNB0000000` (#229)
+- Update list of UPI enabled banks
+- Fix all exported datasets to include correct bank name.
+- Only use validated MICR codes
+
 ## [1.5.13][1.5.13]
 - [upi] Vijaya Bank and Dena Gujarat Gramin Bank are no more
 - [upi] 7 new banks now support UPI
@@ -196,7 +204,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   Removes some data formats (YAML/Large JSON) for cleaner code. If you were using them, please let create an issue.
 
-[unreleased]: https://github.com/razorpay/ifsc/compare/1.5.13...HEAD
+[unreleased]: https://github.com/razorpay/ifsc/compare/1.6.0...HEAD
+[1.6.0]: https://github.com/razorpay/ifsc/releases/tag/1.6.0
 [1.5.13]: https://github.com/razorpay/ifsc/releases/tag/1.5.13
 [1.5.12]: https://github.com/razorpay/ifsc/releases/tag/1.5.12
 [1.5.11]: https://github.com/razorpay/ifsc/releases/tag/1.5.11

README.md

@@ -4,9 +4,9 @@ This is part of the IFSC toolset released by Razorpay.
 You can find more details about the entire release at
 [ifsc.razorpay.com](https://ifsc.razorpay.com).
 
-[![wercker status](https://app.wercker.com/status/bc9b22047e1b8eb55ce98ba451d7b504/s/master 'wercker status')](https://app.wercker.com/project/byKey/bc9b22047e1b8eb55ce98ba451d7b504) [![](https://images.microbadger.com/badges/image/razorpay/ifsc:1.5.13.svg)](https://microbadger.com/images/razorpay/ifsc:1.5.13) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
+[![wercker status](https://app.wercker.com/status/bc9b22047e1b8eb55ce98ba451d7b504/s/master 'wercker status')](https://app.wercker.com/project/byKey/bc9b22047e1b8eb55ce98ba451d7b504) [![](https://images.microbadger.com/badges/image/razorpay/ifsc:1.6.0.svg)](https://microbadger.com/images/razorpay/ifsc:1.6.0) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 
-[![](https://images.microbadger.com/badges/version/razorpay/ifsc:1.5.13.svg)](https://microbadger.com/images/razorpay/ifsc:1.5.13) [![npm version](https://badge.fury.io/js/ifsc.svg)](https://badge.fury.io/js/ifsc) [![Gem Version](https://badge.fury.io/rb/ifsc.svg)](https://badge.fury.io/rb/ifsc) [![PHP version](https://badge.fury.io/ph/razorpay%2Fifsc.svg)](https://badge.fury.io/ph/razorpay%2Fifsc) [![Hex pm](http://img.shields.io/hexpm/v/ifsc.svg)](https://hex.pm/packages/ifsc)
+[![](https://images.microbadger.com/badges/version/razorpay/ifsc:1.6.0.svg)](https://microbadger.com/images/razorpay/ifsc:1.6.0) [![npm version](https://badge.fury.io/js/ifsc.svg)](https://badge.fury.io/js/ifsc) [![Gem Version](https://badge.fury.io/rb/ifsc.svg)](https://badge.fury.io/rb/ifsc) [![PHP version](https://badge.fury.io/ph/razorpay%2Fifsc.svg)](https://badge.fury.io/ph/razorpay%2Fifsc) [![Hex pm](http://img.shields.io/hexpm/v/ifsc.svg)](https://hex.pm/packages/ifsc)
 
 ## Dataset
 
@@ -24,6 +24,8 @@ The source for the dataset are the following files:
 -  List of NEFT IFSCs from [RBI website][combined]
 -  List of RTGS IFSCs from [RBI website][rtgs]
 -  List of ACH Live Banks from [NPCI website][ach] used for IFSC sublet branches
+-  List of [IMPS Live members](https://www.npci.org.in/what-we-do/imps/live-members) on the NPCI website.
+-  RBI maintains a [list of banks in India](https://www.rbi.org.in/commonman/english/scripts/banksinindia.aspx) and [websites of banks in India](https://www.rbi.org.in/scripts/banklinks.aspx)
 
 #### SWIFT
 

composer.json

@@ -37,7 +37,7 @@
         ]
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.1|^8.0",
         "php-http/client-implementation": "^1.0",
         "php-http/discovery": "^1.6",
         "php-http/message-factory": "^1.0",

ifsc.gemspec

@@ -3,8 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = 'ifsc'
-  s.version     = '1.5.13'
-  s.date        = '2021-05-10'
+  s.version     = '1.6.0'
+  s.date        = '2021-07-09'
   s.summary     = 'IFSC code database to help you validate IFSC codes'
   s.description = 'A simple gem by @razorpay to help you validate your IFSC codes. IFSC codes are bank codes within India'
   s.authors     = ['Abhay Rana', 'Nihal Gonsalves']

mix.exs

@@ -4,7 +4,7 @@ defmodule IFSC.Mixfile do
   def project do
     [
       app: :ifsc,
-      version: "1.5.13",
+      version: "1.6.0",
       elixir: "~> 1.5",
       start_permanent: Mix.env == :prod,
       description: description(),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ifsc",
-  "version": "1.5.13",
+  "version": "1.6.0",
   "description": "This is part of the IFSC toolset released by Razorpay. You can find more details about the entire release at [ifsc.razorpay.com](https://ifsc.razorpay.com). Includes only a validation library as of now.",
   "main": "src/node/index.js",
   "directories": {

scraper/Gemfile

@@ -4,3 +4,4 @@ source "https://rubygems.org"
 gem 'nokogiri'
 gem 'spreadsheet'
 gem 'rubyXL'
+gem 'httparty'

scraper/Gemfile.lock

@@ -1,26 +1,34 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.5.1)
-    nokogiri (1.11.3)
+    httparty (0.18.1)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0704)
+    mini_portile2 (2.5.3)
+    multi_xml (0.6.0)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     racc (1.5.2)
     ruby-ole (1.2.12.2)
     rubyXL (3.4.17)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
-    rubyzip (2.3.0)
-    spreadsheet (1.2.8)
+    rubyzip (2.3.2)
+    spreadsheet (1.2.9)
       ruby-ole
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  httparty
   nokogiri
   rubyXL
   spreadsheet
 
 BUNDLED WITH
-   2.2.16
+   2.2.22

scraper/scripts/bootstrap.sh

@@ -9,8 +9,8 @@ if [[ $@ == *'--no-download'* ]]; then
 else
   # List of sublet branches, and IMPS only branches
   # Till NPCI fixes their certificate: https://twitter.com/captn3m0/status/1247806778529599496
-  wget --no-check-certificate --timeout=10 "https://www.npci.org.in/what-we-do/nach/live-members/live-banks" --output-document=nach.html --user-agent="Firefox"
-  wget --no-check-certificate --timeout=10 "https://www.npci.org.in/what-we-do/upi/live-members" --output-document=upi.html --user-agent="Firefox"
+  wget --no-verbose --timeout=30 "https://www.npci.org.in/what-we-do/nach/live-members/live-banks" --output-document=nach.html --user-agent="Firefox"
+  wget --no-verbose --timeout=30 "https://www.npci.org.in/what-we-do/upi/live-members" --output-document=upi.html --user-agent="Firefox"
   wget --timestamping --no-verbose --directory-prefix=sheets/ "https://rbidocs.rbi.org.in/rdocs/content/docs/68774.xlsx" || true
   wget --timestamping --no-verbose --directory-prefix=sheets/ "https://rbidocs.rbi.org.in/rdocs/RTGS/DOCs/RTGEB0815.xlsx" || true
 

scraper/scripts/methods.rb

@@ -154,9 +154,14 @@ def parse_rtgs(banks)
     log "Parsing #RTGS-#{sheet_id}.csv"
     headers = CSV.foreach("sheets/RTGS-#{sheet_id}.csv", encoding: 'utf-8', return_headers: false, headers: true, skip_blanks: true) do |row|
       row = row.to_h
-      micr_match = row['MICR_CODE'].to_s.strip.match('\d{9}')
-      row['MICR'] = micr_match[0] if micr_match
-      row['BANK'] = row.delete('BANK NAME')
+
+      micr_match = row['MICR'].to_s.strip.match('\d{9}')
+
+      if micr_match
+        row['MICR'] = micr_match[0]
+      else
+        row['MICR'] = nil
+      end
 
       if row['STATE'].to_s.strip.match('\d')
         row = fix_row_alignment_for_rtgs(row)
@@ -290,6 +295,8 @@ def merge_dataset(neft, rtgs, imps)
     combined_data['UPI']  ||= false
     combined_data['MICR'] ||= nil
     combined_data['SWIFT'] = nil
+    # Set the bank name considering sublets
+    combined_data['BANK'] = bank_name_from_code(combined_data['IFSC'])
     combined_data.delete('DATE')
 
     h[ifsc] = combined_data
@@ -299,6 +306,7 @@ def merge_dataset(neft, rtgs, imps)
 
 def apply_bank_patches(dataset)
   Dir.glob('../../src/patches/banks/*.yml').each do |patch|
+    log "Applying Bank level patch: #{patch}", :debug
     data = YAML.safe_load(File.read(patch), [Symbol])
     banks = data['banks']
     patch = data['patch']
@@ -316,7 +324,7 @@ def apply_bank_patches(dataset)
 def apply_patches(dataset)
   Dir.glob('../../src/patches/ifsc/*.yml').each do |patch|
     log "Applying #{patch}", :debug
-    data = YAML.safe_load(File.read(patch))
+    data = YAML.safe_load(File.read(patch), [Symbol])
 
     case data['action'].downcase
     when 'patch'

scraper/scripts/utils.rb

@@ -1,3 +1,5 @@
+require '../../src/ruby/ifsc'
+
 def sanitize(str)
   return nil if str.nil? or str.length==0
   ["┬ô", "┬û",'┬ö','┬Æ','┬á','┬æ','┬ù','ý','ý','┬á'].each do |pattern|
@@ -6,6 +8,8 @@ def sanitize(str)
   str.gsub!('É','e')
   str.gsub!('Æ','a')
   str.gsub!('É','e')
+  # replace newlines
+  str.gsub!("\n", " ")
   # Remove all spaces (including nbsp) at the start and end of the string
   str.gsub(/\A[[:space:]]+|[[:space:]]+\z/, '')
 end
@@ -28,3 +32,7 @@ def fix_row_alignment_for_rtgs(row)
   row['CITY2'] = row['CITY1']
   return row
 end
+
+def bank_name_from_code(code)
+  Razorpay::IFSC::IFSC.bank_name_for(code)
+end

src/banknames.json

@@ -178,7 +178,7 @@
   "BODX": "Bagalkot District Central Co-operative Bank",
   "BOFA": "Bank of America",
   "BORX": "Boral Union Co-operative Bank",
-  "BOTM": "Bank of Tokyo Mitsubishi",
+  "BOTM": "MUFG Bank",
   "BOTX": "Shree Botad Mercantile Co-operative Bank",
   "BPCX": "Bhadgaon People's Co-operative Bank",
   "BPSX": "Bilagi Pattana Sahakari Bank Niyamit",

src/banks.json

@@ -455,8 +455,7 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": true,
-    "upi": true
+    "nach_debit": true
   },
   "ALLX": {
     "code": "ALLX",
@@ -600,8 +599,7 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": true,
-    "upi": true
+    "nach_debit": true
   },
   "ANDX": {
     "code": "ANDX",
@@ -3761,7 +3759,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "GGCX": {
     "code": "GGCX",
@@ -5364,7 +5363,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "JPCX": {
     "code": "JPCX",
@@ -6216,7 +6216,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "KNBX": {
     "code": "KNBX",
@@ -6859,7 +6860,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "LUCX": {
     "code": "LUCX",
@@ -9747,7 +9749,8 @@
     "apbs": false,
     "ach_credit": false,
     "ach_debit": false,
-    "nach_debit": true
+    "nach_debit": true,
+    "imps": false
   },
   "RCBX": {
     "code": "RCBX",
@@ -9879,7 +9882,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "RHMX": {
     "code": "RHMX",
@@ -10225,7 +10229,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "SAIX": {
     "code": "SAIX",
@@ -10347,7 +10352,8 @@
     "apbs": false,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "SAWX": {
     "code": "SAWX",
@@ -12335,7 +12341,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "TEHX": {
     "code": "TEHX",
@@ -13690,7 +13697,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "UTKX": {
     "code": "UTKX",
@@ -13757,7 +13765,8 @@
     "apbs": true,
     "ach_credit": true,
     "ach_debit": true,
-    "nach_debit": false
+    "nach_debit": false,
+    "upi": true
   },
   "VARA": {
     "code": "VARA",

src/patches/banks/rbi-no-imps.yml

@@ -0,0 +1,8 @@
+---
+action: patch
+patch:
+  :imps: false
+banks:
+  - RBIS
+  - RBIN
+  - RBIP