pokotarou 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b008cbcb0ba3e353b7211ea37fd527cce5755ec8fd849468f8a0344d7821f7
-  data.tar.gz: f91024c92ff088d12152fd95d544a2566146481ec703c1125dc3b72fceacd768
+  metadata.gz: 0313ae9034a4b9ed1a64829a7d16a1811df5da6937f5639a8e3700a7c658a211
+  data.tar.gz: b7b90ac0f1fd81f2fb11e015ee0cfd6b8b38544f4e0ed272ee1a834dc05cf340
 SHA512:
-  metadata.gz: 9f81cc482686a8b858408cd2e9abe3c545f9de99cb3acaea6a243d45909eb5f3bf37b11fdb595aa08d9563009d77a068572cf792ce1eb98a73e3dac820bc4148
-  data.tar.gz: 18194fb1c96afe3951ed3f2c055c022c9f5670a801a7708ceeef34f074ad8333bf6ccafa3e1705f10ea34e66b6b12cb603824495423628606a64badb40facfe9
+  metadata.gz: 79b8112bd089213e28269d6cced5a1cc4157453079a3502218d4afecc01864393a6aab6dad7dc238dd257c8b47e0ba53c0fface455e2f32fa590bab8fa6fda02
+  data.tar.gz: 27462bd7caa6e7173a623fdbabaa406141a6cbd80618c70e7581355f2521d3921b75b0225f1503b3236aad45efab3645b8505b92033cabd21163c93ea9102028

data/lib/pokotarou.rb

@@ -5,108 +5,190 @@ end
 require "activerecord-import"
 
 module Pokotarou
-  class NotFoundLoader < StandardError; end
-
-  class << self
-    def execute input
-      init_proc()
-
-      # if input is filepath, generate config_data
-      return_val =
-        if input.kind_of?(String)
-          DataRegister.register(gen_config(input))
-        else
-          DataRegister.register(input)
-        end
-
-      AdditionalMethods.remove_filepathes_from_yml()
-
-      return_val
-    end
-
-    def pipeline_execute input_arr
-      init_proc()
-
-      return_vals = []
-      input_arr.each do |e|
-        handler = gen_handler_with_cache(e[:filepath])
-
-        if e[:change_data].present?
-          e[:change_data].each do |block, config|
-            config.each do |model, seed|
-              seed.each do |col_name, val|         
-                handler.change_seed(block, model, col_name, val)
+  class Operater
+    class NotFoundLoader < StandardError; end
+    class << self
+      def execute input
+        init_proc()
+  
+        # if input is filepath, generate config_data
+        return_val =
+          if input.kind_of?(String)
+            DataRegister.register(gen_config(input))
+          else
+            DataRegister.register(input)
+          end
+  
+        AdditionalMethods.remove_filepathes_from_yml()
+  
+        return_val
+      end
+  
+      def pipeline_execute input_arr
+        init_proc()
+  
+        return_vals = []
+        input_arr.each do |e|
+          handler = gen_handler_with_cache(e[:filepath])
+  
+          if e[:change_data].present?
+            e[:change_data].each do |block, config|
+              config.each do |model, seed|
+                seed.each do |col_name, val|         
+                  handler.change_seed(block, model, col_name, val)
+                end
               end
             end
           end
+          
+          e[:args] ||= {}
+          e[:args][:passed_return_val] = return_vals.last
+          set_args(e[:args])
+  
+          return_vals << Pokotarou.execute(handler.get_data())
+          AdditionalMethods.remove_filepathes_from_yml()
         end
-        
-        e[:args] ||= {}
-        e[:args][:passed_return_val] = return_vals.last
-        set_args(e[:args])
-
-        return_vals << Pokotarou.execute(handler.get_data())
-        AdditionalMethods.remove_filepathes_from_yml()
+  
+        return_vals
+      end
+  
+      def import filepath
+        init_proc()
+  
+        AdditionalMethods.import(filepath)
+      end
+  
+      def set_args hash
+        Arguments.import(hash)
+      end
+  
+      def reset
+        AdditionalMethods.remove()
+        Arguments.remove()
+        AdditionalVariables.remove()
+        @handler_chache = {}
+      end
+  
+      def gen_handler filepath
+        init_proc()
+  
+        PokotarouHandler.new(gen_config(filepath))
+      end
+  
+      def gen_handler_with_cache filepath
+        init_proc()
+  
+        @handler_cache ||= {}
+        @handler_cache[filepath] ||= PokotarouHandler.new(gen_config(filepath))
+  
+        @handler_cache[filepath].deep_dup
+      end
+  
+      private
+      def init_proc
+        AdditionalMethods.init()
       end
