go_import 3.0.9 → 3.0.10

data/bin/go-import

@@ -56,6 +56,11 @@ class GoImportCommandLine < Thor
             puts "WARNING: FILES_FOLDER should be set unless you are only importing files with absolute paths."
         end
 
+        if model.documents.files.length > 0 && (!defined?(FILES_FOLDER_AT_CUSTOMER) || FILES_FOLDER_AT_CUSTOMER.empty?())
+            puts "WARNING: It looks like you are importing files but FILES_FOLDER_AT_CUSTOMER has not been set in your converter.rb"
+            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)
         if is_ok
             go_data_zip = options.output.nil? == true ? "go.zip" : options.output

data/lib/go_import/model/file.rb

@@ -102,43 +102,88 @@ module GoImport
             end
         end
 
-        def validate
-            error = String.new
-
+        # This is the path to where the file should be accessed
+        # from within the project.
+        def path_for_project
             if @path.nil? || @path.empty?
-                error = "Path is required for file.\n"
+                return ""
+            end
+
+            # Get the folder where files should be accessed from
+            # during the import. If not defined in converter.rb use
+            # the current directory
+            if defined?(FILES_FOLDER) && !FILES_FOLDER.empty?()
+                root_folder = FILES_FOLDER
+            else
+                root_folder = Dir.pwd
+            end
+
+            if has_relative_path?()
+                # since this file is stored with a relative file name
+                # we should get it from the root folder
+                path_for_project = ::File.expand_path(@path, root_folder)
             else
-                if has_relative_path?()
-                    if defined?(FILES_FOLDER) && !FILES_FOLDER.empty?()
-                        root_folder = FILES_FOLDER
-                    else
-                        root_folder = Dir.pwd
-                    end
-
-                    if !::File.exists?("#{root_folder}/#{@path}")
-                        error = "#{error}Can't find file '#{root_folder}/#{@path}'.\n"
-                    end
+                # the file is stored with an absolute path, if the
+                # file cant be access using that path we must change
+                # it to a path that is accessible from this computer.
+                # The FILES_FOLDER_AT_CUSTOMER constant states what
+                # part of the path that should be replaced with the
+                # root folder.
+
+                # We assume that the original system used ONE location
+                # for all its files. If not, we should change
+                # FILES_FOLDER_AT_CUSTOMER to a list of folders.
+                if defined?(FILES_FOLDER_AT_CUSTOMER) && !FILES_FOLDER_AT_CUSTOMER.empty?()
+                    files_folder_at_customer = FILES_FOLDER_AT_CUSTOMER
                 else
-                    if !::File.exists?(@path)
-                        error = "#{error}Can't find file '#{@path}'.\n"
-                    end
+                    files_folder_at_customer = ""
                 end
+
+                if files_folder_at_customer.empty?
+                    path_for_project = @path
+                else
+                    path_for_project = ::File.expand_path(@path.downcase.sub(files_folder_at_customer.downcase, root_folder))
+                end
+            end
+
+            return path_for_project
+        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
 
+            zip_file.add(@location_in_zip_file, path_for_project)
+        end
+
+        def validate
+            error = String.new
+
             if @name.nil? || @name.empty?
                 error = "#{error}A file must have a name.\n"
             end
 
+            if @path.nil? || @path.empty?
+                error = "Path is required for file.\n"
+            else
+                if !::File.exists?(path_for_project())
+                    error = "#{error}Can't find file with name '#{@name}' and original path '#{@path}' at '#{path_for_project()}'."
+                end
+            end
+
             if @created_by_reference.nil?
-                error = "#{error}Created_by is required for file.\n"
+                error = "#{error}Created_by is required for file (#{@name}).\n"
             end
 
             if @organization_reference.nil? && @deal_reference.nil?
-                error = "#{error}A file must have either an organization or a deal.\n"
+                error = "#{error}The file (#{@name}) must have either an organization or a deal.\n"
             end
 
             if !@organization_reference.nil? && !@deal_reference.nil?
-                error = "#{error}A file can't be attached to both an organization and a deal."
+                error = "#{error}The file (#{@name}) can't be attached to both an organization and a deal."
             end
 
             return error

data/lib/go_import/model/rootmodel.rb

@@ -399,18 +399,7 @@ module GoImport
                     # we dont need to check that the file exists since
                     # we assume that rootmodel.validate has been
                     # called before save_to_zip.
-                    if file.has_relative_path?
-                        file.location_in_zip_file = "files/#{file.path}"
-                        zip_file.add(file.location_in_zip_file, "#{root_folder}/#{file.path}")
-                    else
-                        file.location_in_zip_file = "files/__abs/#{SecureRandom.uuid}/#{::File.basename(file.path).to_s}"
-                        if files_folder_at_customer.empty?
-                            zip_file.add(file.location_in_zip_file, file.path)
-                        else
-                            zip_file.add(file.location_in_zip_file,
-                                         file.path.downcase.sub(files_folder_at_customer.downcase, root_folder))
-                        end
-                    end
+                    file.add_to_zip_file(zip_file)
                 end
 
                 # 2) go.xml - with all data from source

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

@@ -190,6 +190,8 @@ def from_project_document_to_organization_document(row, includes, rootmodel)
 
     organization_id = includes[row['idProject']]
     file.organization = rootmodel.find_organization_by_integration_id(organization_id)
+
+    return file
 end
 
 def init_deal(row, rootmodel, includes)

data/spec/file_spec.rb

@@ -27,6 +27,18 @@ 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
+
+    # end
+
+
     it "is not valid when it has path and deal" do
         # must have a created_by
         # given

metadata

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