column_pack 1.0.0 → 1.0.1

data/lib/column_pack/railtie.rb

@@ -1,11 +1,11 @@
-require 'column_pack/view_helpers'
-require 'column_pack/bin_packer'
-require 'column_pack/column_packer'
-
-module ColumnPack
-  class Railtie < Rails::Railtie
-    initializer "column_pack.view_helpers" do |app|
-      ActionView::Base.send :include, ViewHelpers
-    end
-  end
-end
+require 'column_pack/view_helpers'
+require 'column_pack/bin_packer'
+require 'column_pack/column_packer'
+
+module ColumnPack
+  class Railtie < Rails::Railtie
+    initializer "column_pack.view_helpers" do |app|
+      ActionView::Base.send :include, ViewHelpers
+    end
+  end
+end

data/lib/column_pack/version.rb

@@ -1,3 +1,3 @@
-module ColumnPack
-  VERSION = "1.0.0"
-end
+module ColumnPack
+  VERSION = "1.0.1"
+end

data/lib/column_pack/view_helpers.rb

@@ -1,51 +1,51 @@
-module ColumnPack
-  module ViewHelpers
-
-    # Packs content into columns.
-    #
-    # pack_in_columns expect a block to be passed:
-    #
-    #   pack_in_columns(3) do
-    #     pack_element(100) do
-    #       "A"
-    #     end
-    #  end
-    #
-    # Options:
-    # :algorithm        specify a different bin packing algorithm (default :best_fit_decreasing)
-    #                   available algorithms are :best_fit_decreasing, :best_fit_increasing
-    #
-    # :shuffle_in_col   after packing columns, shuffle the elements in each column (defaults to true)
-    #
-    def pack_in_columns(total_columns, options = {})
-      @column_packer = ColumnPacker.new(total_columns, options)
-
-      yield
-
-      @column_packer.render
-    end
-
-    # Packs a single element with a given height into a column.
-    #
-    # pack_element should be called withing pack_in_columns's block:
-    #
-    #   pack_in_columns(3) do
-    #     pack_element(100) do
-    #       "A"
-    #     end
-    #  end
-    #
-    # Accepts parameter strings or block content (ERB, strings, etc).
-    #
-    def pack_element(height, content = nil, &block)
-      return if @column_packer.nil?
-
-      if block_given?
-        @column_packer.add(height.to_i, capture(&block))
-      else
-        @column_packer.add(height.to_i, content)
-      end
-    end
-
-  end
-end
+module ColumnPack
+  module ViewHelpers
+
+    # Packs content into columns.
+    #
+    # pack_in_columns expect a block to be passed:
+    #
+    #   pack_in_columns(3) do
+    #     pack_element(100) do
+    #       "A"
+    #     end
+    #  end
+    #
+    # Options:
+    # :algorithm        specify a different bin packing algorithm (default :best_fit_decreasing)
+    #                   available algorithms are :best_fit_decreasing, :best_fit_increasing
+    #
+    # :shuffle_in_col   after packing columns, shuffle the elements in each column (defaults to true)
+    #
+    def pack_in_columns(total_columns, options = {})
+      @column_packer = ColumnPacker.new(total_columns, options)
+
+      yield
+
+      @column_packer.render
+    end
+
+    # Packs a single element with a given height into a column.
+    #
+    # pack_element should be called withing pack_in_columns's block:
+    #
+    #   pack_in_columns(3) do
+    #     pack_element(100) do
+    #       "A"
+    #     end
+    #  end
+    #
+    # Accepts parameter strings or block content (ERB, strings, etc).
+    #
+    def pack_element(height, content = nil, &block)
+      return if @column_packer.nil?
+
+      if block_given?
+        @column_packer.add(height.to_i, capture(&block))
+      else
+        @column_packer.add(height.to_i, content)
+      end
+    end
+
+  end
+end

data/test/bin_packer_test.rb

