removed parameterized parse function
This commit is contained in:
parent
7a058847eb
commit
bfae38147e
5 changed files with 5 additions and 13 deletions
|
@ -34,18 +34,10 @@ module FoodsoftArticleImport
|
|||
# @param file [File, Tempfile]
|
||||
# @option opts [String] type file format (required) (see {.file_formats})
|
||||
# @return [File, Roo::Spreadsheet] file with encoding set if needed
|
||||
def self.parse(file, custom_file=nil, type:, **opts, &blk)
|
||||
def self.parse(file, custom_file=nil, type='bnn', **opts, &blk)
|
||||
# @todo handle wrong or undetected type
|
||||
parser = file_formats[type]
|
||||
if block_given?
|
||||
puts "
|
||||
" + "______________" + "
|
||||
" + "______________" + "
|
||||
" + "______________" + "
|
||||
" + "given" + "
|
||||
" + "______________"+ "
|
||||
" + "______________"+ "
|
||||
" + "______________"
|
||||
parser.parse(file, custom_file, **opts, &blk)
|
||||
else
|
||||
data = []
|
||||
|
|
|
@ -27,7 +27,7 @@ module FoodsoftArticleImport
|
|||
RES_PARSE_UNIT_LIST.map {|r| /#{r}\s*$/} +
|
||||
RES_PARSE_UNIT_LIST.map {|r| /-#{r}/}
|
||||
|
||||
def self.parse(file, **opts)
|
||||
def self.parse(file, custom_file=nil, **opts)
|
||||
opts = OPTIONS.merge(opts)
|
||||
ss = FoodsoftArticleImport.open_spreadsheet(file, **opts)
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ module FoodsoftArticleImport
|
|||
encoding: "UTF-8" # @todo check this
|
||||
}.freeze
|
||||
|
||||
def self.parse(file, **opts)
|
||||
def self.parse(file, custom_file=nil, **opts)
|
||||
global_manufacturer = nil
|
||||
|
||||
file.set_encoding(opts[:encoding] || OPTIONS[:encoding])
|
||||
|
|
|
@ -14,7 +14,7 @@ module FoodsoftArticleImport
|
|||
OPTIONS = {}.freeze
|
||||
|
||||
# parses a string or file
|
||||
def self.parse(file, opts={})
|
||||
def self.parse(file, custom_file=nil, opts={})
|
||||
doc = Nokogiri.XML(file, nil, nil,
|
||||
Nokogiri::XML::ParseOptions::RECOVER +
|
||||
Nokogiri::XML::ParseOptions::NONET +
|
||||
|
|
|
@ -16,7 +16,7 @@ module FoodsoftArticleImport::Foodsoft
|
|||
|
||||
# Parses Foodsoft file
|
||||
# the yielded article is a simple hash
|
||||
def self.parse(file, **opts)
|
||||
def self.parse(file, custom_file=nil, **opts)
|
||||
opts = OPTIONS.merge(opts)
|
||||
ss = FoodsoftArticleImport.open_spreadsheet(file, **opts)
|
||||
|
||||
|
|
Loading…
Reference in a new issue