From 8cd651d5f1966e04a60c7861cce38c1e0ffcfc52 Mon Sep 17 00:00:00 2001
From: Andy Meneely <andy@se.rit.edu>
Date: Mon, 11 Apr 2016 22:30:32 -0400
Subject: [PATCH] samples: gistifying excel.rb and csv.rb

---
 .gitmodules                                   |   4 ++
 samples/csv_import.rb                         |  33 -----------
 samples/data                                  |   1 +
 samples/excel.rb                              |  55 ------------------
 samples/explode_quantities.xlsx               | Bin 8333 -> 0 bytes
 samples/quantity_explosion.csv                |   3 -
 samples/sample.csv                            |   3 -
 samples/sample.xlsx                           | Bin 10748 -> 0 bytes
 .../{csv_import.rb.txt => data/_csv.rb.txt}   |   0
 .../{excel.rb.txt => data/_excel.rb.txt}      |   0
 .../samples/images/_more_load_images.rb.txt   |   8 +--
 spec/samples/samples_regression_spec.rb       |  17 +++---
 12 files changed, 16 insertions(+), 108 deletions(-)
 delete mode 100644 samples/csv_import.rb
 create mode 160000 samples/data
 delete mode 100644 samples/excel.rb
 delete mode 100644 samples/explode_quantities.xlsx
 delete mode 100644 samples/quantity_explosion.csv
 delete mode 100644 samples/sample.csv
 delete mode 100644 samples/sample.xlsx
 rename spec/data/samples/{csv_import.rb.txt => data/_csv.rb.txt} (100%)
 rename spec/data/samples/{excel.rb.txt => data/_excel.rb.txt} (100%)

diff --git a/.gitmodules b/.gitmodules
index 9f255ca..80c46f3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -27,3 +27,7 @@
 [submodule "samples/saves"]
   	path = samples/saves
   	url = https://gist.github.com/3c60c13b25f525abd037db4055abf35c.git
+
+[submodule "samples/data"]
+  	path = samples/data
+  	url = https://gist.github.com/6f89115805e205c647a779b7b4866151.git
diff --git a/samples/csv_import.rb b/samples/csv_import.rb
deleted file mode 100644
index ea4f4ae..0000000
--- a/samples/csv_import.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'squib'
-
-Squib::Deck.new(cards: 2) do
-  background color: :white
-
-  # Outputs a hash of arrays with the header names as keys
-  data = csv file: 'sample.csv'
-  text str: data['Type'], x: 250, y: 55, font: 'Arial 54'
-  text str: data['Level'], x: 65, y: 65, font: 'Arial 72'
-
-  save format: :png, prefix: 'sample_csv_'
-
-  # You can also specify the sheet, starting at 0
-  data = xlsx file: 'sample.xlsx', sheet: 2
-end
-
-# CSV is also a Squib-module-level function, so this also works:
-data      = Squib.csv file: 'quantity_explosion.csv' # 2 rows...
-num_cards = data['Name'].size                        #          ...but 4 cards!
-
-Squib::Deck.new(cards: num_cards) do
-  background color: :white
-  rect # card border
-  text str: data['Name'], font: 'Arial 54'
-  save_sheet prefix: 'sample_csv_qty_', columns: 4
-end
-
-# Additionally, CSV supports inline data specifically
-data = Squib.csv data: <<-EOCSV
-Name,Cost
-Knight,3
-Orc,1
-EOCSV
diff --git a/samples/data b/samples/data
new file mode 160000
index 0000000..d9d087e
--- /dev/null
+++ b/samples/data
@@ -0,0 +1 @@
+Subproject commit d9d087ebf415698bb81605c042b4b7e84bcdcb52
diff --git a/samples/excel.rb b/samples/excel.rb
deleted file mode 100644
index 9fc9099..0000000
--- a/samples/excel.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'squib'
-
-Squib::Deck.new(cards: 3) do
-  background color: :white
-
-  # Reads the first sheet by default (sheet 0)
-  # Outputs a hash of arrays with the header names as keys
-  data = xlsx file: 'sample.xlsx'
-
-  text str: data['Name'], x: 250, y: 55, font: 'Arial 54'
-  text str: data['Level'], x: 65, y: 65, font: 'Arial 72'
-  text str: data['Description'], x: 65, y: 600, font: 'Arial 36'
-
-  save format: :png, prefix: 'sample_excel_' # save to individual pngs
-end
-
-# xlsx is also a Squib-module-level function, so this also works:
-data      = Squib.xlsx file: 'explode_quantities.xlsx' # 2 rows...
-num_cards = data['Name'].size                          #          ...but 4 cards!
-
-Squib::Deck.new(cards: num_cards) do
-  background color: :white
-  rect # card border
-  text str: data['Name'], font: 'Arial 54'
-  save_sheet prefix: 'sample_xlsx_qty_', columns: 4
-end
-
-
-# Here's another example, a bit more realistic. Here's what's going on:
-#   * We call xlsx from Squib directly - BEFORE Squib::Deck creation. This
-#     allows us to infer the number of cards based on the size of the "Name"
-#     field
-#   * We make use of quantity explosion. Fields named "Qty" or "Quantity"
-#     (any capitalization), or any other in the "qty_header" get expanded by the
-#     number given
-#   * We also make sure that trailing and leading whitespace is stripped
-#     from each value. This is the default behavior in Squib, but the options
-#     are here just to make sure.
-
-resource_data = Squib.xlsx(file: 'sample.xlsx', sheet: 2, strip: true) do |header, value|
-  case header
-  when 'Cost'
-    "$#{value}k" # e.g. "3" becomes "$3k"
-  else
-    value # always return the original value if you didn't do anything to it
-  end
-end
-
-Squib::Deck.new(cards: resource_data['Name'].size) do
-  background color: :white
-  rect width: :deck, height: :deck
-  text str: resource_data['Name'], align: :center, width: :deck, hint: 'red'
-  text str: resource_data['Cost'], align: :right, width: :deck, hint: 'red'
-  save_sheet prefix: 'sample_excel_resources_' # save to a whole sheet
-end
diff --git a/samples/explode_quantities.xlsx b/samples/explode_quantities.xlsx
deleted file mode 100644
index 9e8b0abc1deea4e1a2e8b473806ac8080a7e380f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8333
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

diff --git a/samples/quantity_explosion.csv b/samples/quantity_explosion.csv
deleted file mode 100644
index efaa11c..0000000
--- a/samples/quantity_explosion.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-Name,Qty
-Basilisk,3
-High Templar,1
\ No newline at end of file
diff --git a/samples/sample.csv b/samples/sample.csv
deleted file mode 100644
index 2685b0f..0000000
--- a/samples/sample.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-Type,"Level"
-Thief,1
-Mastermind,2
\ No newline at end of file
diff --git a/samples/sample.xlsx b/samples/sample.xlsx
deleted file mode 100644
index eabcf9b9f5ba16b0da724a2cdcd812dedb14b6a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10748
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

diff --git a/spec/data/samples/csv_import.rb.txt b/spec/data/samples/data/_csv.rb.txt
similarity index 100%
rename from spec/data/samples/csv_import.rb.txt
rename to spec/data/samples/data/_csv.rb.txt
diff --git a/spec/data/samples/excel.rb.txt b/spec/data/samples/data/_excel.rb.txt
similarity index 100%
rename from spec/data/samples/excel.rb.txt
rename to spec/data/samples/data/_excel.rb.txt
diff --git a/spec/data/samples/images/_more_load_images.rb.txt b/spec/data/samples/images/_more_load_images.rb.txt
index be2f238..4da01a1 100644
--- a/spec/data/samples/images/_more_load_images.rb.txt
+++ b/spec/data/samples/images/_more_load_images.rb.txt
@@ -108,7 +108,7 @@ cairo: scale([1.0, 1.0])
 cairo: rotate([0])
 cairo: transform([Matrix])
 cairo: translate([-300, -350])
-cairo: rounded_rectangle([300, 350, 128.0, 64.0, 0, 0])
+cairo: rounded_rectangle([300, 350, 200.0, 100.0, 0, 0])
 cairo: clip([])
 cairo: translate([0, 0])
 cairo: set_source([ImageSurface, 300, 350])
@@ -166,7 +166,7 @@ cairo: scale([1.0, 1.0])
 cairo: rotate([0])
 cairo: transform([Matrix])
 cairo: translate([-300, -535])
-cairo: rounded_rectangle([300, 535, 128.0, 64.0, 0, 0])
+cairo: rounded_rectangle([300, 535, 200.0, 100.0, 0, 0])
 cairo: clip([])
 cairo: translate([0, 0])
 cairo: set_source([ImageSurface, 300, 535])
@@ -216,8 +216,8 @@ cairo: save([])
 cairo: translate([0, 0])
 cairo: transform([Matrix])
 cairo: rotate([0])
-cairo: scale([0.8021390374331551, 0.8032128514056225])
-cairo: rounded_rectangle([0, 0, 748.0, 747.0, 0, 0])
+cairo: scale([6.0, 6.0])
+cairo: rounded_rectangle([0, 0, 100.0, 100.0, 0, 0])
 cairo: clip([])
 cairo: translate([0, 0])
 cairo: render_rsvg_handle([RSVG::Handle, "#thing"])
diff --git a/spec/samples/samples_regression_spec.rb b/spec/samples/samples_regression_spec.rb
index 7ecffba..fd980fa 100644
--- a/spec/samples/samples_regression_spec.rb
+++ b/spec/samples/samples_regression_spec.rb
@@ -4,12 +4,6 @@ require 'pp'
 
 describe 'Squib samples' do
 
-  around(:each) do |example|
-    Dir.chdir(samples_dir) do
-      example.run
-    end
-  end
-
   # This test could use some explanation
   # Much of the development of Squib has been sample-driven. Every time I want
   # new syntax or feature, I write a sample, get it working, and then write
@@ -42,12 +36,12 @@ describe 'Squib samples' do
       autoscale_font/_autoscale_font.rb
       basic.rb
       cairo_access.rb
-      csv_import.rb
+      data/_csv.rb
       config_text_markup.rb
       custom_config.rb
       shapes/_draw_shapes.rb
       embed_text.rb
-      excel.rb
+      data/_excel.rb
       gradients.rb
       saves/_hand.rb
       hello_world.rb
@@ -63,8 +57,11 @@ describe 'Squib samples' do
     it "has not changed for #{sample}", slow: true do
       log = StringIO.new
       mock_cairo(log)
-      load sample
-      overwrite_sample(sample, log) # Use TEMPORARILY once happy with the new sample log
+      full_sample_path = File.expand_path "#{samples_dir}/#{sample}"
+      Dir.chdir(File.dirname("#{samples_dir}/#{sample}")) do
+        load full_sample_path
+      end
+      # overwrite_sample(sample, log) # Use TEMPORARILY once happy with the new sample log
       test_file_str = File.open(sample_regression_file(sample), 'r:UTF-8').read
       expect(log.string).to eq(test_file_str)
     end