indonesia 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 98bd53a629678b2b6b3efcb1b0ec1f999cbac954
-  data.tar.gz: 84a1d037f453194cac1c2863f079561eb7bf82bf
+SHA256:
+  metadata.gz: aa65565e8072d925524bb37fc4e4d771f43c8e66e969491262d366d07d63f141
+  data.tar.gz: e97af4cbc6b15cbc70566cd9c63a71e27e9af1310475ff7bb6ee90dfd90d5325
 SHA512:
-  metadata.gz: bc2c87e67a0b2ed8ba9adfdd60a86fe8e20dbc4fa2817e34643a5c0cfba4d93925c0c8d9e28626d7aba84293bdbc75dae834c1cd628d303c5dbe1e2f7d65135b
-  data.tar.gz: 078404b46d61f1fc192e984d90eefed0c346cd9f42d2d079fbb4884b2802b4135191b524249f3ec5c3889817a240298e1a4503efd5e3c0c4880e9b930cf45441
+  metadata.gz: 2a1f89d435ccd8269058ad742b5f6a8174f9aee0b7efa62f1ddd76624e1510ee56789b9011672ef75b50f8dc0dc08098837b7a73f2fe655e909c2e7d67dab61b
+  data.tar.gz: 4dddbefa4b4f2c5f7469d64c4881fc0ed9e40f9f9d7e64a72ffd4ed091807db3708d60a6d7352c618099b50bb1d6cef463a1c1518831715fe35d02b224dc1c98

data/.gitignore

@@ -7,4 +7,3 @@
 /pkg/
 /spec/reports/
 /tmp/
-/rails_app

data/README.md

@@ -44,11 +44,6 @@ Indonesia.regencies
 => [{:id=>1101, :province_id=>11, :name=>"KABUPATEN SIMEULUE"}, ...]
 ```
 
-* Get regencies by Province ID
-```ruby
-Indonesia.regencies(11)
-```
-
 * Get all districts
 ```ruby
 Indonesia.districts
@@ -56,12 +51,6 @@ Indonesia.districts
 # result
 => [{:id=>1101010, :regency_id=>1101, :name=>"TEUPAH SELATAN"}, ...]
 ```
-
-* Get all districts by Regency ID
-```ruby
-Indonesia.districts(1101)
-```
-
 * Get all villages
 ```ruby
 Indonesia.villages
