pokotarou 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa801fd4bb62051c3a7859bba742c5b4814a320b20a2069f3eefccb48754b92
-  data.tar.gz: 5890e97baf6bd9994a4cb34830c9ecb5b36be6380e1198f76b70819cd8f1c9df
+  metadata.gz: f260f6c90328001a3c729c61542b44c05074d7c411956d5664252503fbac7823
+  data.tar.gz: 87fe8c2c794c6d005ec1a6d55f92c15ceb955ffea329459c7817eb08a785f9fb
 SHA512:
-  metadata.gz: 600a0fca3e8584d1f498a016583a4e4341facefb465bdfd5362082fc1cdc485fa0ba3f61e31f045c299722a95ac83fa633c8ed1a7a8f2784d630f132e4344ea6
-  data.tar.gz: c54bb8913a8d29e8604cd9d7e2b8e18495398dd1dd452ba208d4d38a831d6a2b456a08d8f618762e45b42c5c3ee36a713b7e2609fff4b7ad28d4772df6d3838c
+  metadata.gz: be2671c30d814129c9dd1e813bdff9c807555ca1ca57edaeea5a5dd23d770ce52d341314fb2a8d4d3f07926e4e95d36e6a457be0ba08345ac29c27ba96010560
+  data.tar.gz: d3f264b79c5fc9e8e6c910e819a2fb9b43bb477934bb2686a8abbd60f56750abd7297662c65abcc3f549d038029ccfef008b91a6995df7a3e0167c131daf8b51

data/lib/pokotarou/additional_methods.rb

@@ -1,14 +1,40 @@
 module AdditionalMethods
   class << self
-    @filepath = nil
-    attr_reader :filepath
+    attr_reader :filepathes
+    attr_reader :filepathes_from_yml
+
+    @filepathes = []
+    @filepathes_from_yml = []
+
+    def init
+      @filepathes ||= []
+      @filepathes_from_yml = []
+    end
 
     def import filepath
-      @filepath = filepath
+      add(@filepathes, filepath)
+    end
+
+    def import_from_yml filepath
+      add(@filepathes_from_yml, filepath)
     end
 
     def remove
-      @filepath = nil
+      @filepathes = []
+      @filepathes_from_yml = []
+    end
+
+    def remove_filepathes_from_yml
+      @filepathes_from_yml = []
+    end
+
+    private
+    def add filepath_arr, filepath
+      if filepath.instance_of?(Array)
+        filepath_arr.concat(filepath)
+      else
+        filepath_arr.push(filepath)
+      end
     end
   end
 end

data/lib/pokotarou/additional_variables/additional_variables.rb

@@ -1,24 +1,33 @@
 module AdditionalVariables
   class << self
     CONST_KEY = :"const'"
-    @const = nil
+    @const = {}
     attr_reader :const
-    
-    def import data
-      return unless data.has_key?(CONST_KEY)
+
+    def set_const data
+      set_const_variables(data)
+    end
+
+    def remove
+      @const = {}
+    end
+
+    def filepath
+      "pokotarou/additional_variables/def_variable.rb"
+    end
+
+    private 
+    def set_const_variables data
+      return {} unless data.has_key?(CONST_KEY)
       @const = data[CONST_KEY]
 
       # parse expression configlation
       @const.each do |key, val|
-        @const[key] = ConstExpressionParser.parse(val)
+        @const[key] = ConstParser.parse(val)
       end
 
       data.delete(CONST_KEY)
     end
 
-    def filepath
-      "pokotarou/additional_variables/def_const.rb"
-    end
-
   end  
 end

data/lib/pokotarou/additional_variables/def_variable.rb

@@ -0,0 +1,3 @@
+def const; AdditionalVariables.const end
+
+def let; AdditionalVariables.let end

data/lib/pokotarou/data_register.rb

@@ -1,12 +1,14 @@
-class RegistError < StandardError; end
+require "pokotarou/additional_variables/additional_variables.rb"
+
+class RegisterError < StandardError; end
 class SeedError < StandardError; end
 
 class DataRegister
   class << self
     def register data
       # init maked to accumulate maded data
