physical 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e4ba860fa3455e767610003a3f3289a8258475d
-  data.tar.gz: 64ca6a082897e15e864f008a5f62e905f3b729f3
+  metadata.gz: 76beac13fca836278bba298bbb217f4dd9cb4b40
+  data.tar.gz: 0351e63dfa2b4af7200662e2f8b8ece442e95fa9
 SHA512:
-  metadata.gz: 949da5a40f8a79108471090cfdb7ccc20cdb726ad49b9a434332c818f7fdf1d9c6dec400ce6c114dbfe17e1ec0c98c1761ea21884a5ee39fa1f14c99bd3fd202
-  data.tar.gz: 79d2c5fbbb2ae1551e012dbc226dfcf051368ea07008da56db96ad2f80875234fcf94d3f333115d5875545be3d27fd0525c5a94435b74f8abc85d04182356e27
+  metadata.gz: 6dc47ed1063302a50ecf4c65898163e94752a5ee776be58ff37663a64dcbfac51c1a7d9296d9a9fe37774c8a6f20c828faf6a6bfad6511ae58470e81c973325e
+  data.tar.gz: e5caf73ede430f01767575bf25b4f0a56101f0ece9d273aacdbad1ecfe70ca0dac4a24e17ddc65df9b425410e0a919d927dc32bbabcbd3a2d8259b1de19758c6

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-       - image: circleci/ruby:2.4.1-node-browsers
+       - image: circleci/ruby:2.4.5
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images

data/Rakefile

@@ -1,5 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "bundler/gem_helper"
+Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/physical/cuboid.rb

@@ -4,17 +4,19 @@ require 'measured'
 
 module Physical
   class Cuboid
-    attr_reader :dimensions, :weight, :id
+    attr_reader :dimensions, :width, :height, :depth, :weight, :id, :properties
 
-    def initialize(id: nil, dimensions: [], dimension_unit: :cm, weight: 0, weight_unit: :g)
+    def initialize(id: nil, dimensions: [], dimension_unit: :cm, weight: 0, weight_unit: :g, properties: {})
       @id = id || SecureRandom.uuid
-      @weight = Measured::Weight(weight, weight_unit).convert_to(:g)
-      @dimensions = dimensions.map { |dimension| Measured::Length.new(dimension, dimension_unit).convert_to(:cm) }
+      @weight = Measured::Weight(weight, weight_unit)
+      @dimensions = dimensions.map { |dimension| Measured::Length.new(dimension, dimension_unit) }
       @dimensions.fill(Measured::Length(self.class::DEFAULT_LENGTH, dimension_unit), @dimensions.length..2)
+      @width, @height, @depth = *@dimensions
+      @properties = properties
     end
 
     def volume
-      Measured::Volume(dimensions.map(&:value).reduce(&:*), :ml)
+      Measured::Volume(dimensions.map { |d| d.convert_to(:cm).value }.reduce(1, &:*), :ml)
     end
 
     def ==(other)

data/lib/physical/item.rb

@@ -3,12 +3,5 @@
 module Physical
   class Item < Cuboid
     DEFAULT_LENGTH = 0
-
-    attr_reader :properties
-
-    def initialize(properties: {}, **args)
-      @properties = properties
-      super(args)
-    end
   end
 end

data/lib/physical/location.rb

@@ -44,8 +44,8 @@ module Physical
 
       if region.is_a?(Carmen::Region)
         @region = region
-      elsif country.is_a?(Carmen::Country)
-        @region = country.subregions.coded(region.to_s.upcase)
+      elsif @country.is_a?(Carmen::Country)
+        @region = @country.subregions.coded(region.to_s.upcase)
       end
 
       @name = name

data/lib/physical/package.rb

@@ -2,15 +2,18 @@
 
 module Physical
   class Package
+    extend Forwardable
     attr_reader :container, :items, :void_fill_density, :id
 
     def initialize(id: nil, container: Physical::Box.new, items: [], void_fill_density: 0, void_fill_density_unit: :g)
       @id = id || SecureRandom.uuid
-      @void_fill_density = Measured::Weight(void_fill_density, void_fill_density_unit)
+      @void_fill_density = measured_void_fill_density(void_fill_density, void_fill_density_unit)
       @container = container
       @items = Set[*items]
     end
 
+    def_delegator :@container, :dimensions
+
     def <<(item)
       @items.add(item)
     end
@@ -20,11 +23,11 @@ module Physical
     end
 
     def weight
-      container.weight + items.map(&:weight).reduce(&:+) + void_fill_weight
+      container.weight + items.map(&:weight).reduce(Measured::Weight(0, :g), &:+) + void_fill_weight
     end
 
     def remaining_volume
-      container.volume - items.map(&:volume).reduce(&:+)
+      container.volume - items.map(&:volume).reduce(Measured::Volume(0, :ml), &:+)
     end
 
     def void_fill_weight
@@ -32,5 +35,14 @@ module Physical
 
       Measured::Weight(void_fill_density.value * remaining_volume.value, void_fill_density.unit)
     end
+
+    def measured_void_fill_density(void_fill_density, void_fill_density_unit)
+      case void_fill_density
+      when Measured::Weight
+        void_fill_density
+      else
+        Measured::Weight(void_fill_density, void_fill_density_unit)
+      end
+    end
   end
 end

data/lib/physical/spec_support/shared_examples.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'a cuboid' do
+  let(:args) { {dimensions: [1.1, 2.2, 3.3], dimension_unit: :cm} }
+
+  it { is_expected.to be_a(Physical::Cuboid) }
+
+  it "has dimensions as Measured::Length objects with rational values" do
+    expect(subject.dimensions).to eq(
+      [
+        Measured::Length.new(1.1, :cm),
+        Measured::Length.new(2.2, :cm),
+        Measured::Length.new(3.3, :cm)
+      ]
+    )
+  end
+
+  it "has getter methods for each dimension as Measured::Length object" do
+    expect(subject.width).to eq(Measured::Length.new(1.1, :cm))
+    expect(subject.height).to eq(Measured::Length.new(2.2, :cm))
+    expect(subject.depth).to eq(Measured::Length.new(3.3, :cm))
+  end
+end

data/lib/physical/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Physical
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/physical.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.4'
   spec.add_runtime_dependency "carmen", "~> 1.0"
-  spec.add_runtime_dependency "factory_bot", "~> 4.8 "
   spec.add_runtime_dependency "measured", "~> 2.4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", [">= 1.16", "< 3"]
+  spec.add_development_dependency "factory_bot", "~> 4.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: physical
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carmen
@@ -25,47 +25,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: measured
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: measured
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :runtime
+        version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +133,7 @@ files:
 - lib/physical/spec_support/factories/location_factory.rb
 - lib/physical/spec_support/factories/package_factory.rb
 - lib/physical/spec_support/factories/shipment_factory.rb
+- lib/physical/spec_support/shared_examples.rb
 - lib/physical/version.rb
 - physical.gemspec
 homepage: https://github.com/mamhoff/physical