squib 0.4.0 → 0.5.0

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

@@ -25,8 +25,7 @@ cairo: save([])
 cairo: set_source_color([:black])
 cairo: translate([220, 78])
 cairo: rotate([0])
-cairo: translate([-220, -78])
-cairo: move_to([220, 78])
+cairo: move_to([0, 0])
 pango: font_description=([MockDouble])
 pango: text=(["Mastermind"])
 pango: wrap=([#<Pango::Layout::WrapMode word-char>])
@@ -35,6 +34,7 @@ pango: alignment=([#<Pango::Layout::Alignment left>])
 pango: justify=([false])
 pango: spacing=([0])
 cairo: update_pango_layout([MockDouble])
+cairo: move_to([0, 0])
 cairo: update_pango_layout([MockDouble])
 cairo: show_pango_layout([MockDouble])
 cairo: restore([])
@@ -42,8 +42,7 @@ cairo: save([])
 cairo: set_source_color([:black])
 cairo: translate([75, 85])
 cairo: rotate([0])
-cairo: translate([-75, -85])
-cairo: move_to([75, 85])
+cairo: move_to([0, 0])
 pango: font_description=([MockDouble])
 pango: text=(["3"])
 pango: width=([131072])
@@ -53,6 +52,7 @@ pango: alignment=([#<Pango::Layout::Alignment center>])
 pango: justify=([false])
 pango: spacing=([0])
 cairo: update_pango_layout([MockDouble])
+cairo: move_to([0, 0])
 cairo: update_pango_layout([MockDouble])
 cairo: show_pango_layout([MockDouble])
 cairo: restore([])

data/spec/graphics/graphics_text_spec.rb

@@ -8,6 +8,7 @@ describe Squib::Card, '#text' do
     let(:context)   { double(Cairo::Context) }
     let(:layout)    { double(Pango::Layout) }
     let(:font_desc) { double(Pango::FontDescription) }
+    let(:pango_cxt) { double(Pango::Context) }
 
     before(:each) do
       allow(Cairo::Context).to receive(:new).and_return(context)
@@ -15,6 +16,7 @@ describe Squib::Card, '#text' do
       allow(deck).to receive(:count_format).and_return('%02d')
       allow(deck).to receive(:prefix).and_return('card_')
       allow(deck).to receive(:antialias).and_return('best')
+      allow(layout).to receive(:context).and_return(pango_cxt)
     end
 
     it 'make all the expected calls on a smoke test' do
@@ -23,8 +25,7 @@ describe Squib::Card, '#text' do
       expect(context).to receive(:antialias=).with('subpixel').once
       expect(context).to receive(:save).once
       expect(context).to receive(:set_source_color).once
-      expect(context).to receive(:move_to).with(10, 15).once
-      expect(context).to receive(:translate).with(-10, -15).once
+      expect(context).to receive(:move_to).with(0, 0).twice
       expect(context).to receive(:rotate).with(0.0).once
       expect(context).to receive(:translate).with(10, 15).once
       expect(context).to receive(:create_pango_layout).once.and_return(layout)
@@ -35,6 +36,7 @@ describe Squib::Card, '#text' do
       expect(layout ).to receive(:height=).with(25 * Pango::SCALE).once
       expect(layout ).to receive(:ellipsize=).with(Pango::Layout::ELLIPSIZE_NONE).once
       expect(layout ).to receive(:alignment=).with(Pango::Layout::ALIGN_LEFT).once
+      expect(pango_cxt).to receive(:font_options=).once
       expect(layout ).to receive(:justify=).with(false).once
       expect(layout ).to receive(:spacing=).with(1.0 * Pango::SCALE).once
       expect(context).to receive(:update_pango_layout).once
@@ -49,7 +51,7 @@ describe Squib::Card, '#text' do
       #      x, y, width, height,
       #      markup, justify, wrap, ellipsize,
       #      spacing, align, valign, hint, angle)
-      ret = card.text('foo', 'Sans 12', nil, '#abc',
+      ret = card.text(Squib::TextEmbed.new,'foo', 'Sans 12', nil, '#abc',
                       10, 15, 20, 25,
                       nil, false, false, false,
                       1.0, :left, :top, nil, 0.0)
@@ -75,7 +77,7 @@ describe Squib::Card, '#text' do
     it 'aligns right with strings' do
       card = Squib::Card.new(deck, 100, 150)
       expect(layout).to receive(:alignment=).with(Pango::Layout::ALIGN_RIGHT).once
-      card.text('foo', 'Sans 12', nil, '#abc',
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, false, false,
                 1.0, 'right', :top, nil, 0.0)
@@ -84,7 +86,7 @@ describe Squib::Card, '#text' do
     it 'aligns center with strings' do
       card = Squib::Card.new(deck, 100, 150)
       expect(layout).to receive(:alignment=).with(Pango::Layout::ALIGN_CENTER).once
-      card.text('foo', 'Sans 12', nil, '#abc',
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, false, false,
                 1.0, 'center', :top, nil, 0.0)
@@ -93,7 +95,7 @@ describe Squib::Card, '#text' do
     it 'sets wrap to char with string char' do
       card = Squib::Card.new(deck, 100, 150)
       expect(layout).to receive(:wrap=).with(Pango::Layout::WRAP_CHAR).once
-      card.text('foo', 'Sans 12', nil, '#abc',
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, 'char', false,
                 1.0, :left, :top, nil, 0.0)
@@ -102,7 +104,7 @@ describe Squib::Card, '#text' do
     it 'sets wrap to word with word string' do
       card = Squib::Card.new(deck, 100, 150)
       expect(layout).to receive(:wrap=).with(Pango::Layout::WRAP_WORD).once
-      card.text('foo', 'Sans 12', nil, '#abc',
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, 'word', false,
                 1.0, :left, :top, nil, 0.0)
@@ -111,7 +113,7 @@ describe Squib::Card, '#text' do
     it 'sets wrap to word_char with symbol word_char' do
       card = Squib::Card.new(deck, 100, 150)
       expect(layout).to receive(:wrap=).with(Pango::Layout::WRAP_WORD_CHAR).once
-      card.text('foo', 'Sans 12', nil, '#abc',
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, :word_char, false,
                 1.0, :left, :top, nil, 0.0)
@@ -120,7 +122,7 @@ describe Squib::Card, '#text' do
     it 'sets wrap to word_char with true' do
       card = Squib::Card.new(deck, 100, 150)
       expect(layout).to receive(:wrap=).with(Pango::Layout::WRAP_WORD_CHAR).once
-      card.text('foo', 'Sans 12', nil, '#abc',
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, true, false,
                 1.0, :left, :top, nil, 0.0)
@@ -129,7 +131,7 @@ describe Squib::Card, '#text' do
     it 'sets ellipsize to start properly' do
       card = Squib::Card.new(deck, 100, 150)
       expect(layout).to receive(:ellipsize=).with(Pango::Layout::ELLIPSIZE_START).once
-      card.text('foo', 'Sans 12', nil, '#abc',
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, true, :start,
                 1.0, :left, :top, nil, 0.0)
@@ -138,7 +140,7 @@ describe Squib::Card, '#text' do
     it 'sets ellipsize to middle properly' do
       card = Squib::Card.new(deck, 100, 150)
       expect(layout).to receive(:ellipsize=).with(Pango::Layout::ELLIPSIZE_MIDDLE).once
-      card.text('foo', 'Sans 12', nil, '#abc',
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, true, 'middle',
                 1.0, :left, :top, nil, 0.0)

data/spec/samples/samples_regression_spec.rb

@@ -51,8 +51,10 @@ describe "Squib samples" do
       basic.rb
       cairo_access.rb
       csv_import.rb
+      config_text_markup.rb
       custom_config.rb
       draw_shapes.rb
+      embed_text.rb
       excel.rb
       gradients.rb
       hello_world.rb

data/spec/spec_helper.rb

@@ -55,10 +55,13 @@ end
 # Build a mock cairo instance that allows basically any method
 # and logs that call to the string buffer
 def mock_cairo(strio)
-  cxt     = double(Cairo::Context)
-  surface = double(Cairo::ImageSurface)
-  pango   = double(Pango::Layout)
-  font    = double(Pango::FontDescription)
+  cxt       = double(Cairo::Context)
+  surface   = double(Cairo::ImageSurface)
+  pango     = double(Pango::Layout)
+
+  font      = double(Pango::FontDescription)
+  iter      = double('pango_iter')
+  pango_cxt = double('pango_cxt')
   allow(Squib.logger).to receive(:warn) {}
   allow(ProgressBar).to receive(:create).and_return(Squib::DoNothing.new)
   allow(Cairo::ImageSurface).to receive(:new).and_return(surface)
@@ -67,9 +70,19 @@ def mock_cairo(strio)
   allow(Cairo::Context).to receive(:new).and_return(cxt)
   allow(cxt).to receive(:create_pango_layout).and_return(pango)
   allow(cxt).to receive(:target).and_return(surface)
+  allow(cxt).to receive(:matrix).and_return(Cairo::Matrix.new(1,0,0,1,0,0))
   allow(pango).to receive(:height).and_return(25)
   allow(pango).to receive(:width).and_return(25)
+  allow(pango).to receive(:index_to_pos).and_return(Pango::Rectangle.new(0,0,0,0))
   allow(pango).to receive(:extents).and_return([Pango::Rectangle.new(0,0,0,0)]*2)
+  allow(pango).to receive(:iter).and_return(iter)
+  allow(pango).to receive(:alignment).and_return(Pango::Layout::Alignment::LEFT)
+  allow(pango).to receive(:text).and_return("foo")
+  allow(pango).to receive(:context).and_return(pango_cxt)
+  allow(pango_cxt).to receive(:font_options=)
+  allow(iter).to receive(:next_char!).and_return(false)
+  allow(iter).to receive(:char_extents).and_return(Pango::Rectangle.new(5,5,5,5))
+  allow(iter).to receive(:index).and_return(1000)
   allow(Pango::FontDescription).to receive(:new).and_return(font)
   allow(Cairo::PDFSurface).to receive(:new).and_return(nil)
 
@@ -77,7 +90,7 @@ def mock_cairo(strio)
     update_pango_layout width height show_pango_layout rounded_rectangle
     set_line_width stroke fill set_source scale render_rsvg_handle circle
     triangle line_to operator= show_page clip transform mask rectangle
-    reset_clip antialias=).each do |m|
+    reset_clip antialias= curve_to matrix=).each do |m|
     allow(cxt).to receive(m) { |*args| strio << scrub_hex("cairo: #{m}(#{args})\n") }
   end
 
@@ -94,6 +107,10 @@ def mock_cairo(strio)
     allow(surface).to receive(m) { |*args| strio << scrub_hex("surface: #{m}(#{args})\n") }
   end
 
+  %w(next_char!).each do |m|
+    allow(iter).to receive(m) { |*args| strio << scrub_hex("pango_iter: #{m}(#{args})\n") }
+  end
+
 end
 
 # Refine Squib to allow setting the logger and progress bar

data/squib.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'redcarpet', '~> 3.1'
   spec.add_development_dependency 'github-markup', '~> 1.3'
-  spec.add_development_dependency 'yard', '~> 0.8'
+  # spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'byebug'
 

data/squib.sublime-project

@@ -0,0 +1,49 @@
+{
+	"folders":
+	[
+		{
+			"follow_symlinks": true,
+			"path": "."
+		}
+	],
+	"build_systems":
+	[
+		{
+			"name": "rake",
+			"shell_cmd": "rake",
+		},
+		{
+			"name": "rake run[text_options]",
+			"shell_cmd": "rake run[text_options]",
+		},
+		{
+			"name": "rake run[embed_text]",
+			"shell_cmd": "rake run[embed_text]",
+		},
+		{
+			"name": "rake run[draw_shapes]",
+			"shell_cmd": "rake run[draw_shapes]",
+		},
+		{
+			"name": "rake run[config_text_markup]",
+			"shell_cmd": "rake run[config_text_markup]",
+		},
+		{
+			"name":        "rspec spec/samples/samples_regression_spec.rb",
+			"shell_cmd":   "rspec spec/samples/samples_regression_spec.rb",
+			"working_dir": "${project_path:${folder}}"
+		},
+		{
+			"name":        "rspec spec/args/typographer_spec.rb",
+			"shell_cmd":   "rspec spec/args/typographer_spec.rb",
+			"working_dir": "${project_path:${folder}}"
+		},
+		{
+			"name":        "rspec spec/graphics/graphics_text_spec.rb",
+			"shell_cmd":   "rspec spec/graphics/graphics_text_spec.rb",
+			"working_dir": "${project_path:${folder}}"
+		},
+
+	],
+
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andy Meneely
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -164,20 +164,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -218,9 +204,11 @@ extra_rdoc_files:
 - samples/basic.rb
 - samples/cairo_access.rb
 - samples/colors.rb
+- samples/config_text_markup.rb
 - samples/csv_import.rb
 - samples/custom_config.rb
 - samples/draw_shapes.rb
+- samples/embed_text.rb
 - samples/excel.rb
 - samples/gradients.rb
 - samples/hello_world.rb
@@ -265,7 +253,9 @@ files:
 - lib/squib/api/settings.rb
 - lib/squib/api/shapes.rb
 - lib/squib/api/text.rb
+- lib/squib/api/text_embed.rb
 - lib/squib/api/units.rb
+- lib/squib/args/typographer.rb
 - lib/squib/args/unit_conversion.rb
 - lib/squib/card.rb
 - lib/squib/commands/new.rb
@@ -303,6 +293,9 @@ files:
 - samples/basic.rb
 - samples/cairo_access.rb
 - samples/colors.rb
+- samples/config_disable_quotes.yml
+- samples/config_text_markup.rb
+- samples/config_text_markup.yml
 - samples/csv_import.rb
 - samples/custom-config.yml
 - samples/custom-layout.yml
@@ -311,6 +304,7 @@ files:
 - samples/customconfig-imgdir/shiny-purse2.png
 - samples/customconfig-imgdir/spanner2.svg
 - samples/draw_shapes.rb
+- samples/embed_text.rb
 - samples/excel.rb
 - samples/glass-heart.svg
 - samples/gradients.rb
@@ -335,6 +329,7 @@ files:
 - spec/api/api_data_spec.rb
 - spec/api/api_image_spec.rb
 - spec/api/api_text_spec.rb
+- spec/args/typographer_spec.rb
 - spec/args/unit_conversion_spec.rb
 - spec/commands/new_spec.rb
 - spec/data/csv/basic.csv
@@ -359,9 +354,11 @@ files:
 - spec/data/samples/autoscale_font.rb.txt
 - spec/data/samples/basic.rb.txt
 - spec/data/samples/cairo_access.rb.txt
+- spec/data/samples/config_text_markup.rb.txt
 - spec/data/samples/csv_import.rb.txt
 - spec/data/samples/custom_config.rb.txt
 - spec/data/samples/draw_shapes.rb.txt
+- spec/data/samples/embed_text.rb.txt
 - spec/data/samples/excel.rb.txt
 - spec/data/samples/gradients.rb.txt
 - spec/data/samples/hello_world.rb.txt
@@ -387,6 +384,7 @@ files:
 - spec/samples/samples_regression_spec.rb
 - spec/spec_helper.rb
 - squib.gemspec
+- squib.sublime-project
 homepage: https://github.com/andymeneely/squib
 licenses:
 - MIT
@@ -416,6 +414,7 @@ test_files:
 - spec/api/api_data_spec.rb
 - spec/api/api_image_spec.rb
 - spec/api/api_text_spec.rb
+- spec/args/typographer_spec.rb
 - spec/args/unit_conversion_spec.rb
 - spec/commands/new_spec.rb
 - spec/data/csv/basic.csv
@@ -440,9 +439,11 @@ test_files:
 - spec/data/samples/autoscale_font.rb.txt
 - spec/data/samples/basic.rb.txt
 - spec/data/samples/cairo_access.rb.txt
+- spec/data/samples/config_text_markup.rb.txt
 - spec/data/samples/csv_import.rb.txt
 - spec/data/samples/custom_config.rb.txt
 - spec/data/samples/draw_shapes.rb.txt
+- spec/data/samples/embed_text.rb.txt
 - spec/data/samples/excel.rb.txt
 - spec/data/samples/gradients.rb.txt
 - spec/data/samples/hello_world.rb.txt