pokotarou 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2405129bdaf545e80c102a188d1feca1c39462c0ef4f8a59df4f66eef228c8f4
-  data.tar.gz: 75d205d49492a61ec5d621e23043ec31fbfd397ec08f2b2775b0f64746cb4d81
+  metadata.gz: 7ac5ca9e6a97f214d20ea830f738f3b444ab696dd83005d0e469bc7f42f2d7d0
+  data.tar.gz: 8e58ee4c95f0465de660f5c188e9f3b46d3311a4391b0ec1076a855d8d2bb927
 SHA512:
-  metadata.gz: dedda38c93623417cd069c56caa32e335c28e3c05c809533a3adb2cd4904f3ef5d86cd2d309587188693120bce3e523cc766fa70dd80ce1d155f585cd7058de0
-  data.tar.gz: b4c8c1a7f6a1587b5357b3d6c1ced595406c42516acf4db3c3db9657dad7d26f31c7897f586c3517320875a464c09dd88e7537f74d363cc2146d05ad2f95a345
+  metadata.gz: 01761775a3d8204d369de8aab3e7bcc52554e96ba89b1aa164b6c25a11a090f99d90f4c9a37fc0426143c0ff24ee8e409adc8b735ddafca0b8f5ebf35d400c0d
+  data.tar.gz: 608db2c1580ea6151b370e6cb8fb0c97e9f7b902232f6bd73cec988674cb52d7f4e20189092bdc926937d1694307bcae6e03ea825778ab5d37184d8bea0a0aca

data/README.md

@@ -13,7 +13,6 @@ You don't have to write a program for seeder
 
 ### Fast speed
 If it is the following table, 10,000 records can regist in 0.4s on average
-Also, If you enable 'optimize option', 10,000 records can regist in 0.23s on average
 
 |Field|Type|NULL|
 |:---|:---|:---|
@@ -320,17 +319,6 @@ Default:
       id: [100, 101, 102]
 ```
 
-#### Optimize
-
-If you enable 'optimize', Pokotarou Run a query builder, but disable validation
-
-```
-Default:
-  Pref:
-    loop: 3
-    optimaize: true
-```
-
 #### Pokotarou Handler
 
 if you use Pokotarou handler, can update pokotarou's parameter
@@ -378,7 +366,7 @@ Default:
   Pref: 
     loop: 3
     col:
-      name: ["北海道", "青森県", "岩手県"]
+      name: ["Hokkaido", "Aomori", "Iwate"]
     convert:
       name: ["empty(0..0)", "nil(1..2)"]
 ```
@@ -392,4 +380,4 @@ Default:
 | empty    | convert val to empty                     |
 | nil      | convert val to nil                       |
 | big_text | convert val to big_text("text" * 50)     |
-| br_text  | convert val to br_text("text\n" * 5)     |
+| br_text  | convert val to br_text("text\n" * 5)     |

data/lib/pokotarou/array_operation.rb

@@ -0,0 +1,13 @@
+class NothingDataError < StandardError; end
+class ArrayOperation
+  class << self
+    # return rotated val in passed array
+    def get_rotated_val array, size, cnt
+      raise NothingDataError.new("Nothing seed data") if array.nil?
+      raise NothingDataError.new("Seed data is empty") if size.zero?
+      x = (size + cnt) / size
+
+      array[ size + cnt - size * x ]
+    end
+  end
+end

data/lib/pokotarou/data_register.rb

@@ -165,7 +165,7 @@ class DataRegister
     end
 
     def get_seed arr, size, cnt
-      get_rotated_val(arr, size, cnt)
+      ArrayOperation.get_rotated_val(arr, size, cnt)
     end
 
     def get_seed_with_option arr, size, option, cnt

data/lib/pokotarou/expression_parser.rb

@@ -11,8 +11,6 @@ class ExpressionParser
         case
         when config_val.instance_of?(Array)
           return config_val
-        when config_val.nil?
-          return nil
         when is_foreign_key?(config_val)
           # remove 'F|'
           str_model = config_val.sub(FOREIGN_KEY_SYMBOL, "")

data/lib/pokotarou/option.rb

@@ -9,6 +9,7 @@ class Option
 
     def apply arr, size, option_conf, cnt = 0
       selected_val = select(option_conf[:select], arr, size, cnt)
+
       add(option_conf[:add], selected_val, cnt)
     end
 
@@ -28,11 +29,14 @@ class Option
 
     def select option, arr, size, cnt
       return arr.sample if option == "random"
+
       # default return rotate
-      get_rotated_val(arr, size, cnt)
+      ArrayOperation.get_rotated_val(arr, size, cnt)
     end
 
     def add option, val, cnt
+      # if val is nil, return nil
+      return nil if val.nil?
       # use '+', not use '<<' to avoid destructive effect
       return val + "_#{cnt}" if option == "add_id"
 

data/lib/pokotarou/pokotarou_handler.rb

@@ -3,14 +3,30 @@ class PokotarouHandler
     @data = data
   end
 
+  def delete_block sym_block
+    @data.delete(sym_block)
+  end
+
   def delete_model sym_block, sym_class
     @data[sym_block].delete(sym_class)
   end
 
+  def delete_col sym_block, sym_class, sym_col
+    exists_content = ->(key){ @data[sym_block][sym_class][key].present? }
+
+    @data[sym_block][sym_class][:col].delete(sym_col) if exists_content.call(:col)
+    @data[sym_block][sym_class][:option].delete(sym_col) if exists_content.call(:option)
+    @data[sym_block][sym_class][:convert].delete(sym_col) if exists_content.call(:convert)
+  end
+
   def change_loop sym_block, sym_class, n
     @data[sym_block][sym_class][:loop] = n
   end
 
+  def change_col sym_block, sym_class, sym_col, arr
+    @data[sym_block][sym_class][:col][sym_col] = arr
+  end
+
   def get_data
     @data
   end

data/lib/pokotarou/version.rb

@@ -1,3 +1,3 @@
 module Pokotarou
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokotarou
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kashiwara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,12 +50,12 @@ files:
 - Rakefile
 - lib/pokotarou.rb
 - lib/pokotarou/additional_methods.rb
+- lib/pokotarou/array_operation.rb
 - lib/pokotarou/converter.rb
 - lib/pokotarou/data_register.rb
 - lib/pokotarou/data_structure.rb
 - lib/pokotarou/expression_parser.rb
 - lib/pokotarou/loader.rb
-- lib/pokotarou/my_mthods.rb
 - lib/pokotarou/option.rb
 - lib/pokotarou/pokotarou_handler.rb
 - lib/pokotarou/query_builder.rb

data/lib/pokotarou/my_mthods.rb

@@ -1,9 +0,0 @@
-class NothingDataError < StandardError; end
-
-# return rotated val in passed array
-def get_rotated_val array, size, cnt
-  raise NothingDataError.new("Nothing seed data") if array.nil?
-  raise NothingDataError.new("Seed data is empty") if size.zero?
-  x = (size + cnt) / size
-  array[ size + cnt - size * x ]
-end