unit_measurements 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 286c6438c249edf7fe0872a2ad8956f42cb5150819885e8bebe353a7955c97c9
-  data.tar.gz: 1e82f6cf7ec7dc4f51670be13980cc30ccfe56583fb2b94622f12614d9a0c91e
+  metadata.gz: 330be281aba063532010cf47f1e0065c35390510749002f368ff3139a22e6b5c
+  data.tar.gz: 26a8aa9db580205a117b11a8b653a5c609d1972be7b3eb76e2b91ec20f02b7be
 SHA512:
-  metadata.gz: 5353470b9101426b12d5fd34474d41fe04de2e4ef8286dd42c78605f01f35116f62341626299708f5ea0cc53613977437876b906d7fd79d91888ed9f1221a6e9
-  data.tar.gz: 7bda4b4f0598d53e2b3cf933da8d8485d8052ca6172d772bbaf55aa4400542782c62b99d583d0109ef5af2a7ed3504eb4991eb06b5a5f9cbcdcc4f87575ac919
+  metadata.gz: 2d67ddc3a66baec5ce04878b046541dd7b9f3d8da65a18fcf84179f4178c467b3e2276f1a236e22caac9d170815d6529be842fdac2ac45aed79e48b32d136de7
+  data.tar.gz: 331afbfc4616fd9cbccf13ed6c3d01266ba6fd49e9fe4ae06c9f8ed311210a77381056d0037415b4fc4c48477a5fcda48d2d64397c8df3888bcacf1b965c79c8

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.2.0](https://github.com/shivam091/unit_measurements/compare/v1.1.0...v1.2.0) - 2023-08-15
+
+### What's new
+
+- Added support to specify unit value as an `array` of number and unit. viz.,
+
+----------
+
+## [1.1.0](https://github.com/shivam091/unit_measurements/compare/v1.0.0...v1.1.0) - 2023-08-14
+
+### What's new
+
+- Added `#format` method to format quantity of the measurement.
+
+----------
+
 ## [1.0.0](https://github.com/shivam091/unit_measurements/compare/v0.1.0...v1.0.0) - 2023-09-14
 
 ### What's new

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unit_measurements (1.0.0)
+    unit_measurements (1.2.0)
       activesupport (~> 7.0)
 
 GEM

data/README.md

@@ -219,6 +219,20 @@ UnitMeasurements::Weight.parse("2e⁻² kg to g")
 
 Supported special characters for exponents are `⁰`, `¹`, `²`, `³`, `⁴`, `⁵`, `⁶`, `⁷`, `⁸`, `⁹`, `⁺`, `⁻`.
 
+**Formatting measurement:**
+
+If you want to format measurement to certain format, you can use `#format` method.
+If format is not specified, it defaults to `"%.2<value>f %<unit>s"`.
+
+```ruby
+UnitMeasurements::Weight.parse("2 kg").to(:st).format
+#=> "0.31 st"
+UnitMeasurements::Weight.parse("2 kg").to(:st).format("%.4<quantity>f %<unit>s")
+#=> "0.3149 st"
+UnitMeasurements::Weight.parse("2 kg").to(:st).format("%.4<quantity>f")
+#=> "0.3149"
+```
+
 **Extract the unit and the quantity from measurement:**
 
 ```ruby
@@ -385,6 +399,9 @@ UnitMeasurements::Time = UnitMeasurements.build do
   # You can also specify conversion string if it's converted against a unit other
   # than the unit group's base unit.
   unit :h, value: "60 min", aliases: [:hour, :hours]
+
+  # You can also specify unit value as an array.
+  unit :d, value: [24, :h], aliases: [:day, :days]
 end
 ```
 

data/lib/unit_measurements/base.rb

@@ -27,6 +27,7 @@ require "unit_measurements/unit"
 require "unit_measurements/unit_group"
 require "unit_measurements/normalizer"
 require "unit_measurements/parser"
+require "unit_measurements/formatter"
 require "unit_measurements/measurement"
 
 require "unit_measurements/errors/unit_error"

data/lib/unit_measurements/errors/parse_error.rb

@@ -3,7 +3,7 @@
 # -*- warn_indent: true -*-
 
 module UnitMeasurements
-  class ParseError < StandardError
+  class ParseError < BaseError
     attr_reader :string
 
     def initialize(string)

data/lib/unit_measurements/errors/unit_already_defined_error.rb

@@ -3,7 +3,7 @@
 # -*- warn_indent: true -*-
 
 module UnitMeasurements
-  class UnitAlreadyDefinedError < StandardError
+  class UnitAlreadyDefinedError < BaseError
     attr_reader :unit
 
     def initialize(unit)

data/lib/unit_measurements/errors/unit_error.rb

@@ -3,7 +3,7 @@
 # -*- warn_indent: true -*-
 
 module UnitMeasurements
-  class UnitError < StandardError
+  class UnitError < BaseError
     attr_reader :unit
 
     def initialize(unit)

data/lib/unit_measurements/formatter.rb

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module UnitMeasurements
+  module Formatter
+    # The default format for formatting measurements.
+    DEFAULT_FORMAT = "%.2<quantity>f %<unit>s".freeze
+
+    # Formats measurement to certain formatted string specified by +format+.
+    # If +format+ is not specified, it uses +DEFAULT_FORMAT+ for
+    # formatting the measurement
+    #
+    # @example
+    #   UnitMeasurements::Weight.parse("2 kg").to(:st).format
+    #   => "0.31 st"
+    #   UnitMeasurements::Weight.parse("2 kg").to(:st).format("%.4<quantity>f %<unit>s")
+    #   => "0.3149 st"
+    #
+    # @param [String] format
+    #
+    # @return [String]
+    def format(format = nil)
+      kwargs = {quantity: quantity, unit: unit.to_s}
+      (format || DEFAULT_FORMAT) % kwargs
+    end
+  end
+end

data/lib/unit_measurements/measurement.rb

@@ -4,13 +4,14 @@
 
 module UnitMeasurements
   class Measurement
+    include Formatter
     CONVERSION_STRING_REGEXP = /(.+?)\s?(?:\s+(?:in|to|as)\s+(.+)|\z)/i.freeze
 
     attr_reader :quantity, :unit
 
     def initialize(quantity, unit)
-      raise ArgumentError, "Quantity cannot be blank." if quantity.blank?
-      raise ArgumentError, "Unit cannot be blank." if unit.blank?
+      raise BaseError, "Quantity cannot be blank." if quantity.blank?
+      raise BaseError, "Unit cannot be blank." if unit.blank?
 
       @quantity = convert_quantity(quantity)
       @unit = unit_from_unit_or_name!(unit)

data/lib/unit_measurements/unit.rb

@@ -38,13 +38,11 @@ module UnitMeasurements
     end
 
     def conversion_factor
-      if value.is_a?(String)
-        measurement_value, measurement_unit = Parser.parse(value)
-        conversion_factor = unit_group.unit_for!(measurement_unit).conversion_factor
-        conversion_factor * measurement_value
-      else
-        value
-      end
+      return value if value.is_a?(Numeric)
+
+      measurement_value, measurement_unit = parse_value(value)
+      conversion_factor = unit_group.unit_for!(measurement_unit).conversion_factor
+      conversion_factor * measurement_value
     end
 
     private
@@ -75,5 +73,17 @@ module UnitMeasurements
       ["R",  %w(ronna),     1e+27],
       ["Q",  %w(quetta),    1e+30]
     ].map(&:freeze).freeze
+
+    def parse_value(tokens)
+      case tokens
+      when String
+        tokens = Parser.parse(value)
+      when Array
+        raise BaseError, "Cannot parse [number, unit] formatted tokens from #{tokens}." unless tokens.size == 2
+      else
+        raise BaseError, "Value of the unit must be defined as string or array, but received #{tokens}"
+      end
+      [tokens[0].to_r, tokens[1].freeze]
+    end
   end
 end

data/lib/unit_measurements/version.rb

@@ -3,5 +3,5 @@
 # -*- warn_indent: true -*-
 
 module UnitMeasurements
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/lib/unit_measurements.rb

@@ -2,6 +2,10 @@
 # -*- frozen_string_literal: true -*-
 # -*- warn_indent: true -*-
 
+module UnitMeasurements
+  class BaseError < StandardError; end
+end
+
 require "unit_measurements/base"
 
 require "unit_measurements/unit_groups/all"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unit_measurements
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Harshal LADHE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -107,6 +107,7 @@ files:
 - lib/unit_measurements/errors/parse_error.rb
 - lib/unit_measurements/errors/unit_already_defined_error.rb
 - lib/unit_measurements/errors/unit_error.rb
+- lib/unit_measurements/formatter.rb
 - lib/unit_measurements/measurement.rb
 - lib/unit_measurements/normalizer.rb
 - lib/unit_measurements/parser.rb