dot_grid 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a925c03705950b5f01d2c6cb92ee1bc9f3e023
-  data.tar.gz: 4511d7eea919e7397faa5a181a94bd8b20aea0c9
+  metadata.gz: 7ffb5b75ffa638ae3bfd9d7b42ca6ef7c6bc92a9
+  data.tar.gz: e5849864c9d5bb7671909055a2b352d63bfb915d
 SHA512:
-  metadata.gz: 8c4cb6d4f14c07903142d916f181fe23fefb120b988fbc1923223d1b73407bfecc479b034b7e42137ebf0fb88055c97db31698e5b431dbf03b336b64d6789a06
-  data.tar.gz: ab5e6792388c751dbf3b0e463d613689b8bcffd42b4a340ce0f818cd3b871165a4837375a2b6f9ea2a9a2122d79cc5ecc84615e44a181fef092bd2d84198ff28
+  metadata.gz: c362a59e770ac32c855d1c3ba63937c42dcab3bdb132705fa134ccb813cdf760d1fb8b0ccb681f6ea85db6f134867dada43c5ff96ff4d12b71d7aaaeb9d06222
+  data.tar.gz: 2a8006d84e41212fc53045952e0ffb4da63850a576c3664f7448e478a9c4c3a5f3181fb27c26c6ee754f6709c47ab2c256986faba95cb0bef471d1b4ceb5066d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dot_grid (0.0.3)
+    dot_grid (0.0.5)
       prawn (~> 1.0.0)
       require_all (~> 1.3.2)
       trollop (~> 2.0)

data/lib/dot_grid/bounding_box.rb

@@ -0,0 +1,15 @@
+module DotGrid
+  class BoundingBox
+    attr_accessor(
+      :upper_left,
+      :width,
+      :height
+    )
+
+    def initialize(params)
+      @upper_left = params[:upper_left]
+      @width = params[:width]
+      @height = params[:height]
+    end
+  end
+end

data/lib/dot_grid/page/checkerboard.rb

@@ -1,18 +1,9 @@
 module DotGrid
   module Page
     class Checkerboard < Page
-      attr_accessor(
-        :pattern,
-      )
 
-      def initialize(params)
-        super
-        @pattern = ::DotGrid::Pattern::Checkerboard.new(params.merge!(:bounds => pdf.bounds))
-      end
-
-      def generate
-        super
-        pattern.draw
+      def post_initialize(params)
+        add_pattern(::DotGrid::Pattern::Checkerboard.new(params))
       end
     end
   end

data/lib/dot_grid/page/dot_grid.rb

@@ -1,21 +1,9 @@
 module DotGrid
   module Page
     class DotGrid < Page
-      attr_accessor(
-        :dot_weight,
-        :grid_color,
-        :spacing,
-        :pattern
-      )
 
-      def initialize(params)
-        super
-        @pattern = ::DotGrid::Pattern::DotGrid.new(params.merge!(:bounds => pdf.bounds))
-      end
-
-      def generate
-        super
-        pattern.draw
+      def post_initialize(params)
+        add_pattern(::DotGrid::Pattern::DotGrid.new(params))
       end
     end
   end

data/lib/dot_grid/page/grid.rb

@@ -1,20 +1,9 @@
 module DotGrid
   module Page
     class Grid < Page
-      attr_accessor(
-        :grid_color,
-        :spacing,
-        :pattern
-      )
 
-      def initialize(params)
-        super
-        @pattern = ::DotGrid::Pattern::Grid.new(params.merge!(:bounds => pdf.bounds))
-      end
-
-      def generate
-        super
-        pattern.draw
+      def post_initialize(params)
+        add_pattern(::DotGrid::Pattern::Grid.new(params))
       end
     end
   end

data/lib/dot_grid/page/horizontal_rule.rb

@@ -1,20 +1,10 @@
 module DotGrid
   module Page
     class HorizontalRule < Page
-      attr_accessor(
-        :pattern
-      )
 
-      def initialize(params)
-        super
-        @pattern = ::DotGrid::Pattern::HorizontalRule.new(params.merge!(:bounds => pdf.bounds))
-      end
-
-      def generate
-        super
-        pattern.draw
+      def post_initialize(params)
+        add_pattern(::DotGrid::Pattern::HorizontalRule.new(params))
       end
     end
   end
 end
-

data/lib/dot_grid/page/page.rb

