bcl 0.3.2 → 0.3.3

data/lib/bcl/component_spreadsheet.rb

@@ -77,8 +77,13 @@ if $have_win32ole
         end   
       end
 
-      xlsx.saved = true
-      xlsx.Save
+      #save spreadsheet if changes have been made
+      if xlsx.saved == true
+        #puts "[ComponentSpreadsheet] Spreadsheet unchanged; not saving"
+      else
+        xlsx.Save
+        puts "[ComponentSpreadsheet] Spreadsheet changes saved"
+      end
     
     ensure
     
@@ -277,12 +282,17 @@ end # if $have_win32ole
       component.uid = xlsx_worksheet.Range("B#{i}").value
       if component.uid.nil? or component.uid.empty?
         component.uid = UUID.new.generate
+        puts "#{component.name} uid missing; creating new one"
         xlsx_worksheet.Range("B#{i}").value = component.uid     
       end
       
-      # always write new version id
-      component.version_id = UUID.new.generate
-      xlsx_worksheet.Range("C#{i}").value = component.version_id
+      # get version_id, if empty set it
+      component.version_id = xlsx_worksheet.Range("C#{i}").value
+      if component.version_id.nil? or component.version_id.empty?
+        component.version_id = UUID.new.generate
+        puts "#{component.name} version id missing; creating new one"       
+        xlsx_worksheet.Range("C#{i}").value = component.version_id
+      end      
       
       component.headers = headers
       component.values = xlsx_worksheet.Range("A#{i}:#{max_col}#{i}").value

data/lib/bcl/component_xml.rb

@@ -261,10 +261,21 @@ module BCL
 
     def save_component_xml(dir_path = resolve_path)
       FileUtils.mkpath(dir_path) if !File.exists?(dir_path)
-
-      generate_uuid() if @uuid.nil?
-      generate_vuid() if @vuid.nil?
-
+      
+      #make sure the uid and vid are pulled in from the Component
+      @uuid = @uid
+      @vuid = @comp_version_id
+      
+      if @uuid.nil?
+        puts "uid was missing; creating a new one"
+        generate_uuid()
+      end  
+        
+      if @vuid.nil?
+        puts "vid was missing; creating a new one"
+        generate_vuid()
+      end
+        
       xmlfile = File.new(dir_path + '/component.xml', 'w')
       comp_xml = Builder::XmlMarkup.new(:target => xmlfile, :indent=>2)
 

data/lib/bcl/version.rb

@@ -18,5 +18,5 @@
 ######################################################################
 
 module BCL
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bcl
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Daniel Macumber
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-27 00:00:00 Z
+date: 2013-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuid