geo_master_jp 0.1.26 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 222479be95afab1d7dfa5087907f5a99dcf229a4c35090c0b2dc8ba0fad79ac6
-  data.tar.gz: 9e7a0dfd2ace7c18dc608d2255cf2a6e50b9198a0f1d981865d650ac479674a5
+  metadata.gz: adc8a7e422e37711056c4ddd7712130b61589a1c195b37523dc3d724ffd8a5e9
+  data.tar.gz: ed1f046133cf53560bf063eac7077da0e10e6d48673824c54bcef2e37af54211
 SHA512:
-  metadata.gz: 3a77f5add500810b1e8c5af4645e72f5a420b1a9f2cf2e92682ebbd7636f327b87833c01ae4174e62a9a9efc48d1c7670426bc0bc71ec7e54b88c128f3dad423
-  data.tar.gz: 67e6b73dad5918e49cc8f92889471cbd3521ff7a60e3fa4980fbc9c5a97b7b89d1e4b2911e68b8e7efcda75a3e0081aa6edbd5c04aea6a5c87bfc501a424f813
+  metadata.gz: ccd1b651a6d72e10c34d9224fc700d549efd350df4a7b091b4adaea5be7fbc39d37b0ea4b80e2ea21e82f669db158fa089b2b2fe6585e80e68608d6d1a438b71
+  data.tar.gz: 5ea2374908c016d0ad9709075263889b580e889503d29e924ef8a5a58aea4ebd3da63695a1d10e3afe29d54e1ff79567330a50f2098a2bbf710527e241399f0e

data/app/controllers/geo_master_jp/area_api_controller.rb

@@ -3,11 +3,13 @@ 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])
         },
-        initials: prefectures.group_by(&:head_kana).sort_by(&:first).to_h
+        initials: prefectures.sort_by(&:name_kana).group_by(&:head_kana).sort_by(&:first).to_h
       }
     end
 
@@ -20,11 +22,13 @@ 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])
         },
-        initials: cities.group_by(&:head_kana).sort_by(&:first).to_h
+        initials: cities.sort_by(&:name_kana).group_by(&:head_kana).sort_by(&:first).to_h
       }
     end
 
@@ -37,12 +41,18 @@ 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])
         },
-        initials: towns.group_by(&:head_kana).sort_by(&:first).to_h
+        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/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.26'
+  VERSION = '0.1.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_master_jp
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.28
 platform: ruby
 authors:
 - ykogure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails