pokotarou 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f75bcc0cbeeed32c48874cf3ea41817cfe359d82a0aecdc1b5062365bf48d23
-  data.tar.gz: bd97590057da55d8a5f6f9e907c7f718030524172a545afb9f00059deb1e0fb5
+  metadata.gz: ffa801fd4bb62051c3a7859bba742c5b4814a320b20a2069f3eefccb48754b92
+  data.tar.gz: 5890e97baf6bd9994a4cb34830c9ecb5b36be6380e1198f76b70819cd8f1c9df
 SHA512:
-  metadata.gz: 0777afe90ef3099ebe61bc5956ac9dbf0eb1eb62c4a84658f078af80ae6c40577c24eabfb35b3997b4474bb897e47ed031aab0455c9ad96c9bc2cf6ae0667083
-  data.tar.gz: 8c24b5afe74f74a7d2ad274c88b97fdf669c0cc5da1f3cf9d7e997569287ff53c5163a324f23b550827b8e27f1c5c699f0c19d098bdf52ca5bfd1830e7a1fa11
+  metadata.gz: 600a0fca3e8584d1f498a016583a4e4341facefb465bdfd5362082fc1cdc485fa0ba3f61e31f045c299722a95ac83fa633c8ed1a7a8f2784d630f132e4344ea6
+  data.tar.gz: c54bb8913a8d29e8604cd9d7e2b8e18495398dd1dd452ba208d4d38a831d6a2b456a08d8f618762e45b42c5c3ee36a713b7e2609fff4b7ad28d4772df6d3838c

data/lib/pokotarou.rb

@@ -17,7 +17,7 @@ module Pokotarou
       end
     end
 
-    def pipleine_execute input_arr
+    def pipeline_execute input_arr
       return_vals = []
       input_arr.each do |e|
         handler = gen_handler_with_cache(e[:filepath])

data/lib/pokotarou/data_register.rb

@@ -1,5 +1,4 @@
 class RegistError < StandardError; end
-class SettingError < StandardError; end
 class SeedError < StandardError; end
 
 class DataRegister
@@ -27,14 +26,13 @@ class DataRegister
     private
 
     def register_val_by_bulk sym_block, model_data, maked, model_cache, maked_col
-      begin
-        model_data.each do |e|
+      model_data.each do |e|
+        begin
           str_model = e.first.to_s
           save_model_cache(model_cache, str_model)
 
           model = model_cache[str_model][:model]
           sym_model = model_cache[str_model][:sym_model]
-
           # model_data.values is config_data
           config_data = e.second
           # set expand expression for loop '<>' and ':' and so on...
@@ -46,15 +44,20 @@ class DataRegister
 
           output_log(config_data[:log])
           insert_record(sym_block, str_model, config_data ,model_cache)
+        rescue => e
+          print "\e[31m"
+          puts "[Pokotarou ERROR]"
+          puts "+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+"
+          puts "Failed Register record"
+          puts "BLOCK: #{sym_block}"
+          puts "MODEL: #{str_model}"
+          puts "MESSAGE: #{e.message}"
+          puts "+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+"
+          print "\e[0m"
+          puts ""
+
+          raise RegistError.new
         end
-      rescue => e
-        raise SettingError.new("
-          Failed setting for bulk insert...
-
-          block: #{sym_block}
-          model: #{str_model}
-          message: #{e.message}
-        ")
       end
     end
 
@@ -63,18 +66,7 @@ class DataRegister
       col_arr = config_data[:col].keys
       # seed_arr: [[elem1, elem2, elem3...]]
       seed_arr = config_data[:col].map{|_, val| val }.transpose
-
-        begin
-          model_cache[str_model][:model].import(col_arr, seed_arr, validate: config_data[:validate], timestamps: false)
-        rescue => e
-          raise RegistError.new("
-            Failed bulk insert...
-
-            block: #{sym_block}
-            model: #{str_model}
-            message: #{e.message}
-          ")
-        end
+      model_cache[str_model][:model].import(col_arr, seed_arr, validate: config_data[:validate], timestamps: false)
     end
 
     def save_model_cache model_cache, str_model
@@ -146,13 +138,19 @@ class DataRegister
           update_maked_col(maked_col, sym_model, key, config_data[:col][key])
           config_data[:col][key] = seeds
         rescue => e
-          raise SeedError.new("
-            Failed generate seed data...
-            block: #{sym_block}
-            model: #{sym_model}
-            column: #{key}
-            message: #{e.message}
-          ")
+          print "\e[31m"
+          puts "[Pokotarou ERROR]"
+          puts "+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+"
+          puts "Failed Generating seed"
+          puts "BLOCK: #{sym_block}"
+          puts "MODEL: #{sym_model}"
+          puts "COLUMN: #{key}"
+          puts "MESSAGE: #{e.message}"
+          puts "+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+"
+          print "\e[0m"
+          puts ""
+
+          raise SeedError.new
         end
       end
     end

data/lib/pokotarou/option.rb

@@ -19,7 +19,7 @@ class Option
       # separate option to 'select' and 'add'
       # { select = >[], add => [] }
       select_filter = ->(name){ ["rotate", "random"].include?(name) }
-      add_filter = ->(name){ ["add_id"].include?(name) }
+      add_filter = ->(name){ ["add_id", "sequence"].include?(name) }
 
       {
         select: option.find{|s| select_filter.call(s)},
@@ -38,7 +38,7 @@ class Option
       # if val is nil, return nil
       return nil if val.nil?
       # not use '<<' to avoid destructive effect
-      return "#{val}_#{cnt}" if option == "add_id"
+      return "#{val}_#{cnt}" if option == "add_id" || option == "sequence"
 
       val
     end

data/lib/pokotarou/seeder.rb

@@ -1,4 +1,4 @@
-class Seeder 
+class Seeder
   class << self
     def gen config_data, key
       n = config_data[:loop]
@@ -9,8 +9,8 @@ class Seeder
       return make_array(n, ->(){ rand(100) }) if type == "integer"
       return make_array(n, ->(){ rand(0.0..100.0) }) if type == "float"
       return make_array(n, ->(){ rand(0.0..1_000_000_000.0) }) if type == "decimal"
-      return make_array(n, ->(){ "test_text test_text" }) if type == "string"
-      return make_array(n, ->(){ "test_long_text test_long_text test_long_text" }) if ["text", "binary"].include?(type)
+      return make_array(n, ->(){ SecureRandom.hex(20) }) if type == "string"
+      return make_array(n, ->(){ SecureRandom.hex(200) }) if ["text", "binary"].include?(type)
       return make_array(n, ->(){ [true, false].sample }) if type == "boolean"
       return make_string_array(n, enum) if type == "string"
       return make_datetime_array() if ["datetime", "date", "time"].include?(type)

data/lib/pokotarou/version.rb

@@ -1,3 +1,3 @@
 module Pokotarou
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokotarou
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Kashiwara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails