squib 0.6.0 → 0.7.0

data/spec/graphics/graphics_save_doc_spec.rb

@@ -1,65 +1,67 @@
-require 'spec_helper'
-require 'squib'
-
-describe Squib::Deck, '#save_pdf' do
-
-  context 'typical inputs' do
-    let(:cxt) { double(Cairo::Context) }
-
-    def expect_card_place(x, y)
-      expect(cxt).to receive(:translate).with(x, y).once
-      expect(cxt).to receive(:rectangle).once
-      expect(cxt).to receive(:clip).once
-      expect(cxt).to receive(:set_source)  # place the card
-                      .with(instance_of(Cairo::ImageSurface), 0, 0).once
-      expect(cxt).to receive(:paint).once  # paint placed card
-      expect(cxt).to receive(:translate).with(-x,-y).once
-      expect(cxt).to receive(:reset_clip).once
-    end
-
-    before(:each) do
-      allow(Cairo::PDFSurface).to receive(:new).and_return(nil) #don't create the file
-      allow(Cairo::Context).to    receive(:new).and_return(cxt)
-      allow(cxt).to receive(:antialias=)
-    end
-
-    it 'make all the expected calls on a smoke test' do
-      num_cards = 9
-      deck = Squib::Deck.new(cards: 9, width: 825, height: 1125)
-      expect(deck).to receive(:dirify) { |arg| arg } #don't create the dir
-      expect(Squib.logger).to receive(:debug).at_least(:once)
-      expect(cxt).to receive(:scale).with(0.24, 0.24)
-
-      expect_card_place(75, 75)
-      expect_card_place(831, 75)
-      expect_card_place(1587, 75)
-      expect_card_place(2343, 75)
-      expect_card_place(75, 1131)
-      expect_card_place(831, 1131)
-      expect_card_place(1587, 1131)
-      expect_card_place(2343, 1131)
-      expect(cxt).to receive(:show_page).once
-      expect_card_place(75, 75)
-
-      args = { file: 'foo.pdf', dir: '_out', margin: 75, gap: 5, trim: 37 }
-      deck.save_pdf(args)
-    end
-
-    it 'only does the three cards on a limited range' do
-      num_cards = 9
-      args = { range: 2..4, file: 'foo.pdf', dir: '_out', margin: 75, gap: 5, trim: 37 }
-      deck = Squib::Deck.new(cards: num_cards, width: 825, height: 1125)
-      expect(Squib.logger).to receive(:debug).at_least(:once)
-      expect(deck).to receive(:dirify) { |arg| arg }  #don't create the dir
-      expect(cxt).to receive(:scale).with(0.24, 0.24)
-
-      expect_card_place(75, 75)
-      expect_card_place(831, 75)
-      expect_card_place(1587, 75)
-
-      deck.save_pdf(args)
-    end
-
-  end
-
-end
+require 'spec_helper'
+require 'squib'
+
+describe Squib::Deck, '#save_pdf' do
+
+  context 'typical inputs' do
+    let(:cxt) { double(Cairo::Context) }
+
+    def expect_card_place(x, y)
+      expect(cxt).to receive(:translate).with(x, y).once
+      expect(cxt).to receive(:rectangle).once
+      expect(cxt).to receive(:clip).once
+      expect(cxt).to receive(:set_source)  # place the card
+                      .with(instance_of(Cairo::ImageSurface), 0, 0).once
+      expect(cxt).to receive(:paint).once  # paint placed card
+      expect(cxt).to receive(:translate).with(-x,-y).once
+      expect(cxt).to receive(:reset_clip).once
+    end
+
+    before(:each) do
+      allow(Cairo::PDFSurface).to receive(:new).and_return(nil) #don't create the file
+      allow(Cairo::Context).to    receive(:new).and_return(cxt)
+      allow(cxt).to receive(:antialias=)
+    end
+
+    it 'make all the expected calls on a smoke test' do
+      num_cards = 9
+      deck = Squib::Deck.new(cards: 9, width: 825, height: 1125)
+      expect(Squib.logger).to receive(:debug).at_least(:once)
+      expect(Squib.logger).to receive(:warn).exactly(:once) #warn about making the dir
+      expect(Dir).to receive(:mkdir) {} # don't actually make the dir
+      expect(cxt).to receive(:scale).with(0.24, 0.24)
+
+      expect_card_place(75, 75)
+      expect_card_place(831, 75)
+      expect_card_place(1587, 75)
+      expect_card_place(2343, 75)
+      expect_card_place(75, 1131)
+      expect_card_place(831, 1131)
+      expect_card_place(1587, 1131)
+      expect_card_place(2343, 1131)
+      expect(cxt).to receive(:show_page).once
+      expect_card_place(75, 75)
+
+      args = { file: 'foo.pdf', dir: '_out', margin: 75, gap: 5, trim: 37 }
+      deck.save_pdf(args)
+    end
+
+    it 'only does the three cards on a limited range' do
+      num_cards = 9
+      args = { range: 2..4, file: 'foo.pdf', dir: '_out', margin: 75, gap: 5, trim: 37 }
+      deck = Squib::Deck.new(cards: num_cards, width: 825, height: 1125)
+      expect(Squib.logger).to receive(:debug).at_least(:once)
+      expect(Squib.logger).to receive(:warn).exactly(:once) #warn about making the dir
+      expect(Dir).to receive(:mkdir) {} # don't actually make the dir
+      expect(cxt).to receive(:scale).with(0.24, 0.24)
+
+      expect_card_place(75, 75)
+      expect_card_place(831, 75)
+      expect_card_place(1587, 75)
+
+      deck.save_pdf(args)
+    end
+
+  end
+
+end

