laser-cutter 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d78af71d854c6d20420b751eab1db6f8ab0052dc
-  data.tar.gz: 36373b9a7e2858dc489aa2c7ba4489f7db044b0e
+  metadata.gz: 06711815bb7563755b270427de4acb6dc2208777
+  data.tar.gz: 8daa7da0e30ed501f04b5786cf0b31c8b62ec823
 SHA512:
-  metadata.gz: 9e7ad6c1861371edf9e00856c68f79e9ccc0833918d442f42270b57afd4751fa0a462701ce280ec2e781d2a178a3236c5b3e518da9c5699930f2103af0ff63ec
-  data.tar.gz: 3bade22e2009f8ac1d1dbd2efb9c195323e6a66d094ff5e742b56a1457dee2e28f79b5d111cda64942ec66e7e1f4571dfa0dbcbdc3a27321ffed8732c7aa1717
+  metadata.gz: 267e0cc220e9e83a0f8a8570429d3f11207d677b5d876831544ac33871fef9ce14daaab7f2594784d4d0a6da1e5161e8299d205d177543a3408ad3ccec42a2b5
+  data.tar.gz: f5c49c5f68fc71df0e84af028086f9a231cf9abfd42c07350bdfc175f3df31bf40469032c30c33ca49a000f5e82764d1e5788db5d42c90de65e6ed91936e71d9

data/README.md

@@ -18,7 +18,14 @@ command line options, and perhaps a light weight web application.  If you are in
 contributing to the project, please see [contributing](CONTRIBUTING.md) for more details. 
 
 ```laser-cutter``` supports many flexible command line options that allow setting dimensions, 
-stroke width, page size, layout, margins, padding (spacing between the boxes), and many more.  
+stroke width, page size, layout, margins, padding (spacing between the boxes), and many more.
+  
+## Web Front-End
+
+There is a web online application that uses this gem and allows you to generate PDFs with 
+a friendly UI.
+
+Please visit [http://makeabox.io](http://makeabox.io).
 
 ## Dependencies
 
@@ -42,25 +49,24 @@ Or install it yourself as:
 
 ```bash
 Usage: laser-cutter [options] -o filename.pdf
-   eg: laser-cutter -i -s 1x1.5x2/0.125/0.125 -O -o box.pdf
+   eg: laser-cutter -s 1x1.5x2/0.125/0.125 -O -o box.pdf
 
 Specific Options:
-        --width WIDTH                Internal width of the box
+    -w, --width WIDTH                Internal width of the box
     -h, --height HEIGHT              Internal height of the box
     -d, --depth DEPTH                Internal depth of the box
-        --thickness THICKNESS        Thickness of the box material
+    -t, --thickness THICKNESS        Thickness of the box material
     -n, --notch NOTCH                Preferred notch length (used only as a guide)
 
     -m, --margin MARGIN              Margins from the edge of the document
     -p, --padding PADDING            Space between the boxes on the page
-    -t, --stroke WIDTH               Numeric stroke width of the line
+    -k, --stroke WIDTH               Numeric stroke width of the line
     -z, --page_size LETTER           Page size, see --list-all-page-sizes for more info.
     -y, --page_layout portrait       Page layout, other option is 'landscape'
 
     -O, --open                       Open generated file with system viewer before exiting
-    -w, --write FILE                 Save current configuration to a file, use '-' for STDOUT
-    -r, --read FILE                  Read configuration from a file, use '-' for STDIN
-    -u, --units UNITS                Either 'mm' (default) or 'in'
+    -W, --write FILE                 Save provided configuration to a file, use '-' for STDOUT
+    -R, --read FILE                  Read configuration from a file, or use '-' for STDIN
 
     -l, --list-all-page-sizes        Print all available page sizes with dimensions and exit
     -M, --no-metadata                Do not print box metadata on the PDF
@@ -75,24 +81,43 @@ Common Options:
     -s, --size WxHxD/T/N             Combined internal dimensions: W = width, H = height,
                                      D = depth, T = thickness, N = notch length
 
-    -i, --inches                     Switch measurements to inches instead of millimeters
+    -u, --units UNITS                Either 'in' for inches (default) or 'mm'
+```
+
+### Examples
 
-Examples:
-  1. Create a box defined in inches, and open PDF in preview right after:
+Create a box defined in inches, and open PDF in preview right after:
 
-       laser-cutter -i -s 3x2x2/0.125/0.5 -O -o box.pdf
+```bash
+    laser-cutter -s 3x2x2/0.125/0.5 -O -o box.pdf
+```       
 
-  2. Create a box defined in millimeters, print verbose info and set
-     page size to A3, and layout to landscape, and stroke width to 1/2mm:
+Create a box defined in millimeters, print verbose info, and set
+page size to A3, and layout to landscape, and stroke width to 1/2mm:
 
-       laser-cutter -w70 -h20 -d50 -t4.3 -n5 -PA3 -L landscape -S0.5 -v -O -o box.pdf
+```bash
+    laser-cutter -u mm -w70 -h20 -d50 -t4.3 -n5 -zA3 -y landscape -k0.5 -v -O -o box.pdf
+```   
 
-  3. List all possible page sizes in metric or imperial systems:
+List all possible page sizes in metric system:
 
-       laser-cutter --list-all-page-sizes
-       laser-cutter --list-all-page-sizes --inches
+```bash
+    laser-cutter -l -u mm
 ```                 
 
+Create a box with provided dimensions, and save the config to a file for later use:
+
+```bash
+    laser-cutter -s 1.1x2.5x1.5/0.125/0.125 -p 0.1 -O -o box.pdf -W box-settings.json
+```    
+
+Read settings from a previously saved file:
+
+```bash
+    laser-cutter -O -o box.pdf -R box-settings.json
+    cat box-settings.json | laser-cutter -O -o box.pdf -R -
+```
+
 ## Future Features
 
 * Extensibility with various layout strategies, notch drawing strategies, basically plug and play
@@ -100,7 +125,6 @@ Examples:
 * Support more shapes than just box
 * Create T-style joins, using various standard sizes of nuts and bolts (such as common #4-40 and M2 sizes)
 * Supporting lids and front panels, that are larger than the box itself and have holes for notches. 
-* A web-app that uses the gem and renders box live in CSS using CSS 2D to show preview.
 * Your brilliant idea can be here too!  Please see [contributing](CONTRIBUTING.md) for more info.
 
 ## Comparison with BoxMaker
@@ -137,14 +161,14 @@ niceties):
 ```bash
 git clone https://github.com/aphelps/boxmaker && cd boxmaker && ant
 java -cp BOX.jar com.rahulbotics.boxmaker.BoxMaker \
-      -i -W 1 -H 2 -D 1.5 -T 0.125 -n 0.125 -f box.pdf
+      -W 1 -H 2 -D 1.5 -T 0.125 -n 0.125 -o box.pdf
 ```
 
 And laser-cutter:
 
 ```bash
 gem install laser-cutter
-laser-cutter -i -s 1x1.5x2/0.125/0.125 -O -o box.pdf
+laser-cutter -s 1x1.5x2/0.125/0.125 -O -o box.pdf
 ```
 
 ![LaserCutter Comparison](doc/comparison.jpg).

data/bin/laser-cutter

@@ -18,7 +18,7 @@ module Laser
 #{('Laser-Cutter v'+ Laser::Cutter::VERSION).bold}
 
 Usage: laser-cutter [options] -o filename.pdf
-   eg: laser-cutter -i -s 1x1.5x2/0.125/0.125 -O -o box.pdf
+   eg: laser-cutter -s 1x1.5x2/0.125/0.125 -O -o box.pdf
         EOF
 
         examples = <<-EOF
@@ -26,21 +26,31 @@ Usage: laser-cutter [options] -o filename.pdf
 Examples:
   1. Create a box defined in inches, and open PDF in preview right after:
 
-       laser-cutter -i -s 3x2x2/0.125/0.5 -O -o box.pdf
+       laser-cutter -s 3x2x2/0.125/0.5 -O -o box.pdf
 
-  2. Create a box defined in millimeters, print verbose info and set
+  2. Create a box defined in millimeters, print verbose info, and set
      page size to A3, and layout to landscape, and stroke width to 1/2mm:
 
-       laser-cutter -w70 -h20 -d50 -t4.3 -n5 -PA3 -L landscape -S0.5 -v -O -o box.pdf
+       laser-cutter -u mm -w70 -h20 -d50 -t4.3 -n5 -zA3 -y landscape -k0.5 -v -O -o box.pdf
 
-  3. List all possible page sizes in metric or imperial systems:
+  3. List all possible page sizes in metric systems:
+
+       laser-cutter -l -u mm
+
+  4. Create a box with provided dimensions, and save the config to a file
+     for later use:
+
+       laser-cutter -s 1.1x2.5x1.5/0.125/0.125 -p 0.1 -O -o box.pdf -W box-settings.json
+
+  5. Read settings from a previously saved file:
+
+       laser-cutter -O -o box.pdf -R box-settings.json
+       cat box-settings.json | laser-cutter -O -o box.pdf -R -
 
-       laser-cutter --list-all-page-sizes
-       laser-cutter --list-all-page-sizes --inches
         EOF
         options = Hashie::Mash.new
         options.verbose = false
-        options.units = 'mm'
+        options.units = 'in'
 
         opt_parser = OptionParser.new do |opts|
           opts.banner = banner_text.blue
@@ -53,14 +63,13 @@ Examples:
           opts.separator ""
           opts.on("-m", "--margin MARGIN", "Margins from the edge of the document") { |value| options.margin = value }
           opts.on("-p", "--padding PADDING", "Space between the boxes on the page") { |value| options.padding = value }
-          opts.on("-t", "--stroke WIDTH", "Numeric stroke width of the line") { |value| options.stroke = value }
+          opts.on("-k", "--stroke WIDTH", "Numeric stroke width of the line") { |value| options.stroke = value }
           opts.on("-z", "--page_size LETTER", "Page size, see --list-all-page-sizes for more info.") { |value| options.page_size = value }
           opts.on("-y", "--page_layout portrait", "Page layout, other option is 'landscape' ") { |value| options.page_layout = value }
           opts.separator ""
           opts.on("-O", "--open", "Open generated file with system viewer before exiting") { |v| options.open = v }
-          opts.on("-w", "--write FILE", "Save current configuration to a file, use '-' for STDOUT") { |v| options.write_file = v }
-          opts.on("-r", "--read FILE", "Read configuration from a file, use '-' for STDIN") { |v| options.read_file = v }
-          opts.on("-u", "--units UNITS", "Either 'mm' (default) or 'in'") { |value| options.units = value }
+          opts.on("-W", "--write FILE", "Save provided configuration to a file, use '-' for STDOUT") { |v| options.write_file = v }
+          opts.on("-R", "--read FILE", "Read configuration from a file, or use '-' for STDIN") { |v| options.read_file = v }
           opts.separator ""
           opts.on("-l", "--list-all-page-sizes", "Print all available page sizes with dimensions and exit") { |v| options.list_all_page_sizes = true }
           opts.on("-M", "--no-metadata", "Do not print box metadata on the PDF") { |value| options.metadata = value }
@@ -76,7 +85,7 @@ Examples:
                        "Combined internal dimensions: W = width, H = height,\n#{" " * 37}D = depth, T = thickness, N = notch length\n\n") do |size|
             options.size = size
           end
