haversack 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf37108921d996da5627939fc13908ccb719958853a6d9620c89fb2e0a0a360
-  data.tar.gz: 21f14e3402e28bdef0b0a4fda8504886a5a06468bf0ab11782ddba7a9ceec839
+  metadata.gz: ee68cfa21230115da4dccd2b313615367ae482ffbc428f8b439dbb88ec87712d
+  data.tar.gz: 25ef9a07cb8b920114eecb288b89eb9db0cc2072c35ecac6027fd98636b932bb
 SHA512:
-  metadata.gz: f496dd7d39b89a525eb35eee1a26a80997d9821a8543f002f3e27b8078cec6593de424bec8582177738dee1fe637c820c532cbe8f5991e6acf52dc804ff6a5a3
-  data.tar.gz: 0c36f081dac2c44173e92c3ebb0f24f2555d09e645976d629a831970a4b6ac59f9506222b33cdae4e904fa120cef6b3a7c45849398a7b8c1d942f8a557b5edd5
+  metadata.gz: c2b76426d798393318ba9c69319713284dd10f367d37166949a6d10a2ea9bf3be6980e388eef66cf8c747e39f937c8d65b1126cf3409343f54dd3dd29541216a
+  data.tar.gz: 6d0399fecfa4b92a0e85065023762d332aefcce21e60c1ed3c1f33c5c2da3e16203261f0101a875c67866f889a6a7212790e4cbf7bfb9186a14ee91f62df74a2

data/README.md

@@ -1,4 +1,6 @@
 # Haversack
