laser-cutter 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5deb406767dbe7132db874d700abb81d6c962c1
-  data.tar.gz: 7703c53e8cef81e4dd8bade1084fe48ab9025e79
+  metadata.gz: b027c579de8cded3aba462a120045ed6ec685930
+  data.tar.gz: 76e13dddecbae505385b1064cb29198c7a0a5d41
 SHA512:
-  metadata.gz: 7ef97b5e5ed0c0655cd45c1e1c101368cbb6887352ab81fbe1c57f2996bc1f8c1ad461925071acec8f0faae3d863547307991b366c574ddb0d4a6f7268f23766
-  data.tar.gz: 677f12f8586448827cf4cce7d1895eb21ce6ae1eadb6182a7b511e6c2a888c7b5bd2290685af0695d76247c7444ee3482f1de41b1850b36c5899527cf9a7705d
+  metadata.gz: 843bd8781e86f9da4d6bee52529f625d7b04f177c1a3bf50847b33a51bcb938ce6310faf10b1f0bee57de4d21ee36427515ddfc1529e0c933f21ca268e842091
+  data.tar.gz: 337ae8d3ebe98ce3dc4380ef65a81c9172eb75ae7f799f60db35f228b2bd6713b525c6898c67dbff00da8de8ecd8adac8cff0d14e9d2d22c23e0598744f40294

data/lib/laser-cutter/cli/opt_parser.rb

@@ -61,7 +61,7 @@ Examples:
             opts.on("-d", "--depth DEPTH", "Internal depth of the box") { |value| options.depth= value }
             opts.on("-t", "--thickness THICKNESS", "Thickness of the box material") { |value| options.thickness = value }
             opts.on("-n", "--notch NOTCH", "Optional notch length (aka \"tab width\"), guide only") { |value| options.notch = value }
-            opts.on("-k", "--kerf KERF", "Kerf - cut width (default is 0.007in)") { |value| options.kerf = value }
+            opts.on("-k", "--kerf KERF", "Kerf - cut width (default is #{Laser::Cutter::Configuration::UNIT_SPECIFIC_DEFAULTS['in'][:kerf]}in)") { |value| options.kerf = value }
             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 }

data/lib/laser-cutter/configuration.rb

@@ -4,10 +4,18 @@ require 'pdf/core/page_geometry'
 
 module Laser
   module Cutter
-    class MissingOption < RuntimeError
-    end
-    class ZeroValueNotAllowed < MissingOption
+    class MissingOption < RuntimeError; end
+    class ZeroValueNotAllowed < MissingOption; end
+
+    class UnitsConverter
+      def self.mm2in value
+        0.039370079 * value
+      end
+      def self.in2mm value
+        25.4 * value
+      end
     end
+
     class Configuration < Hashie::Mash
       DEFAULTS = {
           units: 'in',
@@ -16,23 +24,19 @@ module Laser
       }
 
       UNIT_SPECIFIC_DEFAULTS = {
-          'mm' => {
-              margin: 3,
-              padding: 2,
-              stroke: 0.0254,
-              kerf: 0.1778
-          },
           'in' => {
-              kerf: 0.007, # smallest kerf for thin material, usually it's more than that.
+              kerf: 0.0024, # smallest kerf for thin material, usually it's more than that.
               margin: 0.125,
               padding: 0.1,
               stroke: 0.001,
           }
       }
 
+      UNIT_SPECIFIC_DEFAULTS['mm'] = UNIT_SPECIFIC_DEFAULTS['in'].map{|k, v| [k, UnitsConverter.in2mm(v)] }.to_h
+
       SIZE_REGEXP = /[\d\.]+x[\d\.]+x[\d\.]+\/[\d\.]+(\/[\d\.]+)?/
 
-      FLOATS = %w(width height depth thickness notch margin padding stroke kerf)
+      FLOATS   = %w(width height depth thickness notch margin padding stroke kerf)
       NON_ZERO = %w(width height depth thickness stroke)
       REQUIRED = %w(width height depth thickness notch file)
 
@@ -67,7 +71,7 @@ module Laser
 
       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
+        k = (self.units == 'in') ? UnitsConverter.in2mm(1.0) : UnitsConverter.mm2in(1.0)
         FLOATS.each do |field|
           next if self.send(field.to_sym).nil?
           self.send("#{field}=".to_sym, (self.send(field.to_sym) * k).round(5))

data/lib/laser-cutter/notching/edge.rb

@@ -38,23 +38,18 @@ module Laser
 
         def adjust_for_kerf!
           if kerf?
-            k = kerf / 2.0
-            p1 = inside.p1.plus(v1 * k)
-            p2 = inside.p2.plus(v2 * k)
-            self.inside = Geometry::Line.new(p1, p2)
-
-            p1 = outside.p1.plus(v1 * k)
-            p2 = outside.p2.plus(v2 * k)
-            self.outside = Geometry::Line.new(p1, p2)
-
-            inside.relocate!
-            outside.relocate!
-            # note – we have not increased the length of the sides to compensate
-            # for kerf – we simply shifted both lines. We'll compenensate for this
-            # in notch width calculations later, and also corner box inclusion.
+            self.inside  = move_line_for_kerf(inside)
+            self.outside = move_line_for_kerf(outside)
           end
         end
 
+        def move_line_for_kerf line
+          k = kerf / 2.0
+          p1 = line.p1.plus(v1 * k)
+          p2 = line.p2.plus(v2 * k)
+          Geometry::Line.new(p1, p2).relocate!
+        end
+
         def kerf?
           self.kerf > 0.0
         end

data/lib/laser-cutter/version.rb

@@ -1,5 +1,5 @@
 module Laser
   module Cutter
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laser-cutter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn