dot_grid 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37dc6770f99c575f28ae776313c5f63d578b5bb2
-  data.tar.gz: 2ce9b5d286a2ee92eab7c0dbc14321827d6c3040
+  metadata.gz: 54a925c03705950b5f01d2c6cb92ee1bc9f3e023
+  data.tar.gz: 4511d7eea919e7397faa5a181a94bd8b20aea0c9
 SHA512:
-  metadata.gz: 825a31391384cfd28e187a1944d29ffd13951d3506666bbc26cf1cd63e716de4a71961fd8759209f5ac9094ddc9ee785deb8bc08b6235d575a54377acc9a7a27
-  data.tar.gz: cc2932c0ac9baf8ae5b42685e58be4b4c704a3810bd8a0eda07466eed76903a57412b9974a3258b4207b1af89a7c46e73acf84d19d2188b45844cdbaa737d258
+  metadata.gz: 8c4cb6d4f14c07903142d916f181fe23fefb120b988fbc1923223d1b73407bfecc479b034b7e42137ebf0fb88055c97db31698e5b431dbf03b336b64d6789a06
+  data.tar.gz: ab5e6792388c751dbf3b0e463d613689b8bcffd42b4a340ce0f818cd3b871165a4837375a2b6f9ea2a9a2122d79cc5ecc84615e44a181fef092bd2d84198ff28

data/base

@@ -1,4 +1,15 @@
 # Base planner
-bin/dotgrid -f dotgrid_w5_c2dfff_no_grid.pdf --no-grid --grid-color CFBAEC --dot-weight 0.5 -m 0.0 --planner --planner-color-1 dddddd --planner-color-2 C2DFFF
+bin/dotgrid -f planner_w5_c2dfff_no_grid.pdf --no-dot-grid --grid-color CFBAEC --dot-weight 0.5 -m 0.0 --planner --planner-color-1 dddddd --planner-color-2 C2DFFF
+bin/dotgrid -f planner_w75_c2dfff_no_grid.pdf --no-dot-grid --grid-color CFBAEC --dot-weight 0.75 -m 0.0 --planner --planner-color-1 dddddd --planner-color-2 C2DFFF
 
-bin/dotgrid -f dotgrid_w75_c2dfff_no_grid.pdf --no-grid --grid-color CFBAEC --dot-weight 0.75 -m 0.0 --planner --planner-color-1 dddddd --planner-color-2 C2DFFF
+# Dot grid
+bin/dotgrid -f dot_grid_c2dfff.pdf --dot-grid --spacing 5 --grid-color CFBAEC -m 0.0
+
+# Regular grid
+bin/dotgrid -f grid_c2dfff.pdf --grid --no-dot-grid --spacing 5 --grid-color CFBAEC -m 0.0
+
+# Horizontal rule
+bin/dotgrid -f horizontal_rule_c2dfff.pdf --horizontal-rule --no-dot-grid --spacing 5 --grid-color CFBAEC -m 0.0
+
+# Checkerboard
+bin/dotgrid -f checkerboard_c2dfff.pdf --checkerboard --no-dot-grid --spacing 5 --grid-color CFBAEC -m 0.0

data/bin/dotgrid

@@ -10,7 +10,7 @@ require_all 'lib'
 
 opts = Trollop::options do
   opt :file_name, "File Name", :type => :string, :default => "dotgrid.pdf"
-  opt :grid, "Add a Grid Page", default: true
+  opt :dot_grid, "Add a Dot Grid Page", default: true
   opt :dot_weight, "Dot Weight", :type => :float, :default => 1.5
   opt :margin, "Border", :type => :float, :default => 0.5
   opt :page_size, "Page Size (LEGAL, LETTER)", :type => :string, :default => "LETTER"
@@ -18,6 +18,9 @@ opts = Trollop::options do
   opt :spacing, "Dot Spacing (mm)", :type => :integer, :default => 5
   opt :pages, "Number of pages", :type => :integer, :default => 1
   opt :planner, "Add a Planner Page"
+  opt :grid, "Add a Regular Grid page"
+  opt :horizontal_rule, "Add a Horizontal Rule page"
+  opt :checkerboard, "Add a Checkerboard page"
   opt :planner_color_1, "Planner Left and Footer color", type: :string, default: "CCCCCC"
   opt :planner_color_2, "Planner Right color", type: :string, default: "0099ff"
 end

data/lib/dot_grid/generator.rb

@@ -8,11 +8,16 @@ module DotGrid
       :file_name,
       :page_size,
       :grid,
+      :dot_grid_page,
       :grid_page,
       :margin,
       :pages,
       :planner,
-      :planner_page
+      :planner_page,
+      :horizontal_rule,
+      :horizontal_rule_page,
+      :checkerboard,
+      :checkerboard_page,
     )
 
     def initialize(params)
@@ -22,14 +27,21 @@ module DotGrid
       @pages = params[:pages] || 1
       @pdf = Prawn::Document.new(margin: margin, page_size: page_size, skip_page_creation: true)
       params[:pdf] = pdf
-      @grid_page = DotGrid::Grid.new(params) if params[:grid]
-      @planner_page = DotGrid::Planner.new(params) if params[:planner]
+
+      @dot_grid_page = DotGrid::Page::DotGrid.new(params) if params[:dot_grid]
+      @planner_page = DotGrid::Page::Planner.new(params) if params[:planner]
+      @grid_page = DotGrid::Page::Grid.new(params) if params[:grid]
+      @horizontal_rule_page = DotGrid::Page::HorizontalRule.new(params) if params[:horizontal_rule]
+      @checkerboard_page = DotGrid::Page::Checkerboard.new(params) if params[:checkerboard]
     end
 
     def generate
       (1..pages).each do |page|
         planner_page.generate if planner_page
         grid_page.generate if grid_page
+        dot_grid_page.generate if dot_grid_page
+        horizontal_rule_page.generate if horizontal_rule_page
+        checkerboard_page.generate if checkerboard_page
       end
       pdf.render_file file_name
     end

data/lib/dot_grid/page/checkerboard.rb

@@ -0,0 +1,20 @@
+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
+      end
+    end
+  end
+end
+

data/lib/dot_grid/page/dot_grid.rb

@@ -0,0 +1,22 @@
+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
+      end
+    end
+  end
+end

data/lib/dot_grid/page/grid.rb

@@ -0,0 +1,21 @@
+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
+      end
+    end
+  end
+end

data/lib/dot_grid/page/horizontal_rule.rb

@@ -0,0 +1,20 @@
+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
+      end
+    end
+  end
+end
+

data/lib/dot_grid/page/page.rb

@@ -0,0 +1,40 @@
+module DotGrid
+  module Page
+    class Page
+      attr_accessor(
+        :pdf,
+        :dot_weight,
+        :grid_color,
+        :spacing
+      )
+
+      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
+      end
+
+      def generate
+        pdf.start_new_page
+      end
+
+      def page_width
+        pdf.bounds.width
+      end
+
+      def page_height
+        pdf.bounds.height
+      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
+      end
+    end
+  end
+end

data/lib/dot_grid/page/planner.rb

@@ -0,0 +1,118 @@
+module DotGrid
+  module Page
+    class Planner < Page
+      attr_accessor(
+        :planner_color_1,
+        :planner_color_2
+      )
+
+      HEADER_HEIGHT = 0.05               # 5.0 %
+      HEADER_LEFT_START = 0.05           # 5.0%
+      SQUARE_GRID_WIDTH = 0.30           # 30.0%
+      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
+        @planner_color_1 = params[:planner_color_1] || "CCCCCC"
+        @planner_color_2 = params[:planner_color_2] || "0099ff"
+      end
+
+      def header_height
+        HEADER_HEIGHT * page_height
+      end
+
+      def square_grid_columns
+        ((SQUARE_GRID_WIDTH * page_width) / spacing).floor
+      end
+
+      def header_left_color
+        planner_color_1
+      end
+
+      def header_left_start
+        HEADER_LEFT_START * page_width
+      end
+
+      def header_left_width
+        square_grid_columns*spacing
+      end
+
+      def header_gap_start
+        header_left_start + header_left_width
+      end
+
+      def header_gap_width
+        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
+
+      def header_right_start
+        header_gap_start + header_gap_width
+      end
+
+      def header_right_width
+        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
+
+      def generate
+        super
+
+        # Header left
+        draw_header(header_left_start, header_left_width, header_height, header_left_color)
+
+        # 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
+
+      def draw_header(header_start, header_width, header_height, header_color)
+        pdf.fill_color header_color
+        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
+    end
+  end
+end

data/lib/dot_grid/pattern/checkerboard.rb

@@ -0,0 +1,17 @@
+module DotGrid
+  module Pattern
+    class Checkerboard < Pattern
+
+      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
+        end
+      end
+    end
+  end
+end

data/lib/dot_grid/pattern/dot_grid.rb

@@ -0,0 +1,22 @@
+module DotGrid
+  module Pattern
+    class DotGrid < Pattern
+      attr_accessor(
+        :dot_weight,
+      )
+
+      def post_initialize(params)
+        @dot_weight = params[:dot_weight] || 1.5
+      end
+
+      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
+        end
+      end
+    end
+  end
+end

data/lib/dot_grid/pattern/grid.rb

@@ -0,0 +1,15 @@
+module DotGrid
+  module Pattern
+    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)
+        end
+      end
+    end
+  end
+end

data/lib/dot_grid/pattern/horizontal_rule.rb

@@ -0,0 +1,13 @@
+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)
+        end
+      end
+    end
+  end
+end

data/lib/dot_grid/pattern/pattern.rb

@@ -0,0 +1,37 @@
+module DotGrid
+  module Pattern
+    class Pattern
+      attr_accessor(
+        :pdf,
+        :bounds,
+        :grid_color,
+        :spacing,
+      )
+
+      def initialize(params = {})
+        @pdf = params[:pdf]
+        @bounds = params[:bounds]
+        @grid_color = params[:grid_color] || "B3B3B3"
+        @spacing = params[:spacing] ? params[:spacing].mm : 5.mm
+        post_initialize(params)
+      end
+
+      def post_initialize(params)
+        nil
+      end
+
+      def rows
+        (bounds.height / spacing).floor
+      end
+
+      def columns
+        (bounds.width / spacing).floor
+      end
+
+      def draw
+        raise NotImplementedError
+      end
+    end
+  end
+end
+

data/lib/dot_grid/version.rb

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

data/lib/dot_grid.rb

@@ -1,7 +1,17 @@
 require 'dot_grid/generator'
-require 'dot_grid/page'
-require 'dot_grid/grid'
-require 'dot_grid/planner'
+
+require 'dot_grid/page/page'
+require 'dot_grid/page/dot_grid'
+require 'dot_grid/page/planner'
+require 'dot_grid/page/grid'
+require 'dot_grid/page/horizontal_rule'
+require 'dot_grid/page/checkerboard'
+
+require 'dot_grid/pattern/pattern'
+require 'dot_grid/pattern/grid'
+require 'dot_grid/pattern/dot_grid'
+require 'dot_grid/pattern/checkerboard'
+require 'dot_grid/pattern/horizontal_rule'
 
 module DotGrid
 end

data/spec/lib/dot_grid/generator_spec.rb

@@ -27,14 +27,14 @@ describe "DotGrid::Generator" do
 
     context "when there is a grid parameter" do
       it "creates a new grid page" do
-        expect(DotGrid::Grid).to receive(:new)
-        DotGrid::Generator.new({:grid => true})
+        expect(DotGrid::Page::DotGrid).to receive(:new)
+        DotGrid::Generator.new({:dot_grid => true})
       end
     end
 
     context "when there is a planner parameter" do
       it "creates a new grid page" do
-        expect(DotGrid::Planner).to receive(:new)
+        expect(DotGrid::Page::Planner).to receive(:new)
         DotGrid::Generator.new({:planner => true})
       end
     end
@@ -49,6 +49,14 @@ describe "DotGrid::Generator" do
       end
     end
 
+    context "when there is a dot grid page" do
+      let(:subject) { DotGrid::Generator.new(:dot_grid => true)}
+      it "generates a new grid page" do
+        expect(subject.dot_grid_page).to receive(:generate)
+        subject.generate
+      end
+    end
+
     context "when there is a grid page" do
       let(:subject) { DotGrid::Generator.new(:grid => true)}
       it "generates a new grid page" do
@@ -57,11 +65,19 @@ describe "DotGrid::Generator" do
       end
     end
 
+    context "when there is a horizontal rule page" do
+      let(:subject) { DotGrid::Generator.new(:horizontal_rule => true)}
+      it "generates a new horizontal rule page" do
+        expect(subject.horizontal_rule_page).to receive(:generate)
+        subject.generate
+      end
+    end
+
     context "when there are multiple pages" do
-      let(:subject) { DotGrid::Generator.new(:grid => true, :planner => true, :pages => 2)}
+      let(:subject) { DotGrid::Generator.new(:dot_grid => true, :planner => true, :pages => 2)}
 
       it "generates grid for each page" do
-        expect(subject.grid_page).to receive(:generate).twice
+        expect(subject.dot_grid_page).to receive(:generate).twice
         subject.generate
       end
 

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

@@ -0,0 +1,19 @@
+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') }
+
+    before do
+      allow(pdf).to receive(:start_new_page)
+      allow(subject).to receive(:pattern).and_return(pattern)
+    end
+
+    it "draws the pattern" do
+      expect(pattern).to receive(:draw)
+      subject.generate
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+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') }
+
+    before do
+      allow(pdf).to receive(:start_new_page)
+      allow(subject).to receive(:pattern).and_return(pattern)
+    end
+
+    it "draws the pattern" do
+      expect(pattern).to receive(:draw)
+      subject.generate
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+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') }
+
+    before do
+      allow(pdf).to receive(:start_new_page)
+      allow(subject).to receive(:pattern).and_return(pattern)
+    end
+
+    it "draws the pattern" do
+      expect(pattern).to receive(:draw)
+      subject.generate
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+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') }
+
+    before do
+      allow(pdf).to receive(:start_new_page)
+      allow(subject).to receive(:pattern).and_return(pattern)
+    end
+
+    it "draws the pattern" do
+      expect(pattern).to receive(:draw)
+      subject.generate
+    end
+  end
+end

data/spec/lib/dot_grid/{planner_spec.rb → page/planner_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe "DotGrid::Planner" do
+describe "DotGrid::Page::Planner" do
   describe "#initialize" do
-    let(:subject) { DotGrid::Planner.new({}) }
+    let(:subject) { DotGrid::Page::Planner.new({}) }
 
     it "has a default planner color 1" do
       expect(subject.planner_color_1).to eq("CCCCCC")
@@ -15,37 +15,37 @@ describe "DotGrid::Planner" do
 
   describe "#header_height" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => 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)
-      expect(subject.header_height).to eq(DotGrid::Planner::HEADER_HEIGHT * subject.page_height)
+      expect(subject.header_height).to eq(DotGrid::Page::Planner::HEADER_HEIGHT * subject.page_height)
     end
   end
 
   describe "#header_height" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => 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)
-      expect(subject.header_height).to eq(DotGrid::Planner::HEADER_HEIGHT * subject.page_height)
+      expect(subject.header_height).to eq(DotGrid::Page::Planner::HEADER_HEIGHT * subject.page_height)
     end
   end
 
   describe "#square_grid_columns" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => pdf, spacing: 5 }) }
+    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf, spacing: 5 }) }
 
     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::Planner::SQUARE_GRID_WIDTH * subject.page_width / subject.spacing).floor)
+      expect(subject.square_grid_columns).to eq((DotGrid::Page::Planner::SQUARE_GRID_WIDTH * subject.page_width / subject.spacing).floor)
     end
   end
 
   describe "#header_left_color" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => pdf, planner_color_1: "DDEEFF" }) }
+    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
@@ -53,27 +53,27 @@ describe "DotGrid::Planner" do
 
   describe "#header_left_start" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => pdf }) }
+    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
 
     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::Planner::HEADER_LEFT_START * subject.page_width)
+      expect(subject.header_left_start).to eq(DotGrid::Page::Planner::HEADER_LEFT_START * subject.page_width)
     end
   end
 
   describe "#header_gap_width" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => pdf }) }
+    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
 
     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::Planner::HEADER_GAP_WIDTH * subject.page_width)
+      expect(subject.header_gap_width).to eq(DotGrid::Page::Planner::HEADER_GAP_WIDTH * subject.page_width)
     end
   end
 
   describe "#header_right_color" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => pdf, planner_color_2: "FFEEDD" }) }
+    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
@@ -81,7 +81,7 @@ describe "DotGrid::Planner" do
 
   describe "#dot_grid_rows" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => pdf }) }
+    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
     let(:square_grid_rows) { 10 }
 
     it "returns the foot height" do
@@ -92,18 +92,18 @@ describe "DotGrid::Planner" do
 
   describe "#footer_height" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => pdf }) }
+    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
     let(:header_height) { 100 }
 
     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::Planner::FOOT_HEIGHT_RATIO)
+      expect(subject.footer_height).to eq(header_height*DotGrid::Page::Planner::FOOT_HEIGHT_RATIO)
     end
   end
 
   describe "#generate" do
     let(:pdf) { double('pdf') }
-    let(:subject) { DotGrid::Planner.new({:pdf => pdf }) }
+    let(:subject) { DotGrid::Page::Planner.new({:pdf => pdf }) }
 
     before do
       allow(subject).to receive(:page_width).and_return(10)

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

@@ -0,0 +1,39 @@
+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(:subject) { DotGrid::Pattern::Checkerboard.new(params) }
+
+  describe "#rows" do
+    it "calculates the rows based on the bounds" do
+      expect(subject.rows).to eq(4)
+    end
+  end
+
+  describe "#columns" do
+    it "calculates the rows based on the bounds" do
+      expect(subject.columns).to eq(2)
+    end
+  end
+
+  describe "#draw" do
+    before do
+      allow(pdf).to receive(:fill_color)
+      allow(pdf).to receive(:fill_rectangle)
+    end
+
+    it "sets the fill color" do
+      expect(pdf).to receive(:fill_color)
+      subject.draw
+    end
+
+    it "calls fill rectangle the correct number of times" do
+      allow(subject).to receive(:rows).and_return(2)
+      allow(subject).to receive(:columns).and_return(3)
+      expect(pdf).to receive(:fill_rectangle).exactly(3*4 / 2).times
+      subject.draw
+    end
+  end
+end
+

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

@@ -0,0 +1,26 @@
+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(:subject) { DotGrid::Pattern::DotGrid.new(params) }
+
+    before do
+      allow(pdf).to receive(:fill_color)
+      allow(pdf).to receive(:fill_circle)
+    end
+
+    it "sets the fill color" do
+      expect(pdf).to receive(:fill_color)
+      subject.draw
+    end
+
+    it "calls fill circle the correct number of times" do
+      allow(subject).to receive(:rows).and_return(2)
+      allow(subject).to receive(:columns).and_return(3)
+      expect(pdf).to receive(:fill_circle).exactly(3*4).times
+      subject.draw
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+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(:subject) { DotGrid::Pattern::Grid.new(params) }
+
+    before do
+      allow(pdf).to receive(:stroke_color)
+      allow(pdf).to receive(:stroke_horizontal_line)
+      allow(pdf).to receive(:stroke_vertical_line)
+    end
+
+    it "sets the fill color" do
+      expect(pdf).to receive(:stroke_color)
+      subject.draw
+    end
+
+    it "draws teh horizontal lines" do
+      allow(subject).to receive(:rows).and_return(2)
+      expect(pdf).to receive(:stroke_horizontal_line).exactly(3).times
+      subject.draw
+    end
+
+    it "calls fill rectangle the correct number of times" do
+      allow(subject).to receive(:columns).and_return(3)
+      expect(pdf).to receive(:stroke_vertical_line).exactly(4).times
+      subject.draw
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+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(:subject) { DotGrid::Pattern::HorizontalRule.new(params) }
+
+    before do
+      allow(pdf).to receive(:stroke_color)
+      allow(pdf).to receive(:stroke_horizontal_line)
+    end
+
+    it "sets the fill color" do
+      expect(pdf).to receive(:stroke_color)
+      subject.draw
+    end
+
+    it "calls horizontal line the correct number of times" do
+      allow(subject).to receive(:rows).and_return(2)
+      expect(pdf).to receive(:stroke_horizontal_line).exactly(2 + 1).times
+      subject.draw
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+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(:subject) { DotGrid::Pattern::Pattern.new(params) }
+
+  describe "#new" do
+    it "calls the post initialize method" do
+      expect_any_instance_of(DotGrid::Pattern::Pattern).to receive(:post_initialize)
+      DotGrid::Pattern::Pattern.new(params)
+    end
+  end
+
+  describe "#post_initialize" do
+    it "is nil" do
+      expect(subject.post_initialize({})).to be_nil
+    end
+  end
+
+  describe "#rows" do
+    it "calculates the rows based on the bounds" do
+      expect(subject.rows).to eq(4)
+    end
+  end
+
+  describe "#columns" do
+    it "calculates the rows based on the bounds" do
+      expect(subject.columns).to eq(2)
+    end
+  end
+
+  describe "#draw" do
+    it "raises an error" do
+      expect { subject.draw }.to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 require 'coveralls'
 Coveralls.wear!
 
-require File.expand_path('../../lib/dot_grid', __FILE__)
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '../lib')
+require 'dot_grid'
 
 RSpec.configure do |c|
   # May need some code in here ...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dot_grid
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Scott LaBounty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -116,14 +116,29 @@ files:
 - dot_grid.gemspec
 - lib/dot_grid.rb
 - lib/dot_grid/generator.rb
-- lib/dot_grid/grid.rb
-- lib/dot_grid/page.rb
-- lib/dot_grid/planner.rb
+- lib/dot_grid/page/checkerboard.rb
+- lib/dot_grid/page/dot_grid.rb
+- lib/dot_grid/page/grid.rb
+- lib/dot_grid/page/horizontal_rule.rb
+- lib/dot_grid/page/page.rb
+- lib/dot_grid/page/planner.rb
+- lib/dot_grid/pattern/checkerboard.rb
+- lib/dot_grid/pattern/dot_grid.rb
+- lib/dot_grid/pattern/grid.rb
+- lib/dot_grid/pattern/horizontal_rule.rb
+- lib/dot_grid/pattern/pattern.rb
 - lib/dot_grid/version.rb
 - spec/lib/dot_grid/generator_spec.rb
-- spec/lib/dot_grid/grid_spec.rb
-- spec/lib/dot_grid/page_spec.rb
-- spec/lib/dot_grid/planner_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/planner_spec.rb
+- spec/lib/dot_grid/pattern/checkerboard_spec.rb
+- spec/lib/dot_grid/pattern/dot_grid_spec.rb
+- spec/lib/dot_grid/pattern/grid_spec.rb
+- spec/lib/dot_grid/pattern/horizontal_rule_spec.rb
+- spec/lib/dot_grid/pattern/pattern_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/slabounty/dot_grid
 licenses:
@@ -151,7 +166,14 @@ specification_version: 4
 summary: Dot Grid planner PDF generator.
 test_files:
 - spec/lib/dot_grid/generator_spec.rb
-- spec/lib/dot_grid/grid_spec.rb
-- spec/lib/dot_grid/page_spec.rb
-- spec/lib/dot_grid/planner_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/planner_spec.rb
+- spec/lib/dot_grid/pattern/checkerboard_spec.rb
+- spec/lib/dot_grid/pattern/dot_grid_spec.rb
+- spec/lib/dot_grid/pattern/grid_spec.rb
+- spec/lib/dot_grid/pattern/horizontal_rule_spec.rb
+- spec/lib/dot_grid/pattern/pattern_spec.rb
 - spec/spec_helper.rb

data/lib/dot_grid/grid.rb

@@ -1,29 +0,0 @@
-module DotGrid
-  class Grid < Page
-    attr_accessor(
-      :dot_weight,
-      :grid_color,
-      :spacing,
-    )
-
-    def initialize(params)
-      super
-    end
-
-
-    def page_rows
-      (page_height / spacing).floor
-    end
-
-    def page_columns
-      (page_width / spacing).floor
-    end
-
-    def generate
-      pdf.start_new_page
-      num_columns = page_columns
-      num_rows = page_rows
-      draw_dot_grid(num_rows, num_columns, 0, pdf.bounds.height)
-    end
-  end
-end

data/lib/dot_grid/page.rb

@@ -1,34 +0,0 @@
-module DotGrid
-  class Page
-    attr_accessor(
-      :pdf,
-      :dot_weight,
-      :grid_color,
-      :spacing
-    )
-
-    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
-    end
-
-    def page_width
-      pdf.bounds.width
-    end
-
-    def page_height
-      pdf.bounds.height
-    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
-    end
-  end
-end

