go_import 3.0.10 → 3.0.12

data/bin/go-import

@@ -42,6 +42,10 @@ class GoImportCommandLine < Thor
            :desc => "Name of the file where the converted source will be saved. This file should be sent to LIME Go. If the file already exist it will be replaced.",
            :type => :string,
            :required => false)
+    option(:ignore_missing_files,
+           :desc => "Output will be created even if the import contains missing files",
+           :type => :boolean,
+           :required => false)
     def run_import()
         if !is_valid_goimport_project?
             return
@@ -61,23 +65,58 @@ class GoImportCommandLine < Thor
             puts "WARNING: This means that files with an absolute path will be imported with their original path. Set this constant if you want to get files from the FILES_FOLDER directory."
         end
 
-        is_ok, error_msg = can_be_serialized?(model)
+        is_ok, error_msg = can_be_serialized?(model, options.ignore_missing_files)
         if is_ok
+            if options.ignore_missing_files && model.documents.files.length > 0
+                log_and_remove_missing_files model
+            end
+
             go_data_zip = options.output.nil? == true ? "go.zip" : options.output
             model.save_to_zip(go_data_zip)
             puts "Source has been been converted into '#{go_data_zip}'."
         else
-            puts "Source could not be converted due to"
+            puts "ERROR: Source could not be converted due to:"
             puts error_msg
+
+            if !options.ignore_missing_files &&
+                    model.documents.files.any? {|file| !::File.exists?(file.path_for_project)}
+                puts "go-import detected missing files (see above), you can ignore these with the option --ignore-missing-files."
+            end
+        end
+    end
+
+    private
+    def log_and_remove_missing_files(model)
+        if model.documents.files.length > 0
+            puts "Trying to log files that can't be found..."
+            file_log_header = "name;integration_id;path;organization.integrationid;organization.name;deal.integrationid;deal.name"
+            file_log = ""
+            model.documents.files.each do |file|
+                if !::File.exists?(file.path_for_project)
+                    file_log = "#{file_log}#{file.name};#{file.integration_id};#{file.path};#{file.organization.nil? ? '' : file.organization.integration_id};#{file.organization.nil? ? '' : file.organization.name};#{file.deal.nil? ? '' : file.deal.integration_id};#{file.deal.nil? ? '' : file.deal.name}\n"
+                    model.documents.files.delete file
+                end
+            end
+
+            if file_log.length > 0
+                log_filename = 'go-import-missing-files.csv'
+                ::File.open(log_filename, 'w') { |f|
+                    f.puts file_log_header
+                    f.puts file_log
+                }
+                puts "WARNING: go-import has ignored files. Filenames of all ignored files has been written to '#{log_filename}'."
+            else
+                puts "All files are OK."
+            end
         end
     end
 
     private
-    def can_be_serialized?(rootmodel)
+    def can_be_serialized?(rootmodel, ignore_missing_files)
         is_ok = false
         error = rootmodel.sanity_check
         if error.empty?
-            error = rootmodel.validate
+            error = rootmodel.validate(ignore_missing_files)
 
             if error.empty?
                 is_ok = true

data/lib/go_import/model/file.rb

@@ -15,9 +15,9 @@ module GoImport
 
         attr_reader :name
 
-        # zip_path is used internally when the file is stored in the
-        # zip file that is sent to LIME Go. You should not modify this
-        # property
+        # location_in_zip_file is used internally when the file is
+        # stored in the zip file that is sent to LIME Go. You should
+        # not modify this property
         attr_accessor :location_in_zip_file
 
         def initialize(opt = nil)
@@ -150,17 +150,14 @@ module GoImport
         end
 
         def add_to_zip_file(zip_file)
-            if has_relative_path?
-                @location_in_zip_file = "files/#{@path}"
-            else
-                @location_in_zip_file = "files/__abs/#{SecureRandom.uuid}/#{::File.basename(@path).to_s}"
-            end
+            @location_in_zip_file = "files/#{SecureRandom.uuid}#{::File.extname(@path).to_s}"
 
             zip_file.add(@location_in_zip_file, path_for_project)
         end
 
-        def validate
+        def validate(ignore_missing_files = false)
             error = String.new
+            warning = String.new
 
             if @name.nil? || @name.empty?
                 error = "#{error}A file must have a name.\n"
@@ -169,7 +166,7 @@ module GoImport
             if @path.nil? || @path.empty?
                 error = "Path is required for file.\n"
             else
-                if !::File.exists?(path_for_project())
+                if !ignore_missing_files && !::File.exists?(path_for_project())
                     error = "#{error}Can't find file with name '#{@name}' and original path '#{@path}' at '#{path_for_project()}'."
                 end
             end

data/lib/go_import/model/rootmodel.rb

@@ -304,7 +304,7 @@ module GoImport
             return error.strip
         end
 
-        def validate()
+        def validate(ignore_missing_files = false)
             error = String.new
 
             @organizations.each do |o|
@@ -339,7 +339,7 @@ module GoImport
             end
 
             @documents.files.each do |file|
-                validation_message = file.validate
+                validation_message = file.validate(ignore_missing_files)
                 if !validation_message.empty?
                     error = "#{error}\n#{validation_message}"
                 end

data/sources/easy/.go_import/runner.rb

@@ -174,7 +174,12 @@ def to_organization_document(row, rootmodel)
     file.name = row['Comment']
 
     file.created_by = rootmodel.find_coworker_by_integration_id(row['idUser-Created'])
-    file.organization = rootmodel.find_organization_by_integration_id(row['idCompany'])
+
+    org = rootmodel.find_organization_by_integration_id(row['idCompany'])
+    if org.nil?
+        return nil
+    end
+    file.organization = org
 
     return file
 end
@@ -189,7 +194,12 @@ def from_project_document_to_organization_document(row, includes, rootmodel)
     file.created_by = rootmodel.find_coworker_by_integration_id(row['idUser-Created'])
 
     organization_id = includes[row['idProject']]
-    file.organization = rootmodel.find_organization_by_integration_id(organization_id)
+    org = rootmodel.find_organization_by_integration_id(organization_id)
+    if org.nil?
+        return nil
+    end
+
+    file.organization = org
 
     return file
 end

data/spec/file_spec.rb

@@ -27,16 +27,16 @@ describe "File" do
         file.validate.should eq ""
     end
 
-    # it "fe" do
-    #     # given
-    #     FILES_FOLDER = "./files"
-    #     FILES_FOLDER_AT_CUSTOMER = ""
-    #     file.name = "Offert"
-    #     file.path = "spec/sample_data/offert.docx"
-
-    #     # when, then
+    it "is valid when it has name, invalid path, created_by and deal but ignores the path" do
+        # given
+        file.name = "Offert"
+        file.path = "c:\\mydocs\\offert.docx"
+        file.created_by = GoImport::CoworkerReference.new( { :integration_id => "123" } )
+        file.deal = GoImport::DealReference.new( { :integration_id => "456" } )
 
-    # end
+        # when, then
+        file.validate(true).should eq ""
+    end
 
 
     it "is not valid when it has path and deal" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go_import
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes