fias 0.0.2 → 1.0.0

data/spec/support/db.rb

@@ -0,0 +1,30 @@
+DB = {}
+SHORTCUTS = {}
+
+YAML.load_file('spec/fixtures/addressing.yml').each.with_index do |item, index|
+  ancestry = item.inject([]) do |ancestry, element|
+    name = element.last
+    name, _, abbr, _ = Fias::Name::Extract.extract(name)
+    tokens = Fias::Name::Synonyms.tokens(name)
+    forms = Fias::Name::Synonyms.forms(name)
+    id = DB.size + 1
+
+    DB[id] = {
+      id: id,
+      parent_id: ancestry.last,
+      name: name,
+      abbr: abbr,
+      ancestry: ancestry.reverse,
+      tokens: tokens,
+      forms: forms
+    }
+
+    ancestry + [id]
+  end
+
+  SHORTCUTS[index] = DB[ancestry.last]
+end
+
+def find_in_addressing_db(tokens)
+  DB.values.find_all { |record| (record[:tokens] & tokens).size > 0 }.dup
+end

data/spec/support/query.rb

@@ -0,0 +1,13 @@
+class UndefinedQuery
+  include Fias::Query
+end
+
+class TestQuery
+  include Fias::Query
+
+  def find(tokens)
+    return [] if tokens.empty?
+
+    find_in_addressing_db(tokens)
+  end
+end

data/tasks/db.rake

@@ -0,0 +1,52 @@
+require 'fias'
+require 'ruby-progressbar'
+require 'sequel'
+
+namespace :fias do
+  desc 'Create FIAS tables (PREFIX, FIAS_PATH to dbfs, DATABASE_URL and TABLES)'
+  task :create_tables do
+    within_connection do |tables|
+      tables.create
+      puts "#{tables.files.keys.join(', ')} created."
+    end
+  end
+
+  desc 'Import FIAS data (PREFIX, FIAS_PATH to dbfs, DATABASE_URL and TABLES)'
+  task :import do
+    within_connection do |tables|
+      tables.copy.each do |table|
+        puts "Encoding #{table.table_name}..."
+        bar = ProgressBar.create(
+          total: table.dbf.record_count,
+          format: '%a |%B| [%E] (%c/%C) %p%%'
+        )
+
+        table.encode { bar.increment }
+        table.copy
+      end
+    end
+  end
+
+  private
+
+  def connect_db
+    if ENV['DATABASE_URL'].blank?
+      fail 'Specify DATABASE_URL (eg. postgres://localhost/fias)'
+    end
+
+    Sequel.connect(ENV['DATABASE_URL'])
+  end
+
+  def within_connection(&block)
+    db = Sequel.connect(ENV['DATABASE_URL'])
+    fias_path = ENV['FIAS_PATH'] || 'tmp/fias'
+    only = *ENV['TABLES'].to_s.split(',')
+    files = Fias::Import::Dbf.new(fias_path).only(*only)
+    tables = Fias::Import::Tables.new(db, files)
+
+    diff = only - files.keys.map(&:to_s)
+    puts "WARNING: Missing DBF files for: #{diff.join(', ')}" if diff.any?
+
+    yield(tables)
+  end
+end

data/tasks/download.rake

@@ -0,0 +1,15 @@
+require 'fias'
+
+namespace :fias do
+  desc 'Returns lastest url of FIAS db (bundle exec rake fias:download | xargs wget)'
+  task :download do
+    url = Fias::Import::DownloadService.url
+
+    if url
+      puts url
+    else
+      puts 'An error occured during SOAP call'
+      return 999
+    end
+  end
+end

metadata

@@ -1,182 +1,364 @@
 --- !ruby/object:Gem::Specification
 name: fias
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Victor Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: pg_data_encoder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: progress_bar
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  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'
+- !ruby/object:Gem::Dependency
+  name: unicode
+  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'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hirb
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruby wrapper to FIAS database
+description: Imports Russian FIAS database into SQL (for Ruby on Rails on PostgreSQL
+  projects)
 email:
 - gzigzigzeo@evilmartians.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- config/names.txt
+- config/synonyms.yml
+- examples/create.rb
+- examples/generate_index.rb
 - fias.gemspec
 - lib/fias.rb
-- lib/fias/active_record/address_object.rb
-- lib/fias/active_record/address_object_type.rb
-- lib/fias/dbf_wrapper.rb
-- lib/fias/importer.rb
-- lib/fias/importer/base.rb
-- lib/fias/importer/pg.rb
-- lib/fias/importer/sqlite.rb
+- lib/fias/config.rb
+- lib/fias/import/copy.rb
+- lib/fias/import/dbf.rb
+- lib/fias/import/download_service.rb
+- lib/fias/import/restore_parent_id.rb
+- lib/fias/import/tables.rb
+- lib/fias/name/append.rb
+- lib/fias/name/canonical.rb
+- lib/fias/name/extract.rb
+- lib/fias/name/house_number.rb
+- lib/fias/name/split.rb
+- lib/fias/name/synonyms.rb
+- lib/fias/query.rb
+- lib/fias/query/estimate.rb
+- lib/fias/query/finder.rb
+- lib/fias/query/params.rb
 - lib/fias/railtie.rb
 - lib/fias/version.rb
-- lib/generators/fias/migration.rb
-- lib/generators/fias/templates/create_fias_tables.rb
-- tasks/fias.rake
+- spec/fixtures/ACTSTAT.DBF
+- spec/fixtures/NORDOC99.DBF
+- spec/fixtures/STRSTAT.DBF
+- spec/fixtures/addressing.yml
+- spec/fixtures/query.yml
+- spec/fixtures/query_sanitization.yml
+- spec/fixtures/status_append.yml
+- spec/lib/import/copy_spec.rb
+- spec/lib/import/dbf_spec.rb
+- spec/lib/import/download_service_spec.rb
+- spec/lib/import/restore_parent_id_spec.rb
+- spec/lib/import/tables_spec.rb
+- spec/lib/name/append_spec.rb
+- spec/lib/name/canonical_spec.rb
+- spec/lib/name/extract_spec.rb
+- spec/lib/name/house_number_spec.rb
+- spec/lib/name/query_spec.rb
+- spec/lib/name/split_spec.rb
+- spec/lib/name/synonyms_spec.rb
+- spec/lib/query/params_spec.rb
+- spec/lib/query_spec.rb
+- spec/spec_helper.rb
+- spec/support/db.rb
+- spec/support/query.rb
+- tasks/db.rake
+- tasks/download.rake
 homepage: http://github.com/evilmartians/fias
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 493497803985021140
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 493497803985021140
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Ruby wrapper to FIAS database
-test_files: []
+specification_version: 4
+summary: Imports Russian FIAS database into SQL
+test_files:
+- spec/fixtures/ACTSTAT.DBF
+- spec/fixtures/NORDOC99.DBF
+- spec/fixtures/STRSTAT.DBF
+- spec/fixtures/addressing.yml
+- spec/fixtures/query.yml
+- spec/fixtures/query_sanitization.yml
+- spec/fixtures/status_append.yml
+- spec/lib/import/copy_spec.rb
+- spec/lib/import/dbf_spec.rb
+- spec/lib/import/download_service_spec.rb
+- spec/lib/import/restore_parent_id_spec.rb
+- spec/lib/import/tables_spec.rb
+- spec/lib/name/append_spec.rb
+- spec/lib/name/canonical_spec.rb
+- spec/lib/name/extract_spec.rb
+- spec/lib/name/house_number_spec.rb
+- spec/lib/name/query_spec.rb
+- spec/lib/name/split_spec.rb
+- spec/lib/name/synonyms_spec.rb
+- spec/lib/query/params_spec.rb
+- spec/lib/query_spec.rb
+- spec/spec_helper.rb
+- spec/support/db.rb
+- spec/support/query.rb