laser-cutter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df5fc0b8025663e5d008e970a56fa3fe49f5a275
-  data.tar.gz: c9a4201c05edf34506255706906d979249047b92
+  metadata.gz: 5a4b3007500f32bdfa746101e673e39f1926dbff
+  data.tar.gz: c78f838314670acc0dbe0a938a30ce558e625539
 SHA512:
-  metadata.gz: 88b3fbacb5fbc6f0049f7799a7721f9b22ccff4ddfe313496a051b931ce5b9184efd273b68981234038f3d5967e1b073d0d8bbe6aa88a35a925bd4f2ab7b343f
-  data.tar.gz: 4c816f055a6f32109305ece7f3b7e2cb98d69d71b70d2e8cc6f7c566edd475c3cb6cb8a53de4a1598187f0b88ba170026acecd1a09329b0d8f0f4567e2581c08
+  metadata.gz: cdfc3dae22670701459a011656d8f3e6b2b3afd70958de0caf132067f85d4b01159fefe32974e7a694143d55b321519f2514cdb6d8b7d76742bcd7f5df8430a6
+  data.tar.gz: ba642a3dcfb26df3626e153ce003452fe2d5e91a94ffa01074c6cf276a9fe8169104a981a993d5fd622096358a0184bc78f54a7e5a2b052df6b3359a46546590

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format progress
+--require rspec/legacy_formatters

data/laser-cutter.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', "~> 1.6"
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-legacy_formatters'
 
 end

data/lib/laser-cutter/configuration.rb

@@ -28,16 +28,20 @@ module Laser
 
       SIZE_REGEXP = /[\d\.]+x[\d\.]+x[\d\.]+\/[\d\.]+\/[\d\.]+/
 
-      FLOATS   = %w(width height depth thickness notch margin padding stroke)
+      FLOATS = %w(width height depth thickness notch margin padding stroke)
+      NON_ZERO = %w(width height depth thickness stroke)
       REQUIRED = %w(width height depth thickness notch file)
 
       def initialize(options = {})
-        options.delete_if{|k,v| v.nil?}
+        options.delete_if { |k, v| v.nil? }
+        if options['units'] && !UNIT_SPECIFIC_DEFAULTS.keys.include?(options['units'])
+          options.delete('units')
+        end
         self.merge!(DEFAULTS)
         self.merge!(options)
         if self['size'] && self['size'] =~ SIZE_REGEXP
           dim, self['thickness'], self['notch'] = self['size'].split('/')
-          self['width'],self['height'],self['depth'] = dim.split('x')
+          self['width'], self['height'], self['depth'] = dim.split('x')
           delete('size')
         end
         FLOATS.each do |k|
@@ -54,21 +58,43 @@ module Laser
         unless missing.empty?
           raise MissingOption.new("#{missing.join(', ')} #{missing.size > 1 ? 'are' : 'is'} required, but missing.")
         end
+
+        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
       end
 
-      def all_page_sizes
+      def page_size_values
         unit = 1.0 / 72.0 # PDF units per inch
         multiplier = (self.units == 'in') ? 1.0 : 25.4
         h = PDF::Core::PageGeometry::SIZES
-        output = "\n"
+        array = []
         h.keys.sort.each do |k|
-          output << sprintf("\t%10s:\t%6.1f x %6.1f\n",
-                 k,
-                 multiplier * h[k][0].to_f * unit,
-                 multiplier * h[k][1].to_f * unit )
+          array << [ k,
+                      multiplier * h[k][0].to_f * unit,
+                      multiplier * h[k][1].to_f * unit ]
+        end
+        array
+      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
+        FLOATS.each do |field|
+          self.send("#{field}=".to_sym, self.send(field.to_sym) * k)
+        end
+        self.units = new_units
+      end
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Laser
         end
 
         def render pdf = nil
-          pdf = Prawn::Document.new(:margin => options.margin.send(options.units),
+          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

data/lib/laser-cutter/version.rb

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

data/spec/configuration_spec.rb

@@ -37,7 +37,40 @@ module Laser
             end
           end
         end
+      end
+
+      context "#default to mm for incorrect units" do
+        let(:opts) { {"size" => "2x3x2/0.125/0.5", "units" => 'xx'} }
+        it 'should default to millimeters' do
+          expect(config.units).to eql('mm')
+        end
+      end
 
+      context "#change_units" do
+        context "from inches" do
+          let(:opts) { {"size" => "2.0x3x2/0.125/0.5", 'padding' => '4.0', "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.units).to eql('mm')
+          end
+        end
+        context "from mm" do
+          let(:opts) { {"size" => "20.0x30.0x40.0/5/5", 'margin' => '10.0', "units" => 'mm'} }
+          it "should convert to inches" do
+            expect(config.width).to eql(20.0)
+            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.units).to eql('in')
+          end
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ require "codeclimate-test-reporter"
 
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  #config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laser-cutter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-legacy_formatters
+  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