basho 0.2.2 → 0.3.0

data/lib/basho/data/loader.rb

@@ -37,7 +37,7 @@ module Basho
 
         def load_json(relative_path)
           path = File.join(DATA_DIR, relative_path)
-          return [] unless File.exist?(path)
+          return [] unless path.start_with?("#{DATA_DIR}/") && File.exist?(path)
 
           JSON.parse(File.read(path), symbolize_names: true)
         end

data/lib/basho/engine.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Basho
-  # Hotwire自動入力・カスケードセレクトを提供するRails Engine
+  # Hotwire郵便番号自動入力を提供するRails Engine
   class Engine < ::Rails::Engine
     isolate_namespace Basho
 
@@ -9,6 +9,12 @@ module Basho
       app.config.importmap.paths << root.join("config/importmap.rb") if app.config.respond_to?(:importmap)
     end
 
+    initializer "basho.helpers" do
+      ActiveSupport.on_load(:action_view) do
+        include Basho::FormHelper
+      end
+    end
+
     initializer "basho.assets" do |app|
       app.config.assets.paths << root.join("app/assets/javascripts") if app.config.respond_to?(:assets)
     end

data/lib/basho/postal_code.rb

@@ -2,10 +2,6 @@
 
 module Basho
   PostalCode = ::Data.define(:code, :prefecture_code, :city_name, :town) do
-    def initialize(city: nil, city_name: nil, **attrs)
-      super(city_name: city || city_name, **attrs)
-    end
-
     def formatted_code
       "#{code[0..2]}-#{code[3..]}"
     end
@@ -20,6 +16,10 @@ module Basho
 
     class << self
       def find(code)
+        where(code: code).first
+      end
+
+      def where(code:)
         normalized = code.to_s.delete("-")
         return [] unless normalized.match?(/\A\d{7}\z/)
 

data/lib/basho/prefecture.rb

@@ -2,10 +2,6 @@
 
 module Basho
   Prefecture = ::Data.define(:code, :name, :name_en, :name_kana, :name_hiragana, :region_name, :type, :capital_code) do
-    def initialize(region: nil, region_name: nil, **attrs)
-      super(region_name: region || region_name, **attrs)
-    end
-
     def region
       Region.find(region_name)
     end
@@ -23,14 +19,11 @@ module Basho
         @all ||= Data::Loader.prefectures.map { |data| new(**data) }
       end
 
-      def find(code_or_options = nil, **options)
-        case code_or_options
-        when Integer
-          all.find { |pref| pref.code == code_or_options }
-        when Hash
-          find_by_options(code_or_options)
-        else
-          find_by_options(options) if options.any?
+      def find(code = nil, **options)
+        if code
+          all.find { |pref| pref.code == code }
+        elsif options.any?
+          find_by_options(options)
         end
       end
 

data/lib/basho/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Basho
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basho
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Hirotaka Wagai
@@ -23,9 +23,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/controllers/basho/auto_fill_controller.js
-- app/assets/javascripts/controllers/basho/cascade_select_controller.js
 - app/controllers/basho/postal_codes_controller.rb
-- app/controllers/basho/prefectures_controller.rb
 - app/helpers/basho/form_helper.rb
 - app/views/basho/postal_codes/lookup.html.erb
 - config/importmap.rb
@@ -1060,7 +1058,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Japanese address data (prefectures, cities, postal codes, regions) in a single
   gem

data/app/assets/javascripts/controllers/basho/cascade_select_controller.js

@@ -1,77 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["prefecture", "city"]
-  static values = {
-    prefecturesUrl: String,
-    citiesUrlTemplate: String
-  }
-
-  connect() {
-    this.abortController = new AbortController()
-
-    if (this.prefectureTarget.options.length <= 1) {
-      this.#loadPrefectures()
-    }
-  }
-
-  disconnect() {
-    this.abortController.abort()
-  }
-
-  prefectureChanged() {
-    const code = this.prefectureTarget.value
-    this.#clearOptions(this.cityTarget)
-
-    if (!code) return
-
-    this.#loadCities(code)
-  }
-
-  async #loadPrefectures() {
-    try {
-      const response = await fetch(this.prefecturesUrlValue, {
-        signal: this.abortController.signal
-      })
-      if (!response.ok) return
-
-      const prefectures = await response.json()
-      prefectures.forEach(({ code, name }) => {
-        this.prefectureTarget.appendChild(new Option(name, code))
-      })
-    } catch (error) {
-      if (error.name !== "AbortError") {
-        this.dispatch("error", { detail: { message: "Failed to load prefectures", error } })
-      }
-    }
-  }
-
-  async #loadCities(code) {
-    if (!/^\d{1,2}$/.test(code)) return
-
-    try {
-      const url = this.citiesUrlTemplateValue.replace(":code", encodeURIComponent(code))
-      const response = await fetch(url, {
-        signal: this.abortController.signal
-      })
-      if (!response.ok) return
-
-      const cities = await response.json()
-      cities.forEach(({ code, name }) => {
-        this.cityTarget.appendChild(new Option(name, code))
-      })
-    } catch (error) {
-      if (error.name !== "AbortError") {
-        this.dispatch("error", { detail: { message: "Failed to load cities", error } })
-      }
-    }
-  }
-
-  #clearOptions(select) {
-    const hasPlaceholder = select.options[0] && !select.options[0].value
-    const start = hasPlaceholder ? 1 : 0
-    while (select.options.length > start) {
-      select.remove(start)
-    }
-  }
-}

data/app/controllers/basho/prefectures_controller.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Basho
-  # 都道府県・市区町村のJSON APIコントローラー
-  class PrefecturesController < ActionController::API
-    CACHE_MAX_AGE = 86_400 # 24時間
-
-    def index
-      expires_in CACHE_MAX_AGE, public: true
-
-      prefectures = Prefecture.all.map { |p| { code: p.code, name: p.name } }
-      render json: prefectures
-    end
-
-    def cities
-      prefecture = find_prefecture
-      return render json: [], status: :not_found unless prefecture
-
-      expires_in CACHE_MAX_AGE, public: true
-
-      cities = City.where(prefecture_code: prefecture.code).map { |c| { code: c.code, name: c.name } }
-      render json: cities
-    end
-
-    private
-
-    def find_prefecture
-      code = params[:code].to_s
-      return nil unless code.match?(/\A[1-9]\d?\z/)
-
-      Prefecture.find(code.to_i)
-    end
-  end
-end