+  
+      def gen_config filepath
+        contents = load_file(filepath)
+        set_const_val_config(contents)
+        DataStructure.gen(contents)
+      end
+  
+      def set_const_val_config contents
+        AdditionalVariables.set_const(contents)
+      end
+  
+      def load_file filepath
+        case File.extname(filepath)
+        when ".yml"
+          return YmlLoader.load(filepath)
+        else
+          raise NotFoundLoader.new("not found loader")
+        end
+      end
+    end
+  end
+end
 
-      return_vals
+module Pokotarou
+  class << self
+    def execute input
+      Operater.execute(input)
     end
 
-    def import filepath
-      init_proc()
+    def pipeline_execute input_arr
+      Operater.pipeline_execute(input_arr)
+    end
 
-      AdditionalMethods.import(filepath)
+    def import filepath
+      Operater.import(filepath)
     end
 
     def set_args hash
-      Arguments.import(hash)
+      Operater.set_args(hash)
     end
 
     def reset
-      AdditionalMethods.remove()
-      Arguments.remove()
-      AdditionalVariables.remove()
-      @handler_chache = {}
+      Operater.reset()
     end
 
     def gen_handler filepath
-      init_proc()
-
-      PokotarouHandler.new(gen_config(filepath))
+      Operater.gen_handler(filepath)
     end
 
     def gen_handler_with_cache filepath
-      init_proc()
+      Operater.gen_handler_with_cache(filepath)
+    end
+  end
+end
 
-      @handler_cache ||= {}
-      @handler_cache[filepath] ||= PokotarouHandler.new(gen_config(filepath))
+class PokotarouHandler
+  def initialize data
+    @data = data
+  end
 
-      @handler_cache[filepath].deep_dup
-    end
+  def make
+    ::Pokotarou::Operater.execute(get_data())
+  end
 
-    private
-    def init_proc
-      AdditionalMethods.init()
-    end
+  def delete_block sym_block
+    @data.delete(sym_block)
+  end
 
-    def gen_config filepath
-      contents = load_file(filepath)
-      set_const_val_config(contents)
-      DataStructure.gen(contents)
-    end
+  def delete_model sym_block, sym_class
+    @data[sym_block].delete(sym_class)
+  end
 
-    def set_const_val_config contents
-      AdditionalVariables.set_const(contents)
-    end
+  def delete_col sym_block, sym_class, sym_col
+    exists_content = ->(key){ @data[sym_block][sym_class][key].present? }
 
-    def load_file filepath
-      case File.extname(filepath)
-      when ".yml"
-        return YmlLoader.load(filepath)
-      else
-        raise NotFoundLoader.new("not found loader")
-      end
-    end
+    @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
-end
+
+  def change_seed sym_block, sym_class, sym_col, arr
+    @data[sym_block][sym_class][:col][sym_col] = arr
+  end
+
+  def get_data
+    @data.deep_dup
+  end
+
+  def set_data data
+    @data = data
+  end
+ 
+  def set_randomincrement sym_block, sym_class, status
+    @data[sym_block][sym_class][:randomincrement] = status
+  end
+
+  def set_autoincrement sym_block, sym_class, status
+    @data[sym_block][sym_class][:autoincrement] = status
+  end
+end

data/lib/pokotarou/data_register.rb

@@ -171,20 +171,23 @@ class DataRegister
     end
 
     def set_autoincrement config_data, model, loop_size, prev_id_arr
-      last_record = model.last
+      max_id = model.maximum(:id)
+
       current_id =
         if prev_id_arr.present?
           prev_id_arr.last
-        elsif last_record.nil?
+        elsif max_id.nil?
           0
         else
-          last_record.id
+          max_id
         end
 
       additions = current_id + loop_size
       next_id = current_id + 1
 
-      config_data[:col][:id] = [*next_id..additions]
+      ids = [*next_id..additions]
+      ids.shuffle! if config_data[:randomincrement]
+      config_data[:col][:id] = ids
     end
 
     def set_expand_expression config_data, key, val, maked, maked_col

data/lib/pokotarou/version.rb

@@ -1,3 +1,3 @@
 module Pokotarou
-  VERSION = '1.1.9'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokotarou
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Kashiwara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,7 +62,6 @@ files:
 - lib/pokotarou/file_loader.rb
 - lib/pokotarou/option.rb
 - lib/pokotarou/p_tool.rb
-- lib/pokotarou/pokotarou_handler.rb
 - lib/pokotarou/seeder.rb
 - lib/pokotarou/version.rb
 - lib/tasks/pokotarou_tasks.rake

data/lib/pokotarou/pokotarou_handler.rb

@@ -1,37 +0,0 @@
-class PokotarouHandler
-  def initialize data
-    @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_seed sym_block, sym_class, sym_col, arr
-    @data[sym_block][sym_class][:col][sym_col] = arr
-  end
-
-  def get_data
-    @data.deep_dup
-  end
-
-  def set_data data
-    @data = data
-  end
-end