squib 0.0.2 → 0.0.3

data/samples/tgc_proofs.rb

@@ -1,20 +1,20 @@
-#!/usr/bin/env ruby
-require 'squib'
-
-# This sample uses a proof overlay from TheGameCrafter.com to check bleed
-Squib::Deck.new(width: 825, height: 1125, cards: 1) do 
-  background color: :white
-  rect x: 38, y: 38, width: 750, height: 1050, x_radius: 38, y_radius: 38
-  rect x: 75, y: 75, width: 128, height: 128, x_radius: 25, y_radius: 25
-
-  text str: 'Mastermind', x: 220, y: 78, font: 'Arial 54'
-  text str: 3, x: 75, y: 85, width: 128, font: 'Arial 72', align: :center
-
-  png file: 'shiny-purse.png', x: 620, y: 75
-  svg file: 'spanner.svg', x: 620, y: 218
-
-  # TGC proof overlay
-  png file: 'pokercard.png', x:0, y:0, alpha: 0.5
-  
-  save_png prefix: 'tgc_sample_'
+#!/usr/bin/env ruby
+require 'squib'
+
+# This sample uses a proof overlay from TheGameCrafter.com to check bleed
+Squib::Deck.new(width: 825, height: 1125, cards: 1) do 
+  background color: :white
+  rect x: 38, y: 38, width: 750, height: 1050, x_radius: 38, y_radius: 38
+  rect x: 75, y: 75, width: 128, height: 128, x_radius: 25, y_radius: 25
+
+  text str: 'Mastermind', x: 220, y: 78, font: 'Arial 54'
+  text str: 3, x: 75, y: 85, width: 128, font: 'Arial 72', align: :center
+
+  png file: 'shiny-purse.png', x: 620, y: 75
+  svg file: 'spanner.svg', x: 620, y: 218
+
+  # TGC proof overlay
+  png file: 'pokercard.png', x:0, y:0, alpha: 0.5
+  
+  save_png prefix: 'tgc_sample_'
 end

data/samples/units.rb

@@ -1,12 +1,12 @@
-require 'squib'
-
-Squib::Deck.new(width: 825, height: 1125, cards: 3) do
-  background color: :white
-
-  bleed = inches(0.125)
-  cut_width = inches(2.5)
-  cut_height = inches(3.5)
-  rect x: bleed, y: bleed, width: cut_width, height: cut_height, radius: 25
-
-  save prefix: 'units_', format: :png
-end
+require 'squib'
+
+Squib::Deck.new(width: 825, height: 1125, cards: 3) do
+  background color: :white
+
+  bleed = inches(0.125)
+  cut_width = inches(2.5)
+  cut_height = inches(3.5)
+  rect x: bleed, y: bleed, width: cut_width, height: cut_height, radius: 25
+
+  save prefix: 'units_', format: :png
+end

data/samples/use_layout.rb

@@ -1,29 +1,29 @@
-require 'squib'
-
-Squib::Deck.new(layout: 'custom-layout.yml') do 
-  background color: :white
-  hint text: :cyan
-
-  # Layouts are YAML files that specify any option as a default
-  rect layout: :frame
-
-  # You can also override a given layout entry in the command
-  circle layout: :frame, x: 50, y: 50, radius: 25
-
-  # Lots of commands have the :layout option
-  text str: 'The Title', layout: :title
-
-  # Layouts also support an "extends" attribute to reuse settings
-  svg file: 'spanner.svg', layout: :icon_left
-  png file: 'shiny-purse.png', layout: :icon_middle
-  svg file: 'spanner.svg', layout: :icon_right
-
-  # Strings can also be used to specify a layout (e.g. from a data file)
-  text str: 'subtitle', layout: 'subtitle'
-
-  # For debugging purposes, you can always print out the loaded layout
-  #require 'pp'
-  #pp @layout
-
-  save_png prefix: 'layout_'
+require 'squib'
+
+Squib::Deck.new(layout: 'custom-layout.yml') do 
+  background color: :white
+  hint text: :cyan
+
+  # Layouts are YAML files that specify any option as a default
+  rect layout: :frame
+
+  # You can also override a given layout entry in the command
+  circle layout: :frame, x: 50, y: 50, radius: 25
+
+  # Lots of commands have the :layout option
+  text str: 'The Title', layout: :title
+
+  # Layouts also support an "extends" attribute to reuse settings
+  svg file: 'spanner.svg', layout: :icon_left
+  png file: 'shiny-purse.png', layout: :icon_middle
+  svg file: 'spanner.svg', layout: :icon_right
+
+  # Strings can also be used to specify a layout (e.g. from a data file)
+  text str: 'subtitle', layout: 'subtitle'
+
+  # For debugging purposes, you can always print out the loaded layout
+  #require 'pp'
+  #pp @layout
+
+  save_png prefix: 'layout_'
 end

data/spec/api/api_text_spec.rb

@@ -1,37 +1,43 @@
-require 'spec_helper'
-require 'squib'
-
-describe Squib::Deck, '#text' do
-
-  context "when working with fonts" do
-     it"should use the default font when #text and #set_font don't specify" do
-      card = instance_double(Squib::Card)
-      expect(card).to receive(:text).with('a', 'Arial 36', anything, anything, anything, anything).once
-      Squib::Deck.new do  
-        @cards = [card] 
-        text str: 'a'
-      end
-    end
-
-    it "should use the #set_font when #text doesn't specify" do
-      card = instance_double(Squib::Card)
-      expect(card).to receive(:text).with('a', 'Times New Roman 16', anything, anything, anything, anything).once
-      Squib::Deck.new do  
-        @cards = [card] 
-        set font: 'Times New Roman 16'
-        text str: 'a'
-      end
-    end
-
-    it "should use the specified font no matter what" do
-      card = instance_double(Squib::Card)
-      expect(card).to receive(:text).with('a', 'Arial 18', anything, anything, anything, anything).once
-      Squib::Deck.new do  
-        @cards = [card] 
-        set font: 'Times New Roman 16'
-        text str: 'a', font: 'Arial 18'
-      end
-    end
-  end
-
+require 'spec_helper'
+require 'squib'
+
+describe Squib::Deck, '#text' do
+
+  context "fonts" do
+     it "should use the default font when #text and #set_font don't specify" do
+      card = instance_double(Squib::Card)
+      expect(card).to receive(:text).with('a', 'Arial 36', 
+                                    anything, anything, anything, anything,anything, anything, anything, anything,anything, anything, anything, anything, anything
+                                    ).once
+      Squib::Deck.new do  
+        @cards = [card] 
+        text str: 'a'
+      end
+    end
+
+    it "should use the #set_font when #text doesn't specify" do
+      card = instance_double(Squib::Card)
+      expect(card).to receive(:text).with('a', 'Times New Roman 16', 
+                                    anything, anything, anything, anything,anything, anything, anything, anything,anything, anything, anything, anything, anything
+                                    ).once
+      Squib::Deck.new do  
+        @cards = [card] 
+        set font: 'Times New Roman 16'
+        text str: 'a'
+      end
+    end
+
+    it "should use the specified font no matter what" do
+      card = instance_double(Squib::Card)
+      expect(card).to receive(:text).with('a', 'Arial 18', 
+                                    anything, anything, anything, anything,anything, anything, anything, anything,anything, anything, anything, anything, anything
+                                    ).once
+      Squib::Deck.new do  
+        @cards = [card] 
+        set font: 'Times New Roman 16'
+        text str: 'a', font: 'Arial 18'
+      end
+    end
+  end
+
 end

data/spec/commands/new_spec.rb

@@ -1,48 +1,48 @@
-require 'spec_helper'
-require 'squib'
-
-describe  Squib::Commands::New do 
-
-  describe "#process" do 
-    before(:all) do
-      @old_stderr = $stderr
-      $stderr = StringIO.new
-      @oldpwd = Dir.pwd
-      Dir.chdir(File.expand_path('../../samples/_output', File.dirname(__FILE__)))
-    end
-
-    before(:each) do
-      FileUtils.rm_rf('foo', secure: true)
-      @cmd = Squib::Commands::New.new
-    end
-
-    it "raises an error if no directory was specified" do
-      expect{@cmd.process([])}.to raise_error(ArgumentError, 'Please specify a path.')
-    end
-
-    it "creates a new template on an fresh directory" do
-      @cmd.process(['foo'])
-      expect(File.exists?('foo/deck.rb')).to be true
-    end
-
-    it "creates a new template on an empty directory" do
-      Dir.mkdir('foo')
-      @cmd.process(['foo'])
-      expect(File.exists?('foo/deck.rb')).to be true
-    end
-
-    it "does not create a new template on an empty " do
-      Dir.mkdir('foo')
-      File.new('foo/somefile.txt', 'w+')
-      @cmd.process(['foo'])
-      $stderr.rewind
-      expect($stderr.string.chomp).to end_with " exists and is not empty. Doing nothing and quitting."
-    end
-
-    after(:all) do
-      $stderr = @old_stderr
-      Dir.chdir(@oldpwd)
-    end
-end
-  
+require 'spec_helper'
+require 'squib'
+
+describe  Squib::Commands::New do 
+
+  describe "#process" do 
+    before(:all) do
+      @old_stderr = $stderr
+      $stderr = StringIO.new
+      @oldpwd = Dir.pwd
+      Dir.chdir(File.expand_path('../../samples/_output', File.dirname(__FILE__)))
+    end
+
+    before(:each) do
+      FileUtils.rm_rf('foo', secure: true)
+      @cmd = Squib::Commands::New.new
+    end
+
+    it "raises an error if no directory was specified" do
+      expect{@cmd.process([])}.to raise_error(ArgumentError, 'Please specify a path.')
+    end
+
+    it "creates a new template on an fresh directory" do
+      @cmd.process(['foo'])
+      expect(File.exists?('foo/deck.rb')).to be true
+    end
+
+    it "creates a new template on an empty directory" do
+      Dir.mkdir('foo')
+      @cmd.process(['foo'])
+      expect(File.exists?('foo/deck.rb')).to be true
+    end
+
+    it "does not create a new template on an empty " do
+      Dir.mkdir('foo')
+      File.new('foo/somefile.txt', 'w+')
+      @cmd.process(['foo'])
+      $stderr.rewind
+      expect($stderr.string.chomp).to end_with " exists and is not empty. Doing nothing and quitting."
+    end
+
+    after(:all) do
+      $stderr = @old_stderr
+      Dir.chdir(@oldpwd)
+    end
+end
+  
 end

data/spec/data/multi-extends-single-entry.yml

@@ -0,0 +1,13 @@
+aunt: &aunt
+  a: 101
+  b: 102
+  c: 103
+uncle: &uncle
+  x: 104
+  y: 105
+  b: 106
+child:
+  <<: *uncle
+  <<: *aunt
+  a: 107
+  x: 108

data/spec/data/multi-level-extends.yml

@@ -0,0 +1,10 @@
+frame: &frame
+  x: 38
+  y: 38
+title: &title
+  <<: *frame
+  y: 50
+  width: 100
+subtitle: 
+  <<: *title
+  y: 150

data/spec/data/no-extends.yml

@@ -0,0 +1,5 @@
+frame: 
+  x: 38
+  valign: !ruby/symbol middle  
+  str: "blah"
+  font: Mr. Font

data/spec/data/single-extends.yml

@@ -0,0 +1,7 @@
+frame: &frame
+  x: 38
+  y: 38
+title:
+  <<: *frame
+  y: 50
+  width: 100

data/spec/data/single-level-multi-extends.yml

@@ -0,0 +1,12 @@
+frame: &frame
+  x: 38
+  y: 38
+title:
+  <<: *frame
+  y: 50
+  width: 100
+title2:
+  <<: *frame
+  x: 75
+  y: 150
+  width: 150

data/spec/deck_spec.rb

@@ -1,49 +1,147 @@
-require 'spec_helper'
-require 'squib/deck'
-
-describe Squib::Deck do   
-
-  it "initializes with default parameters" do
-    d = Squib::Deck.new 
-    expect(d.width).to eq(825)
-    expect(d.height).to eq(1125)
-    expect(d.cards.size).to eq(1)
-  end
-
-  context "in dealing with ranges" do
-    it "calls text on all cards by default" do
-      card1 = instance_double(Squib::Card)
-      card2 = instance_double(Squib::Card) 
-      expect(card1).to receive(:text).once
-      expect(card2).to receive(:text).once
-      Squib::Deck.new do  
-        @cards = [card1, card2]  
-        text str: 'blah'
-      end
-    end
-
-    it "calls text on some cards with an integer" do
-      card1 = instance_double(Squib::Card)
-      card2 = instance_double(Squib::Card)
-      expect(card2).to receive(:text).once
-      Squib::Deck.new do  
-        @cards = [card1, card2]  
-        text range: 1, str: 'blah'
-      end
-    end  
-
-    it "calls text with ranges" do
-      card1 = instance_double(Squib::Card)
-      card2 = instance_double(Squib::Card)
-      card3 = instance_double(Squib::Card)
-      expect(card1).to receive(:text).once
-      expect(card2).to receive(:text).once
-      Squib::Deck.new do  
-        @cards = [card1, card2, card3]  
-        text range: 0..1, str: 'blah'
-      end
-    end
-  end
-
-end#describe
-
+require 'spec_helper'
+require 'squib/deck'
+
+describe Squib::Deck do   
+
+  it "initializes with default parameters" do
+    d = Squib::Deck.new 
+    expect(d.width).to eq(825)
+    expect(d.height).to eq(1125)
+    expect(d.cards.size).to eq(1)
+  end
+
+  context "in dealing with ranges" do
+    it "calls text on all cards by default" do
+      card1 = instance_double(Squib::Card)
+      card2 = instance_double(Squib::Card) 
+      expect(card1).to receive(:text).once
+      expect(card2).to receive(:text).once
+      Squib::Deck.new do  
+        @cards = [card1, card2]  
+        text str: 'blah'
+      end
+    end
+
+    it "calls text on some cards with an integer" do
+      card1 = instance_double(Squib::Card)
+      card2 = instance_double(Squib::Card)
+      expect(card2).to receive(:text).once
+      Squib::Deck.new do  
+        @cards = [card1, card2]  
+        text range: 1, str: 'blah'
+      end
+    end  
+
+    it "calls text with ranges" do
+      card1 = instance_double(Squib::Card)
+      card2 = instance_double(Squib::Card)
+      card3 = instance_double(Squib::Card)
+      expect(card1).to receive(:text).once
+      expect(card2).to receive(:text).once
+      Squib::Deck.new do  
+        @cards = [card1, card2, card3]  
+        text range: 0..1, str: 'blah'
+      end
+    end
+  end
+
+  context "#load_layout" do
+
+    it "loads a normal layout with no extends" do
+      d = Squib::Deck.new(layout: test_file('no-extends.yml')) 
+      expect(d.layout).to \
+        eq({'frame' => {
+              'x' => 38, 
+              'valign' => :middle,
+              'str' => "blah",
+              'font' => "Mr. Font",
+              }
+            }
+          )
+    end
+
+    it "loads with a single extends" do
+      d = Squib::Deck.new(layout: test_file('single-extends.yml')) 
+      expect(d.layout).to \
+        eq({'frame' => {
+              'x' => 38, 
+              'y' => 38, 
+              },
+            'title' => {
+              'x' => 38, 
+              'y' => 50, 
+              'width' => 100,
+              }
+            }
+          )
+    end
+
+    it "applies the single-level extends multiple times" do
+      d = Squib::Deck.new(layout: test_file('single-level-multi-extends.yml')) 
+      expect(d.layout).to \
+        eq({'frame' => {
+              'x' => 38, 
+              'y' => 38, 
+              },
+            'title' => {
+              'x' => 38, 
+              'y' => 50, 
+              'width' => 100,
+              },
+            'title2' => {
+              'x' => 75, 
+              'y' => 150, 
+              'width' => 150,
+              },
+            }
+          )
+    end
+
+    it "applies multiple extends in a single rule" do
+      d = Squib::Deck.new(layout: test_file('multi-extends-single-entry.yml')) 
+      expect(d.layout).to \
+        eq({'aunt' => {
+              'a' => 101, 
+              'b' => 102, 
+              'c' => 103, 
+              },
+            'uncle' => {
+              'x' => 104, 
+              'y' => 105, 
+              'b' => 106, 
+              },
+            'child' => {
+              'a' => 107, # my own
+              'b' => 102, # from the younger aunt
+              'c' => 103, # from aunt
+              'x' => 108, # my own
+              'y' => 105, # from uncle
+              },
+            }
+          )
+    end
+
+    it "applies multi-level extends" do
+      d = Squib::Deck.new(layout: test_file('multi-level-extends.yml')) 
+      expect(d.layout).to \
+        eq({'frame' => {
+              'x' => 38, 
+              'y' => 38, 
+              },
+            'title' => {
+              'x' => 38, 
+              'y' => 50, 
+              'width' => 100,
+              },
+            'subtitle' => {
+              'x' => 38,
+              'y' => 150, 
+              'width' => 100,
+              },
+            }
+          )
+    end
+
+  end
+
+end