@@ -1,139 +1,139 @@
-require 'test_helper'
-
-class BinPackerTest < ActiveSupport::TestCase
-  include ColumnPack
-
-  test "initilizes with three columns" do
-    bp = BinPacker.new(3)
-    assert_equal BinPacker, bp.class
-    assert_equal Array, bp.bins.class
-  end
-
-  test "can't init with a non-positive number of cols" do
-    assert_raises ArgumentError do
-      bp = BinPacker.new(0)
-    end
-
-    assert_raises ArgumentError do
-      bp = BinPacker.new(-100)
-    end
-  end
-
-  test "adds element" do
-    bp = BinPacker.new(1)
-    assert bp.add(400, 'A')
-    assert_equal 'A', bp.bins[0][0]
-  end
-
-  test "height must be greater than zero" do
-    bp = BinPacker.new(3)
-    assert_raises ArgumentError do
-      bp.add(0, 'A')
-    end
-
-    assert_raises ArgumentError do
-      bp.add(-1, 'A')
-    end
-  end
-
-  test "adds two elements" do
-    bp = BinPacker.new(2, {:algorithm => :best_fit_decreasing})
-    assert bp.add(400, 'A')
-    assert bp.add(500, 'B')
-
-    assert_equal 'A', bp.bins[1][0]
-    assert_equal 'B', bp.bins[0][0]
-  end
-
-  test "add six elements" do
-    bp = BinPacker.new(3)
-    bp.add(600, 'F')
-    bp.add(300, 'C')
-    bp.add(500, 'E')
-    bp.add(400, 'D')
-    bp.add(200, 'B')
-    bp.add(100, 'A')
-    assert_equal 3, bp.bins.length
-
-    assert_equal Array, bp.bins[0].class
-    assert_operator 1, :<, bp.bins[0].length
-
-    assert_equal Array, bp.bins[1].class
-    assert_operator 1, :<, bp.bins[1].length
-
-    assert_equal Array, bp.bins[2].class
-    assert_operator 1, :<, bp.bins[2].length
-  end
-
-  test "can iterate bins" do
-    bp = BinPacker.new(3)
-    bp.add(600, 'F')
-    bp.add(300, 'C')
-    bp.add(500, 'E')
-    bp.add(400, 'D')
-    bp.add(200, 'B')
-    bp.add(100, 'A')
-
-    assert_equal Array, bp.bins.class
-
-    bp.bins.each do |bin|
-      bin.each do |element|
-        assert_includes ['A', 'B', 'C', 'D', 'E', 'F'], element.to_s
-      end
-    end
-  end
-
-  test "empty space" do
-    bp = BinPacker.new(3)
-    bp.add(200, 'A')
-    bp.add(900, 'B')
-    assert_equal 1600, bp.empty_space
-  end
-
-  test "test different packing algorithms" do
-    bp = BinPacker.new(3, {:algorithm => :best_fit_decreasing})
-    bp.add(100, 'A')
-    bp.add(900, 'B')
-  end
-
-  test "can turn off shuffling" do
-    bp = BinPacker.new(1, {:algorithm => :best_fit_decreasing, :shuffle_in_col => false})
-    bp.add(900, 'A')
-    bp.add(800, 'B')
-    bp.add(700, 'C')
-    bp.add(600, 'D')
-    bp.add(500, 'E')
-    bp.add(400, 'F')
-
-    assert_equal 'A', bp.bins[0][0]
-    assert_equal 'B', bp.bins[0][1]
-    assert_equal 'C', bp.bins[0][2]
-    assert_equal 'D', bp.bins[0][3]
-    assert_equal 'E', bp.bins[0][4]
-    assert_equal 'F', bp.bins[0][5]
-  end
-
-  test "big data set" do
-    (2..10).each do |num_bins|
-      assert bp = BinPacker.new(num_bins)
-
-      File.readlines(File.expand_path('test/fixtures/files/hundred.txt')).each do |line|
-        number, name, = line.split(' ')
-        assert bp.add(number.to_i, name)
-      end
-    end
-  end
-
-  test "six items with a perfect fit" do
-    bp = BinPacker.new(3)
-    bp.add(100, 'A')
-    bp.add(300, 'B')
-    bp.add(50, 'C')
-    bp.add(350, 'D')
-    bp.add(200, 'E')
-    bp.add(200, 'F')
-
-    assert_equal 0, bp.empty_space
-  end
-
-end
+require 'test_helper'
+
+class BinPackerTest < ActiveSupport::TestCase
+  include ColumnPack
+
+  test "initilizes with three columns" do
+    bp = BinPacker.new(3)
+    assert_equal BinPacker, bp.class
+    assert_equal Array, bp.bins.class
+  end
+
+  test "can't init with a non-positive number of cols" do
+    assert_raises ArgumentError do
+      BinPacker.new(0)
+    end
+
+    assert_raises ArgumentError do
+      BinPacker.new(-100)
+    end
+  end
+
+  test "adds element" do
+    bp = BinPacker.new(1)
+    assert bp.add(400, 'A')
+    assert_equal 'A', bp.bins[0][0]
+  end
+
+  test "height must be greater than zero" do
+    bp = BinPacker.new(3)
+    assert_raises ArgumentError do
+      bp.add(0, 'A')
+    end
+
+    assert_raises ArgumentError do
+      bp.add(-1, 'A')
+    end
+  end
+
+  test "adds two elements" do
+    bp = BinPacker.new(2, {:algorithm => :best_fit_decreasing})
+    assert bp.add(400, 'A')
+    assert bp.add(500, 'B')
+
+    assert_equal 'A', bp.bins[1][0]
+    assert_equal 'B', bp.bins[0][0]
+  end
+
+  test "add six elements" do
+    bp = BinPacker.new(3)
+    bp.add(600, 'F')
+    bp.add(300, 'C')
+    bp.add(500, 'E')
+    bp.add(400, 'D')
+    bp.add(200, 'B')
+    bp.add(100, 'A')
+    assert_equal 3, bp.bins.length
+
+    assert_equal Array, bp.bins[0].class
+    assert_operator 1, :<, bp.bins[0].length
+
+    assert_equal Array, bp.bins[1].class
+    assert_operator 1, :<, bp.bins[1].length
+
+    assert_equal Array, bp.bins[2].class
+    assert_operator 1, :<, bp.bins[2].length
+  end
+
+  test "can iterate bins" do
+    bp = BinPacker.new(3)
+    bp.add(600, 'F')
+    bp.add(300, 'C')
+    bp.add(500, 'E')
+    bp.add(400, 'D')
+    bp.add(200, 'B')
+    bp.add(100, 'A')
+
+    assert_equal Array, bp.bins.class
+
+    bp.bins.each do |bin|
+      bin.each do |element|
+        assert_includes ['A', 'B', 'C', 'D', 'E', 'F'], element.to_s
+      end
+    end
+  end
+
+  test "empty space" do
+    bp = BinPacker.new(3)
+    bp.add(200, 'A')
+    bp.add(900, 'B')
+    assert_equal 1600, bp.empty_space
+  end
+
+  test "test different packing algorithms" do
+    bp = BinPacker.new(3, {:algorithm => :best_fit_decreasing})
+    bp.add(100, 'A')
+    bp.add(900, 'B')
+  end
+
+  test "can turn off shuffling" do
+    bp = BinPacker.new(1, {:algorithm => :best_fit_decreasing, :shuffle_in_col => false})
+    bp.add(900, 'A')
+    bp.add(800, 'B')
+    bp.add(700, 'C')
+    bp.add(600, 'D')
+    bp.add(500, 'E')
+    bp.add(400, 'F')
+
+    assert_equal 'A', bp.bins[0][0]
+    assert_equal 'B', bp.bins[0][1]
+    assert_equal 'C', bp.bins[0][2]
+    assert_equal 'D', bp.bins[0][3]
+    assert_equal 'E', bp.bins[0][4]
+    assert_equal 'F', bp.bins[0][5]
+  end
+
+  test "big data set" do
+    (2..10).each do |num_bins|
+      assert bp = BinPacker.new(num_bins)
+
+      File.readlines(File.expand_path('test/fixtures/files/hundred.txt')).each do |line|
+        number, name, = line.split(' ')
+        assert bp.add(number.to_i, name)
+      end
+    end
+  end
+
+  test "six items with a perfect fit" do
+    bp = BinPacker.new(3)
+    bp.add(100, 'A')
+    bp.add(300, 'B')
+    bp.add(50, 'C')
+    bp.add(350, 'D')
+    bp.add(200, 'E')
+    bp.add(200, 'F')
+
+    assert_equal 0, bp.empty_space
+  end
+
+end

