laser-cutter 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a4b3007500f32bdfa746101e673e39f1926dbff
-  data.tar.gz: c78f838314670acc0dbe0a938a30ce558e625539
+  metadata.gz: 32ce72abddaaccd285d8dbcbf03b9a7644bf0a91
+  data.tar.gz: df1bfc141e15b055e054dd70cbf921460f663ce2
 SHA512:
-  metadata.gz: cdfc3dae22670701459a011656d8f3e6b2b3afd70958de0caf132067f85d4b01159fefe32974e7a694143d55b321519f2514cdb6d8b7d76742bcd7f5df8430a6
-  data.tar.gz: ba642a3dcfb26df3626e153ce003452fe2d5e91a94ffa01074c6cf276a9fe8169104a981a993d5fd622096358a0184bc78f54a7e5a2b052df6b3359a46546590
+  metadata.gz: 14f27fcf968d47af5505d7430022c02b6b69c33aec68102822ad5b80bb6915e44783509e94e4e169b8ee5af840fdc1173116138b239ac184cb52521d99e5ab13
+  data.tar.gz: 90c95f1f44c2ae2f0f15ae978faf130e2a3a62316bf405a719ef70fd26354695f0e905eedf9f440d2d3d591a5ec48ad8cf839c4302ee4fca1c449c217516498a

data/Gemfile

@@ -3,4 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in laser-cutter-cutter.gemspec
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: nil

data/bin/laser-cutter

@@ -62,6 +62,7 @@ EOF
           opts.separator ""
           opts.on("-A", "--list-all-page-sizes", "Print all available page sizes with dimensions and exit") { |v| options.list_all_page_sizes = true }
           opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| options.verbose = v }
+          opts.on("-m", "--[no-]metadata", "Print to the PDF metadata") { |value| options.metadata = value }
           opts.separator ""
           opts.on("--examples", "Show detailed usage examples") {  puts opts; puts examples.yellow; exit  }
           opts.on("--help", "Show this message") { puts opts; exit }

data/laser-cutter.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-legacy_formatters'
-
+  spec.add_development_dependency 'codeclimate-test-reporter'
 end

data/lib/laser-cutter/configuration.rb

@@ -6,11 +6,14 @@ module Laser
   module Cutter
     class MissingOption < RuntimeError
     end
+    class ZeroValueNotAllowed < MissingOption
+    end
     class Configuration < Hashie::Mash
       DEFAULTS = {
           units: 'mm',
           page_size: 'LETTER',
-          page_layout: 'portrait'
+          page_layout: 'portrait',
+          metadata: true
       }
 
       UNIT_SPECIFIC_DEFAULTS = {
@@ -52,18 +55,12 @@ module Laser
 
       def validate!
         missing = []
-        REQUIRED.each do |k|
-          missing << k if self[k].nil?
-        end
-        unless missing.empty?
-          raise MissingOption.new("#{missing.join(', ')} #{missing.size > 1 ? 'are' : 'is'} required, but missing.")
-        end
+        REQUIRED.each { |k| missing << k if self[k].nil? }
+        raise MissingOption.new("#{missing.join(', ')} #{missing.size > 1 ? 'are' : 'is'} required, but missing.") unless missing.empty?
 
-        NON_ZERO.each do |k|
-          if self[k] == 0
-            raise MissingOption.new("#{missing.join(', ')} #{missing.size > 1 ? 'are' : 'is'} required, but is zero.")
-          end
-        end
+        zeros = []
+        NON_ZERO.each { |k| zeros << k if self[k] == 0 }
+        raise ZeroValueNotAllowed.new("#{zeros.join(', ')} #{zeros.size > 1 ? 'are' : 'is'} required, but is zero.") unless zeros.empty?
       end
 
       def page_size_values
@@ -91,7 +88,7 @@ module Laser
         return if (self.units.eql?(new_units) || !UNIT_SPECIFIC_DEFAULTS.keys.include?(new_units))
         k = (self.units == 'in') ? 25.4 : 0.039370079
         FLOATS.each do |field|
-          self.send("#{field}=".to_sym, self.send(field.to_sym) * k)
+          self.send("#{field}=".to_sym, (self.send(field.to_sym) * k).round(5))
         end
         self.units = new_units
       end

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

@@ -5,6 +5,7 @@ module Laser
     module Renderer
       class BoxRenderer < AbstractRenderer
         alias_method :box, :subject
+
         def initialize(options = {})
           self.options = options
           self.subject = Laser::Cutter::Box.new(options)
@@ -16,41 +17,61 @@ module Laser
                                     :page_layout => options.page_layout.to_sym)
           header = <<-EOF
 
-          Produced with Laser Cutter Ruby Gem (v#{Laser::Cutter::VERSION})
-          Credits to Prawn (for ruby PDF generation),
-          and BoxMaker (for the inspiration).
-          © 2014 Konstantin Gredeskoul, MIT license.
+          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/
           https://github.com/kigster/laser-cutter
-          Generated at #{Time.new}.
           EOF
 
           renderer = self
 
+          meta_color = "406080"
+          meta_top = 150
+          metadata = renderer.options.to_hash
+          metadata.delete_if { |k| %w(verbose metadata open).include?(k) }
           pdf.instance_eval do
             self.line_width = renderer.options.stroke.send(renderer.options.units.to_sym)
-            float do
-              bounding_box([0, 50], :width => 150, :height => 40) do
-                stroke_color '0080FF'
-                stroke_bounds
-
-                indent 10 do
-                  font('Courier', :size => 5) do
-                    text header, :color => "0080FF"
+            if renderer.options.metadata
+              float do
+                bounding_box([0, meta_top], :width => 140, :height => 150) do
+                  stroke_color meta_color
+                  stroke_bounds
+                  indent 10 do
+                    font('Helvetica', :size => 6) do
+                      text header, :color => meta_color
+                    end
                   end
-                end
-              end
-              bounding_box([480, 120], :width => 110, :height => 110) do
-                stroke_color '00DF20'
-                stroke_bounds
-                indent 10 do
-                  font('Courier', :size => 6) do
-                    out = JSON.pretty_generate(renderer.options.to_hash).gsub(/[\{\}",]/,'')
-                    text out, :color => "00DF20"
+                  float do
+                    bounding_box([0, 100], :width => 140, :height => 100) do
+                      stroke_color meta_color
+                      stroke_bounds
+                      float do
+                        bounding_box([0, 100], :width => 70, :height => 100) 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, 100], :width => 70, :height => 100) 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"
             renderer.box.notches.each do |notch|
               LineRenderer.new(notch, renderer.options).render(self)

data/lib/laser-cutter/version.rb

@@ -1,5 +1,5 @@
 module Laser
   module Cutter
-    VERSION = "0.4.1"
+    VERSION = "0.4.3"
   end
 end

data/spec/configuration_spec.rb

@@ -16,11 +16,20 @@ module Laser
         end
       end
       context '#validate' do
+        context 'missing options' do
         let(:opts) { {"height" => "23"} }
         it 'should be able to validate missing options' do
           expect(config.height).to eql(23.0)
           expect { config.validate! }.to raise_error(Laser::Cutter::MissingOption)
         end
+        end
+        context 'zero options' do
+        let(:opts) { {"size" => "2.0x0.0x2/0.125/0.5", "inches" => true, 'file' => '/tmp/a'} }
+        it 'should be able to validate missing options' do
+          expect(config.height).to eql(0.0)
+          expect { config.validate! }.to raise_error(Laser::Cutter::ZeroValueNotAllowed)
+        end
+        end
       end
       context '#list_page_sizes' do
         context 'formatting of output' do
@@ -48,14 +57,14 @@ module Laser
 
       context "#change_units" do
         context "from inches" do
-          let(:opts) { {"size" => "2.0x3x2/0.125/0.5", 'padding' => '4.0', "units" => 'in'} }
+          let(:opts) { {"size" => "2.0x3x2/0.125/0.5", 'padding' => '4.2', "units" => 'in'} }
           it "should convert to mm" do
             expect(config.width).to eql(2.0)
             config.change_units('in')
             expect(config.width).to eql(2.0)
             config.change_units('mm')
             expect(config.width).to eql(50.8)
-            expect(config.padding).to eql(101.6)
+            expect(config.padding).to eql(106.68)
             expect(config.units).to eql('mm')
           end
         end
@@ -66,8 +75,8 @@ module Laser
             config.change_units('mm')
             expect(config.width).to eql(20.0)
             config.change_units('in')
-            expect(config.width).to be_within(0.001).of(0.787401575)
-            expect(config.margin).to be_within(0.001).of(0.393700787)
+            expect(config.width).to be_within(0.00001).of(0.787401575)
+            expect(config.margin).to be_within(0.00001).of(0.393700787)
             expect(config.units).to eql('in')
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laser-cutter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Similar to the older BoxMaker, this ruby gem generates PDFs that can
   be used as a basis for cutting boxes on a typical laser cutter. The intention was
   to create an extensible, well tested, and modern ruby gem for generating PDF templates