pokotarou 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52567b76f0cf89c860119076ad2a316aea9d81ab59dda0a93f5ac8ada6f679a2
-  data.tar.gz: bd033c9c0f52d2fa01952d4d80923771e6c3311e59979317403cad0baea7e484
+  metadata.gz: e745ff3535e86963bfd04eb386677ce231ff8de9464eb8661429d8f96debedf9
+  data.tar.gz: ec1da372cf523be34c7f82b51d8218d662da33a4bae792cd0e68aed335944a98
 SHA512:
-  metadata.gz: 27063c77ea44e57f3cf91f7d9e3dc55ebb3da46d223f6db760603616d6bd9abcf35c595f1499dd0bdd7021be33e0761d6035e6efead088a205e751a2251d0251
-  data.tar.gz: 3c2087fc63e1ff6f88735c389aa5fcbb2015f8c69450deb00d1011362db62faa8ebec84f17ddb3b91d4d8181a504a810f4f6b1adebbbf96d03eade9bbb5009ab
+  metadata.gz: 8e302fa4f5684a222ad33be467776dc5b6d005d6ee1a6d726bd3b5bd26e828e856f1cc1c696476f6c58dfa34a70fd16e7c66d0cd0b023150bba8d11fa456c1d7
+  data.tar.gz: 4f194deab82400ddbfb817245b4d4051c060ef847aa2ff6f5dda5b3d5eb5d4699ad29c3e76cdb3e20596d437271444a5d26884cc785bdc0fcfbb55273ee362c0

data/README.md

@@ -1,9 +1,11 @@
-![s_PokotarouLogo](https://user-images.githubusercontent.com/52961642/61586183-ef59b580-aba8-11e9-83b0-19eac7339982.png)  
+![s_PokotarouLogo](https://user-images.githubusercontent.com/52961642/62843884-46f6c700-bcf8-11e9-8267-b9fad8f34085.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)
+[![Build Status](https://travis-ci.org/Kashiwara0205/Pokotarou.svg?branch=master)](https://travis-ci.org/Kashiwara0205/Pokotarou)
 
 Pokotarou is convenient seeder of 'Ruby on Rails'
-Currently only mysql supported
+In MySql, operation has been confirmed
 
 ## Features
 
@@ -375,6 +377,7 @@ In the following example, seed data is changed
 ```
 
 <b>Delete Operation</b>
+
 In the following example, delete block config
 
 ```ruby
@@ -443,4 +446,4 @@ Default:
 
 ```ruby
 ["", nil, nil]
-```
+```

data/lib/pokotarou/data_register.rb

@@ -21,18 +21,6 @@ class DataRegister
 
     private
 
-    def execute model, config_data, table_name, col_arr, seed_arr
-      # optimize is more faster than activerecord-import
-      # however, sql.conf setting is necessary to use
-      if config_data[:optimize] 
-        # seed_arr.transpose: [[col1_element, col2_element], [col1_element, col2_element]...]
-        insert_query = QueryBuilder.insert(table_name, col_arr, seed_arr.transpose)
-        ActiveRecord::Base.connection.execute(insert_query)
-      else
-        model.import(col_arr, seed_arr.transpose, validate: config_data[:validate], timestamps: false)
-      end
-    end
-
     def regist_models sym_block, model_data, maked, model_cache
       model_data.each do |e|
         str_model = e.first.to_s
@@ -53,9 +41,7 @@ class DataRegister
 
         output_log(config_data[:log]) 
         begin
-          # execute insert
-          execute(model_cache[str_model][:model], 
-                  config_data, model_cache[str_model][:table_name], col_arr, seed_arr)
+          model_cache[str_model][:model].import(col_arr, seed_arr.transpose, validate: config_data[:validate], timestamps: false)
         rescue => e
           raise RegistError.new("
             block: #{sym_block}

data/lib/pokotarou/expression_parser.rb

@@ -1,10 +1,10 @@
 require "pokotarou/additional_methods.rb"
 class ParseError < StandardError; end
+FOREIGN_KEY_SYMBOL = "F|"
 
 # for seed data
 class ExpressionParser
   class << self
-    FOREIGN_KEY_SYMBOL = "F|"
     def parse config_val, maked
       begin
         require AdditionalMethods.filepath if AdditionalMethods.filepath.present?
@@ -38,7 +38,6 @@ end
 # for loop data
 class LoopExpressionParser
   class << self
-    FOREIGN_KEY_SYMBOL = "F|"
     def parse config_val, maked
       begin
         require AdditionalMethods.filepath if AdditionalMethods.filepath.present?

data/lib/pokotarou/seeder.rb

@@ -13,7 +13,7 @@ class Seeder
       return make_array(n, ->(){ rand(0.0..1_000_000_000.0) }) if type == "decimal"
       return make_array(n, ->(){ SecureRandom.hex(20) }) if type == "string"
       return make_array(n, ->(){ SecureRandom.hex(300) }) if ["text", "binary"].include?(type)
-      return make_array(n, ->(){ [1, 0].sample }) if type == "boolean"
+      return make_array(n, ->(){ [true, false].sample }) if type == "boolean"
       return make_string_array(n, enum) if type == "string"
       return make_datetime_array() if ["string", "datetime", "date", "time"].include?(type)
     end

data/lib/pokotarou/version.rb

@@ -1,3 +1,3 @@
 module Pokotarou
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokotarou
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Kashiwara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2019-08-17 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 convenient seeder of ''Ruby on Rails'' URL: https://github.com/Tamatebako0205/Pokotarou'
+description: Pokotarou is convenient seeder of 'Ruby on Rails'
 email:
 - tamatebako0205@gmail.com
 executables: []
@@ -55,10 +55,9 @@ files:
 - lib/pokotarou/data_register.rb
 - lib/pokotarou/data_structure.rb
 - lib/pokotarou/expression_parser.rb
-- lib/pokotarou/loader.rb
+- lib/pokotarou/file_loader.rb
 - lib/pokotarou/option.rb
 - lib/pokotarou/pokotarou_handler.rb
-- lib/pokotarou/query_builder.rb
 - lib/pokotarou/seeder.rb
 - lib/pokotarou/version.rb
 - lib/tasks/pokotarou_tasks.rake

data/lib/pokotarou/query_builder.rb

@@ -1,43 +0,0 @@
-class QueryBuilder
-  class << self
-
-    # build insert query
-    def insert table_name, col_arr, seed_arr
-      col_str = convert_col_to_sql_str(col_arr)
-      seed_str = convert_seed_to_sql_str(seed_arr)
-
-      "INSERT INTO #{table_name} #{col_str} VALUES#{seed_str}"
-    end
-
-    def convert_to_sql_str arr
-      arr_str =
-        arr.reduce("(") do |acc, r|
-          acc << add_double_quote(r.to_s) << ","
-        end
-      # remove ' , ' and add ' ) '
-      arr_str.chop << ")"
-    end
-
-    def convert_seed_to_sql_str seed_arr
-      seed_str =
-        seed_arr.reduce("") do |acc, r|
-          acc << convert_to_sql_str(r) << ","
-        end
-      # remove ' , '
-      seed_str.chop
-    end
-
-    def convert_col_to_sql_str col_arr
-      col_str =
-        col_arr.reduce("(") do |acc, r|
-          acc << r.to_s << ","
-        end
-      # remove ' , ' and add ' ) '
-       col_str.chop << ")"
-    end
-
-    def add_double_quote str
-      "\"" << str << "\""
-    end
-  end
-end