data_seeder 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 239e84c1f55501280cc7d421ba065c052734ceff
-  data.tar.gz: 9419b858ae7f39a69d4033f8e8ed7263a5da8f0f
+SHA256:
+  metadata.gz: 60e14d08982cc8ac3b51a66974c190b9a1b2f506016547067dc331270993cb76
+  data.tar.gz: 711fa93ffcd6cdb2960e37681f8db2edb39d1ccffba0ccb1e7695ee5b5bac693
 SHA512:
-  metadata.gz: 29b9e829c052cbb244246caf770dd52fb439ed3af036f99355ba5bfcc1b56842ec0d2fd83c48b239fdbc45b03edc2547c9478d5b47ba4a0935b4bb7e0a651c30
-  data.tar.gz: f2086ba32bd57d04e7fe1ba1d18100abe22594fee1d3240af6f3ec98ade5cb96d6386ac9ea11d0b2a8c17c09ee103c279704075c5691e6d0f5d84630290877cc
+  metadata.gz: 72d53af4e87c879361cfb643b1a19be4a20c366b31df18f8e2e37fdea66b9472dad06d8e01ff9850ca2acb60f6432070e64c9b0be5c7a17a7a6c74ee4dbdf375
+  data.tar.gz: edaa2e0177818a63faa8d3ecb630cfed08303da8089be532d57baa8ae9d621d6a83948674e11cd1407f20fbe37b8d0c0821660c9c3b2a3484c93f8a84cf87d07

data/README.md

@@ -174,6 +174,10 @@ Defines the ActiveRecord Class if it can't be inferred from the seed file.
 
 Proc used for converting a line to attributes.
 
+#### open_options
+
+Options passed to File.open to allow encoding values, etc. (ex: open_options: {encoding: 'ISO-8859-1:UTF-8'})
+
 #### postprocess
 
 Modify the attributes from the seed file before applying them to the model.

data/Rakefile

@@ -30,5 +30,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/models/data_seeder/seed_file.rb

@@ -4,7 +4,7 @@ module DataSeeder
   class SeedFile < ActiveRecord::Base
     def self.file_hash
       @file_hash ||= begin
-        hash = Hash.new { |hash, path| hash[path] = new(path: path) }
+        hash = Hash.new { |h, path| h[path] = new(path: path) }
         all.each do |seed_file|
           hash[seed_file.path] = seed_file
         end
@@ -29,6 +29,10 @@ module DataSeeder
       self.processed_set.proper_superset?(Array(paths).to_set)
     end
 
+    def self.reset
+      @file_hash = nil
+    end
+
     def load
       new_sha256 = Digest::SHA256.file(path).hexdigest
       dot_index      = path.rindex('.')
@@ -41,7 +45,7 @@ module DataSeeder
         end
         begin
           config[:klass] ||= path_minus_ext.classify.constantize
-        rescue NameError => e
+        rescue NameError => _
         end
         ext = File.extname(self.path)[1..-1]
         return true unless ext
@@ -61,7 +65,7 @@ module DataSeeder
         return false if depends && !self.class.processed?(depends)
         DataSeeder.config.logger.info { "Loading #{path}" }
         DataSeeder.config.log_indent do
-          File.open(path, 'r') do |io|
+          File.open(path, 'r', **(config[:open_options] || {})) do |io|
             loader.process(io)
           end
           self.sha256 = new_sha256

data/db/migrate/20150306195118_create_data_seeder_seed_files.rb

@@ -1,4 +1,4 @@
-class CreateDataSeederSeedFiles < ActiveRecord::Migration
+class CreateDataSeederSeedFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :data_seeder_seed_files do |t|
       t.string :path, null: false

data/lib/data_seeder.rb

@@ -15,6 +15,7 @@ module DataSeeder
 
   def self.reset
     @config = Config.new
+    SeedFile.reset
   end
 
   def self.configure

data/lib/data_seeder/config.rb

@@ -1,6 +1,8 @@
 module DataSeeder
   class Config
-    attr_accessor :seed_dirs, :logger, :loaders, :verbose
+    attr_accessor :seed_dirs, :verbose
+    attr_reader :loaders
+    attr_writer :logger
 
     def initialize
       @seed_dirs        = ['db/seed'].freeze

data/lib/data_seeder/loader.rb

@@ -1,10 +1,10 @@
 module DataSeeder
   module Loader
-    attr_reader :seeder_config, :config, :key_attribute, :klass, :path, :path_minus_ext
+    attr_reader :config, :logger, :key_attribute, :klass, :path, :path_minus_ext
 
     def initialize(config)
-      @seeder_config  = DataSeeder.config
       @config         = default_config.merge(config)
+      @logger         = @config[:logger] || DataSeeder.config.logger
       @key_attribute  = @config[:key_attribute] || :id
       @klass          = @config[:klass]
       @path           = @config[:path]
@@ -17,14 +17,12 @@ module DataSeeder
       { purge: true }
     end
 
-    def logger
-      @seeder_config.logger
-    end
-
     def process(io)
+      call_config(:setup)
       setup
       load(io)
       teardown
+      call_config(:teardown)
     end
 
     def setup
@@ -66,7 +64,7 @@ module DataSeeder
 
     # Override for applicable loaders
     def line_number
-      raise "This loader doesn't suppoert line_number"
+      raise "This loader doesn't support line_number"
     end
 
     def save(attr)
@@ -86,6 +84,7 @@ module DataSeeder
       model = self.klass.find_or_initialize_by(find_hash)
       model.attributes = attr
       save_model(model)
+      return model
     end
 
     def save_model(model)
@@ -118,7 +117,12 @@ module DataSeeder
     end
 
     def log_indent(&block)
-      @seeder_config.log_indent(&block)
+      # If we used the default logger, then indent, else no-op
+      if @logger == DataSeeder.config.logger
+        DataSeeder.config.log_indent(&block)
+      else
+        yield
+      end
     end
 
     def call_method(name, *args)
@@ -133,6 +137,16 @@ module DataSeeder
       end
       return nil
     end
+
+    def call_config(name, *args)
+      if val = config[name]
+        if val.kind_of?(Proc)
+          return val.call(*args)
+        else
+          return val
+        end
+      end
+    end
   end
 end
 

data/lib/data_seeder/version.rb

@@ -1,3 +1,3 @@
 module DataSeeder
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

data/test/dummy/config/environments/test.rb

@@ -39,4 +39,7 @@ Rails.application.configure do
 
   config.active_support.test_order = :random
 
+  if Rails.version.to_f >= 5.2 && Rails.version.to_i < 6
+    config.active_record.sqlite3.represent_boolean_as_integer = true
+  end
 end

data/test/dummy/db/migrate/20150313022149_create_countries.rb

@@ -1,4 +1,4 @@
-class CreateCountries < ActiveRecord::Migration
+class CreateCountries < ActiveRecord::Migration[4.2]
   def change
     create_table :countries do |t|
       t.string :code

data/test/dummy/db/migrate/20150313022228_create_states.rb

@@ -1,4 +1,4 @@
-class CreateStates < ActiveRecord::Migration
+class CreateStates < ActiveRecord::Migration[4.2]
   def change
     create_table :states do |t|
       t.string :code

data/test/dummy/db/migrate/20150313172634_create_apps.rb

@@ -1,4 +1,4 @@
-class CreateApps < ActiveRecord::Migration
+class CreateApps < ActiveRecord::Migration[4.2]
   def change
     create_table :apps do |t|
       t.string :name

data/test/dummy/db/migrate/20150313172719_create_app_errors.rb

@@ -1,4 +1,4 @@
-class CreateAppErrors < ActiveRecord::Migration
+class CreateAppErrors < ActiveRecord::Migration[4.2]
   def change
     create_table :app_errors do |t|
       t.references :app, index: true

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -15,12 +14,11 @@ ActiveRecord::Schema.define(version: 20150313172719) do
 
   create_table "app_errors", force: :cascade do |t|
     t.integer "app_id"
-    t.string  "code"
-    t.string  "message"
+    t.string "code"
+    t.string "message"
+    t.index ["app_id"], name: "index_app_errors_on_app_id"
   end
 
-  add_index "app_errors", ["app_id"], name: "index_app_errors_on_app_id"
-
   create_table "apps", force: :cascade do |t|
     t.string "name"
   end
@@ -31,12 +29,11 @@ ActiveRecord::Schema.define(version: 20150313172719) do
   end
 
   create_table "data_seeder_seed_files", force: :cascade do |t|
-    t.string "path",   null: false
+    t.string "path", null: false
     t.string "sha256", null: false
