squib 0.0.3 → 0.0.4

data/spec/api/api_text_spec.rb

@@ -1,43 +1,43 @@
-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
+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, 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, 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, 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/easy-circular-extends.yml

@@ -0,0 +1,6 @@
+a: 
+  extends: b
+  x: 50
+b:
+  extends: a
+  x: 150

data/spec/data/hard-circular-extends.yml

@@ -0,0 +1,9 @@
+a: 
+  extends: c
+  x: 50
+b:
+  extends: a
+  x: 150
+c: 
+  extends: b
+  y: 250

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

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

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

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

data/spec/data/no-extends.yml

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

data/spec/data/pre-extends.yml

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

data/spec/data/self-circular-extends.yml

@@ -0,0 +1,3 @@
+a: 
+  extends: a
+  x: 50

data/spec/data/single-extends.yml

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

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

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

data/spec/deck_spec.rb

@@ -1,147 +1,188 @@
-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
+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' => {
+              'extends' => 'frame',
+              'x' => 38, 
+              'y' => 50, 
+              'width' => 100,
+              }
+            }
+          )
+    end
+
+    it "applies the extends regardless of order" do
+      d = Squib::Deck.new(layout: test_file('pre-extends.yml')) 
+      expect(d.layout).to \
+        eq({'frame' => {
+              'x' => 38, 
+              'y' => 38, 
+              },
+            'title' => {
+              'extends' => 'frame',
+              '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' => {
+              'extends' => 'frame',
+              'x' => 38, 
+              'y' => 50, 
+              'width' => 100,
+              },
+            'title2' => {
+              'extends' => 'frame',
+              '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' => {
+              'extends' => ['uncle','aunt'],
+              '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' => {
+              'extends' => 'frame',
+              'x' => 38, 
+              'y' => 50, 
+              'width' => 100,
+              },
+            'subtitle' => {
+              'extends' => 'title',
+              'x' => 38,
+              'y' => 150, 
+              'width' => 100,
+              },
+            }
+          )
+    end
+
+    it "fails on a self-circular extends" do
+      file = test_file('self-circular-extends.yml')
+      expect { Squib::Deck.new(layout: file) }.to \
+        raise_error(RuntimeError, "Invalid layout: circular extends with 'a'")
+    end
+
+    it "fails on a easy-circular extends" do
+      file = test_file('easy-circular-extends.yml')
+      expect { Squib::Deck.new(layout: file) }.to \
+        raise_error(RuntimeError, "Invalid layout: circular extends with 'a'")
+    end
+
+    it "hard on a easy-circular extends" do
+      file = test_file('hard-circular-extends.yml')
+      expect { Squib::Deck.new(layout: file) }.to \
+        raise_error(RuntimeError, "Invalid layout: circular extends with 'a'")
+    end
+
+  end
+
+end