data/spec/samples/samples_regression_spec.rb

@@ -1,82 +1,82 @@
-require 'spec_helper'
-require 'squib'
-require 'pp'
-
-describe "Squib samples" do
-  @SAMPLES_DIR      = "#{File.expand_path(File.dirname(__FILE__))}/../../samples/"
-  let(:samples_dir) { "#{File.expand_path(File.dirname(__FILE__))}/../../samples/" }
-
-  around(:each) do |example|
-    Dir.chdir(samples_dir) do
-      example.run
-    end
-  end
-
-  Dir["#{@SAMPLES_DIR}/**/*.rb"].each do |sample|
-    it "should execute #{sample} with no errors", slow: true do
-      allow(Squib.logger).to receive(:warn) {}
-      allow(ProgressBar).to receive(:create).and_return(Squib::DoNothing.new)
-      load sample
-    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
-  # tests for boundary cases in the unit tests.
-  #
-  # This makes documentation much easier and example-driven.
-  # ...but I want to use those samples for regression & integration tests too.
-  #
-  # The above test is a good smoke test, but it just looks for exceptions.
-  # What this set of tests do is run the samples again, but mocking out Cairo,
-  # Pango, RSVG, and any other dependencies. We log those API calls and store
-  # them in a super-verbose string. We compare our runs against what happened
-  # before.
-  #
-  # Thus, if we ever change anything that results in a ANY change to our
-  # regression logs, then these tests will fail. If it's SURPRISING, then we
-  # caught an integration bug. If it's not, just update and overwrite the logs.
-  #
-  # So it's understood that you should have to periodically enable the
-  # overwrite_sample method below to store the new regression log. Just make
-  # sure you inspect the change and make sure it makes sense with the change
-  # you made to the samples or Squib.
-  # FOR NOW!! These two I can't get working on Travis, so I'm disabling
-  # Has to do with UTF-8 encoding of a special characters
-      # layouts.rb
-  # These are samples that don't really need a regression log
-      # colors.rb
-      # unicode.rb
-  %w( autoscale_font.rb
-      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
-      hand.rb
-      hello_world.rb
-      load_images.rb
-      portrait-landscape.rb
-      ranges.rb
-      saves.rb
-      showcase.rb
-      text_options.rb
-      tgc_proofs.rb
-      units.rb
-  ).each do |sample|
-    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
-      test_file_str = File.open(sample_regression_file(sample), 'r:UTF-8').read
-      expect(log.string).to eq(test_file_str)
-    end
-  end
-
-end
+require 'spec_helper'
+require 'squib'
+require 'pp'
+
+describe "Squib samples" do
+  @SAMPLES_DIR      = "#{File.expand_path(File.dirname(__FILE__))}/../../samples/"
+  let(:samples_dir) { "#{File.expand_path(File.dirname(__FILE__))}/../../samples/" }
+
+  around(:each) do |example|
+    Dir.chdir(samples_dir) do
+      example.run
+    end
+  end
+
+  Dir["#{@SAMPLES_DIR}/**/*.rb"].each do |sample|
+    it "should execute #{sample} with no errors", slow: true do
+      allow(Squib.logger).to receive(:warn) {}
+      allow(ProgressBar).to receive(:create).and_return(Squib::DoNothing.new)
+      load sample
+    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
+  # tests for boundary cases in the unit tests.
+  #
+  # This makes documentation much easier and example-driven.
+  # ...but I want to use those samples for regression & integration tests too.
+  #
+  # The above test is a good smoke test, but it just looks for exceptions.
+  # What this set of tests do is run the samples again, but mocking out Cairo,
+  # Pango, RSVG, and any other dependencies. We log those API calls and store
+  # them in a super-verbose string. We compare our runs against what happened
+  # before.
+  #
+  # Thus, if we ever change anything that results in a ANY change to our
+  # regression logs, then these tests will fail. If it's SURPRISING, then we
+  # caught an integration bug. If it's not, just update and overwrite the logs.
+  #
+  # So it's understood that you should have to periodically enable the
+  # overwrite_sample method below to store the new regression log. Just make
+  # sure you inspect the change and make sure it makes sense with the change
+  # you made to the samples or Squib.
+  # FOR NOW!! These two I can't get working on Travis, so I'm disabling
+  # Has to do with UTF-8 encoding of a special characters
+      # layouts.rb
+  # These are samples that don't really need a regression log
+      # colors.rb
+      # unicode.rb
+  %w( autoscale_font.rb
+      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
+      hand.rb
+      hello_world.rb
+      load_images.rb
+      portrait-landscape.rb
+      ranges.rb
+      saves.rb
+      showcase.rb
+      text_options.rb
+      tgc_proofs.rb
+      units.rb
+  ).each do |sample|
+    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
+      test_file_str = File.open(sample_regression_file(sample), 'r:UTF-8').read
+      expect(log.string).to eq(test_file_str)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -61,6 +61,7 @@ def scrub_hex(str)
      .gsub(/#<Cairo::Matrix:.*>/,'Matrix')
      .gsub(/#<RSVG::Handle.*>/,'RSVG::Handle')
      .gsub(/#<RSpec::Mocks::Double:.*>/,'MockDouble')
+     .gsub(/#<Double .*>/,'MockDouble')
      .gsub(/RGB:\w{1,8}/,'RGB:')
 end
 
@@ -104,12 +105,12 @@ def mock_cairo(strio)
     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= curve_to matrix= pango_layout_path stroke_preserve
-    fill_preserve close_path).each do |m|
+    fill_preserve close_path set_dash set_line_cap set_line_join).each do |m|
     allow(cxt).to receive(m) { |*args| strio << scrub_hex("cairo: #{m}(#{args})\n") }
   end
 
   %w(font_description= text= width= height= wrap= ellipsize= alignment=
-    justify= spacing= markup=).each do |m|
+    justify= spacing= markup= ellipsized?).each do |m|
     allow(pango).to receive(m) {|*args| strio << scrub_hex("pango: #{m}(#{args})\n") }
   end
 

data/squib.gemspec

@@ -1,48 +1,48 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'squib/version'
-
-Gem::Specification.new do |spec|
-  spec.specification_version = 2 if spec.respond_to? :specification_version=
-  spec.required_rubygems_version = Gem::Requirement.new('>= 0') if spec.respond_to? :required_rubygems_version=
-  spec.rubygems_version = '2.2.2'
-  spec.required_ruby_version = '>= 2.0.0'
-
-  spec.name          = 'squib'
-  spec.version       = Squib::VERSION
-  spec.license       = 'MIT'
-
-  spec.summary       = 'A Ruby DSL for prototyping card games'
-  spec.description   = 'Squib is a Ruby DSL for prototyping card games'
-  spec.authors       = ['Andy Meneely']
-  spec.email         = 'playconfidencegames@gmail.com'
-  spec.homepage      = 'https://github.com/andymeneely/squib'
-
-  spec.rdoc_options = ['--charset=UTF-8']
-  spec.extra_rdoc_files = Dir['README.md', 'samples/**/*.rb']
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
-  spec.require_paths = ['lib']
-
-  spec.add_runtime_dependency 'cairo', '~> 1.14.0'
-  spec.add_runtime_dependency 'pango', '~> 2.2.0'
-  spec.add_runtime_dependency 'roo', '~> 2.0.0'
-  spec.add_runtime_dependency 'rsvg2', '~> 2.2.0'
-  spec.add_runtime_dependency 'mercenary', '~> 0.3.4'
-  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.6'
-
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake'
-  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 'coveralls'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'launchy'
-  spec.add_development_dependency 'game_icons'
-
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'squib/version'
+
+Gem::Specification.new do |spec|
+  spec.specification_version = 2 if spec.respond_to? :specification_version=
+  spec.required_rubygems_version = Gem::Requirement.new('>= 0') if spec.respond_to? :required_rubygems_version=
+  spec.rubygems_version = '2.2.2'
+  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.name          = 'squib'
+  spec.version       = Squib::VERSION
+  spec.license       = 'MIT'
+
+  spec.summary       = 'A Ruby DSL for prototyping card games'
+  spec.description   = 'Squib is a Ruby DSL for prototyping card games'
+  spec.authors       = ['Andy Meneely']
+  spec.email         = 'playconfidencegames@gmail.com'
+  spec.homepage      = 'https://github.com/andymeneely/squib'
+
+  spec.rdoc_options = ['--charset=UTF-8']
+  spec.extra_rdoc_files = Dir['README.md', 'samples/**/*.rb']
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'cairo', '~> 1.14.3'
+  spec.add_runtime_dependency 'pango', '~> 3.0.1'
+  spec.add_runtime_dependency 'roo', '~> 2.1.0'
+  spec.add_runtime_dependency 'rsvg2', '~> 3.0.0'
+  spec.add_runtime_dependency 'mercenary', '~> 0.3.4'
+  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.6'
+
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.3'
+  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 'coveralls'
+  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'launchy'
+  spec.add_development_dependency 'game_icons'
+
+end

data/squib.sublime-project

@@ -1,36 +1,42 @@
-{
-	"folders":
-	[
-		{
-			"follow_symlinks": true,
-			"path": ".",
-               "folder_exclude_patterns": [
-                    "doc",
-                    ".yardoc",
-                    "coverage",
-                    "pkg",
-               ]
-		}
-	],
-	"build_systems":[
-     {"name": "rake",                         "shell_cmd": "rake",},
-     {"name": "rake sanity",                  "shell_cmd": "rake sanity",},
-     {"name": "rake spec_fastonly",           "shell_cmd": "rake spec_fastonly",},
-     {"name": "rake run[hand]",               "shell_cmd": "rake run[hand]",},
-     // {"name": "rake run[config_text_markup]", "shell_cmd": "rake run[config_text_markup]",},
-     // {"name": "rake run[csv_import]",         "shell_cmd": "rake run[csv_import]",},
-     // {"name": "rake run[custom_config]",      "shell_cmd": "rake run[custom_config]",},
-     {"name": "rake run[draw_shapes]",        "shell_cmd": "rake run[draw_shapes]",},
-     // {"name": "rake run[embed_text]",         "shell_cmd": "rake run[embed_text]",},
-     // {"name": "rake run[load_images]",        "shell_cmd": "rake run[load_images]",},
-     // {"name": "rake run[text_options]",       "shell_cmd": "rake run[text_options]",},
-     // {"name": "rspec spec/args/typographer_spec.rb",           "shell_cmd": "rspec spec/args/typographer_spec.rb", "working_dir": "${project_path:${folder}}"},
-     // {"name": "rspec spec/conf_spec.rb",                       "shell_cmd": "rspec spec/conf_spec.rb", "working_dir": "${project_path:${folder}}"},
-     // {"name": "rspec spec/graphics/graphics_images_spec.rb",   "shell_cmd": "rspec spec/graphics/graphics_images_spec.rb", "working_dir": "${project_path:${folder}}"},
-     // {"name": "rspec spec/graphics/graphics_shapes_spec.rb",   "shell_cmd": "rspec spec/graphics/graphics_shapes_spec.rb", "working_dir": "${project_path:${folder}}"},
-     // {"name": "rspec spec/graphics/graphics_shapes_spec.rb",   "shell_cmd": "rspec spec/graphics/graphics_shapes_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}}"},
-     // {"name": "rspec spec/samples/samples_regression_spec.rb", "shell_cmd": "rspec spec/samples/samples_regression_spec.rb", "working_dir": "${project_path:${folder}}"},
-	]
-
-}
+{
+     "tab_size": 2,
+     "translate_tabs_to_spaces": true,
+	"folders":
+	[
+		{
+			"follow_symlinks": true,
+			"path": ".",
+               "folder_exclude_patterns": [
+                    "doc",
+                    ".yardoc",
+                    "coverage",
+                    "pkg",
+               ]
+		}
+	],
+	"build_systems":[
+     {"name": "rake",                         "shell_cmd": "rake",},
+     {"name": "rake sanity",                  "shell_cmd": "rake sanity",},
+     {"name": "rake spec_fastonly",           "shell_cmd": "rake spec_fastonly",},
+     {"name": "rake run[text_options]",       "shell_cmd": "rake run[text_options]",},
+     {"name": "rake run[hand]",               "shell_cmd": "rake run[hand]",},
+     {"name": "rspec spec/args/paragraph_spec.rb", "shell_cmd": "rspec spec/args/paragraph_spec.rb", "working_dir": "${project_path:${folder}}"},
+     {"name": "rspec spec/args/*_spec.rb", "shell_cmd": "rspec spec/args/*_spec.rb", "working_dir": "${project_path:${folder}}"},
+     // {"name": "rake run[config_text_markup]", "shell_cmd": "rake run[config_text_markup]",},
+     // {"name": "rake run[csv_import]",         "shell_cmd": "rake run[csv_import]",},
+     // {"name": "rake run[custom_config]",      "shell_cmd": "rake run[custom_config]",},
+     {"name": "rake run[draw_shapes]",        "shell_cmd": "rake run[draw_shapes]",},
+     {"name": "rake run[layouts]",        "shell_cmd": "rake run[layouts]",},
+     // {"name": "rake run[embed_text]",         "shell_cmd": "rake run[embed_text]",},
+     // {"name": "rake run[load_images]",        "shell_cmd": "rake run[load_images]",},
+     // {"name": "rake run[text_options]",       "shell_cmd": "rake run[text_options]",},
+     // {"name": "rspec spec/args/typographer_spec.rb",           "shell_cmd": "rspec spec/args/typographer_spec.rb", "working_dir": "${project_path:${folder}}"},
+     // {"name": "rspec spec/conf_spec.rb",                       "shell_cmd": "rspec spec/conf_spec.rb", "working_dir": "${project_path:${folder}}"},
+     // {"name": "rspec spec/graphics/graphics_images_spec.rb",   "shell_cmd": "rspec spec/graphics/graphics_images_spec.rb", "working_dir": "${project_path:${folder}}"},
+     // {"name": "rspec spec/graphics/graphics_shapes_spec.rb",   "shell_cmd": "rspec spec/graphics/graphics_shapes_spec.rb", "working_dir": "${project_path:${folder}}"},
+     // {"name": "rspec spec/graphics/graphics_shapes_spec.rb",   "shell_cmd": "rspec spec/graphics/graphics_shapes_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}}"},
+     // {"name": "rspec spec/samples/samples_regression_spec.rb", "shell_cmd": "rspec spec/samples/samples_regression_spec.rb", "working_dir": "${project_path:${folder}}"},
+	]
+
+}