@@ -3,37 +3,26 @@ module DotGrid
     class Page
       attr_accessor(
         :pdf,
-        :dot_weight,
-        :grid_color,
-        :spacing
+        :patterns
       )
 
       def initialize(params)
         @pdf = params[:pdf]
-        @dot_weight = params[:dot_weight] || 1.5
-        @grid_color = params[:grid_color] || "B3B3B3"
-        @spacing = params[:spacing] ? params[:spacing].mm : 5.mm
+        @patterns = []
+        post_initialize(params)
       end
 
-      def generate
-        pdf.start_new_page
-      end
-
-      def page_width
-        pdf.bounds.width
+      def post_initialize(params)
+        nil
       end
 
-      def page_height
-        pdf.bounds.height
+      def add_pattern(pattern)
+        patterns << pattern
       end
 
-      def draw_dot_grid(rows, columns, left_start, height_start)
-        pdf.fill_color grid_color
-        (1..rows).each do |row|
-          (1..columns).each do |col|
-            pdf.fill_circle [left_start + (col-1)*spacing, height_start - spacing - (row-1)*spacing], dot_weight
-          end
-        end
+      def generate
+        pdf.start_new_page
+        patterns.each { |pattern| pattern.draw }
       end
     end
   end

data/lib/dot_grid/page/planner.rb

@@ -3,29 +3,46 @@ module DotGrid
     class Planner < Page
       attr_accessor(
         :planner_color_1,
-        :planner_color_2
+        :planner_color_2,
+        :dot_weight,
+        :grid_color,
+        :spacing,
       )
 
       HEADER_HEIGHT = 0.05               # 5.0 %
       HEADER_LEFT_START = 0.05           # 5.0%
-      SQUARE_GRID_WIDTH = 0.30           # 30.0%
+      SQUARE_GRID_WIDTH = 0.32           # 32.0% - Basically, what looks good on 8.5 x 11
       HEADER_GAP_WIDTH = 0.03            # 3.0%
-      DOT_GRID_COLUMN_WIDTH = 0.62       # 62%
-      SQUARE_GRID_ROWS_WIDTH = 0.80      # 80%
       FOOT_HEIGHT_RATIO = 2              # Ratio of footer to header
 
-      def initialize(params)
-        super
+      def post_initialize(params)
         @planner_color_1 = params[:planner_color_1] || "CCCCCC"
         @planner_color_2 = params[:planner_color_2] || "0099ff"
+        @dot_weight = params[:dot_weight] || 1.5
+        @grid_color = params[:grid_color] || "B3B3B3"
+        @spacing = params[:spacing] ? params[:spacing].mm : 5.mm
+        add_pattern(::DotGrid::Pattern::SquareGrid.new(params.merge!(:bounds => square_grid_bounds, grid_color: @planner_color_1)))
+        add_pattern(::DotGrid::Pattern::DotGrid.new(params.merge!(:bounds => dot_grid_bounds)))
+      end
+
+      def square_grid_bounds
+        ::DotGrid::BoundingBox.new(upper_left: [header_left_start, grid_top], width: header_left_width, height: grid_height)
+      end
+
+      def dot_grid_bounds
+        ::DotGrid::BoundingBox.new(upper_left: [header_right_start, grid_top], width: header_right_width, height: grid_height)
       end
 
       def header_height
         HEADER_HEIGHT * page_height
       end
 
-      def square_grid_columns
-        ((SQUARE_GRID_WIDTH * page_width) / spacing).floor
+      def grid_top
+        page_height - header_height - spacing
+      end
+
+      def grid_height
+        (grid_top - footer_height - spacing)
       end
 
       def header_left_color
@@ -37,7 +54,7 @@ module DotGrid
       end
 
       def header_left_width
-        square_grid_columns*spacing
+        ((SQUARE_GRID_WIDTH * page_width) / spacing).floor * spacing
       end
 
       def header_gap_start
@@ -48,14 +65,6 @@ module DotGrid
         page_width * HEADER_GAP_WIDTH
       end
 
-      def dot_grid_columns
-        (page_width * DOT_GRID_COLUMN_WIDTH / spacing).floor  + 2
-      end
-
-      def dot_grid_rows
-        square_grid_rows + 1
-      end
-
       def header_right_color
         planner_color_2
       end
@@ -68,10 +77,6 @@ module DotGrid
         page_width - header_right_start
       end
 
-      def square_grid_rows
-        (page_height * SQUARE_GRID_ROWS_WIDTH / spacing).floor
-      end
-
       def footer_height
         header_height * FOOT_HEIGHT_RATIO
       end
@@ -85,12 +90,6 @@ module DotGrid
         # Header right
         draw_header(header_right_start, header_right_width, header_height, header_right_color)
 
-        # Square Grid Left
-        draw_square_grid_left(square_grid_rows, square_grid_columns, header_left_color, header_left_start, page_height - header_height - spacing, spacing)
-
-        # Dot Grid Right
-        draw_dot_grid(dot_grid_rows, dot_grid_columns, header_right_start, page_height-header_height)
-
         # Footer
         draw_footer(planner_color_1, header_left_start, footer_height, page_width-header_left_start)
       end
@@ -100,19 +99,18 @@ module DotGrid
         pdf.fill_rectangle [header_start, page_height], header_width, header_height
       end
 
-      def draw_square_grid_left(square_grid_rows, square_grid_columns, grid_color, left_start, height_start, spacing)
-        pdf.fill_color grid_color
-        (1..square_grid_rows).each do |row|
-          (1..square_grid_columns).each do |col|
-            pdf.fill_rectangle [left_start + (col-1)*spacing, height_start - (row-1)*spacing], spacing-1 ,spacing-1
-          end
-        end
-      end
-
       def draw_footer(footer_color, footer_start, footer_height, footer_width)
         pdf.fill_color footer_color
         pdf.fill_rectangle [footer_start, footer_height], footer_width, footer_height
       end
+
+      def page_width
+        pdf.bounds.width
+      end
+
+      def page_height
+        pdf.bounds.height
+      end
     end
   end
 end

data/lib/dot_grid/pattern/checkerboard.rb

@@ -2,14 +2,14 @@ module DotGrid
   module Pattern
     class Checkerboard < Pattern
 
+      def draw_square?(row, column)
+        (row % 2 == 0 && column % 2 == 0) || (row % 2 == 1 && column % 2 == 1)
+      end
+
       def draw
         pdf.fill_color grid_color
-        (0..rows).each do |row|
-          (0..columns).each do |column|
-            if (row % 2 == 0 && column % 2 == 0) || (row % 2 == 1 && column % 2 == 1)
-              pdf.fill_rectangle [column*spacing, row*spacing], spacing, spacing
-            end
-          end
+        draw_grid do |row, column|
+          pdf.fill_rectangle [column*spacing, row*spacing], spacing, spacing if draw_square?(row, column)
         end
       end
     end

data/lib/dot_grid/pattern/dot_grid.rb

@@ -11,10 +11,8 @@ module DotGrid
 
       def draw
         pdf.fill_color grid_color
-        (0..rows).each do |row|
-          (0..columns).each do |col|
-            pdf.fill_circle [col*spacing, row*spacing], dot_weight
-          end
+        draw_grid do |row, column|
+          pdf.fill_circle [column*spacing, row*spacing], dot_weight
         end
       end
     end

data/lib/dot_grid/pattern/grid.rb

@@ -3,11 +3,9 @@ module DotGrid
     class Grid < Pattern
       def draw
         pdf.stroke_color grid_color
-        (0..rows).each do |row|
-          pdf.stroke_horizontal_line(0, bounds.width, :at => row*spacing)
-        end
-        (0..columns).each do |column|
-          pdf.stroke_vertical_line(0, bounds.height, :at => column*spacing)
+        draw_grid do |row, column|
+          pdf.stroke_horizontal_line(0, bounds.width, :at => row*spacing) if column == 0
+          pdf.stroke_vertical_line(0, bounds.height, :at => column*spacing) if row == 0
         end
       end
     end

data/lib/dot_grid/pattern/horizontal_rule.rb

@@ -1,11 +1,10 @@
 module DotGrid
   module Pattern
     class HorizontalRule < Pattern
-
       def draw
         pdf.stroke_color grid_color
-        (0..rows).each do |row|
-          pdf.stroke_horizontal_line(0, bounds.width, :at => row*spacing)
+        draw_grid do |row, column|
+          pdf.stroke_horizontal_line(0, bounds.width, :at => row*spacing) if column == 0
         end
       end
     end

data/lib/dot_grid/pattern/pattern.rb

@@ -10,7 +10,7 @@ module DotGrid
 
       def initialize(params = {})
         @pdf = params[:pdf]
-        @bounds = params[:bounds]
+        @bounds = params[:bounds] || ::DotGrid::BoundingBox.new(upper_left: [0, pdf.bounds.height], width: pdf.bounds.width, height: pdf.bounds.height)
         @grid_color = params[:grid_color] || "B3B3B3"
         @spacing = params[:spacing] ? params[:spacing].mm : 5.mm
         post_initialize(params)
@@ -28,6 +28,16 @@ module DotGrid
         (bounds.width / spacing).floor
       end
 
+      def draw_grid(shorten = false)
+        pdf.bounding_box(bounds.upper_left, width: bounds.width, height: bounds.height) do
+          (0..(shorten ? rows-1 : rows)).each do |row|
+            (0..(shorten ? columns-1 : columns)).each do |column|
+              yield row, column
+            end
+          end
+        end
+      end
+
       def draw
         raise NotImplementedError
       end

data/lib/dot_grid/pattern/square_grid.rb

@@ -0,0 +1,12 @@
+module DotGrid
+  module Pattern
+    class SquareGrid < Pattern
+      def draw
+        pdf.fill_color grid_color
+        draw_grid(true) do |row, column|
+          pdf.fill_rectangle [column*spacing, (row+1)*spacing], spacing-1, spacing-1
+        end
+      end
+    end
+  end
+end

data/lib/dot_grid/version.rb

@@ -1,3 +1,3 @@
 module DotGrid
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/dot_grid.rb

@@ -1,4 +1,5 @@
 require 'dot_grid/generator'
+require 'dot_grid/bounding_box'
 
 require 'dot_grid/page/page'
 require 'dot_grid/page/dot_grid'
@@ -12,6 +13,7 @@ require 'dot_grid/pattern/grid'
 require 'dot_grid/pattern/dot_grid'
 require 'dot_grid/pattern/checkerboard'
 require 'dot_grid/pattern/horizontal_rule'
+require 'dot_grid/pattern/square_grid'
 
 module DotGrid
 end

data/spec/lib/dot_grid/page/checkerboard_spec.rb

@@ -1,19 +1,16 @@
 require 'spec_helper'
 
 describe "DotGrid::Page::Checkerboard" do
-  describe "#draw" do
-    let(:pdf) { double('pdf', bounds: double('bounds')) }
-    let(:subject) { DotGrid::Page::Checkerboard.new({pdf: pdf})}
-    let(:pattern) { double('pattern') }
+  describe "#post_initialize" do
+    let(:subject) { DotGrid::Page::Checkerboard.new({})}
 
     before do
-      allow(pdf).to receive(:start_new_page)
-      allow(subject).to receive(:pattern).and_return(pattern)
+      allow(::DotGrid::Pattern::Checkerboard).to receive(:new)
     end
 
-    it "draws the pattern" do
-      expect(pattern).to receive(:draw)
-      subject.generate
+    it "adds the pattern" do
+      expect(subject).to receive(:add_pattern)
+      subject.post_initialize({})
     end
   end
 end

data/spec/lib/dot_grid/page/dot_grid_spec.rb

@@ -1,28 +1,16 @@
 require 'spec_helper'
 
 describe "DotGrid::Page::DotGrid" do
-  describe "#initialize" do
-    let(:pdf) { double('pdf', bounds: double('bounds')) }
-
-    it "creates a dot grid pattern" do
-      expect(::DotGrid::Pattern::DotGrid).to receive(:new)
-      DotGrid::Page::DotGrid.new({pdf: pdf})
-    end
-  end
-
-  describe "#generate" do
-    let(:pdf) { double('pdf', bounds: double('bounds')) }
-    let(:subject) { DotGrid::Page::DotGrid.new({pdf: pdf})}
-    let(:pattern) { double('pattern') }
+  describe "#post_initialize" do
+    let(:subject) { DotGrid::Page::DotGrid.new({})}
 
     before do
-      allow(pdf).to receive(:start_new_page)
-      allow(subject).to receive(:pattern).and_return(pattern)
+      allow(::DotGrid::Pattern::DotGrid).to receive(:new)
     end
 
-    it "draws the pattern" do
-      expect(pattern).to receive(:draw)
-      subject.generate
+    it "adds the pattern" do
+      expect(subject).to receive(:add_pattern)
+      subject.post_initialize({})
     end
   end
 end

data/spec/lib/dot_grid/page/grid_spec.rb

@@ -1,28 +1,16 @@
 require 'spec_helper'
 
 describe "DotGrid::Page::Grid" do
-  describe "#initialize" do
-    let(:pdf) { double('pdf', bounds: double('bounds')) }
-
-    it "creates a dot grid pattern" do
-      expect(::DotGrid::Pattern::Grid).to receive(:new)
-      DotGrid::Page::Grid.new({pdf: pdf})
-    end
-  end
-
-  describe "#generate" do
-    let(:pdf) { double('pdf', bounds: double('bounds')) }
-    let(:subject) { DotGrid::Page::Grid.new({pdf: pdf})}
-    let(:pattern) { double('pattern') }
+  describe "#post_initialize" do
+    let(:subject) { DotGrid::Page::Grid.new({})}
 
     before do
-      allow(pdf).to receive(:start_new_page)
-      allow(subject).to receive(:pattern).and_return(pattern)
+      allow(::DotGrid::Pattern::Grid).to receive(:new)
     end
 
     it "draws the pattern" do
-      expect(pattern).to receive(:draw)
-      subject.generate
+      expect(subject).to receive(:add_pattern)
+      subject.post_initialize({})
     end
   end
 end

data/spec/lib/dot_grid/page/horizontal_rule_spec.rb

@@ -1,28 +1,16 @@
 require 'spec_helper'
 
 describe "DotGrid::Page::HorizontalRule" do
-  describe "#initialize" do
-    let(:pdf) { double('pdf', bounds: double('bounds')) }
-
-    it "creates a dot grid pattern" do
-      expect(::DotGrid::Pattern::HorizontalRule).to receive(:new)
-      DotGrid::Page::HorizontalRule.new({pdf: pdf})
-    end
-  end
-
-  describe "#generate" do
-    let(:pdf) { double('pdf', bounds: double('bounds')) }
-    let(:subject) { DotGrid::Page::HorizontalRule.new({pdf: pdf})}
-    let(:pattern) { double('pattern') }
+  describe "#post_initialize" do
+    let(:subject) { DotGrid::Page::HorizontalRule.new({})}
 
     before do
-      allow(pdf).to receive(:start_new_page)
-      allow(subject).to receive(:pattern).and_return(pattern)
+      allow(::DotGrid::Pattern::HorizontalRule).to receive(:new)
     end
 
     it "draws the pattern" do
-      expect(pattern).to receive(:draw)
-      subject.generate
+      expect(subject).to receive(:add_pattern)
+      subject.post_initialize({})
     end
   end
 end

data/spec/lib/dot_grid/page/page_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe "DotGrid::Page::Page" do
+  describe "#initialize" do
+    let(:subject) { DotGrid::Page::Page.new({}) }
+    it "creates then empty patterns" do
+      expect(subject.patterns).to eq([])
+    end
+
+    it "calls the post initialize method" do
+      expect_any_instance_of(DotGrid::Page::Page).to receive(:post_initialize)
+      DotGrid::Page::Page.new({})
+    end
+  end
+
+  describe "#add_pattern" do
+    let(:subject) { DotGrid::Page::Page.new({})}
+    let(:pattern) { double('pattern') }
+
+    it "adds a pattern to patterns" do
+      expect(subject.patterns).to receive(:<<).with(pattern)
+      subject.add_pattern(pattern)
+    end
+  end
+
+  describe "#generate" do
+    let(:pdf) { double('pdf', bounds: double('bounds')) }
+    let(:subject) { DotGrid::Page::Page.new({pdf: pdf})}
+    let(:pattern) { double('pattern') }
+
+    before do
+      allow(pdf).to receive(:start_new_page)
+      allow(subject).to receive(:patterns).and_return([pattern])
+      allow(pattern).to receive(:draw)
+    end
+
+    it "starts a new page" do
+      expect(pdf).to receive(:start_new_page)
+      subject.generate
+    end
+
+    it "draws the pattern" do
+      expect(pattern).to receive(:draw)
+      subject.generate
+    end
+  end
+end
+

data/spec/lib/dot_grid/page/planner_spec.rb

@@ -2,7 +2,13 @@ require 'spec_helper'
 
 describe "DotGrid::Page::Planner" do
   describe "#initialize" do
-    let(:subject) { DotGrid::Page::Planner.new({}) }
+    let(:pdf) { double('pdf') }
+    let(:bounds) { double('bounds', width: 10, height: 20) }
+    let(:subject) { DotGrid::Page::Planner.new({pdf: pdf}) }
+
+    before do
+      allow(pdf).to receive(:bounds).and_return(bounds)
+    end
 
     it "has a default planner color 1" do
       expect(subject.planner_color_1).to eq("CCCCCC")
@@ -15,17 +21,12 @@ describe "DotGrid::Page::Planner" do
 
   describe "#header_height" do
     let(:pdf) { double('pdf') }
+    let(:bounds) { double('bounds', width: 10, height: 20) }
     let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
 
-    it "returns the HEADER_HEIGHT of the header height" do
-      allow(subject).to receive(:page_height).and_return(20)
-      expect(subject.header_height).to eq(DotGrid::Page::Planner::HEADER_HEIGHT * subject.page_height)
+    before do
+      allow(pdf).to receive(:bounds).and_return(bounds)
     end
-  end
-
-  describe "#header_height" do
-    let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
 
     it "returns the HEADER_HEIGHT of the header height" do
       allow(subject).to receive(:page_height).and_return(20)
@@ -33,28 +34,29 @@ describe "DotGrid::Page::Planner" do
     end
   end
 
-  describe "#square_grid_columns" do
+  describe "#header_left_color" do
+    let(:bounds) { double('bounds', width: 10, height: 20) }
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf, spacing: 5 }) }
+    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf, planner_color_1: "DDEEFF" }) }
 
-    it "returns the HEADER_HEIGHT of the header height" do
-      allow(subject).to receive(:page_width).and_return(100)
-      expect(subject.square_grid_columns).to eq((DotGrid::Page::Planner::SQUARE_GRID_WIDTH * subject.page_width / subject.spacing).floor)
+    before do
+      allow(pdf).to receive(:bounds).and_return(bounds)
     end
-  end
 
-  describe "#header_left_color" do
-    let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf, planner_color_1: "DDEEFF" }) }
     it "returns the planner color 1" do
       expect(subject.header_left_color).to eq("DDEEFF")
     end
   end
 
   describe "#header_left_start" do
+    let(:bounds) { double('bounds', width: 10, height: 20) }
     let(:pdf) { double('pdf') }
     let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
 
+    before do
+      allow(pdf).to receive(:bounds).and_return(bounds)
+    end
+
     it "returns the the header left_start" do
       allow(subject).to receive(:page_width).and_return(30)
       expect(subject.header_left_start).to eq(DotGrid::Page::Planner::HEADER_LEFT_START * subject.page_width)
@@ -62,9 +64,14 @@ describe "DotGrid::Page::Planner" do
   end
 
   describe "#header_gap_width" do
+    let(:bounds) { double('bounds', width: 10, height: 20) }
     let(:pdf) { double('pdf') }
     let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
 
+    before do
+      allow(pdf).to receive(:bounds).and_return(bounds)
+    end
+
     it "returns the the header gap width" do
       allow(subject).to receive(:page_width).and_return(30)
       expect(subject.header_gap_width).to eq(DotGrid::Page::Planner::HEADER_GAP_WIDTH * subject.page_width)
@@ -72,29 +79,29 @@ describe "DotGrid::Page::Planner" do
   end
 
   describe "#header_right_color" do
+    let(:bounds) { double('bounds', width: 10, height: 20) }
     let(:pdf) { double('pdf') }
     let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf, planner_color_2: "FFEEDD" }) }
-    it "returns the planner color 1" do
-      expect(subject.header_right_color).to eq("FFEEDD")
-    end
-  end
 
-  describe "#dot_grid_rows" do
-    let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
-    let(:square_grid_rows) { 10 }
+    before do
+      allow(pdf).to receive(:bounds).and_return(bounds)
+    end
 
-    it "returns the foot height" do
-      allow(subject).to receive(:square_grid_rows).and_return(square_grid_rows)
-      expect(subject.dot_grid_rows).to eq(square_grid_rows+1)
+    it "returns the planner color 1" do
+      expect(subject.header_right_color).to eq("FFEEDD")
     end
   end
 
   describe "#footer_height" do
+    let(:bounds) { double('bounds', width: 10, height: 20) }
     let(:pdf) { double('pdf') }
     let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
     let(:header_height) { 100 }
 
+    before do
+      allow(pdf).to receive(:bounds).and_return(bounds)
+    end
+
     it "returns the foot height" do
       allow(subject).to receive(:header_height).and_return(header_height)
       expect(subject.footer_height).to eq(header_height*DotGrid::Page::Planner::FOOT_HEIGHT_RATIO)
@@ -102,40 +109,21 @@ describe "DotGrid::Page::Planner" do
   end
 
   describe "#generate" do
-    let(:pdf) { double('pdf') }
+    let(:pdf) { double('pdf', bounds: double('bounds', width: 10, height: 20)) }
     let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
 
     before do
       allow(subject).to receive(:page_width).and_return(10)
       allow(subject).to receive(:page_height).and_return(20)
       allow(pdf).to receive(:start_new_page)
-      allow(pdf).to receive(:fill_color)
-      allow(pdf).to receive(:fill_rectangle)
-      allow(pdf).to receive(:fill_circle)
-    end
-
-    it "starts a new page" do
-      expect(pdf).to receive(:start_new_page)
-      subject.generate
-    end
-
-    it "gets the page_width" do
-      expect(subject).to receive(:page_width)
-      subject.generate
-    end
-
-    it "gets the page_height" do
-      expect(subject).to receive(:page_height)
-      subject.generate
-    end
-
-    it "draws the left square grid" do
-      expect(subject).to receive(:draw_square_grid_left)
-      subject.generate
+      allow(subject).to receive(:draw_header).twice
+      allow(subject).to receive(:draw_footer)
+      allow_any_instance_of(::DotGrid::Pattern::SquareGrid).to receive(:draw)
+      allow_any_instance_of(::DotGrid::Pattern::DotGrid).to receive(:draw)
     end
 
-    it "draws the dot grid" do
-      expect(subject).to receive(:draw_dot_grid)
+    it "draws the header" do
+      expect(subject).to receive(:draw_header).twice
       subject.generate
     end
 

data/spec/lib/dot_grid/pattern/checkerboard_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "DotGrid::Pattern::Checkerboard" do
   let(:pdf) { double('pdf') }
-  let(:params) { { pdf: pdf, bounds: double('bounds', { height: 20.mm, width: 10.mm } ), spacing: 5 } }
+  let(:params) { { pdf: pdf, bounds: double('bounds', { upper_left: [0, 0], height: 20.mm, width: 10.mm } ), spacing: 5 } }
   let(:subject) { DotGrid::Pattern::Checkerboard.new(params) }
 
   describe "#rows" do
@@ -21,6 +21,7 @@ describe "DotGrid::Pattern::Checkerboard" do
     before do
       allow(pdf).to receive(:fill_color)
       allow(pdf).to receive(:fill_rectangle)
+      allow(pdf).to receive(:bounding_box).and_yield
     end
 
     it "sets the fill color" do

data/spec/lib/dot_grid/pattern/dot_grid_spec.rb

@@ -3,10 +3,11 @@ require 'spec_helper'
 describe "DotGrid::Pattern::DotGrid" do
   describe "#draw" do
     let(:pdf) { double('pdf') }
-    let(:params) { { pdf: pdf, bounds: double('bounds', { height: 20.mm, width: 10.mm } ), spacing: 5 } }
+    let(:params) { { pdf: pdf, bounds: double('bounds', { upper_left: [0, 0], height: 20.mm, width: 10.mm } ), spacing: 5 } }
     let(:subject) { DotGrid::Pattern::DotGrid.new(params) }
 
     before do
+      allow(pdf).to receive(:bounding_box).and_yield
       allow(pdf).to receive(:fill_color)
       allow(pdf).to receive(:fill_circle)
     end

data/spec/lib/dot_grid/pattern/grid_spec.rb

@@ -3,11 +3,12 @@ require 'spec_helper'
 describe "DotGrid::Pattern::Grid" do
   describe "#draw" do
     let(:pdf) { double('pdf') }
-    let(:params) { { pdf: pdf, bounds: double('bounds', { height: 20.mm, width: 10.mm } ), spacing: 5 } }
+    let(:params) { { pdf: pdf, bounds: double('bounds', { upper_left: [0, 0], height: 20.mm, width: 10.mm } ), spacing: 5 } }
     let(:subject) { DotGrid::Pattern::Grid.new(params) }
 
     before do
       allow(pdf).to receive(:stroke_color)
