planter 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eab293e0cec74131351f8e1ff29919165da5e7eeb9cea2d305802f8cf5e1c8f
-  data.tar.gz: 6e06237482fb476e3a664fead3bfd64d15013f5570316964360161c9e05a25a4
+  metadata.gz: 37c19399e25198fe0545690d5b5568c5bd91b4736258af3d8664c36abe882889
+  data.tar.gz: a399b54a606d7c0e98d49f0bad5abff1fc4726d96eab3573c82d1dc649b83b1e
 SHA512:
-  metadata.gz: 3d28919333f86c7e0d6be6e4a12a4dea558ec0d734ccb63457931af6c8070f71ff76a90c370d2e26a8500106dbb81585ca9685b829c2cf220cd770be229e274d
-  data.tar.gz: a40e5e9ae771224e486c8263d2194fc5de1256b6d6a0d9d880ef44aea01294160fbbe1f139b74a375f4adb3e6372e155700968de0d862918ad0662ce3a2fc80c
+  metadata.gz: 6275a47f463227b86374e327781edd92bbd9cdf9399bafa68c6c4cb3316ae812cf081509a26e81e04101f9cd4af43396f2c008477741f00f475ea09436353ba8
+  data.tar.gz: 1a5a27d9253b78ae0c1c0526c1f8dcb977a428ec5c62cb4239f5542413e1f5020c68d8ee0d356ded4c1f3094c7f449f03fefb72180250388de81f8c44c2c6a63

data/README.md

@@ -66,6 +66,10 @@ Planter.configure do |config|
   ##
   # The directory where CSVs are kept.
   # config.csv_files_directory = 'db/seed_files'
+
+  ##
+  # The default trim mode for ERB.
+  # config.erb_trim_mode = nil
 end
 ```
 
@@ -135,18 +139,37 @@ class UsersSeeder < Planter::Seeder
 end
 ```
 
-`ERB` can be used in the CSV files if you name it with `.erb` at the end of the
-file name. For example, `users.csv.erb`. Note that lines starting with `<%` and
-ending with `%>` will not be considered rows, so you can use `ERB` rows to set
-values. For example:
+`ERB` can be used in the CSV files if you end the file name with `.csv.erb`.
+For example, `users.csv.erb`.
 
 ```
-email,login_attempts
-<% count = 1 %>
-test2@example.com,<%= count += 1 %>
-test2@example.com,<%= count += 1 %>
+participant_id,name
+<%= Participant.find_by(email: 'test1@example.com').id %>,"Test User1"
+<%= Participant.find_by(email: 'test2@example.com').id %>,"Test User2"
 ```
 
+Note that, if you need to change the trim mode for ERB, you can set a default in
+the initializer.
+
+```ruby
+Planter.configure do |config|
+  config.seeders = %i[
+    users
+  ]
+  config.erb_trim_mode = '<>'
+end
+```
+
+...or, for individual seeders, via `seeding_method`.
+
+```ruby
+class UsersSeeder < Planter::Seeder
+  seeding_method :csv, erb_trim_mode: '<>'
+end
+```
+
+For help with `erb_trim_mode`, see the help documentation for `ERB::new`.
+
 Running `rails planter:seed` will now seed your `users` table.
 
 ## Seeding from a data array

data/lib/generators/planter/initializer_generator.rb

@@ -25,6 +25,10 @@ module Planter
             ##
             # The directory where CSVs are kept.
             # config.csv_files_directory = 'db/seed_files'
+
+            ##
+            # The default trim mode for ERB.
+            # config.erb_trim_mode = nil
           end
         EOF
       end

data/lib/planter/config.rb

@@ -42,6 +42,15 @@ module Planter
     # @return [Boolean]
     attr_accessor :quiet
 
+    ##
+    # The default trim mode for ERB. Must be "%", "<>", ">", or "-".
+    # For more information, see documentation for +ERB::new+.
+    #
+    # @param [String] erb_trim_mode
+    #
+    # @return [String]
+    attr_accessor :erb_trim_mode
+
     ##
     # Create a new instance of the config.
     def initialize

data/lib/planter/seeder.rb

@@ -120,6 +120,8 @@ module Planter
     #
     # @kwarg [Symbol, String] unique_columns
     #
+    # @kwarg [String] erb_trim_mode
+    #
     # @example
     #   require 'planter'
     #   class UsersSeeder < Planter::Seeder
@@ -129,16 +131,18 @@ module Planter
     #       parent_model: 'Person',
     #       association: :users,
     #       csv_name: :awesome_users,
-    #       unique_columns %i[username email]
+    #       unique_columns %i[username email],
+    #       erb_trim_mode: '<>'
     #   end
     def self.seeding_method(
       method,
       number_of_records: 1,
-      model: to_s.delete_suffix('Seeder').singularize,
+      model: nil,
       parent_model: nil,
       association: nil,
       csv_name: nil,
-      unique_columns: nil
+      unique_columns: nil,
+      erb_trim_mode: nil
     )
       if !SEEDING_METHODS.include?(method.intern)
         raise ArgumentError, "Method must be one of #{SEEDING_METHODS.join(', ')}"
@@ -148,10 +152,11 @@ module Planter
 
       @seeding_method = method
       @number_of_records = number_of_records
-      @model = model
+      @model = model || to_s.delete_suffix('Seeder').singularize
       @parent_model = parent_model
       @association = @parent_model && (association || determine_association)
       @csv_file = determine_csv_filename(csv_name) if @seeding_method == :csv
+      @erb_trim_mode = erb_trim_mode || Planter.config.erb_trim_mode
       @unique_columns =
         case unique_columns
         when String, Symbol then [unique_columns.intern]
@@ -260,6 +265,14 @@ module Planter
       @unique_columns ||= self.class.instance_variable_get('@unique_columns')
     end
 
+    ##
+    # What trim mode should ERB use?
+    #
+    # @return [String]
+    def erb_trim_mode
+      @erb_trim_mode ||= self.class.instance_variable_get('@erb_trim_mode')
+    end
+
     ##
     # Creates records from the +data+ attribute.
     def create_records
@@ -309,7 +322,7 @@ module Planter
       when :csv
         contents = ::File.read(csv_file)
         if csv_file.end_with?('.erb')
-          contents = ERB.new(contents, trim_mode: '<>').result(binding)
+          contents = ERB.new(contents, trim_mode: erb_trim_mode).result(binding)
         end
 
         @data ||= ::CSV.parse(

data/lib/planter/version.rb

@@ -21,7 +21,7 @@ module Planter
     # Patch version.
     #
     # @return [Integer]
-    PATCH = 11
+    PATCH = 12
 
     ##
     # Version as +[MAJOR, MINOR, PATCH]+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: planter
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Evan Gray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails