pokotarou 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb37e93ab913cfc45d6bb0c06cbfec3149ac957e0592ef12d62f1ad6d3b0146e
-  data.tar.gz: c67cccf940b65008a991684a9603a99395aca02a9137613331680dc23612b841
+  metadata.gz: 12597f8db907a8280e94b6007de1bdd0b77e63501a3123f202e6fec7786c7bcd
+  data.tar.gz: 15072090ef575f4e34eba0e403c04552f22046a3ca1cc3effbe4d5cf4d8625e1
 SHA512:
-  metadata.gz: 870208b9d5b2449ccd6bc1884bf0a78596da211d261deccba8353919fec4a617925cbcdeaf2330949d34c07370e89b24ad8649eef3c28aa8fe0f41b5602bab3c
-  data.tar.gz: 406ad8070133722c71dcebf8b2df12f2471563b0e0ad15f4647d41a62025c20e85a32ba2334fee1951966e6b77fb8815e23f668e4f5320c92cfb57d26f6f3e87
+  metadata.gz: ff32c23a477fc3c4a618c6dce3eff767e413b63c37ec8a21dc83c6bc65d41b62c4c37109ab4faa0e96086b00eb48b673ca79184d1f764fe94b6c39bf1c9b6102
+  data.tar.gz: 84d896e8fc5418a08ce555aaf40fe327ee245d9e081a76ebb632789eb10c5dee6669d876bd7eeea7fbdfac2b734c4d4fcb47738cd06f46ea90ac9f5a26c8d30a

data/lib/pokotarou/registration_config_maker/config_domain.rb

@@ -16,6 +16,11 @@ module Pokotarou
           return false if all_content.blank?
           return all_content.has_key?(:"template_path'")
         end
+
+        def has_dush_preset_path_syntax? all_content
+          return false if all_content.blank?
+          return all_content.has_key?(:"preset_path'")
+        end
   
         def has_grouping_syntax? model_content
           return false if model_content.blank?

data/lib/pokotarou/registration_config_maker/main.rb

@@ -4,7 +4,8 @@ require "pokotarou/registration_config_maker/import_option_setter.rb"
 require "pokotarou/registration_config_maker/template_option_setter.rb"
 require "pokotarou/registration_config_maker/grouping_option_setter.rb"
 require "pokotarou/registration_config_maker/model_option_setter.rb"
-  
+require "pokotarou/registration_config_maker/preset_option_setter.rb"
+
 module Pokotarou
   module RegistrationConfigMaker
     class Main
@@ -29,6 +30,7 @@ module Pokotarou
   
         def set_header_config all_content
           set_template_option(all_content)
+          set_preset_option(all_content)
           set_import_option(all_content)
         end
   
@@ -36,6 +38,11 @@ module Pokotarou
           return unless ConfigDomain.has_dush_import_syntax?(all_content)
           ImportOptionSetter.set(all_content)
         end
+
+        def set_preset_option all_content
+          return all_content unless ConfigDomain.has_dush_preset_path_syntax?(all_content)
+          PresetOptionSetter.set(all_content)
+        end
   
         def set_template_option all_content
           return if !ConfigDomain.has_dush_template_syntax?(all_content) && !ConfigDomain.has_dush_template_path_syntax?(all_content)

data/lib/pokotarou/registration_config_maker/preset_option_setter.rb

@@ -0,0 +1,45 @@
+require "pokotarou/registration_config_maker/config_domain.rb"
+module Pokotarou
+  module RegistrationConfigMaker
+    class PresetOptionSetter
+      class << self
+        def set all_content
+          preset_content = {}
+
+          all_content[:"preset_path'"].each do |path|
+            YAML.load_file(path).deep_symbolize_keys!.each do |preset|
+                preset_content[preset.first] = preset.second
+            end
+          end
+
+          # 使用済みのKeyなので削除
+          all_content.delete(:"preset_path'")
+          
+          # hashの順番を更新するために一度全てのKeyを消す
+          tmp = {}
+          all_content.each do |config|
+            key = config.first
+            value = config.second
+            tmp[key] = value
+
+            all_content.delete(key)
+          end
+          
+          # presetを先に展開する必要があるので、再代入して順番を変更する
+          merge(all_content, preset_content)
+          merge(all_content, tmp)
+        end
+
+        private
+        def merge all_content, merge_hash
+          merge_hash.each do |config|
+            key = config.first
+            value = config.second
+            all_content[key] = value
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/pokotarou/version.rb

@@ -1,3 +1,3 @@
 module Pokotarou
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokotarou
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Kashiwara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -65,6 +65,7 @@ files:
 - lib/pokotarou/registration_config_maker/import_option_setter.rb
 - lib/pokotarou/registration_config_maker/main.rb
 - lib/pokotarou/registration_config_maker/model_option_setter.rb
+- lib/pokotarou/registration_config_maker/preset_option_setter.rb
 - lib/pokotarou/registration_config_maker/template_option_setter.rb
 - lib/pokotarou/registration_config_updater/array_utils.rb
 - lib/pokotarou/registration_config_updater/convert_config.rb