-      maked = {}
-      maked_col = {}
+      maked = Hash.new { |h,k| h[k] = Hash.new(&h.default_proc) }
+      maked_col = Hash.new { |h,k| h[k] = {} }
       # init model_data to cache data of model
       model_cache = {}
       ActiveRecord::Base.transaction do
@@ -56,7 +58,7 @@ class DataRegister
           print "\e[0m"
           puts ""
 
-          raise RegistError.new
+          raise RegisterError.new
         end
       end
     end
@@ -155,6 +157,13 @@ class DataRegister
       end
     end
 
+    def update_let_key let, maked, maked_col
+      let.each do |key, val|
+        # TODO: run only maked_col or make key
+        AdditionalVariables.let[key] = ExpressionParser.parse(val, maked, maked_col)
+      end
+    end
+
     def apply_autoincrement? autoincrement_flg
       # default true
       return true if autoincrement_flg.nil?
@@ -199,17 +208,12 @@ class DataRegister
 
     def update_maked_data maked, sym_block, sym_model, col, seed
       # maked: { key: Model, value: {key: col1, val: [col1_element, col1_element]} }
-      maked[sym_block] ||= {}
-      maked[sym_block][sym_model] ||= {}
       maked[sym_block][sym_model][col] = seed
     end
 
     def update_maked_col maked_col, sym_model, column, vals
-      maked_col[sym_model] ||= {}
       maked_col[sym_model][column] ||= []
       maked_col[sym_model][column].concat(vals)
-
-      maked_col
     end
 
     def output_log log

data/lib/pokotarou/data_structure.rb

@@ -1,7 +1,10 @@
+require "pokotarou/additional_methods.rb"
+
 class DataStructure
   class << self
     def gen data
       execute_template_option_setting(data)
+      execute_import_setting(data)
       # return data structure bellow
       # [{ block_name => { model_name => { column_configration }}}, ...]
       data.reduce({}) do |acc, r|
@@ -17,6 +20,12 @@ class DataStructure
 
     private
 
+    def execute_import_setting data
+      return unless data.has_key?(:"import'")
+      AdditionalMethods.import_from_yml(data[:"import'"])
+      data.delete(:"import'")
+    end
+
     def execute_template_option_setting data
       return unless data.has_key?(:"template'")
       templates = data[:"template'"]

data/lib/pokotarou/expression_parser.rb

@@ -1,12 +1,22 @@
 require "pokotarou/additional_methods.rb"
 require "pokotarou/additional_variables/additional_variables.rb"
 require "pokotarou/arguments/arguments.rb"
+require "pokotarou/p_tool.rb"
+
+def load_filepath
+  require AdditionalVariables.filepath
+  require Arguments.filepath
+  AdditionalMethods.filepathes.each do |filepath|; require filepath end
+  AdditionalMethods.filepathes_from_yml.each do |filepath|; require filepath end
+end
+
 class ParseError < StandardError; end
 FOREIGN_KEY_SYMBOL = "F|"
 COLUMN_SYMBOL = "C|"
 
 class ExpressionParser
   class << self
+    
     def parse config_val, maked = nil, maked_col = nil
       begin
         case
@@ -29,6 +39,10 @@ class ExpressionParser
         # Integer
         when is_integer?(config_val)
           integer_process(config_val)
+        
+        # NeedUpdate
+        when is_need_update?(config_val)
+          need_update_process(config_val, maked, maked_col)
 
         # Nil
         when is_nil?(config_val)
@@ -66,9 +80,7 @@ class ExpressionParser
     def expression_process val, maked, maked_col
       # remove '<>'
       expression = val.strip[1..-2]
-      require AdditionalVariables.filepath if AdditionalVariables.const.present?
-      require AdditionalMethods.filepath if AdditionalMethods.filepath.present?
-      require Arguments.filepath if Arguments.filepath.present?
+      load_filepath()
       return self.parse(eval(expression), maked, maked_col)
     end
 
@@ -76,6 +88,10 @@ class ExpressionParser
       nothing_apply_process(val)
     end
 
