weighable 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466560269b82c5abdfb14f87cf477906cdcd791c
-  data.tar.gz: a1c58752b469af1c7ccc709ea7186028b67cddb8
+  metadata.gz: 8fcb2ad44acb8fa91d311207dafaab42e6b3bc22
+  data.tar.gz: 794c7738019d489ccca5c957c00f5a390d555600
 SHA512:
-  metadata.gz: 7bc750cc906e88c464bd43aaef8bb47f5946eded3e14d5e98848a93ee4c820d840137ed96f71d3c69cc785199f8611c9d4425b15d9cc3e81d0e145bd51dd79dc
-  data.tar.gz: 387e334f16d5e0d0d9a398cfb3faa8783ecdeb6c7aa043ba1071488e266c8f30372a59a33b425e67f0ef521ceeb6567ea13d41eebb05329f4e40f42972f03a40
+  metadata.gz: 16c995bb7cc1512e2ea0b631bae0740430897b392f8fd17fcfd02772dd964ad0dafb992fea476a4834d5cc5fc0d24941d281211219d0229af6a30b782add1192
+  data.tar.gz: c46c5885215fef364313d62c2f444ed7f0a573d4e56858c694d00d00aac97580eb3ffc8b506662ed332f47b5f762a5adf0e674ebe062c8068fc80a71e52cbaa8

data/.rubocop.yml

@@ -1,2 +1,6 @@
 inherit_from:
   - .ruby-style.yml
+
+Lint/UselessComparison:
+  Exclude:
+    - 'spec/**/*.rb'

data/Guardfile

@@ -1,5 +1,5 @@
-guard :rspec, cmd: "bundle exec rspec", failed_mode: :keep do
-  require "guard/rspec/dsl"
+guard :rspec, cmd: 'bundle exec rspec', failed_mode: :keep do
+  require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 
   # Feel free to open issues for suggestions and improvements

data/circle.yml

@@ -1,3 +1,18 @@
+machine:
+  environment:
+    CC_TEST_REPORTER_ID: 0f917edc031f16b4e113269d2a97c6db32df02fb034919c35d95c896d68e5c2a
+
 dependencies:
   pre:
     - gem update bundler
+  post:
+    - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+    - chmod +x ./cc-test-reporter
+
+test:
+  pre:
+    - ./cc-test-reporter before-build
+  override:
+    - bundle exec rspec --format documentation --format RspecJunitFormatter -o $CIRCLE_TEST_REPORTS/rspec.xml
+  post:
+    - ./cc-test-reporter after-build --exit-code $EXIT_CODE

data/lib/weighable/version.rb

@@ -1,3 +1,3 @@
 module Weighable
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/lib/weighable/weight.rb

@@ -152,20 +152,15 @@ module Weighable
     end
 
     def *(other)
-      if other.is_a? Weight
-        other = other.to(unit_name)
-        Weight.new(@value * other.value, unit_name)
-      else
-        Weight.new(@value * other, unit_name)
-      end
+      Weight.new(@value * to_math_value(other), unit_name)
     end
 
     def /(other)
-      if other.is_a? Weight
+      if other.is_a?(Weight) && !other.is_unit?
         other = other.to(unit_name)
         BigDecimal.new(@value / other.value)
       else
-        Weight.new(@value / other, unit_name)
+        Weight.new(@value / to_math_value(other), unit_name)
       end
     end
 
@@ -209,6 +204,16 @@ module Weighable
 
     private
 
+    def to_math_value(other)
+      if other.is_a?(Weight) && other.is_unit?
+        other.value
+      elsif other.is_a?(Weight)
+        other.to(unit_name).value
+      else
+        other
+      end
+    end
+
     def unit_name
       unit_from_int(@unit)
     end

data/weighable.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.4.0'
   spec.add_development_dependency 'guard', '~> 2.13.0'
   spec.add_development_dependency 'guard-rspec', '~> 4.6.4'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weighable
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Trae Robrock
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.6.4
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: Like BigDecimal, but for weight. Includes Rails integration.
 email:
 - trobrock@gmail.com