excel_to_code 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c1bb313b18cf981e477100780e9f33bddc25eba
-  data.tar.gz: aee477a185842cb7feaf2efc0dfae1e3de81e7b9
+  metadata.gz: 30a048682c2cf9317de28a612f4394e205d507fb
+  data.tar.gz: 95d2d238aab30a09195a6665f91124e2fa6a4c29
 SHA512:
-  metadata.gz: 712f6b5fd56caa1a531d2a2c60355998b1b51e3a80594c92b906790d814f764f9447e671274c5f8cc97a7b2402f8c47b58f16f0c1b41c9b0d849f66984146646
-  data.tar.gz: 3e93b0e883b059728867256bd3c59dc63e73d869bb238e0aa6c7049175631b8fe60ef8d1639cbbc80ebf150cbf921015bdb7d78afab82a211116ea4bf26c34c3
+  metadata.gz: 087a77eefc3bcbfc39b330c2bf21c7ca58e9a5dfd529db6e345ec820937a6e1d16a0ccee457f67a2f8fe001a95ba8f3f2dd29a017e462d05f6fb281f37811619
+  data.tar.gz: 4bdda7d4a4db5e06468b16c9ed3f4e544c60757f33bcf705039677174603c8a522d462bb5011d0a470da20d4283a5fff3e018eaa04235c73f6a1b078cd86521a

data/src/commands/excel_to_x.rb

@@ -509,6 +509,8 @@ class ExcelToX
   def required_references
     log.info "Checking required references"
     required_refs = {}
+
+    # Need to add blank for any settable cells that aren't defined
     if @cells_that_can_be_set_at_runtime && @cells_that_can_be_set_at_runtime != :named_references_only
       @cells_that_can_be_set_at_runtime.each do |worksheet, refs|
         next if refs == :all
@@ -517,6 +519,8 @@ class ExcelToX
         end
       end
     end
+
+    # Need to add blanks for any cells the user want's, but aren't defined
     if @cells_to_keep
       @cells_to_keep.each do |worksheet, refs|
         next if refs == :all
@@ -525,6 +529,34 @@ class ExcelToX
         end
       end
     end
+
+    # In some situations also need to add the named references 
+    if @named_references_to_keep
+      @named_references_to_keep.each do |name|
+        ref = @named_references[name]
+        if ref.first == :sheet_reference
+          s = ref[1]
+          c = Reference.for(ref[2][1]).unfix.to_sym
+          required_refs[[s, c]] = [:blank]
+        elsif ref.first == :array
+          ref.each do |row|
+            next unless row.is_a?(Array)
+            row.each do |cell|
+              next unless cell.is_a?(Array)
+              if cell.first == :sheet_reference
+                s = cell[1]
+                c = Reference.for(cell[2][1]).unfix.to_sym
+                required_refs[[s, c]] = [:blank]
+              else
+                log.warn "Named reference '#{name}' refers to cells that can't be interpreted"
+              end
+            end
+          end
+        else
+          log.warn "Named reference '#{name}' refers to cells that can't be interpreted"
+        end
+      end
+    end
     required_refs
   end
 
@@ -538,8 +570,9 @@ class ExcelToX
       ref = @named_references[name]
       if ref
         add_ref_to_hash(ref, @cells_to_keep)
+        p @cells_to_keep
       else
-        log.warn "Named reference "#{name}" not found"
+        log.warn "Named reference \"#{name}\" not found"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg