geo_master_jp 0.1.27 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdbb79f24d837f43fc96dc1ddf04fe14bd43d1b234e9928d9e8435f3445f6216
-  data.tar.gz: 06a43b3aa8e7ac69bc00e1dfc8fa7df61e8f7fff830652be49febcceccf6e901
+  metadata.gz: 792aee56124d3e9f0267333ba66bf7e5429ad6c281013efe1c2a3b23557cbd36
+  data.tar.gz: 4bcefa376a8fe95065214fb025ee4cd40bf33e81baedff8de8347cee88f16680
 SHA512:
-  metadata.gz: e994cc5ab019eed3de83acff48524e0cd97f1bb047f1313d816ac2951861a2455fb917af49fe7d2f05ad917295794dc7791f3f7f9a9c72e9ed9b6581c8d3e8ed
-  data.tar.gz: 355268293ef44ba5a4009cda8a951935b9bede0d82d20f1ac3efcff91d290db9b43ec94bd384e3a4ad62f4b2c8d0b858243e3e99e1254b8bbf878659a89d6c70
+  metadata.gz: 7f5af00e3bd7ed49ed3acb9669b03a7b19f5df9a2c16918b460e9d7296e15a32ad996a98be753400c01d83b17c6ac3db160fc25f590cb6ce8d94d24b1b2bfd8d
+  data.tar.gz: 7d6c998a40c969fba255c4ad086afca0799e959f91ee1f722ae53239ea71e69e2bb5f5aac66d01fef3c048916883ab5d72a4869921977a6f06d73c79d9763c2d

data/README.md

@@ -45,6 +45,8 @@ rails g geo_master_jp:install_area_data
 rails g geo_master_jp:install_railway_data
 ```
 
+*Area data is required as a prerequisite.
+
 ## Usage
 
 ### Use Area Data Examples

data/app/controllers/geo_master_jp/area_api_controller.rb

@@ -3,6 +3,8 @@ module GeoMasterJp
     def prefectures
       prefectures = GeoMasterJp::Prefecture.all
 
+      prefectures = GeoMasterJp.config.api.prefectures_filter.call(prefectures) if GeoMasterJp.config.api.prefectures_filter
+
       render json: {
         prefectures: prefectures.map{|prefecture|
           prefecture.as_json(only: [:code, :name, :name_kana, :name_alphabet, :short_name])
@@ -20,6 +22,8 @@ module GeoMasterJp
 
       cities = GeoMasterJp::Prefecture.find_by(code: params[:prefecture_code]).cities
 
+      cities = GeoMasterJp.config.api.cities_filter.call(cities) if GeoMasterJp.config.api.cities_filter
+
       render json: {
         cities: cities.map{|city|
           city.as_json(only: [:code, :name, :name_kana, :name_alphabet, :short_name])
@@ -37,6 +41,8 @@ module GeoMasterJp
 
       towns = GeoMasterJp::City.find_by(code: params[:city_code]).towns
 
+      towns = GeoMasterJp.config.api.towns_filter.call(towns) if GeoMasterJp.config.api.towns_filter
+
       render json: {
         towns: towns.map{|town|
           town.as_json(only: [:zip_code, :code, :name, :name_kana, :name_alphabet, :short_name])
@@ -44,5 +50,9 @@ module GeoMasterJp
         initials: towns.sort_by(&:name_kana).group_by(&:head_kana).sort_by(&:first).to_h
       }
     end
+
+    def self.aaa(text)
+      puts text
+    end
   end
 end

data/app/models/geo_master_jp/prefecture.rb

@@ -22,8 +22,8 @@ module GeoMasterJp
       self.cities.map{|city| [city.name, city.code] }
     end
 
-    def self.select_options
-      self.all.map{|prefecture| [prefecture.name, prefecture.code] }
+    def self.select_options(transactions=nil)
+      (transactions || all).map{|prefecture| [prefecture.name, prefecture.code] }
     end
   end
 end

data/lib/generators/geo_master_jp/install_railway_data_generator.rb

@@ -5,10 +5,10 @@ require 'yaml'
 module GeoMasterJp
   module Generators
     class InstallRailwayDataGenerator < Rails::Generators::Base
-      RAILWAY_COMPANY_VERSION    = '20180424'
-      LINE_VERSION               = '20190405'
-      STATION_VERSION            = '20190405'
-      STATION_CONNECTION_VERSION = '20190405'
+      RAILWAY_COMPANY_VERSION    = '20240328'
+      LINE_VERSION               = '20240426'
+      STATION_VERSION            = '20240426'
+      STATION_CONNECTION_VERSION = '20240426'
 
       source_root File.expand_path('templates', __dir__)
 
@@ -165,8 +165,8 @@ module GeoMasterJp
           station.address    = row[8].gsub('-', '')
           station.longitude  = row[9]
           station.latitude   = row[10]
-          station.open_date  = Date.parse(row[11]) if row[11].present?
-          station.close_date = Date.parse(row[12]) if row[12].present?
+          station.open_date  = Date.parse(row[11]) if row[11].present? && row[11] != '0000-00-00'
+          station.close_date = Date.parse(row[12]) if row[12].present? && row[12] != '0000-00-00'
           station.sort_order = row[14].to_i
 
           station

data/lib/generators/geo_master_jp/templates/geo_master_jp.rb

@@ -12,4 +12,14 @@ GeoMasterJp.configure do |config|
 
   # Use Models
   # config.use_models = [:area, :railway]
+
+  # API Filters
+  # config.api.prefectures_filter = ->(prefectures) {
+  #   prefecture_codes = ['11', '12', '13', '14']
+  #   prefectures.select { |prefecture| prefecture.code.in?(prefecture_codes) }
+  # }
+  # config.api.cities_filter = ->(cities) {
+  # }
+  # config.api.towns_filter = ->(towns) {
+  # }
 end

data/lib/geo_master_jp/config.rb

@@ -9,15 +9,20 @@ module GeoMasterJp
 
   class Config
     # Variables detail is writen in lib/generators/templates/geo_master_jp.rb.
-    attr_accessor :alternative_class_names, :use_models
+    attr_accessor :alternative_class_names, :use_models, :api
 
     def initialize
       @alternative_class_names = {}
       @use_models = [:area, :railway]
+      @api = API.new
     end
 
     def alternative_class_name(key)
       @alternative_class_names[key] || "GeoMasterJp::#{key.to_s.camelize}"
     end
+
+    class API
+      attr_accessor :prefectures_filter, :cities_filter, :towns_filter
+    end
   end
 end

data/lib/geo_master_jp/version.rb

@@ -1,3 +1,3 @@
 module GeoMasterJp
-  VERSION = '0.1.27'
+  VERSION = '0.1.29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_master_jp
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.29
 platform: ruby
 authors:
 - ykogure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2024-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,11 +101,11 @@ files:
 - app/models/geo_master_jp/town.rb
 - app/models/geo_master_jp/version.rb
 - config/routes.rb
-- lib/generators/geo_master_jp/data/company20180424.csv.zip
-- lib/generators/geo_master_jp/data/join20190405.csv.zip
-- lib/generators/geo_master_jp/data/line20190405free.csv.zip
+- lib/generators/geo_master_jp/data/company20240328.csv.zip
+- lib/generators/geo_master_jp/data/join20240426.csv.zip
+- lib/generators/geo_master_jp/data/line20240426free.csv.zip
 - lib/generators/geo_master_jp/data/prefectures.yml
-- lib/generators/geo_master_jp/data/station20190405free.csv.zip
+- lib/generators/geo_master_jp/data/station20240426free.csv.zip
 - lib/generators/geo_master_jp/install_area_data_generator.rb
 - lib/generators/geo_master_jp/install_generator.rb
 - lib/generators/geo_master_jp/install_migration_generator.rb
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Summary of GeoMasterJp.