+    def need_update_process val, maked, maked_col
+      return self.parse(val[:NeedUpdate], maked, maked_col)
+    end
+
     def nil_process val
       nothing_apply_process(val)
     end
@@ -160,14 +176,13 @@ class LoopExpressionParser < ExpressionParser
 end
 
 # for const variables
-class ConstExpressionParser < ExpressionParser
+class ConstParser < ExpressionParser
   class << self
     private
     def expression_process val, _, _
       # remove '<>'
       expression = val.strip[1..-2]
-      require AdditionalMethods.filepath if AdditionalMethods.filepath.present?
-      require Arguments.filepath if Arguments.filepath.present?
+      load_filepath()
       return self.parse(eval(expression))
     end
 
@@ -208,6 +223,11 @@ def is_integer? val
   val.instance_of?(Integer)
 end
 
+def is_need_update? val
+  return false unless val.kind_of?(Hash)
+  val.has_key?(:NeedUpdate)
+end
+
 def is_nil? val
   val.nil?
 end

data/lib/pokotarou/p_tool.rb

@@ -0,0 +1,38 @@
+module Ptool
+  class << self
+    def gen_br_text
+      ["text\ntext"]
+    end
+
+    def gen_created_at n = 7, datetime_str = DateTime.now.to_s, with_random_time = false
+      datetime = DateTime.parse(datetime_str)
+      n.times.reduce([]) do |acc, index|
+        hours_num = 0
+        minutes_num = 0
+        hours_num, minutes_num = get_random_time() if with_random_time
+
+        acc.push(datetime + index.day + hours_num.hours + minutes_num.minutes)
+
+        acc
+      end
+    end
+
+    def gen_updated_at created_arr, with_random_time = false
+      created_arr.each.reduce([]) do |acc, created_datetime|
+        hours_num = 5
+        minutes_num = 10
+        hours_num, minutes_num = get_random_time() if with_random_time
+
+        acc.push(created_datetime + hours_num.hours + minutes_num.minutes)
+
+        acc
+      end
+    end
+
+    private 
+
+    def get_random_time
+      [ rand(24) + 1, second_num = rand(59) + 1]
+    end
+  end 
+end

data/lib/pokotarou/version.rb

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

data/lib/pokotarou.rb

@@ -9,15 +9,24 @@ module Pokotarou
 
   class << self
     def execute input
+      AdditionalMethods.init()
+
       # if input is filepath, generate config_data
-      if input.kind_of?(String)
-        DataRegister.register(gen_config(input))
-      else
-        DataRegister.register(input)
-      end
+      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
+      AdditionalMethods.init()
+
       return_vals = []
       input_arr.each do |e|
         handler = gen_handler_with_cache(e[:filepath])
@@ -37,6 +46,7 @@ module Pokotarou
         set_args(e[:args])
 
         return_vals << Pokotarou.execute(handler.get_data())
+        AdditionalMethods.remove_filepathes_from_yml()
       end
 
       return_vals
@@ -53,6 +63,7 @@ module Pokotarou
     def reset
       AdditionalMethods.remove()
       Arguments.remove()
+      AdditionalVariables.remove()
       @handler_chache = {}
     end
 
@@ -76,7 +87,7 @@ module Pokotarou
     end
 
     def set_const_val_config contents
-      AdditionalVariables.import(contents)
+      AdditionalVariables.set_const(contents)
     end
 
     def load_file filepath

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokotarou
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Kashiwara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,7 +51,7 @@ files:
 - lib/pokotarou.rb
 - lib/pokotarou/additional_methods.rb
 - lib/pokotarou/additional_variables/additional_variables.rb
-- lib/pokotarou/additional_variables/def_const.rb
+- lib/pokotarou/additional_variables/def_variable.rb
 - lib/pokotarou/arguments/arguments.rb
 - lib/pokotarou/arguments/def_args.rb
 - lib/pokotarou/array_operation.rb
@@ -61,6 +61,7 @@ files:
 - lib/pokotarou/expression_parser.rb
 - 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

data/lib/pokotarou/additional_variables/def_const.rb

@@ -1 +0,0 @@
-def const; AdditionalVariables.const end