seed-do 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a144ca5bdde78bd698bd63b5b7ec5d4538e290d494d6d9feaf3b72c2fabc94bd
-  data.tar.gz: 05156a89c384563da57269b0850fc21f89b6d3f87fdb1801d83b5743cc286d22
+  metadata.gz: f41a0a75dff7954f90a7ed6cafe60eef73f0c20490ff9e42952b34e2efe896bc
+  data.tar.gz: dd04a94f944a7a290d211b16cec2537a3fa34bc2816cee6c1b594d22a91a907c
 SHA512:
-  metadata.gz: 22803ec0568fbfe2d89b20cd65f04c331da02673b901724e7fcd48d22c8b764eff73763c14cd197292e9408f7345fe562a4c1ee5b329f3c8e926b7a25413e166
-  data.tar.gz: '006481304627db4be5b6eb2ebba80c043078b78c1b4e815a9323398a7aa9f7b395ca3971cb0069f942413a957637f8cf839f71c479ebb9feaa8cf6f7b915ba83'
+  metadata.gz: ee3af13c18e0354bc04a378db5d0fc6ef344e2af3c617cc5405153200dd37d316be5e31d07234e077719e875c0daa6098878907146c27924ccb2021c9ba36725
+  data.tar.gz: 36367e0c2457b3d18781824ef255095545b7c441c37468c28c2448413877656c5180edca15da8f8d7309cc2bda78d4d9e2e0e7066afdfe607ec0ad71dc89fd89

data/lib/seed-do/active_record_extension.rb

@@ -41,25 +41,25 @@ module SeedDo
     #   Person.seed_once(:id, :id => 1, :name => "Harry") # => Name *not* changed
     def seed_once(*args, &block)
       constraints, data = parse_seed_do_args(args, block)
-      SeedDo::Seeder.new(self, constraints, data, :insert_only => true).seed
+      SeedDo::Seeder.new(self, constraints, data, insert_only: true).seed
     end
 
     private
 
-      def parse_seed_do_args(args, block)
-        if block.nil?
-          if args.last.is_a?(Array)
-            # Last arg is an array of data, so assume the rest of the args are constraints
-            data = args.pop
-            [args, data]
-          else
-            # Partition the args, assuming the first hash is the start of the data
-            args.partition { |arg| !arg.is_a?(Hash) }
-          end
+    def parse_seed_do_args(args, block)
+      if block.nil?
+        if args.last.is_a?(Array)
+          # Last arg is an array of data, so assume the rest of the args are constraints
+          data = args.pop
+          [args, data]
         else
-          # We have a block, so assume the args are all constraints
-          [args, [SeedDo::BlockHash.new(block).to_hash]]
+          # Partition the args, assuming the first hash is the start of the data
+          args.partition { |arg| !arg.is_a?(Hash) }
         end
+      else
+        # We have a block, so assume the args are all constraints
+        [args, [SeedDo::BlockHash.new(block).to_hash]]
       end
+    end
   end
 end

data/lib/seed-do/block_hash.rb

@@ -12,7 +12,7 @@ module SeedDo
 
     def method_missing(method_name, *args, &block)
       if method_name.to_s =~ /^(.*)=$/ && args.length == 1 && block.nil?
-        @hash[$1] = args.first
+        @hash[::Regexp.last_match(1)] = args.first
       else
         super
       end

data/lib/seed-do/capistrano.rb

@@ -1,7 +1,7 @@
 Capistrano::Configuration.instance.load do
   namespace :db do
-    desc "Load seed data into database"
-    task :seed_do, :roles => :db, :only => { :primary => true } do
+    desc 'Load seed data into database'
+    task :seed_do, roles: :db, only: { primary: true } do
       run "cd #{release_path} && bundle exec rake RAILS_ENV=#{rails_env} db:seed_do"
     end
   end

data/lib/seed-do/capistrano3.rb

@@ -1 +1 @@
-load File.expand_path('../../tasks/seed_do_capistrano3.rake', __FILE__)
+load File.expand_path('../tasks/seed_do_capistrano3.rake', __dir__)

data/lib/seed-do/railtie.rb

@@ -1,7 +1,7 @@
 module SeedDo
   class Railtie < Rails::Railtie
     rake_tasks do
-      load "tasks/seed_do.rake"
+      load 'tasks/seed_do.rake'
     end
 
     initializer 'seed_do.set_fixture_paths' do

data/lib/seed-do/runner.rb