+    t.index ["path"], name: "index_data_seeder_seed_files_on_path", unique: true
   end
 
-  add_index "data_seeder_seed_files", ["path"], name: "index_data_seeder_seed_files_on_path", unique: true
-
   create_table "states", force: :cascade do |t|
     t.string "code"
     t.string "name"

data/test/models/data_seeder/loader_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+describe DataSeeder::Loader, :model do
+  include SeedHelper
+
+  describe 'allow a configurable logger' do
+    before do
+      @name      = 'test_loader_logger'
+      @seed_dirs = setup_seed_dirs(@name, 'states_txt')
+      @logfile   = Rails.root.join('tmp', "loader_test.log.#{$$}")
+    end
+
+    after do
+      cleanup_seed_dir(@name)
+      FileUtils.rm(@logfile)
+    end
+
+    it 'should load seed files' do
+      loader = DataSeeder::Loader::Txt.new(logger: Logger.new(@logfile))
+      loader.logger.info('hello foobar')
+      buf = File.read(@logfile)
+      assert buf.match(/hello foobar/)
+    end
+  end
+end

data/test/models/data_seeder_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 describe DataSeeder, :model do
+  include SeedHelper
+
   describe 'when run with txt files' do
     before do
       @name      = 'test.txt'
@@ -161,36 +163,4 @@ describe DataSeeder, :model do
       assert zulu.app_errors.find_by(code: 'Z1')
     end
   end
-
-
-  def setup_seed_dirs(name, *dirs)
-    dir_name = seed_dir_name(name)
-    FileUtils.mkdir_p(dir_name)
-    return dirs.map do |dir|
-      FileUtils.cp_r(Rails.root.join('db', 'seed.test', dir), dir_name)
-      "#{dir_name}/#{dir}"
-    end
-  end
-
-  def cleanup_seed_dir(name)
-    FileUtils.rm_rf(seed_dir_name(name))
-    # Reset config stuff
-    DataSeeder.reset
-  end
-
-  def modify_seed_file(name, file, &block)
-    file_name = seed_file_name(name, file)
-    body = File.read(file_name)
-    File.open(file_name, 'w') do |f|
-      f.write yield(body)
-    end
-  end
-
-  def seed_dir_name(name)
-    Rails.root.join('tmp', "db.seed.#{name}.#{$$}")
-  end
-
-  def seed_file_name(name, file)
-    File.join(seed_dir_name(name), file)
-  end
 end

data/test/support/seed_helper.rb

@@ -0,0 +1,32 @@
+module SeedHelper
+  def setup_seed_dirs(name, *dirs)
+    dir_name = seed_dir_name(name)
+    FileUtils.mkdir_p(dir_name)
+    return dirs.map do |dir|
+      FileUtils.cp_r(Rails.root.join('db', 'seed.test', dir), dir_name)
+      "#{dir_name}/#{dir}"
+    end
+  end
+
+  def cleanup_seed_dir(name)
+    FileUtils.rm_rf(seed_dir_name(name))
+    # Reset config stuff
+    DataSeeder.reset
+  end
+
+  def modify_seed_file(name, file, &block)
+    file_name = seed_file_name(name, file)
+    body = File.read(file_name)
+    File.open(file_name, 'w') do |f|
+      f.write yield(body)
+    end
+  end
+
+  def seed_dir_name(name)
+    Rails.root.join('tmp', "db.seed.#{name}.#{$$}")
+  end
+
+  def seed_file_name(name, file)
+    File.join(seed_dir_name(name), file)
+  end
+end

data/test/test_helper.rb

@@ -1,12 +1,14 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
+require_relative "dummy/config/environment"
 
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-#ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-#ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
+# Needed for Dummy test app
+require "minitest/autorun"
 require "rails/test_help"
-require "minitest/rails"
 
 # Filter out Minitest backtrace while allowing backtrace from other libraries
 # to be shown.
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new
+Rails.backtrace_cleaner.remove_silencers!
 ActiveRecord::Migration.maintain_test_schema!
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_seeder
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Brad Pardee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,7 +62,6 @@ files:
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20150313022149_create_countries.rb
 - test/dummy/db/migrate/20150313022228_create_states.rb
 - test/dummy/db/migrate/20150313172634_create_apps.rb
@@ -82,22 +81,9 @@ files:
 - test/dummy/db/seed.test/states_yml/states.cfg
 - test/dummy/db/seed.test/states_yml/states.yml
 - test/dummy/db/seed.test/zulu_err/zulu.err
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/tmp/db.seed.test.txt.20720/countries_txt/countries.cfg
-- test/dummy/tmp/db.seed.test.txt.20720/countries_txt/countries.txt
-- test/dummy/tmp/db.seed.test.txt.20720/states_txt/states.cfg
-- test/dummy/tmp/db.seed.test.txt.20720/states_txt/states.txt
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.5816/states.cfg
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.5816/states.csv
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.5907/states.cfg
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.5907/states.csv
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.7662/states.cfg
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.7662/states.csv
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.7690/states.cfg
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.7690/states.csv
+- test/models/data_seeder/loader_test.rb
 - test/models/data_seeder_test.rb
+- test/support/seed_helper.rb
 - test/test_helper.rb
 homepage: http://github.com/bpardee/data_seeder
 licenses:
@@ -119,64 +105,49 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Seed your Rails database
 test_files:
+- test/dummy/app/models/state.rb
 - test/dummy/app/models/app.rb
-- test/dummy/app/models/app_error.rb
-- test/dummy/app/models/app_error_data_seeder.rb
 - test/dummy/app/models/country.rb
-- test/dummy/app/models/state.rb
+- test/dummy/app/models/app_error_data_seeder.rb
+- test/dummy/app/models/app_error.rb
+- test/dummy/bin/rake
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config.ru
-- test/dummy/db/development.sqlite3
-- test/dummy/db/migrate/20150313022149_create_countries.rb
-- test/dummy/db/migrate/20150313022228_create_states.rb
-- test/dummy/db/migrate/20150313172634_create_apps.rb
-- test/dummy/db/migrate/20150313172719_create_app_errors.rb
+- test/dummy/Rakefile
 - test/dummy/db/schema.rb
-- test/dummy/db/seed.test/bar_err/bar.err
-- test/dummy/db/seed.test/countries_csv/countries.cfg
-- test/dummy/db/seed.test/countries_csv/countries.csv
-- test/dummy/db/seed.test/countries_txt/countries.cfg
-- test/dummy/db/seed.test/countries_txt/countries.txt
-- test/dummy/db/seed.test/foo_err/foo.err
+- test/dummy/db/seed.test/states_yml/states.cfg
+- test/dummy/db/seed.test/states_yml/states.yml
 - test/dummy/db/seed.test/states_csv/states.csv
+- test/dummy/db/seed.test/foo_err/foo.err
 - test/dummy/db/seed.test/states_json/states.cfg
 - test/dummy/db/seed.test/states_json/states.json
+- test/dummy/db/seed.test/bar_err/bar.err
+- test/dummy/db/seed.test/countries_txt/countries.txt
+- test/dummy/db/seed.test/countries_txt/countries.cfg
 - test/dummy/db/seed.test/states_txt/states.cfg
 - test/dummy/db/seed.test/states_txt/states.txt
-- test/dummy/db/seed.test/states_yml/states.cfg
-- test/dummy/db/seed.test/states_yml/states.yml
 - test/dummy/db/seed.test/zulu_err/zulu.err
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/Rakefile
-- test/dummy/tmp/db.seed.test.txt.20720/countries_txt/countries.cfg
-- test/dummy/tmp/db.seed.test.txt.20720/countries_txt/countries.txt
-- test/dummy/tmp/db.seed.test.txt.20720/states_txt/states.cfg
-- test/dummy/tmp/db.seed.test.txt.20720/states_txt/states.txt
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.5816/states.cfg
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.5816/states.csv
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.5907/states.cfg
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.5907/states.csv
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.7662/states.cfg
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.7662/states.csv
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.7690/states.cfg
-- test/dummy/tmp/db.seed.test.use_line_number_as_id.7690/states.csv
+- test/dummy/db/seed.test/countries_csv/countries.csv
+- test/dummy/db/seed.test/countries_csv/countries.cfg
+- test/dummy/db/migrate/20150313022228_create_states.rb
+- test/dummy/db/migrate/20150313172634_create_apps.rb
+- test/dummy/db/migrate/20150313172719_create_app_errors.rb
+- test/dummy/db/migrate/20150313022149_create_countries.rb
+- test/models/data_seeder/loader_test.rb
 - test/models/data_seeder_test.rb
+- test/support/seed_helper.rb
 - test/test_helper.rb
-has_rdoc: