weighable 1.1.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 796c7341c87131931e5896422b919270a952c9d87763a7e3696697682d7236ab
-  data.tar.gz: 7cf5162848d619bb19863bffaccda5cf09725a689dca2db94424e9ecd5ee6596
+  metadata.gz: 31c05d666a97b448105e5a074c65a5f3f55a174f9e594f04567d36abf07ec3b2
+  data.tar.gz: eecfc7259d196bc8480bec0a8a65960359ccbfd2a5a1bec6491f421890f46706
 SHA512:
-  metadata.gz: b798ed54c99730c1d4d8504a2eb246d34105d313aca1bc3e6c0b2fc5b13f6cd7fba76531e38ef1df827e99a0730c74a93577e820d8a93ebbb084632b0e45e11c
-  data.tar.gz: 34e84421edec24cfa3f4b3b01425e366b991024c70481d0d6b160ce6683d5f4da747243acaf2933f6472b8b0c8120e85b33cb1dd285381ce2f9b38ca9c5db1d3
+  metadata.gz: 47017d565bce95f6b597459155d83d7d4b5ba372e3e94c1aa89a3581706ec1a98cd0f746b04154bd97d23a369453d25c7de51278562948ebee7f6d2bb61d5a79
+  data.tar.gz: 0a9238a5c9ca54d15a4cd3d766dc27285faea5d8d1a42e1584e33a239326086ba03a8e613a464526bf007b004ddacac12aa0a036c47f2e5def83d77709c01198

data/.circleci/config.yml

@@ -0,0 +1,32 @@
+version: 2
+jobs:
+  build:
+    environment:
+      CC_TEST_REPORTER_ID: 0f917edc031f16b4e113269d2a97c6db32df02fb034919c35d95c896d68e5c2a
+    docker:
+      - image: circleci/ruby:2.2.8
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - weighable-{{ checksum "Gemfile" }}
+            - weighable-
+      - run:
+          name: install dependencies
+          command: bundle check || bundle install
+      - save_cache:
+          key: weighable-{{ checksum "Gemfile" }}
+          paths:
+            - vendor/bundle
+      - run:
+          name: Setup Code Climate test-reporter
+          command: |
+            # download test reporter as a static binary
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+            chmod +x ./cc-test-reporter
+      - run:
+          name: Run rspec in parallel
+          command: |
+            ./cc-test-reporter before-build
+            bundle exec rspec --format documentation --format RspecJunitFormatter -o rspec.xml
+            ./cc-test-reporter after-build --exit-code $?

data/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-16.04
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+        rails: [ 4, 5, 6 ]
+    name: weighable ruby:${{matrix.ruby}} rails:${{matrix.rails}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3 --gemfile=Gemfile-rails${{ matrix.rails }}
+          bundle exec rspec

data/.gitignore

@@ -1,6 +1,6 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
+/Gemfile*.lock
 /_yardoc/
 /coverage/
 /doc/

data/.ruby-version

@@ -1 +1 @@
-2.2.8
+2.7.0

data/Gemfile-rails4

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '> 4.2.4', '< 5'
+
+# Specify your gem's dependencies in weighable.gemspec
+gemspec

data/{Gemfile → Gemfile-rails5}

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'activesupport', '> 5', '< 6'
+
 # Specify your gem's dependencies in weighable.gemspec
 gemspec

data/Gemfile-rails6

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '> 6', '< 7'
+
+# Specify your gem's dependencies in weighable.gemspec
+gemspec

data/README.md

@@ -83,7 +83,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/greenbits/weighable.
+Bug reports and pull requests are welcome on GitHub at https://github.com/trobrock/weighable.
 
 ## License
 

data/lib/weighable/model.rb

@@ -13,7 +13,9 @@ module Weighable
 
       def define_setter(column, store_as: :gram, precision: nil)
         define_method "#{column}=" do |weight|
-          weight = Weight.new(weight['value'], weight['unit']) if weight.is_a?(Hash)
+          if weight.respond_to?(:key?) && weight.key?('value') && weight.key?('unit')
+            weight = Weight.new(weight['value'], weight['unit'])
+          end
           original_unit = weight.try(:unit)
 
           if original_unit && original_unit != Weight::UNIT[:unit]

data/lib/weighable/version.rb

@@ -1,3 +1,3 @@
 module Weighable
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/lib/weighable/weight.rb

@@ -7,102 +7,126 @@ module Weighable
     attr_reader :value, :unit
 
     UNIT = {
-      gram:      0,
-      ounce:     1,
-      pound:     2,
-      milligram: 3,
-      kilogram:  4,
-      unit:      5
+      gram:        0,
+      ounce:       1,
+      pound:       2,
+      milligram:   3,
+      kilogram:    4,
+      unit:        5,
+      fluid_ounce: 6
     }.freeze
 
     UNIT_ABBREVIATION = {
-      gram:      'g',
-      ounce:     'oz',
-      pound:     'lb',
-      milligram: 'mg',
-      kilogram:  'kg',
-      unit:      nil
+      gram:        'g',
+      ounce:       'oz',
+      pound:       'lb',
+      milligram:   'mg',
+      kilogram:    'kg',
+      fluid_ounce: 'fl oz',
+      unit:        nil
     }.freeze
 
     ABBREVIATION_ALIASES = {
-      'g'    => :gram,
-      'oz'   => :ounce,
-      'lb'   => :pound,
-      'mg'   => :milligram,
-      'kg'   => :kilogram,
-      'ea'   => :unit,
-      'each' => :unit,
-      nil    => :unit
+      'g'     => :gram,
+      'oz'    => :ounce,
+      'lb'    => :pound,
+      'mg'    => :milligram,
+      'kg'    => :kilogram,
+      'fl oz' => :fluid_ounce,
+      'ea'    => :unit,
+      'each'  => :unit,
+      nil     => :unit
     }.freeze
 
-    GRAMS_PER_OUNCE     = BigDecimal.new('28.34952')
-    GRAMS_PER_POUND     = BigDecimal.new('453.59237')
-    OUNCES_PER_POUND    = BigDecimal.new('16')
-    MILLIGRAMS_PER_GRAM = BigDecimal.new('1000')
-    KILOGRAMS_PER_GRAM  = BigDecimal.new('0.001')
-    IDENTITY            = BigDecimal.new('1')
+    GRAMS_PER_OUNCE     = BigDecimal('28.34952')
+    GRAMS_PER_POUND     = BigDecimal('453.59237')
+    OUNCES_PER_POUND    = BigDecimal('16')
+    MILLIGRAMS_PER_GRAM = BigDecimal('1000')
+    KILOGRAMS_PER_GRAM  = BigDecimal('0.001')
+    IDENTITY            = BigDecimal('1')
 
     MILLIGRAMS_PER_OUNCE    = GRAMS_PER_OUNCE * MILLIGRAMS_PER_GRAM
     KILOGRAMS_PER_OUNCE     = GRAMS_PER_OUNCE * KILOGRAMS_PER_GRAM
     MILLIGRAMS_PER_POUND    = GRAMS_PER_POUND * MILLIGRAMS_PER_GRAM
     KILOGRAMS_PER_POUND     = GRAMS_PER_POUND * KILOGRAMS_PER_GRAM
-    KILOGRAMS_PER_MILLIGRAM = MILLIGRAMS_PER_GRAM**2
+    MILLIGRAMS_PER_KILOGRAM = MILLIGRAMS_PER_GRAM**2
+    FLUID_OUNCE_PER_OUNCE   = IDENTITY
 
     CONVERSIONS = {
       UNIT[:unit] => {
         UNIT[:unit] => [:*, IDENTITY]
       },
       UNIT[:gram] => {
-        UNIT[:gram]      => [:*, IDENTITY],
-        UNIT[:ounce]     => [:/, GRAMS_PER_OUNCE],
-        UNIT[:pound]     => [:/, GRAMS_PER_POUND],
-        UNIT[:milligram] => [:*, MILLIGRAMS_PER_GRAM],
-        UNIT[:kilogram]  => [:*, KILOGRAMS_PER_GRAM]
+        UNIT[:gram]        => [:*, IDENTITY],
+        UNIT[:ounce]       => [:/, GRAMS_PER_OUNCE],
+        UNIT[:pound]       => [:/, GRAMS_PER_POUND],
+        UNIT[:milligram]   => [:*, MILLIGRAMS_PER_GRAM],
+        UNIT[:kilogram]    => [:*, KILOGRAMS_PER_GRAM],
+        UNIT[:fluid_ounce] => [:/, GRAMS_PER_OUNCE]
       },
       UNIT[:ounce] => {
         UNIT[:gram]      => [:*, GRAMS_PER_OUNCE],
         UNIT[:ounce]     => [:*, IDENTITY],
         UNIT[:pound]     => [:/, OUNCES_PER_POUND],
         UNIT[:milligram] => [:*, MILLIGRAMS_PER_OUNCE],
-        UNIT[:kilogram]  => [:*, KILOGRAMS_PER_OUNCE]
+        UNIT[:kilogram]  => [:*, KILOGRAMS_PER_OUNCE],
+        UNIT[:fluid_ounce] => [:*, IDENTITY]
       },
       UNIT[:pound] => {
         UNIT[:gram]      => [:*, GRAMS_PER_POUND],
         UNIT[:ounce]     => [:*, OUNCES_PER_POUND],
         UNIT[:pound]     => [:*, IDENTITY],
         UNIT[:milligram] => [:*, MILLIGRAMS_PER_POUND],
-        UNIT[:kilogram]  => [:*, KILOGRAMS_PER_POUND]
+        UNIT[:kilogram]  => [:*, KILOGRAMS_PER_POUND],
+        UNIT[:fluid_ounce] => [:*, OUNCES_PER_POUND]
       },
       UNIT[:milligram] => {
         UNIT[:gram]      => [:/, MILLIGRAMS_PER_GRAM],
         UNIT[:ounce]     => [:/, MILLIGRAMS_PER_OUNCE],
         UNIT[:pound]     => [:/, MILLIGRAMS_PER_POUND],
         UNIT[:milligram] => [:*, IDENTITY],
-        UNIT[:kilogram]  => [:/, KILOGRAMS_PER_MILLIGRAM]
+        UNIT[:kilogram]  => [:/, MILLIGRAMS_PER_KILOGRAM],
+        UNIT[:fluid_ounce] => [:/, MILLIGRAMS_PER_OUNCE]
       },
       UNIT[:kilogram] => {
         UNIT[:gram]      => [:/, KILOGRAMS_PER_GRAM],
         UNIT[:ounce]     => [:/, KILOGRAMS_PER_OUNCE],
         UNIT[:pound]     => [:/, KILOGRAMS_PER_POUND],
-        UNIT[:milligram] => [:*, KILOGRAMS_PER_MILLIGRAM],
-        UNIT[:kilogram]  => [:*, IDENTITY]
+        UNIT[:milligram] => [:*, MILLIGRAMS_PER_KILOGRAM],
+        UNIT[:kilogram]  => [:*, IDENTITY],
+        UNIT[:fluid_ounce] => [:/, KILOGRAMS_PER_OUNCE]
+      },
+      UNIT[:fluid_ounce] => {
+        UNIT[:fluid_ounce] => [:*, IDENTITY],
+        UNIT[:gram]        => [:*, GRAMS_PER_OUNCE],
+        UNIT[:ounce]       => [:*, IDENTITY],
+        UNIT[:pound]       => [:/, OUNCES_PER_POUND],
+        UNIT[:milligram]   => [:*, MILLIGRAMS_PER_OUNCE],
+        UNIT[:kilogram]    => [:*, KILOGRAMS_PER_OUNCE],
       }
     }.freeze
 
     def self.parse(string)
-      value, unit = string.split(' ')
-      from_value_and_unit(value, unit)
+      trimmed = string.strip
+      unit_start = trimmed.index(' ')
+      if unit_start
+        unit = trimmed.slice!(unit_start + 1..-1)
+        value = trimmed.slice!(0..unit_start - 1)
+        from_value_and_unit(value, unit)
+      else
+        from_value_and_unit(trimmed, nil)
+      end
     end
 
     def self.from_value_and_unit(value, unit)
       unit = parse_unit(unit)
-      fail ArgumentError, 'invalid weight' if unit.nil? || value.nil?
+      fail ArgumentError, 'invalid weight' if unit.nil? || value.to_s.strip.empty?
       Weight.new(value, unit)
     end
 
     def self.parse_unit(unit)
       unit = ActiveSupport::Inflector.singularize(unit.downcase) unless unit.nil?
-      unit_symbol = unit ? unit.to_sym : unit
+      unit_symbol = unit ? unit.tr(' ', '_').to_sym : unit
       UNIT[unit_symbol] || ABBREVIATION_ALIASES[unit]
     end
 
@@ -160,7 +184,7 @@ module Weighable
         Weight.new(@value / to_math_value(other), unit_name)
       else
         other = other.to(unit_name)
-        BigDecimal.new(@value / other.value)
+        BigDecimal(@value / other.value)
       end
     end
 

data/weighable.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 4.2.4'
+  spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop', '~> 0.49.0'
   spec.add_development_dependency 'rspec', '~> 3.4.0'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: weighable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Trae Robrock
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,20 +143,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-style.yml"
 - ".ruby-version"
-- Gemfile
+- Gemfile-rails4
+- Gemfile-rails5
+- Gemfile-rails6
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
 - lib/weighable.rb
 - lib/weighable/active_record/migration_extensions/schema_statements.rb
 - lib/weighable/active_record/migration_extensions/table.rb
@@ -173,7 +176,7 @@ homepage: https://github.com/greenbits/weighable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,9 +191,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Like BigDecimal, but for weight. Includes Rails integration.
 test_files: []

data/circle.yml

@@ -1,18 +0,0 @@
-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