@@ -70,54 +59,6 @@ Indonesia.villages
 => [{:id=>1101010001, :district_id=>1101010, :name=>"LATIUNG"},...]
 ```
 
-* Get all districts by district id
-```ruby
-Indonesia.villages(1101010)
-```
-### Rails helper
-
-#### #options_for_select (:province, :regency, :district)
-```ruby
-# provinces
-Indonesia.options_for_select(:province)
-
-# result
-=> [["ACEH", 11], ["SUMATERA UTARA", 12], ["SUMATERA BARAT", 13], ...]
-
-# regencies
-Indonesia.options_for_select(:regency)
-# or
-Indonesia.options_for_select(:regency, 11) # 11 is province_id
-
-# result
-=> [["KABUPATEN SIMEULUE", 1101], ["KABUPATEN ACEH SINGKIL", 1102], ...]
-
-# districts
-Indonesia.options_for_select(:district, 1101) # 1101 is regency_id
-
-# result
-=> [["TEUPAH SELATAN", 1101010], ["SIMEULUE TIMUR", 1101020], ...]
-```
-#### Generate for select options rails
-* Province
-```erb
-<%= f.select :province_id, Indonesia.options_for_select(:province) %>
-```
-
-* Regency
-```erb
-<%= f.select :regency_id, Indonesia.options_for_select(:regency) %>
-or
-<%= f.select :regency_id, Indonesia.options_for_select(:regency, 11) %>
-```
-
-* District
-```erb
-<%= f.select :district_id, Indonesia.options_for_select(:district) %>
-or
-<%= f.select :district_id, Indonesia.options_for_select(:district, 1101) %>
-```
-
 ### Rails migrations
 
 Generate models, migrations and save address data to database

data/lib/indonesia.rb

@@ -1,35 +1,12 @@
 require 'csv'
 
-require 'indonesia/version'
-require 'indonesia/province'
-require 'indonesia/regency'
-require 'indonesia/district'
-require 'indonesia/village'
+require 'indonesia/finder'
 
 module Indonesia
-  def self.options_for_select(type = :province, parent_id = nil)
-    case type
-    when :province
-      provinces.map { |province| [province[:name], province[:id]] }
-    when :regency
-      regencies(parent_id).map { |regency| [regency[:name], regency[:id]] }
-    when :district
-      districts(parent_id).map { |district| [district[:name], district[:id]] }
-    else
-      []
-    end
-  end
-
-  def self.find(type, query)
-    address = %w(province regency district)
-    types = address + address.map(&:to_sym)
 
-    if types.include? type
-      # manual using pluralize
-      type = type.to_s == 'regency' ? 'regencies' : "#{type}s"
-      self.send(type).find { |t| t[:name].downcase == query.downcase }
-    else
-      nil
-    end
+  def self.read_csv(file)
+    file_path = File.join(File.dirname(__FILE__), 'data/', "#{file}.csv")
+    CSV.read(file_path)
   end
+
 end

data/lib/indonesia/finder.rb

@@ -0,0 +1,31 @@
+module Indonesia
+
+  def self.provinces
+    @provinces ||= begin
+      data = read_csv('provinces')
+      data.map { |r| { id: r[0].to_i, name: r[1] } }
+    end
+  end
+
+  def self.regencies
+    @regencies ||= begin
+      data = read_csv('regencies')
+      data.map { |r| { id: r[0].to_i, province_id: r[1].to_i, name: r[2] } }
+    end
+  end
+
+  def self.districts
+    @districts ||= begin
+      data = read_csv('districts')
+      data.map { |r| { id: r[0].to_i, regency_id: r[1].to_i, name: r[2] } }
+    end
+  end
+
+  def self.villages
+    @villages ||= begin
+      data = read_csv('villages')
+      data.map { |r| { id: r[0].to_i, district_id: r[1].to_i, name: r[2] } }
+    end
+  end
+
+end

data/lib/indonesia/version.rb

@@ -1,3 +1,3 @@
 module Indonesia
-  VERSION = '0.5.0'.freeze
-end
+  VERSION = '0.6.0'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: indonesia
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Dimas J. Taniawan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,11 +96,8 @@ files:
 - lib/generators/indonesia/templates/models/province.rb
 - lib/generators/indonesia/templates/models/regency.rb
 - lib/indonesia.rb
-- lib/indonesia/district.rb
-- lib/indonesia/province.rb
-- lib/indonesia/regency.rb
+- lib/indonesia/finder.rb
 - lib/indonesia/version.rb
-- lib/indonesia/village.rb
 homepage: https://github.com/dimasjt/indonesia
 licenses:
 - MIT
@@ -120,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Indonesia addresses

data/lib/indonesia/district.rb

@@ -1,14 +0,0 @@
-module Indonesia
-  def self.districts(regency_id = nil)
-    @_districts ||= begin
-      data = CSV.read('lib/data/districts.csv')
-      data.map { |r| { id: r[0].to_i, regency_id: r[1].to_i, name: r[2] } }
-    end
-
-    if regency_id.nil?
-      @_districts
-    else
-      @_districts.select { |d| d[:regency_id] == regency_id.to_i }
-    end
-  end
-end

data/lib/indonesia/province.rb

@@ -1,8 +0,0 @@
-module Indonesia
-  def self.provinces
-    @_provinces ||= begin
-      data = CSV.read('lib/data/provinces.csv')
-      data.map { |r| { id: r[0].to_i, name: r[1] } }
-    end
-  end
-end

data/lib/indonesia/regency.rb

@@ -1,14 +0,0 @@
-module Indonesia
-  def self.regencies(province_id = nil)
-    @_regencies ||= begin
-      data = CSV.read('lib/data/regencies.csv')
-      data.map { |r| { id: r[0].to_i, province_id: r[1].to_i, name: r[2] } }
-    end
-
-    if province_id.nil?
-      @_regencies
-    else
-      @_regencies.select { |r| r[:province_id] == province_id.to_i }
-    end
-  end
-end

data/lib/indonesia/village.rb

@@ -1,14 +0,0 @@
-module Indonesia
-  def self.villages(district_id = nil)
-    @_villages ||= begin
-      data = CSV.read('lib/data/villages.csv')
-      data.map { |r| { id: r[0].to_i, district_id: r[1].to_i, name: r[2] } }
-    end
-
-    if district_id.nil?
-      @_villages
-    else
-      @_villages.select { |v| v[:district_id] == district_id.to_i }
-    end
-  end
-end