Support for parsing one cell anchored images (#107)

PavitKaur05 · web-flow · commit 4c6b9fa61885 · 2022-11-29T07:40:08.000-05:00
diff --git a/lib/creek/drawing.rb b/lib/creek/drawing.rb
@@ -66,7 +66,7 @@ def tmpdir
     # Drawing xml contains relationships ID's and coordinates (row, col).
     # Drawing relationships xml contains images' locations.
     def load_drawings_and_rels
-      @drawings = parse_xml(@drawing_filepath).css('xdr|twoCellAnchor')
+      @drawings = parse_xml(@drawing_filepath).css('xdr|twoCellAnchor', 'xdr|oneCellAnchor' )
       drawing_rels_filepath = expand_to_rels_path(@drawing_filepath)
       @drawings_rels = parse_xml(drawing_rels_filepath).css('Relationships')
     end
@@ -82,7 +82,7 @@ def load_images_pathnames_by_cells
       col_from_selector = 'xdr:from/xdr:col'.freeze
       col_to_selector = 'xdr:to/xdr:col'.freeze
 
-      @drawings.xpath('//xdr:twoCellAnchor').each do |drawing|
+      @drawings.xpath('//xdr:twoCellAnchor', '//xdr:oneCellAnchor').each do |drawing|
         # embed = drawing.xpath(image_selector).first.attributes['embed']
         temp = drawing.xpath(image_selector).first
         embed = temp.attributes['embed'] if temp
@@ -93,12 +93,17 @@ def load_images_pathnames_by_cells
 
         row_from = drawing.xpath(row_from_selector).text.to_i
         col_from = drawing.xpath(col_from_selector).text.to_i
-        row_to = drawing.xpath(row_to_selector).text.to_i
-        col_to = drawing.xpath(col_to_selector).text.to_i
 
-        (col_from..col_to).each do |col|
-          (row_from..row_to).each do |row|
-            @images_pathnames[[row, col]].push(path)
+        if drawing.name == 'oneCellAnchor'
+          @images_pathnames[[row_from , col_from ]].push(path)
+        else
+          row_to = drawing.xpath(row_to_selector).text.to_i
+          col_to = drawing.xpath(col_to_selector).text.to_i
+
+          (col_from..col_to).each do |col|
+            (row_from..row_to).each do |row|
+              @images_pathnames[[row, col]].push(path)
+            end
           end
         end
       end
diff --git a/spec/drawing_spec.rb b/spec/drawing_spec.rb
@@ -3,9 +3,11 @@
 describe 'drawing' do
   let(:book) { Creek::Book.new('spec/fixtures/sample-with-images.xlsx') }
   let(:book_no_images) { Creek::Book.new('spec/fixtures/sample.xlsx') }
+  let(:book_with_one_cell_anchored_images) { Creek::Book.new('spec/fixtures/sample-with-one-cell-anchored-images.xlsx') }
   let(:drawingfile) { 'xl/drawings/drawing1.xml' }
   let(:drawing) { Creek::Drawing.new(book, drawingfile) }
   let(:drawing_without_images) { Creek::Drawing.new(book_no_images, drawingfile) }
+  let(:drawing_with_one_cell_anchored_images) { Creek::Drawing.new(book_with_one_cell_anchored_images, drawingfile) }
 
   describe '#has_images?' do
     it 'has' do
@@ -48,5 +50,21 @@
         expect(image1).to eq(image2)
       end
     end
+
+    context 'when one cell anchored images in cell' do
+      it 'returns image for anchored cell' do
+        image = drawing_with_one_cell_anchored_images.images_at('A2')[0]
+        expect(image.class).to eq(Pathname)
+        expect(image.exist?).to eq(true)
+      end
+
+      it 'returns nil for non-anchored cell' do
+        image = drawing_with_one_cell_anchored_images.images_at('A3')[0]
+        # Image can be seen present on cell A4 in `sample-with-one-cell-anchored-images.xlsx`
+        image_at_non_anchored_cell = drawing_with_one_cell_anchored_images.images_at('A4')
+        expect(image.class).to eq(Pathname)
+        expect(image_at_non_anchored_cell).to eq(nil)
+      end
+    end
   end
 end
diff --git a/spec/fixtures/sample-with-one-cell-anchored-images.xlsx b/spec/fixtures/sample-with-one-cell-anchored-images.xlsx
diff --git a/spec/sheet_spec.rb b/spec/sheet_spec.rb
@@ -65,6 +65,20 @@ def load_cell(rows, cell_name)
       end
     end
 
+    context 'when one cell anchored images in cell' do
+      let(:book_with_one_cell_anchored_images) { Creek::Book.new('spec/fixtures/sample-with-one-cell-anchored-images.xlsx') }
+      let(:sheet_with_one_cell_anchored_images) { Creek::Sheet.new(book_with_one_cell_anchored_images, 'Sheet 1', 1, '', '', '1', sheetfile) }
+      let(:rows) { sheet_with_one_cell_anchored_images.with_images.rows.map { |r| r } }
+
+      it 'returns image for anchored cell' do
+        expect(load_cell(rows, 'A2').size).to eq(1)
+      end
+
+      it 'returns nil for non-anchored cell' do
+        expect(load_cell(rows, 'A4')).to eq(nil)
+      end
+    end
+
     context 'with excel without images' do
       let(:book_no_images) { Creek::Book.new('spec/fixtures/sample.xlsx') }
       let(:sheet_no_images) { Creek::Sheet.new(book_no_images, 'Sheet 1', 1, '', '', '1', sheetfile) }