@@ -29,45 +29,41 @@ module SeedDo
 
     private
 
-      def run_file(filename)
-        puts "\n== Seed from #{filename}" unless SeedDo.quiet
+    def run_file(filename)
+      puts "\n== Seed from #{filename}" unless SeedDo.quiet
 
-        ActiveRecord::Base.transaction do
-          open(filename) do |file|
-            chunked_ruby = +''
-            file.each_line do |line|
-              if line == "# BREAK EVAL\n"
-                eval(chunked_ruby)
-                chunked_ruby = +''
-              else
-                chunked_ruby << line
-              end
+      ActiveRecord::Base.transaction do
+        open(filename) do |file|
+          chunked_ruby = +''
+          file.each_line do |line|
+            if line == "# BREAK EVAL\n"
+              eval(chunked_ruby)
+              chunked_ruby = +''
+            else
+              chunked_ruby << line
             end
-            eval(chunked_ruby) unless chunked_ruby == ''
           end
+          eval(chunked_ruby) unless chunked_ruby == ''
         end
       end
+    end
 
-      def open(filename)
-        if filename[-3..-1] == '.gz'
-          Zlib::GzipReader.open(filename) do |file|
-            yield file
-          end
-        else
-          File.open(filename) do |file|
-            yield file
-          end
-        end
+    def open(filename, &)
+      if filename[-3..-1] == '.gz'
+        Zlib::GzipReader.open(filename, &)
+      else
+        File.open(filename, &)
       end
+    end
 
-      def filenames
-        filenames = []
-        @fixture_paths.each do |path|
-          filenames += (Dir[File.join(path, '*.rb')] + Dir[File.join(path, '*.rb.gz')]).sort
-        end
-        filenames.uniq!
-        filenames = filenames.find_all { |filename| filename =~ @filter } if @filter
-        filenames
+    def filenames
+      filenames = []
+      @fixture_paths.each do |path|
+        filenames += (Dir[File.join(path, '*.rb')] + Dir[File.join(path, '*.rb.gz')]).sort
       end
+      filenames.uniq!
+      filenames = filenames.find_all { |filename| filename =~ @filter } if @filter
+      filenames
+    end
   end
 end

data/lib/seed-do/seeder.rb

@@ -41,62 +41,61 @@ module SeedDo
 
     private
 
-      def validate_constraints!
-        unknown_columns = @constraints.map(&:to_s) - @model_class.column_names
-        unless unknown_columns.empty?
-          raise(ArgumentError,
+    def validate_constraints!
+      unknown_columns = @constraints.map(&:to_s) - @model_class.column_names
+      return if unknown_columns.empty?
+
+      raise(ArgumentError,
             "Your seed constraints contained unknown columns: #{column_list(unknown_columns)}. " +
             "Valid columns are: #{column_list(@model_class.column_names)}.")
-        end
-      end
+    end
 
-      def validate_data!
-        raise ArgumentError, "Seed data missing" if @data.empty?
-      end
+    def validate_data!
+      raise ArgumentError, 'Seed data missing' if @data.empty?
+    end
 
-      def column_list(columns)
-        '`' + columns.join("`, `") + '`'
-      end
+    def column_list(columns)
+      '`' + columns.join('`, `') + '`'
+    end
 
-      def seed_record(data)
-        record = find_or_initialize_record(data)
-        return if @options[:insert_only] && !record.new_record?
+    def seed_record(data)
+      record = find_or_initialize_record(data)
+      return if @options[:insert_only] && !record.new_record?
 
-        puts " - #{@model_class} #{data.inspect}" unless @options[:quiet]
+      puts " - #{@model_class} #{data.inspect}" unless @options[:quiet]
 
-        record.assign_attributes(data)
-        record.save(:validate => false) || raise(ActiveRecord::RecordNotSaved, 'Record not saved!')
-        record
-      end
+      record.assign_attributes(data)
+      record.save(validate: false) || raise(ActiveRecord::RecordNotSaved, 'Record not saved!')
+      record
+    end
 
-      def find_or_initialize_record(data)
-        @model_class.where(constraint_conditions(data)).take ||
+    def find_or_initialize_record(data)
+      @model_class.where(constraint_conditions(data)).take ||
         @model_class.new
-      end
+    end
 
-      def constraint_conditions(data)
-        Hash[@constraints.map { |c| [c, data[c.to_sym]] }]
-      end
+    def constraint_conditions(data)
+      @constraints.to_h { |c| [c, data[c.to_sym]] }
+    end
 
-      def update_id_sequence
-        if @model_class.connection.adapter_name == "PostgreSQL" or @model_class.connection.adapter_name == "PostGIS"
-          return if @model_class.primary_key.nil? || @model_class.sequence_name.nil?
+    def update_id_sequence
+      return unless %w[PostgreSQL PostGIS].include?(@model_class.connection.adapter_name)
+      return if @model_class.primary_key.nil? || @model_class.sequence_name.nil?
 
-          quoted_id       = @model_class.connection.quote_column_name(@model_class.primary_key)
-          sequence = @model_class.sequence_name
+      quoted_id = @model_class.connection.quote_column_name(@model_class.primary_key)
+      sequence = @model_class.sequence_name
 
-          if @model_class.connection.postgresql_version >= 100000
-            sql =<<-EOS
+      if @model_class.connection.postgresql_version >= 100_000
+        sql = <<-EOS
               SELECT setval('#{sequence}', (SELECT GREATEST(MAX(#{quoted_id})+(SELECT seqincrement FROM pg_sequence WHERE seqrelid = '#{sequence}'::regclass), (SELECT seqmin FROM pg_sequence WHERE seqrelid = '#{sequence}'::regclass)) FROM #{@model_class.quoted_table_name}), false)
-            EOS
-          else
-            sql =<<-EOS
+        EOS
+      else
+        sql = <<-EOS
               SELECT setval('#{sequence}', (SELECT GREATEST(MAX(#{quoted_id})+(SELECT increment_by FROM #{sequence}), (SELECT min_value FROM #{sequence})) FROM #{@model_class.quoted_table_name}), false)
-            EOS
-          end
-
-          @model_class.connection.execute sql
-        end
+        EOS
       end
+
+      @model_class.connection.execute sql
+    end
   end
 end

data/lib/seed-do/version.rb

@@ -1,3 +1,3 @@
 module SeedDo
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/seed-do/writer.rb

@@ -18,9 +18,9 @@ module SeedDo
   class Writer
     cattr_accessor :default_options
     @@default_options = {
-      :chunk_size  => 100,
-      :constraints => [:id],
-      :seed_type   => :seed
+      chunk_size: 100,
+      constraints: [:id],
+      seed_type: :seed
     }
 
     # @param [Hash] options
@@ -33,13 +33,13 @@ module SeedDo
     # @option options [Array<Symbol>] :constraints ([:id]) The constraining attributes for the seeds
     def initialize(options = {})
       @options = self.class.default_options.merge(options)
-      raise ArgumentError, "missing option :class_name" unless @options[:class_name]
+      raise ArgumentError, 'missing option :class_name' unless @options[:class_name]
     end
 
     # Creates a new instance of {Writer} with the `options`, and then calls {#write} with the
     # `io_or_filename` and `block`
-    def self.write(io_or_filename, options = {}, &block)
-      new(options).write(io_or_filename, &block)
+    def self.write(io_or_filename, options = {}, &)
+      new(options).write(io_or_filename, &)
     end
 
     # Writes the necessary headers and footers, and yields to a block within which the actual
@@ -51,7 +51,7 @@ module SeedDo
     #   closed automatically.)
     # @yield [self] make calls to `#<<` within the block
     def write(io_or_filename, &block)
-      raise ArgumentError, "missing block" unless block_given?
+      raise ArgumentError, 'missing block' unless block_given?
 
       if io_or_filename.respond_to?(:write)
         write_to_io(io_or_filename, &block)
@@ -65,7 +65,7 @@ module SeedDo
     # Add a seed. Must be called within a block passed to {#write}.
     # @param [Hash] seed The attributes for the seed
     def <<(seed)
-      raise "You must add seeds inside a SeedDo::Writer#write block" unless @io
+      raise 'You must add seeds inside a SeedDo::Writer#write block' unless @io
 
       buffer = +''
 
@@ -76,57 +76,59 @@ module SeedDo
       end
 
       buffer << ",\n"
-      buffer << '  ' + seed.inspect
+      buffer << ('  ' + seed.inspect)
 
       @io.write(buffer)
 
       @count += 1
     end
-    alias_method :add, :<<
+    alias add <<
 
     private
 
-      def write_to_io(io)
-        @io, @count = io, 0
-        @io.write(file_header)
-        @io.write(seed_header)
-        yield(self)
-        @io.write(seed_footer)
-        @io.write(file_footer)
-      ensure
-        @io, @count = nil, nil
-      end
+    def write_to_io(io)
+      @io = io
+      @count = 0
+      @io.write(file_header)
+      @io.write(seed_header)
+      yield(self)
+      @io.write(seed_footer)
+      @io.write(file_footer)
+    ensure
+      @io = nil
+      @count = nil
+    end
 
-      def file_header
-        <<-END
-# DO NOT MODIFY THIS FILE, it was auto-generated.
-#
-# Date: #{Time.now}
-# Seeding #{@options[:class_name]}
-# Written with the command:
-#
-#   #{$0} #{$*.join}
-#
-        END
-      end
+    def file_header
+      <<~END
+        # DO NOT MODIFY THIS FILE, it was auto-generated.
+        #
+        # Date: #{Time.now}
+        # Seeding #{@options[:class_name]}
+        # Written with the command:
+        #
+        #   #{$0} #{$*.join}
+        #
+      END
+    end
 
-      def file_footer
-        <<-END
-# End auto-generated file.
-        END
-      end
+    def file_footer
+      <<~END
+        # End auto-generated file.
+      END
+    end
 
-      def seed_header
-        constraints = @options[:constraints] && @options[:constraints].map(&:inspect).join(', ')
-        "#{@options[:class_name]}.#{@options[:seed_type]}(#{constraints}"
-      end
+    def seed_header
+      constraints = @options[:constraints] && @options[:constraints].map(&:inspect).join(', ')
+      "#{@options[:class_name]}.#{@options[:seed_type]}(#{constraints}"
+    end
 
-      def seed_footer
-        "\n)\n"
-      end
+    def seed_footer
+      "\n)\n"
+    end
 
-      def chunk_this_seed?
-        @count != 0 && (@count % @options[:chunk_size]) == 0
-      end
+    def chunk_this_seed?
+      @count != 0 && (@count % @options[:chunk_size]) == 0
+    end
   end
 end

data/lib/seed-do.rb

@@ -1,6 +1,6 @@
 require 'active_record'
 require 'active_support/core_ext/module/attribute_accessors'
-require 'seed-do/railtie' if defined?(Rails) && Rails.version >= "3"
+require 'seed-do/railtie' if defined?(Rails)
 
 module SeedDo
   autoload :VERSION,               'seed-do/version'
@@ -10,17 +10,13 @@ module SeedDo
   autoload :Runner,                'seed-do/runner'
   autoload :Writer,                'seed-do/writer'
 
-  mattr_accessor :quiet
-
   # Set `SeedDo.quiet = true` to silence all output
-  @@quiet = false
-
-  mattr_accessor :fixture_paths
+  mattr_accessor :quiet, default: false
 
   # Set this to be an array of paths to directories containing your seed files. If used as a Rails
-  # plugin, SeedDo will set to to contain `Rails.root/db/fixtures` and
+  # plugin, SeedDo will set it to contain `Rails.root/db/fixtures` and
   # `Rails.root/db/fixtures/Rails.env`
-  @@fixture_paths = ['db/fixtures']
+  mattr_accessor :fixture_paths, default: ['db/fixtures']
 
   # Load seed data from files
   # @param [Array] fixture_paths The paths to look for seed files in

data/lib/tasks/seed_do.rake

@@ -24,14 +24,10 @@ namespace :db do
       # to load files from RAILS_ROOT/features/fixtures
       rake db:seed_do FIXTURE_PATH=features/fixtures
   EOS
-  task :seed_do => :environment do
-    if ENV["FILTER"]
-      filter = /#{ENV["FILTER"].gsub(/,/, "|")}/
-    end
-
-    if ENV["FIXTURE_PATH"]
-      fixture_paths = [ENV["FIXTURE_PATH"], ENV["FIXTURE_PATH"] + '/' + Rails.env]
-    end
+  task seed_do: :environment do
+    filter = /#{ENV['FILTER'].tr(',', '|')}/ if ENV['FILTER']
+
+    fixture_paths = [ENV['FIXTURE_PATH'], ENV['FIXTURE_PATH'] + '/' + Rails.env] if ENV['FIXTURE_PATH']
 
     SeedDo.seed(fixture_paths, filter)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seed-do
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Shinichi Maeshima
@@ -78,7 +78,8 @@ files:
 homepage: http://github.com/willnet/seed-do
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib