box_packer 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6674a542f5f429666b9e47203e8ccc70dc84959c
-  data.tar.gz: 7f85e16669af7c897a7ec754f0e1a72d05abbef5
+  metadata.gz: 577f9d185a95ed861e725040c6af624d2470fbea
+  data.tar.gz: e1959d0f2230fd26b464b5340d31cd45ea29c3b2
 SHA512:
-  metadata.gz: fb646bc2431f217984f17203585dbe37eeaffc71e6537e223b201eba3f79dc68b084af5a812c95c508b7d931ce24c392e4c226665ae21b72ac0c82f17b95777a
-  data.tar.gz: 4c0da12dd4b7dede43af119a0c00c291ad406ab994ae02359ee87ff303b2dfb6083679230a356c86edd0fa872d6610813f7cb3ff7bc0cb7fc5c4b78bc86bb64f
+  metadata.gz: 708d9ad7db2ca97d46c275e9545ff67e1aadd6788fc439dff8a78acc46d8b334a95d1c8d27a686b61357093a8a11bcf1f41b9c1bacc28ab72aa9d1933a88bcb6
+  data.tar.gz: 704c4c92f46af99ecf269347ecef930f41368922642c3447aed04e2dfdf0e77330a356da14bdcffd2b21eaa5cbb98bd5d985abb1e307849d7e926d3342983626

data/README.md

@@ -30,7 +30,7 @@ BoxPacker.container [3, 6, 7] do
   add_item [1,3,5]
   add_item [4,3,5]
   add_item [3,5,5]
-  pack! # returns 2
+  pack! # 2
 
   puts packed_successfully           # true
   puts packings.count                # 2
@@ -53,7 +53,7 @@ BoxPacker.container [15, 20, 13], label: 'Parcel', weight_limit: 50, packings_li
   add_item [2, 3, 5], label: 'Shoes', weight: 47, quantity: 2
   add_item [3, 3, 1], label: 'Watch', weight: 24
   add_item [1, 1, 4], label: 'Bag',   weight:  7
-  pack! # returns 2
+  pack! # 3
 
   puts self # |Container| Parcel 20x15x13 Weight Limit:50 Packings Limit:3
             # |  Packing| Remaining Volume:3870 Remaining Weight:3

data/lib/box_packer.rb

@@ -1,12 +1,2 @@
-require 'attire'
-require 'forwardable'
-
-require 'box_packer/position'
-require 'box_packer/dimensions'
-require 'box_packer/box'
-require 'box_packer/item'
-require 'box_packer/packer'
-require 'box_packer/packing'
-require 'box_packer/svg_exporter'
 require 'box_packer/container'
 require 'box_packer/builder'

data/lib/box_packer/box.rb

@@ -1,7 +1,16 @@
+require 'forwardable'
+require_relative 'position'
+require_relative 'dimensions'
+
 module BoxPacker
   class Box
     extend Forwardable
-    attr_init :dimensions, position: Position[0, 0, 0]
+
+    def initialize(dimensions, opts = {})
+      @dimensions = dimensions
+      @position = opts[:position] || Position[0, 0, 0]
+    end
+
     def_delegators :dimensions, :volume, :each_rotation, :width, :height, :depth
     attr_accessor :dimensions, :position
 

data/lib/box_packer/builder.rb

@@ -1,3 +1,6 @@
+require_relative 'container'
+require_relative 'item'
+
 module BoxPacker
   def self.builder(&b)
     b.call(Builder.new) if block_given?

data/lib/box_packer/container.rb

@@ -1,3 +1,10 @@
+require_relative 'dimensions'
+require_relative 'item'
+require_relative 'packer'
+require_relative 'packing'
+require_relative 'svg_exporter'
+require_relative 'box'
+
 module BoxPacker
   def self.container(*args, &b)
     Container.new(*args, &b)

data/lib/box_packer/dimensions.rb

@@ -1,43 +1,26 @@
-require 'matrix'
+require_relative 'vector'
 
 module BoxPacker
   class Dimensions < Vector
-    def +(other)
-      Dimensions[*super]
-    end
-
-    def -(other)
-      Dimensions[*super]
-    end
-
-    def width
-      Dimensions[self[0], 0, 0]
-    end
-
-    def height
-      Dimensions[0, self[1], 0]
-    end
-
-    def depth
-      Dimensions[0, 0, self[2]]
-    end
-
     def volume
