squib 0.11.0 → 0.12.0

data/spec/data/samples/saves/_saves.rb.txt

@@ -855,3 +855,19 @@ cairo: paint([])
 cairo: set_source([MockDouble, 180, 75])
 cairo: paint([])
 surface: write_to_png(["_output/save_sheet_range_01.png"])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])

data/spec/data/samples/saves/_showcase.rb.txt

@@ -5936,3 +5936,7 @@ surface: write_to_png(["_output/showcase_individual_00.png"])
 surface: write_to_png(["_output/showcase_individual_01.png"])
 surface: write_to_png(["_output/showcase_individual_02.png"])
 surface: write_to_png(["_output/showcase_individual_03.png"])
+surface: finish([])
+surface: finish([])
+surface: finish([])
+surface: finish([])

data/spec/data/samples/shapes/_draw_shapes.rb.txt

@@ -754,3 +754,4 @@ cairo: set_dash([[]])
 cairo: stroke([])
 cairo: restore([])
 surface: write_to_png(["_output/shape_00.png"])
+surface: finish([])

data/spec/data/samples/text_options.rb.txt

@@ -1153,3 +1153,6 @@ cairo: restore([])
 surface: write_to_png(["_output/text_00.png"])
 surface: write_to_png(["_output/text_01.png"])
 surface: write_to_png(["_output/text_02.png"])
+surface: finish([])
+surface: finish([])
+surface: finish([])

data/spec/data/samples/tgc_proofs.rb.txt

@@ -99,3 +99,4 @@ cairo: set_source([ImageSurface, 0, 0])
 cairo: paint([0.5])
 cairo: restore([])
 surface: write_to_png(["_output/tgc_sample_00.png"])
+surface: finish([])

data/spec/data/samples/{units.rb.txt → units/_units.rb.txt}

@@ -1,27 +1,27 @@
 cairo: antialias=(["subpixel"])
 cairo: save([])
-cairo: set_source_color(["#ddd"])
+cairo: set_source_color(["white"])
 cairo: paint([])
 cairo: restore([])
 cairo: save([])
 cairo: translate([37.5, 37.5])
 cairo: rotate([0])
 cairo: translate([-37.5, -37.5])
-cairo: rounded_rectangle([37.5, 37.5, 750.0, 1050.0, 25, 25])
+cairo: rounded_rectangle([37.5, 37.5, 375.0, 375.0, 0, 0])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])
 cairo: set_source_color(["black"])
 cairo: set_line_width([2.0])
 cairo: set_line_join([0])
 cairo: set_line_cap([0])
-cairo: set_dash([[]])
+cairo: set_dash([[5.905511805, 5.905511805]])
 cairo: stroke([])
 cairo: restore([])
 cairo: save([])
 cairo: translate([75.0, 75.0])
 cairo: rotate([0])
 cairo: translate([-75.0, -75.0])
-cairo: rounded_rectangle([75.0, 75.0, 675.0, 975.0, 25, 25])
+cairo: rounded_rectangle([75.0, 75.0, 300.0, 300.0, 23.62204722, 23.62204722])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])
 cairo: set_source_color(["black"])
@@ -32,17 +32,22 @@ cairo: set_dash([[]])
 cairo: stroke([])
 cairo: restore([])
 cairo: save([])
-cairo: translate([472.4409444, 472.4409444])
-cairo: rotate([0])
-cairo: translate([-472.4409444, -472.4409444])
-cairo: rounded_rectangle([472.4409444, 472.4409444, 100, 100, 0, 0])
-cairo: set_source_color(["#0000"])
-cairo: fill_preserve([])
 cairo: set_source_color(["black"])
-cairo: set_line_width([2.0])
-cairo: set_line_join([0])
-cairo: set_line_cap([0])
-cairo: set_dash([[]])
-cairo: stroke([])
+cairo: translate([134.05511805, 166.24488195])
+cairo: rotate([0])
+cairo: move_to([0, 0])
+pango: font_description=([MockDouble])
+pango: text=(["Hello."])
+pango: width=([384000.0])
+pango: height=([307200])
+pango: wrap=([#<Pango::Layout::WrapMode word-char>])
+pango: ellipsize=([#<Pango::Layout::EllipsizeMode end>])
+pango: alignment=([#<Pango::Layout::Alignment left>])
+pango: justify=([false])
+cairo: move_to([0, 0])
+cairo: move_to([0, 0])
+cairo: show_pango_layout([MockDouble])
+pango: ellipsized?([])
 cairo: restore([])
 surface: write_to_png(["_output/units_00.png"])
+surface: finish([])

data/spec/deck_spec.rb

@@ -22,6 +22,8 @@ describe Squib::Deck do
       card2 = instance_double(Squib::Card)
       expect(card1).to receive(:text).once
       expect(card2).to receive(:text).once
+      expect(card1).to receive(:finish!).once
+      expect(card2).to receive(:finish!).once
       Squib::Deck.new do
         @cards = [card1, card2]
         text str: 'blah'
@@ -31,7 +33,9 @@ describe Squib::Deck do
     it 'calls text on some cards with an integer' do
       card1 = instance_double(Squib::Card)
       card2 = instance_double(Squib::Card)
+      expect(card1).to receive(:finish!).once
       expect(card2).to receive(:text).once
+      expect(card2).to receive(:finish!).once
       Squib::Deck.new do
         @cards = [card1, card2]
         text range: 1, str: 'blah'
@@ -43,7 +47,10 @@ describe Squib::Deck do
       card2 = instance_double(Squib::Card)
       card3 = instance_double(Squib::Card)
       expect(card1).to receive(:text).once
+      expect(card1).to receive(:finish!).once
       expect(card2).to receive(:text).once
+      expect(card2).to receive(:finish!).once
+      expect(card3).to receive(:finish!).once
       Squib::Deck.new do
         @cards = [card1, card2, card3]
         text range: 0..1, str: 'blah'

data/spec/graphics/graphics_save_doc_spec.rb

@@ -45,7 +45,8 @@ describe Squib::Deck, '#save_pdf' do
       expect(cxt).to receive(:target).and_return(target)
       expect(target).to receive(:finish).once
 
-      args = { file: 'foo.pdf', dir: '_out', margin: 75, gap: 5, trim: 37 }
+      args = { file: 'foo.pdf', dir: '_out', crop_marks: false,
+               margin: 75, gap: 5, trim: 37 }
       deck.save_pdf(args)
     end
 

data/spec/import/data_frame_spec.rb

@@ -0,0 +1,251 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+require 'squib/import/data_frame'
+
+describe Squib::DataFrame do
+  let(:basic) do
+    {
+      'Name' => ['Mage', 'Rogue', 'Warrior'],
+      'Cost' => [1, 2, 3],
+    }
+  end
+
+  let(:uneven) do
+     {
+       'Name' => ['Mage', 'Rogue', 'Warrior'],
+       'Cost' => [1, 2],
+     }
+  end
+
+  let(:whitespace) do
+     {
+       'Name \n\r\t' => ['  Mage \t\r\n'],
+     }
+  end
+
+  let(:defined) do
+    {
+      'nrows' => [1,2,3],
+    }
+  end
+
+  context 'is Enumerable and like a hash, so it' do
+    it 'responds to each' do
+      expect(subject).to respond_to(:each)
+    end
+
+    it 'responds to any?' do
+      expect(subject.any?).to be false
+    end
+
+    it 'responds to []' do
+      data = Squib::DataFrame.new basic
+      expect(data['Cost']).to eq([1, 2, 3])
+    end
+
+    it 'responds to []=' do
+      data = Squib::DataFrame.new basic
+      data[:a] = 2
+      expect(data[:a]).to eq(2)
+    end
+  end
+
+  context :columns do
+    it 'provides a list of columns' do
+      data = Squib::DataFrame.new basic
+      expect(data.columns).to eq %w(Name Cost)
+    end
+  end
+
+  context :ncolumns do
+    it 'provides column count' do
+      data = Squib::DataFrame.new basic
+      expect(data.ncolumns).to eq 2
+    end
+  end
+
+  context :row do
+    it 'returns a hash of each row' do
+      data = Squib::DataFrame.new basic
+      expect(data.row(0)).to eq ({'Name' => 'Mage', 'Cost' => 1})
+      expect(data.row(1)).to eq ({'Name' => 'Rogue', 'Cost' => 2})
+    end
+
+    it 'returns nil for uneven data' do
+      data = Squib::DataFrame.new uneven
+      expect(data.row(2)).to eq ({'Name' => 'Warrior', 'Cost' => nil})
+    end
+  end
+
+  context :nrows do
+    it 'returns a row count on even data' do
+      data = Squib::DataFrame.new basic
+      expect(data.nrows).to eq 3
+    end
+
+    it 'returns largest row count on uneven data' do
+      data = Squib::DataFrame.new basic
+      expect(data.nrows).to eq 3
+    end
+  end
+
+  context :json do
+    it 'returns quoty json' do
+      data = Squib::DataFrame.new basic
+      expect(data.to_json).to eq "{\"Name\":[\"Mage\",\"Rogue\",\"Warrior\"],\"Cost\":[1,2,3]}"
+    end
+
+    it 'returns pretty json' do
+      data = Squib::DataFrame.new basic
+      str = <<-EOS
+{
+  "Name": [
+    "Mage",
+    "Rogue",
+    "Warrior"
+  ],
+  "Cost": [
+    1,
+    2,
+    3
+  ]
+}
+EOS
+      expect(data.to_pretty_json).to eq str.chomp
+    end
+  end
+
+  context :def_column do
+    it 'creates name for Name column' do
+      data = Squib::DataFrame.new basic
+      expect(data).to respond_to(:name)
+      expect(data.name).to eq %w(Mage Rogue Warrior)
+      expect(data.cost).to eq [1, 2, 3]
+    end
+
+    it 'does not redefine methods' do
+      data = Squib::DataFrame.new defined
+      expect(data).to respond_to(:nrows)
+      expect(data.nrows).to eq 3
+    end
+
+    it 'defines a new column from empty data frame' do
+      data = Squib::DataFrame.new
+      expect(data).not_to respond_to(:snark)
+      data['snark'] = [1,2,3]
+      expect(data.snark).to eq [1,2,3]
+    end
+  end
+
+  context :snake_case do
+    subject { Squib::DataFrame.new }
+    it 'strips leading & trailing whitespace' do
+      expect(subject.send(:snake_case, '  A ')).to eq :a
+    end
+
+    it 'converts space to _' do
+      expect(subject.send(:snake_case, 'A b')).to eq :a_b
+    end
+
+    it 'handles multiwhitespace' do
+      expect(subject.send(:snake_case, 'A     b')).to eq :a_b
+    end
+
+    it 'handles camelcase' do
+      expect(subject.send(:snake_case, 'fooBar')).to eq :foo_bar
+    end
+
+    it 'handles camelcase with multiple capitals' do
+      expect(subject.send(:snake_case, 'FOOBar')).to eq :foo_bar
+    end
+  end
+
+  context :col? do
+    it 'returns true if a column exists' do
+      data = Squib::DataFrame.new basic
+      expect(data.col? 'Name').to be true
+    end
+
+    it 'returns false if a column does not exist' do
+      data = Squib::DataFrame.new basic
+      expect(data.col? 'ROUS').to be false
+    end
+  end
+
+  context :wrap_n_pad do
+    subject { Squib::DataFrame.new basic }
+
+    it 'returns a handles a single line' do
+      expect(subject.send(:wrap_n_pad, 'a', 3)).
+        to eq "| a                                  |\n"
+    end
+
+    it 'wraps multiple a lines at 34 characters' do
+      expect(subject.send(:wrap_n_pad, 'a' * 40, 3)).
+        to eq <<-EOS
+| aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
+    | aaaaaa                             |
+EOS
+    end
+  end
+
+  context :to_pretty_text do
+
+    let(:verbose) do
+      {
+        'Name' => ['Mage', 'Rogue', 'Warrior'],
+        'Cost' => [1, 2, 3],
+        'Description' => [
+          'Magic, dude.',
+          'I like to be sneaky',
+          'I have a long story to tell to test the word-wrapping ability of pretty text formatting.'
+          ],
+        'Snark' => [nil, '', ' ']
+      }
+    end
+
+    it 'returns fun ascii art of the card' do
+      data = Squib::DataFrame.new verbose
+      expect(data.to_pretty_text).to eq <<-EOS
+            ╭------------------------------------╮
+       Name | Mage                               |
+       Cost | 1                                  |
+Description | Magic, dude.                       |
+      Snark |                                    |
+            ╰------------------------------------╯
+            ╭------------------------------------╮
+       Name | Rogue                              |
+       Cost | 2                                  |
+Description | I like to be sneaky                |
+      Snark |                                    |
+            ╰------------------------------------╯
+            ╭------------------------------------╮
+       Name | Warrior                            |
+       Cost | 3                                  |
+Description | I have a long story to tell to tes |
+            | t the word-wrapping ability of pre |
+            | tty text formatting.               |
+      Snark |                                    |
+            ╰------------------------------------╯
+EOS
+    end
+
+    let(:utf8_fun) do
+      {
+      'Fun with UTF8!' => ['👊'],
+      }
+    end
+
+    it 'is admittedly janky with multibyte chars' do
+      # I hate how Ruby handles multibyte chars. Blech!
+      data = Squib::DataFrame.new utf8_fun
+      expect(data.to_pretty_text).to eq <<-EOS
+               ╭------------------------------------╮
+Fun with UTF8! | 👊                                  |
+               ╰------------------------------------╯
+EOS
+    end
+  end
+
+end

data/spec/samples/run_samples_spec.rb

@@ -11,7 +11,7 @@ describe 'Squib samples' do
       Dir.chdir(File.dirname(sample)) do
         load sample
       end
-    end
+    end unless sample =~ /project/ # ignore our project sample, run it below
   end
 
 end

data/spec/samples/samples_regression_spec.rb

@@ -44,15 +44,16 @@ describe 'Squib samples' do
       embed_text.rb
       hello_world.rb
       images/_more_load_images.rb
-      ranges.rb
+      ranges/_ranges.rb
       saves/_hand.rb
       saves/_portrait_landscape.rb
       saves/_saves.rb
+      saves/_save_pdf.rb
       saves/_showcase.rb
       shapes/_draw_shapes.rb
       text_options.rb
       tgc_proofs.rb
-      units.rb
+      units/_units.rb
   ).each do |sample|
     it "has not changed for #{sample}", slow: true do
       log = StringIO.new

data/squib.gemspec

@@ -27,15 +27,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'cairo', '~> 1.15.2'
-  spec.add_runtime_dependency 'pango', '~> 3.0.9'
+  spec.add_runtime_dependency 'cairo', '~> 1.15.3'
+  spec.add_runtime_dependency 'pango', '~> 3.1.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.7'
-  spec.add_runtime_dependency 'roo', '~> 2.4.0'
-  spec.add_runtime_dependency 'rsvg2', '~> 3.0.9'
+  spec.add_runtime_dependency 'roo', '~> 2.5.1'
+  spec.add_runtime_dependency 'rsvg2', '~> 3.1.0'
   spec.add_runtime_dependency 'mercenary', '~> 0.3.4'
   spec.add_runtime_dependency 'ruby-progressbar', '~> 1.8'
-  spec.add_runtime_dependency 'gobject-introspection', '~> 3.0.9' # for bug 172
-  spec.add_runtime_dependency 'gio2', '~> 3.0.9' # for bug 172
+  spec.add_runtime_dependency 'gobject-introspection', '~> 3.1.0' # for bug 172
+  spec.add_runtime_dependency 'gio2', '~> 3.1.0' # for bug 172
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'