+      allow(pdf).to receive(:bounding_box).and_yield
       allow(pdf).to receive(:stroke_horizontal_line)
       allow(pdf).to receive(:stroke_vertical_line)
     end
@@ -17,7 +18,7 @@ describe "DotGrid::Pattern::Grid" do
       subject.draw
     end
 
-    it "draws teh horizontal lines" do
+    it "draws the horizontal lines" do
       allow(subject).to receive(:rows).and_return(2)
       expect(pdf).to receive(:stroke_horizontal_line).exactly(3).times
       subject.draw

data/spec/lib/dot_grid/pattern/horizontal_rule_spec.rb

@@ -4,10 +4,11 @@ describe "DotGrid::Pattern::HorizontalRule" do
 
   describe "#draw" do
     let(:pdf) { double('pdf') }
-    let(:params) { { pdf: pdf, bounds: double('bounds', { height: 20.mm, width: 10.mm } ), spacing: 5 } }
+    let(:params) { { pdf: pdf, bounds: double('bounds', { upper_left: [0, 0], height: 20.mm, width: 10.mm } ), spacing: 5 } }
     let(:subject) { DotGrid::Pattern::HorizontalRule.new(params) }
 
     before do
+      allow(pdf).to receive(:bounding_box).and_yield
       allow(pdf).to receive(:stroke_color)
       allow(pdf).to receive(:stroke_horizontal_line)
     end

data/spec/lib/dot_grid/pattern/pattern_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "DotGrid::Pattern::Pattern" do
 
   let(:pdf) { double('pdf') }
-  let(:params) { { pdf: pdf, bounds: double('bounds', { height: 20.mm, width: 10.mm } ), spacing: 5 } }
+  let(:params) { { pdf: pdf, bounds: double('bounds', { upper_left: [0, 0], height: 20.mm, width: 10.mm } ), spacing: 5 } }
   let(:subject) { DotGrid::Pattern::Pattern.new(params) }
 
   describe "#new" do
@@ -36,4 +36,13 @@ describe "DotGrid::Pattern::Pattern" do
       expect { subject.draw }.to raise_error
     end
   end
+
+  describe "#draw_grid" do
+    let(:pdf) { double('null object').as_null_object }
+
+    it "sets the bounding box" do
+      expect(pdf).to receive(:bounding_box)
+      subject.draw_grid
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dot_grid
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Scott LaBounty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -115,6 +115,7 @@ files:
 - bin/dotgrid
 - dot_grid.gemspec
 - lib/dot_grid.rb
+- lib/dot_grid/bounding_box.rb
 - lib/dot_grid/generator.rb
 - lib/dot_grid/page/checkerboard.rb
 - lib/dot_grid/page/dot_grid.rb
@@ -127,12 +128,14 @@ files:
 - lib/dot_grid/pattern/grid.rb
 - lib/dot_grid/pattern/horizontal_rule.rb
 - lib/dot_grid/pattern/pattern.rb
+- lib/dot_grid/pattern/square_grid.rb
 - lib/dot_grid/version.rb
 - spec/lib/dot_grid/generator_spec.rb
 - spec/lib/dot_grid/page/checkerboard_spec.rb
 - spec/lib/dot_grid/page/dot_grid_spec.rb
 - spec/lib/dot_grid/page/grid_spec.rb
 - spec/lib/dot_grid/page/horizontal_rule_spec.rb
+- spec/lib/dot_grid/page/page_spec.rb
 - spec/lib/dot_grid/page/planner_spec.rb
 - spec/lib/dot_grid/pattern/checkerboard_spec.rb
 - spec/lib/dot_grid/pattern/dot_grid_spec.rb
@@ -170,6 +173,7 @@ test_files:
 - spec/lib/dot_grid/page/dot_grid_spec.rb
 - spec/lib/dot_grid/page/grid_spec.rb
 - spec/lib/dot_grid/page/horizontal_rule_spec.rb
+- spec/lib/dot_grid/page/page_spec.rb
 - spec/lib/dot_grid/page/planner_spec.rb
 - spec/lib/dot_grid/pattern/checkerboard_spec.rb
 - spec/lib/dot_grid/pattern/dot_grid_spec.rb