measured 2.8.2 → 3.1.0

data/cache/weight.json

@@ -89,6 +89,10 @@
       "numerator": 1,
       "denominator": 1000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000
+    },
     "slug": {
       "numerator": 1000,
       "denominator": 14593903
@@ -203,6 +207,10 @@
       "numerator": 1,
       "denominator": 1000000000000000000000000000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000000000000000000000000000
+    },
     "slug": {
       "numerator": 1,
       "denominator": 14593903000000000000000000000
@@ -317,6 +325,10 @@
       "numerator": 1,
       "denominator": 1000000000000000000000000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000000000000000000000000
+    },
     "slug": {
       "numerator": 1,
       "denominator": 14593903000000000000000000
@@ -431,6 +443,10 @@
       "numerator": 1,
       "denominator": 1000000000000000000000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000000000000000000000
+    },
     "slug": {
       "numerator": 1,
       "denominator": 14593903000000000000000
@@ -545,6 +561,10 @@
       "numerator": 1,
       "denominator": 1000000000000000000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000000000000000000
+    },
     "slug": {
       "numerator": 1,
       "denominator": 14593903000000000000
@@ -659,6 +679,10 @@
       "numerator": 1,
       "denominator": 1000000000000000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000000000000000
+    },
     "slug": {
       "numerator": 1,
       "denominator": 14593903000000000
@@ -773,6 +797,10 @@
       "numerator": 1,
       "denominator": 1000000000000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000000000000
+    },
     "slug": {
       "numerator": 1,
       "denominator": 14593903000000
@@ -887,6 +915,10 @@
       "numerator": 1,
       "denominator": 1000000000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000000000
+    },
     "slug": {
       "numerator": 1,
       "denominator": 14593903000
@@ -1001,6 +1033,10 @@
       "numerator": 1,
       "denominator": 1000000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100000000
+    },
     "slug": {
       "numerator": 1,
       "denominator": 14593903
@@ -1115,6 +1151,10 @@
       "numerator": 1,
       "denominator": 100000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 10000000
+    },
     "slug": {
       "numerator": 10,
       "denominator": 14593903
@@ -1229,6 +1269,10 @@
       "numerator": 1,
       "denominator": 10000000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 1000000
+    },
     "slug": {
       "numerator": 100,
       "denominator": 14593903
@@ -1343,6 +1387,10 @@
       "numerator": 1,
       "denominator": 100000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 10000
+    },
     "slug": {
       "numerator": 10000,
       "denominator": 14593903
@@ -1457,6 +1505,10 @@
       "numerator": 1,
       "denominator": 10000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 1000
+    },
     "slug": {
       "numerator": 100000,
       "denominator": 14593903
@@ -1571,6 +1623,10 @@
       "numerator": 1,
       "denominator": 1000
     },
+    "q": {
+      "numerator": 1,
+      "denominator": 100
+    },
     "slug": {
       "numerator": 1000000,
       "denominator": 14593903
@@ -1685,6 +1741,10 @@
       "numerator": 1,
       "denominator": 1
     },
+    "q": {
+      "numerator": 10,
+      "denominator": 1
+    },
     "slug": {
       "numerator": 1000000000,
       "denominator": 14593903
@@ -1799,6 +1859,10 @@
       "numerator": 1000,
       "denominator": 1
     },
+    "q": {
+      "numerator": 10000,
+      "denominator": 1
+    },
     "slug": {
       "numerator": 1000000000000,
       "denominator": 14593903
@@ -1913,6 +1977,10 @@
       "numerator": 1000000,
       "denominator": 1
     },
+    "q": {
+      "numerator": 10000000,
+      "denominator": 1
+    },
     "slug": {
       "numerator": 1000000000000000,
       "denominator": 14593903
@@ -2027,6 +2095,10 @@
       "numerator": 1000000000,
       "denominator": 1
     },
+    "q": {
+      "numerator": 10000000000,
+      "denominator": 1
+    },
     "slug": {
       "numerator": 1000000000000000000,
       "denominator": 14593903
@@ -2141,6 +2213,10 @@
       "numerator": 1000000000000,
       "denominator": 1
     },
+    "q": {
+      "numerator": 10000000000000,
+      "denominator": 1
+    },
     "slug": {
       "numerator": 1000000000000000000000,
       "denominator": 14593903
@@ -2255,6 +2331,10 @@
       "numerator": 1000000000000000,
       "denominator": 1
     },
+    "q": {
+      "numerator": 10000000000000000,
+      "denominator": 1
+    },
     "slug": {
       "numerator": 1000000000000000000000000,
       "denominator": 14593903
@@ -2369,6 +2449,10 @@
       "numerator": 1000000000000000000,
       "denominator": 1
     },