+[![Build Status](https://travis-ci.org/alex0112/haversack.svg?branch=master)](https://travis-ci.org/alex0112/haversack) [![Maintainability](https://api.codeclimate.com/v1/badges/7ff5206188bb44910d07/maintainability)](https://codeclimate.com/github/alex0112/haversack/maintainability)
+
 
 Haversack is an enumerable abstraction of a [Knapsack](https://en.wikipedia.org/wiki/Knapsack_problem).
 
@@ -52,7 +54,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/haversack.
+Bug reports and pull requests are welcome on GitHub at https://github.com/alex0112/haversack.
 
 ## License
 

data/haversack.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib/haversack.rb"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "factory_bot", "~> 4.0"

data/lib/haversack.rb

@@ -3,4 +3,5 @@ module Haversack
   require "haversack/sack"
   require "haversack/item"
   require "haversack/err"
+  require "haversack/itemcollection"
 end

data/lib/haversack/itemcollection.rb

@@ -0,0 +1,33 @@
+module Haversack
+  class ItemCollection < Array
+
+    def initialize(data, &block)
+      if !block_given?
+        raise ArgumentError, "expected #{data} to contain only elements of class Haversack::Item" unless data.is_a?(Array) && ItemCollection.only_items?(data)
+      end
+
+      @size   = self.size
+      @weight = self.weight
+
+      block_given? ? super(data, block) : super(data)
+    end
+
+    def size
+      map(&:size).sum
+    end
+
+    def weight
+      map(&:weight).sum
+    end
+
+    def push(obj)
+      raise Haversack::KnapsackContentError unless obj.is_a? Haversack::Item
+      super
+    end
+
+    def self.only_items?(data)
+      data.all? { |el| el.is_a? Haversack::Item }
+    end
+    
+  end
+end

data/lib/haversack/sack.rb

@@ -1,79 +1,61 @@
-class Sack
-  include Enumerable
+require 'haversack/itemcollection'
 
-  attr_reader :capacity, :weight, :available_capacity, :current_weight, :contents
+class Sack < Haversack::ItemCollection
 
-  def initialize(capacity:, weight:, contents: nil)
-    @capacity           = capacity
-    @weight             = weight
-    self.contents       = contents || [] ## Use the setter to enforce weight/capacity restrictions
-    @current_weight     = self.current_weight
-    @available_capacity = self.available_capacity
-  end
-
-  def method_missing(method_id)
-    Enumerable.respond_to? method_id ? @contents.send(method_id) : raise(NoMethodError)
-  end
+  attr_accessor :capacity
+  attr_accessor :max_weight
   
-  def contents=(new_contents)
-    raise Haversack::KnapsackContentError          if has_non_items? new_contents
-    raise Haversack::KnapsackCapacityExceededError if exceeds_capacity? new_contents
-    raise Haversack::KnapsackWeightExceededError   if exceeds_weight? new_contents
+  def initialize(data, capacity:, max_weight:, &block)
     
-    @contents = new_contents
-  end
-
-  def has_non_items?(contents) ## TODO: Consider refactor: Static method?  Doesn't rely on instance data.
-    contents.any? { |e| !e.is_a? Haversack::Item }
-  end
-
-  def current_weight
-    @contents.empty? ? 0 : @contents.map { |item| item.weight }.sum
-  end
+    @capacity   = capacity
+    @max_weight = max_weight
+    
+    block_given? ? super(data, &block) : super(data)
+    
+    raise Haversack::KnapsackCapacityExceededError if contents_exceed_capacity?
+    raise Haversack::KnapsackWeightExceededError   if contents_exceed_weight?
+    end
 
-  ## TODO: the *fit* methods duplicate behavior.  Consolidate them in a future itteration.
-  
-  def fits_item_weight?(item)
-    item.weight + @current_weight <= @weight
+  def available_weight
+    empty? ? @max_weight : (@max_weight - weight)
   end
 
   def available_capacity
-    @contents.empty? ? @capacity : (@capacity - @contents.length)
+    empty? ? @capacity : (@capacity - size)
   end
 
-  def fits_item_capacity?(item)
-    item.size < @available_capacity
+  def fits_weight?(item)
+    item.weight <= available_weight
   end
 
-  def fits_item?(item)
-    (item.is_a? Haversack::Item) && (fits_item_capacity?(item) && fits_item_weight?(item))
+  def exceeds_weight?(item)
+    !fits_weight?(item)
   end
-
-  def push(item) ## TODO: Return an error that describes which constraint failed
-    fits_item? item ? @contents.push(item) : raise(Haversack::KnapsackContentError)
-    @contents
+  
+  def fits_capacity?(item)
+    item.size <= available_capacity
   end
 
-  def fits_contents?(contents)
-    fits_weight?(contents) && fits_capacity?(contents)
+  def exceeds_capacity?(item)
+    !fits_capacity?(item)
   end
-
-  def fits_weight?(contents)
-    new_weight = contents.map { |item| item.weight }.sum
-    new_weight <= @weight
+    
+  def fits_item?(item)
+    item.is_a?(Haversack::Item) && fits_capacity?(item) && fits_weight?(item)
   end
-
-  def exceeds_weight?(contents)
-    !fits_weight? contents
+  alias :fits? :fits_item?
+  
+  def push(item) ## TODO: Describe which constraint failed
+    fits_item?(item) ? super : raise(Haversack::KnapsackContentError)
   end
-
-  def fits_capacity?(contents)
-    new_capacity = contents.map { |item| item.size }.sum
-    new_capacity <= @capacity
+  
+  private
+  def contents_exceed_weight?
+    weight > @max_weight
   end
-
-  def exceeds_capacity?(contents)
-    !fits_capacity? contents
+  
+  def contents_exceed_capacity?
+    size > @capacity
   end
-
+  
 end

data/lib/haversack/version.rb

@@ -1,3 +1,3 @@
 module Haversack
-  VERSION = "0.3.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haversack
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - alex0112
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ files:
 - lib/haversack.rb
 - lib/haversack/err.rb
 - lib/haversack/item.rb
+- lib/haversack/itemcollection.rb
 - lib/haversack/sack.rb
 - lib/haversack/version.rb
 homepage: https://github.com/alex0112/haversack