data/lib/dot_grid/planner.rb

@@ -1,116 +0,0 @@
-module DotGrid
-  class Planner < Page
-    attr_accessor(
-      :planner_color_1,
-      :planner_color_2
-    )
-
-    HEADER_HEIGHT = 0.05               # 5.0 %
-    HEADER_LEFT_START = 0.05           # 5.0%
-    SQUARE_GRID_WIDTH = 0.30           # 30.0%
-    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
-      @planner_color_1 = params[:planner_color_1] || "CCCCCC"
-      @planner_color_2 = params[:planner_color_2] || "0099ff"
-    end
-
-    def header_height
-      HEADER_HEIGHT * page_height
-    end
-
-    def square_grid_columns
-      ((SQUARE_GRID_WIDTH * page_width) / spacing).floor
-    end
-
-    def header_left_color
-      planner_color_1
-    end
-
-    def header_left_start
-      HEADER_LEFT_START * page_width
-    end
-
-    def header_left_width
-      square_grid_columns*spacing
-    end
-
-    def header_gap_start
-      header_left_start + header_left_width
-    end
-
-    def header_gap_width
-      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
-
-    def header_right_start
-      header_gap_start + header_gap_width
-    end
-
-    def header_right_width
-      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
-
-    def generate
-      pdf.start_new_page
-
-      # Header left
-      draw_header(header_left_start, header_left_width, header_height, header_left_color)
-
-      # 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
-
-    def draw_header(header_start, header_width, header_height, header_color)
-      pdf.fill_color header_color
-      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
-  end
-end

data/spec/lib/dot_grid/grid_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe "DotGrid::Grid" do
-  describe "#initialize" do
-    let(:subject) { DotGrid::Grid.new({}) }
-
-    it "calculates the number of rows" do
-      allow(subject).to receive(:page_height).and_return(22)
-      allow(subject).to receive(:spacing).and_return(5)
-      expect(subject.page_rows).to eq(4)
-    end
-
-    it "calculates the number of columns" do
-      allow(subject).to receive(:page_width).and_return(44)
-      allow(subject).to receive(:spacing).and_return(6)
-      expect(subject.page_columns).to eq(7)
-    end
-  end
-end

data/spec/lib/dot_grid/page_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe "DotGrid::Page" do
-  describe "#initialize" do
-    let(:subject) { DotGrid::Page.new({}) }
-
-    it "has a default dot weight" do
-      expect(subject.dot_weight).to eq(1.5)
-    end
-
-    it "has a default grid color" do
-      expect(subject.grid_color).to eq("B3B3B3")
-    end
-
-    it "has a default spacing" do
-      expect(subject.spacing).to eq(5.mm)
-    end
-  end
-
-  describe "#page_width" do
-    let(:pdf) { double('pdf', bounds: double(:width => 42)) }
-    let(:subject) { DotGrid::Page.new({:pdf => pdf}) }
-
-    it "uses the pdf to calculate the page width" do
-      expect(subject.page_width).to eq(42)
-    end
-  end
-
-  describe "#page_height" do
-    let(:pdf) { double('pdf', bounds: double(:height => 22)) }
-    let(:subject) { DotGrid::Page.new({:pdf => pdf}) }
-
-    it "uses the pdf to calculate the page height" do
-      expect(subject.page_height).to eq(22)
-    end
-  end
-
-  describe "#draw_dot_grid" do
-    let(:pdf) { double('pdf', bounds: double(:height => 22)) }
-    let(:subject) { DotGrid::Page.new({:pdf => pdf, :grid_color => "CCDDEE"}) }
-
-    it "sets the pdf fill color" do
-      allow(pdf).to receive(:fill_circle)
-      expect(pdf).to receive(:fill_color).with("CCDDEE")
-      subject.draw_dot_grid(1, 1, 100, 200)
-    end
-
-    it "fills the correct number of circles for the grid" do
-      allow(pdf).to receive(:fill_color)
-      expect(pdf).to receive(:fill_circle).exactly(4).times
-      subject.draw_dot_grid(2, 2, 100, 200)
-    end
-  end
-end