-          opts.on_tail("-i", "--inches", "Switch measurements to inches instead of millimeters") { |value| options.units = 'in' }
+          opts.on_tail("-u", "--units UNITS", "Either 'in' for inches (default) or 'mm'") { |value| options.units = value }
         end
 
         opt_parser.parse!(args)
@@ -87,7 +96,7 @@ Examples:
 
         config = Laser::Cutter::Configuration.new(options.to_hash)
         if config.list_all_page_sizes
-          puts config.all_page_sizes
+          puts PageManager.new(config.units).all_page_sizes
           exit 0
         end
 
@@ -150,14 +159,13 @@ end # class OptParse
 config = Laser::Cutter::OptParse.parse(ARGV)
 
 begin
-  Laser::Cutter::Renderer::BoxRenderer.new(config).render
+  Laser::Cutter::Renderer::LayoutRenderer.new(config).render
   if config.open
     `open #{config.file}`
   end
 rescue Exception => e
-  puts_error(e)
-  if options.verbose
-    STDERR.puts "Exception: #{e.inspect}".red
+  STDERR.puts "#{e.inspect}".red
+  if config.verbose
     STDERR.puts e.backtrace.join("\n").red
   end
 end

data/lib/laser-cutter.rb

@@ -3,6 +3,7 @@ require 'laser-cutter/configuration'
 require 'laser-cutter/geometry'
 require 'laser-cutter/box'
 require 'laser-cutter/renderer'
+require 'laser-cutter/page_manager'
 require 'prawn'
 require 'prawn/measurement_extensions'
 

data/lib/laser-cutter/configuration.rb

@@ -10,8 +10,7 @@ module Laser
     end
     class Configuration < Hashie::Mash
       DEFAULTS = {
-          units: 'mm',
-          page_size: 'LETTER',
+          units: 'in',
           page_layout: 'portrait',
           metadata: true
       }
@@ -64,42 +63,6 @@ module Laser
         raise ZeroValueNotAllowed.new("#{zeros.join(', ')} #{zeros.size > 1 ? 'are' : 'is'} required, but is zero.") unless zeros.empty?
       end
 
-      def page_size_values
-        h = PDF::Core::PageGeometry::SIZES
-        array = []
-        h.keys.sort.each do |k|
-          array << [k, value_from_units(h[k][0].to_f), value_from_units(h[k][1].to_f)]
-        end
-        array
-      end
-
-      # if from_units is nil, we expect it to be in dots per inch (default
-      # measurements for Prawn
-      def value_from_units value, from_units = nil
-        multiplier = if from_units.nil?
-                       if units.eql?('in')
-                         1.0 / 72.0 # PDF units per inch
-                       else
-                         25.4 * 1.0 / 72.0
-                       end
-                     elsif self.units.eql?(from_units)
-                       1.0
-                     elsif self.units.eql?('in') && from_units.eql?('mm')
-                       (1.0 / 25.4)
-                     else
-                       25.4
-                     end
-        value.to_f * multiplier
-      end
-
-      def all_page_sizes
-        output = ""
-        page_size_values.each do |k|
-          output << sprintf("\t%10s:\t%6.1f x %6.1f\n", *k)
-        end
-        output
-      end
-
       def change_units(new_units)
         return if (self.units.eql?(new_units) || !UNIT_SPECIFIC_DEFAULTS.keys.include?(new_units))
         k = (self.units == 'in') ? 25.4 : 0.039370079

data/lib/laser-cutter/page_manager.rb

@@ -0,0 +1,43 @@
+require 'hashie/mash'
+require 'prawn/measurement_extensions'
+require 'pdf/core/page_geometry'
+
+class Laser::Cutter::PageManager < Struct.new(:units)
+  SIZES = PDF::Core::PageGeometry::SIZES.clone.freeze
+
+  def all_page_sizes
+    output = ""
+    page_size_values.each do |k|
+      output << sprintf("\t%10s:\t%6.1f x %6.1f\n", *k)
+    end
+    output
+  end
+
+  # if from_units is nil, we expect it to be in dots per inch (default
+  # measurements for Prawn
+  def value_from_units value, from_units = nil
+    multiplier = if from_units.nil?
+                   if units.eql?('in')
+                     1.0 / 72.0 # PDF units per inch
+                   else
+                     25.4 * 1.0 / 72.0
+                   end
+                 elsif self.units.eql?(from_units)
+                   1.0
+                 elsif self.units.eql?('in') && from_units.eql?('mm')
+                   (1.0 / 25.4)
+                 else
+                   25.4
+                 end
+    value.to_f * multiplier
+  end
+
+  def page_size_values
+    h = SIZES
+    array = []
+    h.keys.sort.each do |k|
+      array << [k, value_from_units(h[k][0].to_f), value_from_units(h[k][1].to_f)]
+    end
+    array
+  end
+end

data/lib/laser-cutter/renderer.rb

@@ -1,19 +1,14 @@
 module Laser
   module Cutter
     module Renderer
-      class AbstractRenderer < Struct.new(:subject, :options)
-        def render pdf = nil
-          raise 'Abstract method'
-        end
 
-        def units
-          options.units.to_sym || :mm
-        end
-      end
     end
   end
 end
 
+require 'laser-cutter/renderer/base'
 require 'laser-cutter/renderer/line_renderer'
 require 'laser-cutter/renderer/rect_renderer'
 require 'laser-cutter/renderer/box_renderer'
+require 'laser-cutter/renderer/meta_renderer'
+require 'laser-cutter/renderer/layout_renderer'

data/lib/laser-cutter/renderer/base.rb

@@ -0,0 +1,27 @@
+module Laser
+  module Cutter
+    module Renderer
+      class Base
+        BLACK = "000000"
+        BLUE = "4090E0"
+
+        attr_accessor :config, :subject, :enclosure, :page_manager
+
+        def initialize(config, subject = nil)
+          self.config = config
+          self.subject = subject
+          self.page_manager = Laser::Cutter::PageManager.new(config.units)
+        end
+
+        def render
+          raise 'Abstract method'
+        end
+
+        def units
+          config.units.to_sym || :mm
+        end
+      end
+    end
+  end
+end
+

data/lib/laser-cutter/renderer/box_renderer.rb

@@ -3,96 +3,30 @@ require 'json'
 module Laser
   module Cutter
     module Renderer
-      class BoxRenderer < AbstractRenderer
+      class BoxRenderer < Base
         alias_method :box, :subject
 
-        META_RECT = Geometry::Rect.create(Geometry::Point[0, 0], 140, 150)
-
-        def initialize(options = {})
-          self.options = options
-          self.subject = Laser::Cutter::Box.new(options)
+        def initialize(config)
+          super(config)
+          self.subject = Laser::Cutter::Box.new(config)
         end
 
-        def render pdf = nil
-          pdf = Prawn::Document.new(:margin => options.margin.to_f.send(options.units.to_sym),
-                                    :page_size => options.page_size,
-                                    :page_layout => options.page_layout.to_sym)
-          header = <<-EOF
-
-          Made with Laser Cutter Ruby Gem (v#{Laser::Cutter::VERSION})
-          Credits to Prawn for ruby PDF generation,
-          and BoxMaker for inspiration.
+        def ensure_space_for(rect)
+          coords = [ rect.p2.x, rect.p2.y ].map{|a| page_manager.value_from_units(a)}
+          box.metadata = Geometry::Point.new(coords)
+        end
 
-          Online: http://makeabox.io/
-          https://github.com/kigster/laser-cutter
-          EOF
 
+        def render pdf = nil
           renderer = self
-
-          meta_color = "4090E0"
-          meta_top_height = 50
-          metadata = renderer.options.to_hash
-          metadata.delete_if { |k| %w(verbose metadata open file).include?(k) }
-          if options.metadata
-            coords = [ META_RECT.p2.x, META_RECT.p2.y ].map{|a| options.value_from_units(a)}
-            box.metadata = Geometry::Point.new(coords)
-          end
           pdf.instance_eval do
-            self.line_width = renderer.options.stroke.send(renderer.options.units.to_sym)
-            if renderer.options.metadata
-              float do
-                bounding_box([0, META_RECT.h], :width => META_RECT.w, :height => META_RECT.h) do
-                  stroke_color meta_color
-                  stroke_bounds
-                  indent 10 do
-                    font('Helvetica', :size => 6) do
-                      text header, :color => meta_color
-                    end
-                  end
-                  float do
-                    bounding_box([0, META_RECT.h - meta_top_height],
-                                 :width => META_RECT.w,
-                                 :height => META_RECT.h - meta_top_height) do
-                      stroke_color meta_color
-                      stroke_bounds
-                      float do
-                        bounding_box([0, META_RECT.h - meta_top_height], :width => 70, :height => META_RECT.h - meta_top_height) do
-                          indent 10 do
-                            font('Helvetica', :size => 6) do
-                              out = JSON.pretty_generate(metadata).gsub(/[\{\}",]/, '').gsub(/:.*\n/x, "\n")
-                              text out, :color => meta_color, align: :right
-                            end
-                          end
-                        end
-                      end
-                      float do
-                        bounding_box([60, META_RECT.h - meta_top_height], :width => 70, :height => META_RECT.h - meta_top_height) do
-                          indent 10 do
-                            font('Helvetica', :size => 6) do
-                              out = JSON.pretty_generate(metadata).gsub(/[\{\}",]/, '').gsub(/\n?.*:/x, "\n:")
-                              text out, :color => meta_color
-                            end
-                          end
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-            stroke_color "000000"
+            self.line_width = renderer.config.stroke.send(renderer.config.units.to_sym)
+            stroke_color BLACK
             renderer.box.notches.each do |notch|
-              LineRenderer.new(notch, renderer.options).render(self)
+              LineRenderer.new(renderer.config, notch).render(self)
             end
-
-            render_file(renderer.options.file)
-          end
-
-          if options.verbose
-            puts "file #{options.file} has been written."
           end
         end
-
       end
     end
   end

data/lib/laser-cutter/renderer/layout_renderer.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+require 'json'
+module Laser
+  module Cutter
+    module Renderer
+      class LayoutRenderer < Base
+        def initialize(config)
+          self.config = config
+        end
+
+        def render
+          renderer = self
+
+          meta_renderer = MetaRenderer.new(config)
+          box_renderer = BoxRenderer.new(config)
+          box_renderer.ensure_space_for(meta_renderer.enclosure) if config.metadata
+
+          page_size = config.page_size || 'LETTER' # TODO: auto-detect page size based on box dimensions.
+
+          pdf = Prawn::Document.new(:margin => config.margin.to_f.send(config.units.to_sym),
+                                    :page_size => page_size,
+                                    :page_layout => config.page_layout.to_sym)
+
+          pdf.instance_eval do
+            if renderer.config.metadata
+              meta_renderer.render(self)
+            end
+            box_renderer.render(self)
+            render_file(renderer.config.file)
+          end
+
+          if config.verbose
+            puts "PDF saved to #{config.file}."
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/laser-cutter/renderer/line_renderer.rb

@@ -1,12 +1,15 @@
 module Laser
   module Cutter
     module Renderer
-      class LineRenderer < AbstractRenderer
+      class LineRenderer < Base
         alias_method :line, :subject
         def render pdf = nil
           pdf.stroke { pdf.line [line.p1.x, line.p1.y].map{ |p| p.send(units) },
                                 [line.p2.x, line.p2.y].map{ |p| p.send(units) }}
+        end
 
+        def enclosure
+          self.line
         end
       end
     end

data/lib/laser-cutter/renderer/meta_renderer.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+require 'json'
+class Laser::Cutter::Renderer::MetaRenderer < Laser::Cutter::Renderer::Base
+
+  def initialize(config = {})
+    self.config = config
+    self.enclosure = Laser::Cutter::Geometry::Rect.create(Laser::Cutter::Geometry::Point[1, 1], 140, 150)
+  end
+
+  def render pdf = nil
+    banner = <<-EOF
+
+    Made with Laser Cutter Ruby Gem (v#{Laser::Cutter::VERSION})
+    Credits to Prawn for ruby PDF generation,
+    and BoxMaker for inspiration.
+
+    Online: http://makeabox.io/
+    Source: https://github.com/kigster/laser-cutter
+    EOF
+
+    meta_color = BLUE
+    meta_top_height = 50
+
+    metadata = config.to_hash
+    metadata.delete_if { |k| %w(verbose metadata open file).include?(k) }
+
+    rect = self.enclosure
+
+    pdf.instance_eval do
+      self.line_width = 0.5.mm
+      float do
+        bounding_box([rect.p1.x, rect.h + rect.p1.y], :width => rect.w, :height => rect.h) do
+          stroke_color meta_color
+          stroke_bounds
+
+          # Print banner
+          indent 10 do
+            font('Helvetica', :size => 6) do
+              text banner, :color => meta_color
+            end
+          end
+
+          # print values of the config, in two parts – keys right aligned first,
+          # values left aligned second.
+          float do
+            # parse out meta keys and then values
+            meta_fields = JSON.pretty_generate(metadata).gsub(/[\{\}",]/, '').gsub(/:.*\n/x, "\n")
+            meta_values = JSON.pretty_generate(metadata).gsub(/[\{\}",]/, '').gsub(/\n?.*:/x, "\n:")
+
+            bounding_box([0, rect.h - meta_top_height],
+                         :width => rect.w,
+                         :height => rect.h - meta_top_height) do
+              float do
+                bounding_box([0, rect.h - meta_top_height], :width => 70, :height => rect.h - meta_top_height) do
+                  indent 10 do
+                    font('Helvetica', :size => 7) do
+                      text meta_fields, :color => meta_color, align: :right
+                    end
+                  end
+                end
+              end
+              float do
+                bounding_box([60, rect.h - meta_top_height], :width => 70, :height => rect.h - meta_top_height) do
+                  indent 10 do
+                    font('Helvetica', :size => 7) do
+                      text meta_values, :color => meta_color
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/laser-cutter/renderer/rect_renderer.rb

@@ -1,12 +1,11 @@
 module Laser
   module Cutter
     module Renderer
-      class RectRenderer < AbstractRenderer
+      class RectRenderer < Base
         alias_method :rect, :subject
-
         def render pdf
           rect.sides.each do |side|
-            LineRenderer.new(side, options).render(pdf)
+            LineRenderer.new(config, side).render(pdf)
           end
         end
       end

data/lib/laser-cutter/version.rb

@@ -1,5 +1,5 @@
 module Laser
   module Cutter
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/configuration_spec.rb

@@ -31,49 +31,15 @@ module Laser
           end
         end
       end
-      context '#list_page_sizes' do
-        context 'formatting of output' do
-          context 'when using inches' do
-            let(:opts) { {"units" => "in"} }
-            it 'should return the list in inches' do
-              expect(config.all_page_sizes).to match %r(.*B10\:\s+1\.2\s+x\s+1\.7)
-            end
-          end
-          context 'when using mm' do
-            let(:opts) { {"units" => "mm"} }
-            it 'should return the list in mm' do
-              expect(config.all_page_sizes).to match %r(.*B10\:\s+31\.0\s+x\s+44\.0)
-            end
-          end
-        end
-      end
 
       context 'when invalid units are provided' do
         let(:opts) { {"size" => "2x3x2/0.125/0.5", "units" => 'xx'} }
-        it 'should default to millimeters' do
-          expect(config.units).to eql('mm')
+        it 'should default to inches' do
+          expect(config.units).to eql('in')
         end
       end
 
       context 'when converting between units' do
-        context 'a single value' do
-          context 'to inches' do
-            let(:opts) { {'units' => 'in'} }
-            it 'should be correct' do
-              expect(config.value_from_units(150)).to be_within(0.0001).of(150.0/72.0)
-              expect(config.value_from_units(150, 'mm')).to be_within(0.0001).of(150.0/25.4)
-              expect(config.value_from_units(150, 'in')).to be_within(0.0001).of(150.0)
-            end
-          end
-          context 'to mm' do
-            let(:opts) { {'units' => 'mm'} }
-            it 'should be correct' do
-              expect(config.value_from_units(150)).to be_within(0.0001).of(25.4 * 150.0 / 72.0)
-              expect(config.value_from_units(150, 'in')).to be_within(0.0001).of(150.0 * 25.4)
-              expect(config.value_from_units(150, 'mm')).to be_within(0.0001).of(150.0)
-            end
-          end
-        end
         context 'all config values' do
           context "to mm" do
             let(:opts) { {'size' => "2.0x3x2/0.125/0.5", 'padding' => '4.2', "units" => 'in'} }

data/spec/page_manager_spec.rb

@@ -0,0 +1,45 @@
+require_relative 'spec_helper'
+
+module Laser
+  module Cutter
+    describe PageManager do
+      let(:pm) { Laser::Cutter::PageManager.new(units) }
+
+      context 'a single value' do
+        context 'to inches' do
+          let(:units) { 'in' }
+          it 'should be correct' do
+            expect(pm.value_from_units(150)).to be_within(0.0001).of(150.0/72.0)
+            expect(pm.value_from_units(150, 'mm')).to be_within(0.0001).of(150.0/25.4)
+            expect(pm.value_from_units(150, 'in')).to be_within(0.0001).of(150.0)
+          end
+        end
+        context 'to mm' do
+          let(:units) { 'mm' }
+          it 'should be correct' do
+            expect(pm.value_from_units(150)).to be_within(0.0001).of(25.4 * 150.0 / 72.0)
+            expect(pm.value_from_units(150, 'in')).to be_within(0.0001).of(150.0 * 25.4)
+            expect(pm.value_from_units(150, 'mm')).to be_within(0.0001).of(150.0)
+          end
+        end
+      end
+
+      context '#list_page_sizes' do
+        context 'formatting of output' do
+          context 'when using inches' do
+            let(:units) { "in" }
+            it 'should return the list in inches' do
+              expect(pm.all_page_sizes).to match %r(.*B10\:\s+1\.2\s+x\s+1\.7)
+            end
+          end
+          context 'when using mm' do
+            let(:units) { "mm" }
+            it 'should return the list in mm' do
+              expect(pm.all_page_sizes).to match %r(.*B10\:\s+31\.0\s+x\s+44\.0)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/renderer_spec.rb

@@ -3,19 +3,22 @@ require_relative 'spec_helper'
 module Laser
   module Cutter
     module Renderer
-      describe 'BoxRenderer' do
+      describe LayoutRenderer do
         context '#render' do
-          let(:box) { Laser::Cutter::Box.new(config) }
-          let(:renderer) { BoxRenderer.new(config) }
+          let(:renderer) { LayoutRenderer.new(config) }
           let(:file) { File.expand_path("../../laser-cutter-pdf-test.#{$$}.pdf", __FILE__) }
 
           def render_file filename
+            config.validate!
             expect(!File.exists?(filename))
             renderer.render
             expect(File.exist?(filename))
             expect(File.size(filename) > 0)
+          rescue Exception => e
+            STDERR.puts e.backtrace.join("\n")
+            fail e.message
           ensure
-            File.delete(filename)
+            File.delete(filename) rescue nil
             expect(!File.exists?(filename))
           end
 
@@ -38,7 +41,7 @@ module Laser
 
               it 'should be able to generate a PDF file' do
                 render_file file
-            end
+              end
             end
 
             context 'margins and padding are defaults' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laser-cutter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -158,15 +158,20 @@ files:
 - lib/laser-cutter/geometry/shape/line.rb
 - lib/laser-cutter/geometry/shape/rect.rb
 - lib/laser-cutter/geometry/tuple.rb
+- lib/laser-cutter/page_manager.rb
 - lib/laser-cutter/renderer.rb
+- lib/laser-cutter/renderer/base.rb
 - lib/laser-cutter/renderer/box_renderer.rb
+- lib/laser-cutter/renderer/layout_renderer.rb
 - lib/laser-cutter/renderer/line_renderer.rb
+- lib/laser-cutter/renderer/meta_renderer.rb
 - lib/laser-cutter/renderer/rect_renderer.rb
 - lib/laser-cutter/version.rb
 - spec/box_spec.rb
 - spec/configuration_spec.rb
 - spec/dimensions_spec.rb
 - spec/line_spec.rb
+- spec/page_manager_spec.rb
 - spec/path_generator_spec.rb
 - spec/point_spec.rb
 - spec/rect_spec.rb
@@ -202,8 +207,10 @@ test_files:
 - spec/configuration_spec.rb
 - spec/dimensions_spec.rb
 - spec/line_spec.rb
+- spec/page_manager_spec.rb
 - spec/path_generator_spec.rb
 - spec/point_spec.rb
 - spec/rect_spec.rb
 - spec/renderer_spec.rb
 - spec/spec_helper.rb
+has_rdoc: