squib 0.0.6 → 0.1.0

data/spec/data/samples/units.rb.txt

@@ -1,5 +1,5 @@
 cairo: save([])
-cairo: set_source_color([#<Cairo::Color::RGB: @alpha=1.0, @red=1.0, @green=1.0, @blue=1.0>])
+cairo: set_source_color([#<Cairo::Color::RGB: @alpha=1.0, @red=0.8666666666666667, @green=0.8666666666666667, @blue=0.8666666666666667>])
 cairo: paint([])
 cairo: restore([])
 cairo: save([])
@@ -11,4 +11,22 @@ cairo: rounded_rectangle([37.5, 37.5, 750.0, 1050.0, 25, 25])
 cairo: set_source_color([#<Cairo::Color::RGB: @alpha=0.0, @red=0.0, @green=0.0, @blue=0.0>])
 cairo: fill([])
 cairo: restore([])
+cairo: save([])
+cairo: rounded_rectangle([75.0, 75.0, 675.0, 975.0, 25, 25])
+cairo: set_source_color([#<Cairo::Color::RGB: @alpha=1.0, @red=0.0, @green=0.0, @blue=0.0>])
+cairo: set_line_width([2.0])
+cairo: stroke([])
+cairo: rounded_rectangle([75.0, 75.0, 675.0, 975.0, 25, 25])
+cairo: set_source_color([#<Cairo::Color::RGB: @alpha=0.0, @red=0.0, @green=0.0, @blue=0.0>])
+cairo: fill([])
+cairo: restore([])
+cairo: save([])
+cairo: rounded_rectangle([472.4409444, 472.4409444, 100, 100, 0, 0])
+cairo: set_source_color([#<Cairo::Color::RGB: @alpha=1.0, @red=0.0, @green=0.0, @blue=0.0>])
+cairo: set_line_width([2.0])
+cairo: stroke([])
+cairo: rounded_rectangle([472.4409444, 472.4409444, 100, 100, 0, 0])
+cairo: set_source_color([#<Cairo::Color::RGB: @alpha=0.0, @red=0.0, @green=0.0, @blue=0.0>])
+cairo: fill([])
+cairo: restore([])
 surface: write_to_png(["_output/units_0.png"])

data/spec/deck_spec.rb

@@ -207,6 +207,18 @@ describe Squib::Deck do
           })
     end
 
+    it 'loads nothing on an empty layout file' do
+      d = Squib::Deck.new(layout: layout_file('empty.yml'))
+      expect(d.layout).to eq({})
+    end
+
+    it 'handles extends on a rule with no args' do
+      d = Squib::Deck.new(layout: layout_file('empty-rule.yml'))
+      expect(d.layout).to eq({
+        'empty' => nil
+      })
+    end
+
   end
 
 end

data/spec/graphics/graphics_images_spec.rb

@@ -3,14 +3,15 @@ require 'squib'
 
 describe Squib::Card do
 
-  before(:each) do
-    @deck    = double(Squib::Deck)
-    @context = double(Cairo::Context)
-    @svg     = double(RSVG::Handle)
-    allow(Cairo::Context).to receive(:new).and_return(@context)
-    allow(Cairo::ImageSurface).to receive(:from_png).and_return(nil)
-    allow(Cairo::ImageSurface).to receive(:new).and_return(nil)
-    allow(RSVG::Handle).to receive(:new_from_file).and_return(@svg)
+  before(:example) do
+      @deck    = double(Squib::Deck)
+      @context = double(Cairo::Context)
+      @svg     = double(RSVG::Handle)
+      @png     = double(Cairo::ImageSurface)
+      allow(Cairo::Context).to receive(:new).and_return(@context)
+      allow(Cairo::ImageSurface).to receive(:from_png).and_return(@png)
+      allow(Cairo::ImageSurface).to receive(:new).and_return(@png)
+      allow(RSVG::Handle).to receive(:new_from_file).and_return(@svg)
   end
 
   context '#png' do
@@ -19,13 +20,13 @@ describe Squib::Card do
       expect(@context).to receive(:translate).with(-37, -38).once
       expect(@context).to receive(:rotate).with(0.0).once
       expect(@context).to receive(:translate).with(37, 38).once
-      expect(@context).to receive(:set_source).with(nil, 37, 38).once
+      expect(@context).to receive(:set_source).with(@png, 37, 38).once
       expect(@context).to receive(:paint).with(0.9).once
       expect(@context).to receive(:restore).once
 
       card = Squib::Card.new(@deck, 100, 150)
       # png(file, x, y, alpha, blend, angle)
-      card.png('foo.png', 37, 38, 0.9, :none, 0.0)
+      card.png('foo.png', 37, 38, :native, :native, 0.9, :none, 0.0)
     end
 
     it 'sets blend when needed' do
@@ -33,8 +34,9 @@ describe Squib::Card do
       expect(@context).to receive(:operator=).with(:overlay).once
 
       card = Squib::Card.new(@deck, 100, 150)
-      card.png('foo.png', 37, 38, 0.9, :overlay, 0.0)
+      card.png('foo.png', 37, 38, :native, :native, 0.9, :overlay, 0.0)
     end
+
   end
 
   context '#svg' do
@@ -47,7 +49,7 @@ describe Squib::Card do
       expect(@context).to receive(:translate).with(37, 38).once
       expect(@context).to receive(:scale).with(1.0, 1.0).once
       expect(@context).to receive(:render_rsvg_handle).with(@svg, 'id').once
-      expect(@context).to receive(:set_source).with(nil, 37, 38).once
+      expect(@context).to receive(:set_source).with(@png, 37, 38).once
       expect(@context).to receive(:paint).with(0.9).once
       expect(@context).to receive(:restore).once
 

data/spec/graphics/graphics_save_doc_spec.rb

@@ -25,7 +25,7 @@ describe Squib::Deck, '#save_pdf' do
       args = { file: 'foo.pdf', dir: '_out', margin: 75, gap: 5, trim: 37 }
       deck = Squib::Deck.new(cards: num_cards, width: 825, height: 1125)
       mock_squib_logger(@old_logger) do
-        expect(Squib.logger).to receive(:debug).thrice
+        expect(Squib.logger).to receive(:debug).at_least(:once)
         expect(Cairo::Context).to receive(:new).and_return(@context).exactly(num_cards + 1).times
         expect(deck).to receive(:dirify) { |arg| arg } #don't create the dir
 
@@ -49,7 +49,7 @@ describe Squib::Deck, '#save_pdf' do
       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)
       mock_squib_logger(@old_logger) do
-        expect(Squib.logger).to receive(:debug).thrice
+        expect(Squib.logger).to receive(:debug).at_least(:once)
         expect(Cairo::Context).to receive(:new).and_return(@context).exactly(4).times
         expect(deck).to receive(:dirify) { |arg| arg }  #don't create the dir
 

data/spec/input_helpers_spec.rb

@@ -4,7 +4,7 @@ require 'squib/input_helpers'
 
 class DummyDeck
   include  Squib::InputHelpers
-  attr_accessor :layout, :cards, :custom_colors
+  attr_accessor :layout, :cards, :custom_colors, :width, :height, :dpi
 end
 
 describe Squib::InputHelpers do
@@ -18,6 +18,9 @@ describe Squib::InputHelpers do
     }
     @deck.cards = %w(a b)
     @deck.custom_colors = {}
+    @deck.width = 100
+    @deck.height = 200
+    @deck.dpi = 300
   end
 
   context '#layoutify' do
@@ -135,4 +138,65 @@ describe Squib::InputHelpers do
     end
   end
 
+  context '#convert_units' do
+    it 'does not touch arrays integers' do
+      args = {x: [156]}
+      needed_params = [:x]
+      opts = @deck.send(:convert_units, args, needed_params)
+      expect(opts).to eq({ :x => [156] })
+    end
+
+    it 'does not touch arrays floats' do
+      args = {x: [156.2]}
+      needed_params = [:x]
+      opts = @deck.send(:convert_units, args, needed_params)
+      expect(opts).to eq({ :x => [156.2] })
+    end
+
+    it 'converts array of all inches' do
+      args = {x: ['1in', '2in']}
+      needed_params = [:x]
+      opts = @deck.send(:convert_units, args, needed_params)
+      expect(opts).to eq({:x => [300.0, 600.0] }) #assume 300dpi default
+    end
+
+    it 'converts array of some inches' do
+      args = {x: [156, '2in']}
+      needed_params = [:x]
+      opts = @deck.send(:convert_units, args, needed_params)
+      expect(opts).to eq({:x => [156.0, 600.0]}) #assume 300dpi default
+    end
+
+    it 'handles whitespace' do
+      args = {x: ['1in   ']}
+      needed_params = [:x]
+      opts = @deck.send(:convert_units, args, needed_params)
+      expect(opts).to eq({:x => [300.0] }) #assume 300dpi default
+    end
+
+     it 'converts centimeters' do
+      args = {x: ['2cm']}
+      needed_params = [:x]
+      opts = @deck.send(:convert_units, args, needed_params)
+      expect(opts).to eq({:x => [236.2204722] }) #assume 300dpi default
+    end
+
+  end
+
+  context '#rowify' do
+    it 'does nothing on an integer' do
+      opts = @deck.send(:rowify, {columns: 2, rows: 2})
+      expect(opts).to eq({ columns: 2,
+                           rows: 2
+                        })
+    end
+
+    it 'computes properly on non-integer' do
+      opts = @deck.send(:rowify, {columns: 1, rows: :infinite})
+      expect(opts).to eq({ columns: 1,
+                           rows: 2
+                        })
+    end
+  end
+
 end

data/spec/samples/samples_regression_spec.rb

@@ -12,6 +12,7 @@ describe "Squib samples" do
   end
 
   it 'should execute with no errors' do
+    allow(Squib.logger).to receive(:warn) {}
     allow(ProgressBar).to receive(:create).and_return(Squib::DoNothing.new)
     Dir["#{samples_dir}/**/*.rb"].each do |sample|
       load sample
@@ -43,21 +44,22 @@ describe "Squib samples" do
   # 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
-      # text_options.rb
-  %w( hello_world.rb
-      autoscale_font.rb
-      save_pdf.rb
-      custom_config.rb
-      load_images.rb
+      # unicode.rb
+  %w( autoscale_font.rb
       basic.rb
       cairo_access.rb
-      draw_shapes.rb
       colors.rb
-      excel.rb
       csv_import.rb
+      custom_config.rb
+      draw_shapes.rb
+      excel.rb
+      hello_world.rb
+      load_images.rb
       portrait-landscape.rb
-      tgc_proofs.rb
       ranges.rb
+      saves.rb
+      text_options.rb
+      tgc_proofs.rb
       units.rb
   ).each do |sample|
     it "has not changed for #{sample}" do

data/spec/spec_helper.rb

@@ -54,9 +54,11 @@ def mock_cairo(strio)
   cxt     = double(Cairo::Context)
   surface = double(Cairo::ImageSurface)
   pango   = double(Pango::Layout)
+  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)
   allow(surface).to receive(:width).and_return(100)
+  allow(surface).to receive(:height).and_return(101)
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Andy Meneely
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -226,9 +226,10 @@ extra_rdoc_files:
 - samples/load_images.rb
 - samples/portrait-landscape.rb
 - samples/ranges.rb
-- samples/save_pdf.rb
+- samples/saves.rb
 - samples/text_options.rb
 - samples/tgc_proofs.rb
+- samples/unicode.rb
 - samples/units.rb
 files:
 - .gitignore
@@ -238,6 +239,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASE TODO.md
 - Rakefile
 - bin/squib
 - lib/squib.rb
@@ -297,11 +299,12 @@ files:
 - samples/ranges.rb
 - samples/sample.csv
 - samples/sample.xlsx
-- samples/save_pdf.rb
+- samples/saves.rb
 - samples/shiny-purse.png
 - samples/spanner.svg
 - samples/text_options.rb
 - samples/tgc_proofs.rb
+- samples/unicode.rb
 - samples/units.rb
 - spec/api/api_data_spec.rb
 - spec/api/api_image_spec.rb
@@ -311,6 +314,8 @@ files:
 - spec/data/csv/dup_cols.csv
 - spec/data/csv/with_spaces.csv
 - spec/data/layouts/easy-circular-extends.yml
+- spec/data/layouts/empty-rule.yml
+- spec/data/layouts/empty.yml
 - spec/data/layouts/hard-circular-extends.yml
 - spec/data/layouts/multi-extends-single-entry.yml
 - spec/data/layouts/multi-level-extends.yml
@@ -337,6 +342,7 @@ files:
 - spec/data/samples/portrait-landscape.rb.txt
 - spec/data/samples/ranges.rb.txt
 - spec/data/samples/save_pdf.rb.txt
+- spec/data/samples/saves.rb.txt
 - spec/data/samples/text_options.rb.txt
 - spec/data/samples/tgc_proofs.rb.txt
 - spec/data/samples/units.rb.txt
@@ -370,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 2
 summary: A Ruby DSL for prototyping card games
@@ -383,6 +389,8 @@ test_files:
 - spec/data/csv/dup_cols.csv
 - spec/data/csv/with_spaces.csv
 - spec/data/layouts/easy-circular-extends.yml
+- spec/data/layouts/empty-rule.yml
+- spec/data/layouts/empty.yml
 - spec/data/layouts/hard-circular-extends.yml
 - spec/data/layouts/multi-extends-single-entry.yml
 - spec/data/layouts/multi-level-extends.yml
@@ -409,6 +417,7 @@ test_files:
 - spec/data/samples/portrait-landscape.rb.txt
 - spec/data/samples/ranges.rb.txt
 - spec/data/samples/save_pdf.rb.txt
+- spec/data/samples/saves.rb.txt
 - spec/data/samples/text_options.rb.txt
 - spec/data/samples/tgc_proofs.rb.txt
 - spec/data/samples/units.rb.txt

data/samples/save_pdf.rb

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-require 'squib'
-
-Squib::Deck.new(width: 825, height: 1125, cards: 16) do
-  background color: :gray
-  rect x: 38, y: 38, width: 750, height: 1050, x_radius: 38, y_radius: 38
-
-  text str: (1..16).to_a, x: 220, y: 78, font: 'Arial 54'
-
-  save_pdf file: 'sample-save-pdf.pdf', margin: 75, gap: 5, trim: 37
-
-  #Note that our PNGs still are not trimmed even though the pdf ones are
-  save_png range: 1, prefix: 'save_pdf_'
-end