+    "q": {
+      "numerator": 10000000000000000000,
+      "denominator": 1
+    },
     "slug": {
       "numerator": 1000000000000000000000000000,
       "denominator": 14593903
@@ -2483,6 +2567,10 @@
       "numerator": 1,
       "denominator": 1000000000000000000
     },
+    "q": {
+      "numerator": 10,
+      "denominator": 1
+    },
     "slug": {
       "numerator": 1000000000,
       "denominator": 14593903
@@ -2508,6 +2596,124 @@
       "denominator": 45359237
     }
   },
+  "q": {
+    "q": {
+      "numerator": 1,
+      "denominator": 1
+    },
+    "g": {
+      "numerator": 100000,
+      "denominator": 1
+    },
+    "yg": {
+      "numerator": 100000000000000000000000000000,
+      "denominator": 1
+    },
+    "zg": {
+      "numerator": 100000000000000000000000000,
+      "denominator": 1
+    },
+    "ag": {
+      "numerator": 100000000000000000000000,
+      "denominator": 1
+    },
+    "fg": {
+      "numerator": 100000000000000000000,
+      "denominator": 1
+    },
+    "pg": {
+      "numerator": 100000000000000000,
+      "denominator": 1
+    },
+    "ng": {
+      "numerator": 100000000000000,
+      "denominator": 1
+    },
+    "μg": {
+      "numerator": 100000000000,
+      "denominator": 1
+    },
+    "mg": {
+      "numerator": 100000000,
+      "denominator": 1
+    },
+    "cg": {
+      "numerator": 10000000,
+      "denominator": 1
+    },
+    "dg": {
+      "numerator": 1000000,
+      "denominator": 1
+    },
+    "dag": {
+      "numerator": 10000,
+      "denominator": 1
+    },
+    "hg": {
+      "numerator": 1000,
+      "denominator": 1
+    },
+    "kg": {
+      "numerator": 100,
+      "denominator": 1
+    },
+    "Mg": {
+      "numerator": 1,
+      "denominator": 10
+    },
+    "Gg": {
+      "numerator": 1,
+      "denominator": 10000
+    },
+    "Tg": {
+      "numerator": 1,
+      "denominator": 10000000
+    },
+    "Pg": {
+      "numerator": 1,
+      "denominator": 10000000000
+    },
+    "Eg": {
+      "numerator": 1,
+      "denominator": 10000000000000
+    },
+    "Zg": {
+      "numerator": 1,
+      "denominator": 10000000000000000
+    },
+    "Yg": {
+      "numerator": 1,
+      "denominator": 10000000000000000000
+    },
+    "t": {
+      "numerator": 1,
+      "denominator": 10
+    },
+    "slug": {
+      "numerator": 100000000,
+      "denominator": 14593903
+    },
+    "N": {
+      "numerator": 10000000000000000000,
+      "denominator": 10197162129779283
+    },
+    "long_ton": {
+      "numerator": 31250000,
+      "denominator": 317514659
+    },
+    "short_ton": {
+      "numerator": 5000000,
+      "denominator": 45359237
+    },
+    "lb": {
+      "numerator": 10000000000,
+      "denominator": 45359237
+    },
+    "oz": {
+      "numerator": 160000000000,
+      "denominator": 45359237
+    }
+  },
   "slug": {
     "slug": {
       "numerator": 1,
@@ -2601,6 +2807,10 @@
       "numerator": 14593903,
       "denominator": 1000000000
     },
+    "q": {
+      "numerator": 14593903,
+      "denominator": 100000000
+    },
     "N": {
       "numerator": 1459390300000000000,
       "denominator": 10197162129779283
@@ -2715,6 +2925,10 @@
       "numerator": 10197162129779283,
       "denominator": 100000000000000000000
     },
+    "q": {
+      "numerator": 10197162129779283,
+      "denominator": 10000000000000000000
+    },
     "slug": {
       "numerator": 10197162129779283,
       "denominator": 1459390300000000000
@@ -2829,6 +3043,10 @@
       "numerator": 317514659,
       "denominator": 312500000
     },
+    "q": {
+      "numerator": 317514659,
+      "denominator": 31250000
+    },
     "slug": {
       "numerator": 5080234544,
       "denominator": 72969515
@@ -2943,6 +3161,10 @@
       "numerator": 45359237,
       "denominator": 50000000
     },
+    "q": {
+      "numerator": 45359237,
+      "denominator": 5000000
+    },
     "slug": {
       "numerator": 907184740,
       "denominator": 14593903
@@ -3057,6 +3279,10 @@
       "numerator": 45359237,
       "denominator": 100000000000
     },
+    "q": {
+      "numerator": 45359237,
+      "denominator": 10000000000
+    },
     "slug": {
       "numerator": 45359237,
       "denominator": 1459390300
@@ -3171,6 +3397,10 @@
       "numerator": 45359237,
       "denominator": 1600000000000
     },
+    "q": {
+      "numerator": 45359237,
+      "denominator": 160000000000
+    },
     "slug": {
       "numerator": 45359237,
       "denominator": 23350244800

data/dev.yml

@@ -1,8 +1,7 @@
 name: measured
 
 up:
-  - ruby:
-      version: 3.0.2
+  - ruby
   - bundler
 
 commands:

data/gemfiles/rails-7.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 7.0'
+gem 'activerecord', '~> 7.0'

data/gemfiles/rails-7.1.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 7.1'
+gem "activerecord", '~> 7.1'

data/gemfiles/rails-edge.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', github: 'rails/rails', branch: 'main'
+gem 'activerecord', github: 'rails/rails', branch: 'main'

data/lib/measured/measurable.rb

@@ -17,6 +17,8 @@ class Measured::Measurable < Numeric
       value
     when Integer
       Rational(value)
+    when String
+      /\d+\/\d+/.match?(value) ? Rational(value) : BigDecimal(value)
     else
       BigDecimal(value)
     end
@@ -30,7 +32,7 @@ class Measured::Measurable < Numeric
       else
         value.to_f.to_s
       end
-      str.gsub(/\.0*\Z/, "")
+      /\.0*\Z/.match?(str) ? str.gsub(/\.0*\Z/, "") : str
     end.freeze
   end
 

data/lib/measured/rails/active_record.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+module Measured::Rails::ActiveRecord
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def measured(measured_class, *fields)
+      options = fields.extract_options!
+      options = {}.merge(options)
+
+      measured_class = measured_class.constantize if measured_class.is_a?(String)
+      unless measured_class.is_a?(Class) && measured_class.ancestors.include?(Measured::Measurable)
+        raise Measured::Rails::Error, "Expecting #{ measured_class } to be a subclass of Measured::Measurable"
+      end
+
+      options[:class] = measured_class
+
+      fields.map(&:to_sym).each do |field|
+        raise Measured::Rails::Error, "The field #{ field } has already been measured" if measured_fields.key?(field)
+
+        measured_fields[field] = options
+
+        unit_field_name = if options[:unit_field_name]
+          measured_fields[field][:unit_field_name] = options[:unit_field_name].to_s
+        else
+          "#{ field }_unit"
+        end
+
+        value_field_name = if options[:value_field_name]
+          measured_fields[field][:value_field_name] = options[:value_field_name].to_s
+        else
+          "#{ field }_value"
+        end
+
+        # Reader to retrieve measured object
+        define_method(field) do
+          value = public_send(value_field_name)
+          unit = public_send(unit_field_name)
+
+          return nil unless value && unit
+
+          instance = instance_variable_get("@measured_#{ field }") if instance_variable_defined?("@measured_#{ field }")
+          new_instance = begin
+            measured_class.new(value, unit)
+          rescue Measured::UnitError
+            nil
+          end
+
+          if instance == new_instance
+            instance
+          else
+            instance_variable_set("@measured_#{ field }", new_instance)
+          end
+        end
+
+        # Writer to assign measured object
+        define_method("#{ field }=") do |incoming|
+          if incoming.is_a?(measured_class)
+            instance_variable_set("@measured_#{ field }", incoming)
+            precision = self.column_for_attribute(value_field_name).precision
+            scale = self.column_for_attribute(value_field_name).scale
+            rounded_to_scale_value = incoming.value.round(scale)
+
+            max = self.class.measured_fields[field][:max_on_assignment]
+            if max && rounded_to_scale_value > max
+              rounded_to_scale_value = max
+            elsif rounded_to_scale_value.to_i.to_s.length > (precision - scale)
+              raise Measured::Rails::Error, "The value #{rounded_to_scale_value} being set for column '#{value_field_name}' has too many significant digits. Please ensure it has no more than #{precision - scale} significant digits."
+            end
+
+            public_send("#{ value_field_name }=", rounded_to_scale_value)
+            public_send("#{ unit_field_name }=", incoming.unit.name)
+          else
+            instance_variable_set("@measured_#{ field }", nil)
+            public_send("#{ value_field_name}=", nil)
+            public_send("#{ unit_field_name }=", nil)
+          end
+        end
+
+        # Writer to override unit assignment
+        redefine_method("#{ unit_field_name }=") do |incoming|
+          unit_name = measured_class.unit_system.unit_for(incoming).try!(:name)
+          write_attribute(unit_field_name, unit_name || incoming)
+        end
+      end
+    end
+
+    def measured_fields
+      @measured_fields ||= {}
+    end
+
+  end
+
+  module Length
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def measured_length(*fields)
+        measured(Measured::Length, *fields)
+      end
+    end
+  end
+
+  module Volume
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def measured_volume(*fields)
+        measured(Measured::Volume, *fields)
+      end
+    end
+  end
+
+  module Weight
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def measured_weight(*fields)
+        measured(Measured::Weight, *fields)
+      end
+    end
+  end
+end
+
+::ActiveRecord::Base.include(
+  Measured::Rails::ActiveRecord,
+  Measured::Rails::ActiveRecord::Length,
+  Measured::Rails::ActiveRecord::Volume,
+  Measured::Rails::ActiveRecord::Weight,
+)

data/lib/measured/rails/validations.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require "active_model/validations"
+
+class MeasuredValidator < ActiveModel::EachValidator
+  CHECKS = {
+    greater_than: :>,
+    greater_than_or_equal_to: :>=,
+    equal_to: :==,
+    less_than: :<,
+    less_than_or_equal_to: :<=,
+  }.freeze
+
+  def validate_each(record, attribute, measurable)
+    measured_config = record.class.measured_fields[attribute]
+    unit_field_name = measured_config[:unit_field_name] || "#{ attribute }_unit"
+    value_field_name = measured_config[:value_field_name] || "#{ attribute }_value"
+
+    measured_class = measured_config[:class]
+
+    measurable_unit_name = record.public_send(unit_field_name)
+    measurable_value = record.public_send(value_field_name)
+
+    return unless measurable_unit_name.present? || measurable_value.present?
+
+    measurable_unit = measured_class.unit_system.unit_for(measurable_unit_name)
+    record.errors.add(attribute, message(record, "is not a valid unit")) unless measurable_unit
+
+    if options[:units] && measurable_unit.present?
+      valid_units = Array(options[:units]).map { |unit| measured_class.unit_system.unit_for(unit) }
+      record.errors.add(attribute, message(record, "is not a valid unit")) unless valid_units.include?(measurable_unit)
+    end
+
+    if measurable_unit && measurable_value.present?
+      options.slice(*CHECKS.keys).each do |option, value|
+        comparable_value = value_for(value, record)
+        comparable_value = measured_class.new(comparable_value, measurable_unit) unless comparable_value.is_a?(Measured::Measurable)
+        unless measurable.public_send(CHECKS[option], comparable_value)
+          record.errors.add(attribute, message(record, "#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
+        end
+      end
+    end
+  end
+
+  private
+
+  def message(record, default_message)
+    if options[:message].respond_to?(:call)
+      options[:message].call(record)
+    else
+      options[:message] || default_message
+    end
+  end
+
+  def value_for(key, record)
+    value = case key
+    when Proc
+      key.call(record)
+    when Symbol
+      record.send(key)
+    else
+      key
+    end
+
+    raise ArgumentError, ":#{ value } must be a number or a Measurable object" unless (value.is_a?(Numeric) || value.is_a?(Measured::Measurable))
+    value
+  end
+end

data/lib/measured/railtie.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Measured
+  class Rails < ::Rails::Railtie
+    class Error < StandardError ; end
+
+    ActiveSupport.on_load(:active_record) do
+      require "measured/rails/active_record"
+      require "measured/rails/validations"
+    end
+  end
+end

data/lib/measured/units/weight.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 Measured::Weight = Measured.build do
-  si_unit :g, aliases: [:gram, :grams]
+  si_unit :g, aliases: [:gram, :grams, :gm, :gms]
 
-  unit :t, value: "1000 kg", aliases: [:metric_ton, :metric_tons]
+  unit :t, value: "1000 kg", aliases: [:metric_ton, :metric_tons, :tonne, :tonnes]
+  unit :q, value: "100 kg", aliases: [:quintal, :quintals]
   unit :slug, value: "14.593903 kg", aliases: [:slugs]
   unit :N, value: "0.10197162129779283 kg", aliases: [:newtons, :newton]
   unit :long_ton, value: "2240 lb", aliases: [:long_tons, :weight_ton, :weight_tons, 'W/T', :imperial_ton, :imperial_tons, :displacement_ton, :displacement_tons]

data/lib/measured/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Measured
-  VERSION = "2.8.2"
+  VERSION = "3.1.0"
 end