pokotarou 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38bd381d74ed4731fdb2c3af3211af492cea80f5e08f7d0cd42944e2b722aa8c
-  data.tar.gz: 161e98919c174d0cd170c9401d70d65bc5a2311912e8201618c6fac3c841580b
+  metadata.gz: 62fc987dc55f5258ed2d6a3a8efa366b245795bd380b4178bc769d500ec46338
+  data.tar.gz: 265f6f6918e1b92b0852971c7b925ba77b883f83065ecd2152204e06505b639e
 SHA512:
-  metadata.gz: 5a39ece97d618b6670b69e3db80064b3a499ac315f918293550f807c7a5b8d7360900631bbd32710c05445ff9b780865e7ea621c66f59a5712252d612f145872
-  data.tar.gz: a3d17bd0d59f04e373ac31039d1399592e43aec29fba8802b509b690f97c00780b228529e01c883276f046162c906059ac7d7e54e1289e50926e6910524a5a92
+  metadata.gz: 10ede458b68376974383c29abcb0932c50c721b1115b5818ebc7aadd5cbf4fb6faa45c54037bf6d6c87ea128d9f89f1e1e2fedbeeb7fb31377a9cb1cc1638bab
+  data.tar.gz: ff000b11427a3b70d9a5ffc3066245b763115af51c2e8a736c0c8a4f7f9d56384355289cb74e24bb1642163577ba61dc21cf2a3dbcc52dc96888c3f40a95db67

data/README.md

@@ -1,5 +1,5 @@
-![s_PokotarouLogo](https://user-images.githubusercontent.com/52961642/61586183-ef59b580-aba8-11e9-83b0-19eac7339982.png)
-
+![s_PokotarouLogo](https://user-images.githubusercontent.com/52961642/61586183-ef59b580-aba8-11e9-83b0-19eac7339982.png)  
+[![Gem Version](https://badge.fury.io/rb/pokotarou.svg)](https://badge.fury.io/rb/pokotarou)
 [![Build Status](https://travis-ci.org/Tamatebako0205/Pokotarou.svg?branch=master)](https://travis-ci.org/Tamatebako0205/Pokotarou)
 
 Pokotarou is convenient seeder of 'Ruby on Rails' that uses .yml

data/lib/pokotarou/converter.rb

@@ -0,0 +1,23 @@
+class Converter 
+  class << self
+    PARENTHESES = /\(.*\)/
+    def convert arr, config
+      return arr if config.nil?
+      config.each do |e|
+        range = eval(e.slice(PARENTHESES).delete("()"))
+        convert_name = e.gsub(PARENTHESES, "")
+        arr[range] = get_val(convert_name, range.size)
+      end
+
+      arr
+    end
+
+    def get_val convert_name, size
+      return [""] * size if convert_name == "empty"
+      return [nil] * size if convert_name == "nil"
+      return ["text\n" * 5] * size if convert_name == "br_text"
+      return ["text" * 50] * size if convert_name == "big_text"
+    end
+
+  end
+end

data/lib/pokotarou/data_register.rb

@@ -91,9 +91,9 @@ class DataRegister
     
     def get_seed_arr model, sym_block, sym_model, config_data, maked
       options = config_data[:option]
+      convert_conf = config_data[:convert]
       loop_size = config_data[:loop]
 
-
       if apply_autoincrement?(config_data[:autoincrement])
         set_autoincrement(config_data, model, loop_size)
       end
@@ -103,12 +103,22 @@ class DataRegister
           # set expand expression '<>' and ':' and so on...
           set_expand_expression(config_data, key, val, maked)
           expanded_val = config_data[:col][key]
+          expanded_val_size = expanded_val.size
+
+          # apply converter
+          if convert_conf.present?
+            expanded_val = Converter.convert(expanded_val, convert_conf[key])
+          end
+
+          # get option configration
           option_conf = options.nil? ? nil : Option.gen(options[key])
+
           # Take count yourself, because .with_index is slow
           cnt = 0
           seeds = 
             loop_size.times.map do
-              seed = option_conf.nil? ? get_seed(expanded_val, cnt) : get_seed_with_option(expanded_val, option_conf, cnt)
+              seed =
+                option_conf.nil? ? get_seed(expanded_val, expanded_val_size, cnt) : get_seed_with_option(expanded_val, expanded_val_size, option_conf, cnt)
               cnt += 1
 
               seed
@@ -135,10 +145,12 @@ class DataRegister
 
     def set_autoincrement config_data, model, loop_size
       last_record = model.last
-      # use pluck to optimize(suppress make object)
-      additions = model.all.pluck(:id).size + loop_size      
-      latest_id = last_record.nil? ? 1 : last_record.id + 1
-      config_data[:col][:id] = [*latest_id..additions]
+      # if id is nothing, get 0
+      current_id = last_record.nil? ? 0 : last_record.id
+      additions = current_id + loop_size
+      next_id = current_id + 1
+
+      config_data[:col][:id] = [*next_id..additions]
     end
 
     def set_expand_expression config_data, key, val, maked
@@ -152,12 +164,12 @@ class DataRegister
         LoopExpressionParser.parse(config_data[:loop], maked)  
     end
 
-    def get_seed arr, cnt
-      get_rotated_val(arr, cnt)
+    def get_seed arr, size, cnt
+      get_rotated_val(arr, size, cnt)
     end
 
-    def get_seed_with_option arr, option, cnt
-      Option.apply(arr, option, cnt)
+    def get_seed_with_option arr, size, option, cnt
+      Option.apply(arr, size, option, cnt)
     end
 
     def update_maked_data maked, sym_block, sym_model, col, seed

data/lib/pokotarou/my_mthods.rb

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

data/lib/pokotarou/option.rb

@@ -7,8 +7,8 @@ class Option
       option.nil? ? { select: [], add: [] } : separate(option)
     end
 
-    def apply arr, option_conf, cnt = 0
-      selected_val = select(option_conf[:select], arr, cnt)
+    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
 
@@ -26,10 +26,10 @@ class Option
       }
     end
 
-    def select option, arr, cnt
+    def select option, arr, size, cnt
       return arr.sample if option == "random"
       # default return rotate
-      get_rotated_val(arr, cnt)
+      get_rotated_val(arr, size, cnt)
     end
 
     def add option, val, cnt

data/lib/pokotarou/query_builder.rb

@@ -36,7 +36,6 @@ class QueryBuilder
        col_str.chop << ")"
     end
 
-
     def add_double_quote str
       "\"" << str << "\""
     end

data/lib/pokotarou/version.rb

@@ -1,3 +1,3 @@
 module Pokotarou
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokotarou
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kashiwara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-21 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.00'
-description: 'Pokotarou is fast seeder of ''Ruby on Rails'' URL: https://github.com/Tamatebako0205/Pokotarou'
+description: 'Pokotarou is convenient seeder of ''Ruby on Rails'' URL: https://github.com/Tamatebako0205/Pokotarou'
 email:
 - tamatebako0205@gmail.com
 executables: []
@@ -50,6 +50,7 @@ files:
 - Rakefile
 - lib/pokotarou.rb
 - lib/pokotarou/additional_methods.rb
+- lib/pokotarou/converter.rb
 - lib/pokotarou/data_register.rb
 - lib/pokotarou/data_structure.rb
 - lib/pokotarou/expression_parser.rb