-      @volume ||= self[0] * self[1] * self[2]
+      @volume ||= to_a.reduce(&:*)
     end
 
     def >=(other)
-      map2(other) { |v1, v2| v1 >= v2 }.reduce(&:&)
+      zip_map(other, :>=).reduce(&:&)
     end
 
     def each_rotation
-      to_a.permutation.each do |perm|
-        yield Dimensions[*perm]
-      end
+      yield Dimensions[x, y, z]
+      yield Dimensions[x, z, y]
+      yield Dimensions[z, x, y]
+      yield Dimensions[z, y, x]
+      yield Dimensions[y, x, z]
+      yield Dimensions[y, z, x]
     end
 
     def to_s
-      "#{self[0]}x#{self[1]}x#{self[2]}"
+      to_a.join('x')
     end
   end
 end

data/lib/box_packer/item.rb

@@ -1,3 +1,6 @@
+require_relative 'box'
+require_relative 'dimensions'
+
 module BoxPacker
   class Item < Box
     attr_accessor :label, :weight

data/lib/box_packer/packer.rb

@@ -1,7 +1,15 @@
 module BoxPacker
   class Packer
     extend Forwardable
-    attr_method :pack, :container
+
+    def self.pack(container)
+      new(container).pack
+    end
+
+    def initialize(container)
+      @container = container
+    end
+
     def_delegators :container, :new_packing!, :packings_limit, :packings, :packing
 
     def pack
@@ -17,6 +25,8 @@ module BoxPacker
 
     private
 
+    attr_reader :container
+
     def too_many_packings?
       packings.count >= packings_limit if packings_limit
     end

data/lib/box_packer/position.rb

@@ -1,9 +1,9 @@
-require 'matrix'
+require_relative 'vector'
 
 module BoxPacker
   class Position < Vector
     def to_s
-      "(#{self[0]},#{self[1]},#{self[2]})"
+      "(#{to_a.join(',')})"
     end
   end
 end

data/lib/box_packer/svg_exporter.rb

@@ -53,7 +53,6 @@ module BoxPacker
 
     class Face
       attr_reader :width, :height, :axes
-      attr_query :front?
 
       def self.reset(margin, scale, container_dimensions)
         @@coords_mapping = [0, 1, 2]
@@ -65,7 +64,7 @@ module BoxPacker
       end
 
       def iterate_class_variables
-        if front?
+        if front
           @@axes[0] = width + @@margin * 2
         else
           @@coords_mapping.rotate!
@@ -110,7 +109,7 @@ module BoxPacker
 
       def sorted_items(packing)
         items = packing.sort_by { |i| i.position[k] }
-        items.reverse! unless front?
+        items.reverse! unless front
         items
       end
     end

data/lib/box_packer/vector.rb

@@ -0,0 +1,51 @@
+module BoxPacker
+  class Vector
+    def self.[](*args)
+      new(*args)
+    end
+
+    def initialize(x, y, z)
+      @x, @y, @z = x, y, z
+    end
+
+    attr_reader :x, :y, :z
+
+    def +(other)
+      self.class.new(*zip_map(other, :+))
+    end
+
+    def -(other)
+      self.class.new(*zip_map(other, :-))
+    end
+
+    def width
+      self.class.new(x, 0, 0)
+    end
+
+    def height
+      self.class.new(0, y, 0)
+    end
+
+    def depth
+      self.class.new(0, 0, z)
+    end
+
+    def to_a
+      [x, y, z]
+    end
+
+    def ==(other)
+      zip_map(other, :==).reduce(&:&)
+    end
+
+    def eql?(other)
+      zip_map(other, :eql?).reduce(&:&)
+    end
+
+    private
+
+    def zip_map(other, method)
+      to_a.zip(other.to_a).map { |a, b| a.send(method, b) }
+    end
+  end
+end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: box_packer
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Max White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: attire
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rasem
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +62,7 @@ files:
 - lib/box_packer/packing.rb
 - lib/box_packer/position.rb
 - lib/box_packer/svg_exporter.rb
+- lib/box_packer/vector.rb
 homepage: https://github.com/mushishi78/box_packer
 licenses:
 - MIT