data/test/bp_perf.rb

@@ -1,26 +1,26 @@
-require_relative '../lib/column_pack/bin_packer'
-
-include ColumnPack
-
-hundred = File.readlines(File.expand_path('./dummy/test/fixtures/files/hundred.txt'))
-
-algos = [:best_fit_increasing, :best_fit_decreasing]
-
-algos.each do |algo|
-  empty_spaces = []
-
-  (2..20).each do |num_bins|
-
-    bp = BinPacker.new(num_bins, {:algorithm => algo})
-    hundred.each do |line|
-      number, name, = line.split(' ')
-      bp.add(number.to_i, name)
-    end
-
-    empty_spaces << bp.empty_space
-  end
-
-  puts "#{algo.to_s} average empty space: " + (empty_spaces.reduce(:+).to_f / empty_spaces.size).to_i.to_s
-  puts "#{algo.to_s} max empty space: " + empty_spaces.max.to_s
-  puts "#{algo.to_s} min empty space: " + empty_spaces.min.to_s
-end
+require_relative '../lib/column_pack/bin_packer'
+
+include ColumnPack
+
+hundred = File.readlines(File.expand_path('./dummy/test/fixtures/files/hundred.txt'))
+
+algos = [:best_fit_increasing, :best_fit_decreasing]
+
+algos.each do |algo|
+  empty_spaces = []
+
+  (2..20).each do |num_bins|
+
+    bp = BinPacker.new(num_bins, {:algorithm => algo})
+    hundred.each do |line|
+      number, name, = line.split(' ')
+      bp.add(number.to_i, name)
+    end
+
+    empty_spaces << bp.empty_space
+  end
+
+  puts "#{algo.to_s} average empty space: " + (empty_spaces.reduce(:+).to_f / empty_spaces.size).to_i.to_s
+  puts "#{algo.to_s} max empty space: " + empty_spaces.max.to_s
+  puts "#{algo.to_s} min empty space: " + empty_spaces.min.to_s
+end