measured-rails 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d5f88adb6a1fc196acee3086445d1c4b006fba0
-  data.tar.gz: b5631f498609ac942c7d872979c9dc3b47e38ed3
+  metadata.gz: 92ddafd5d1a33f79eee76d8b642bc787aacc8234
+  data.tar.gz: b31d4d3fefbfce82776255ce6dd9d035ffb2fb1c
 SHA512:
-  metadata.gz: bcf37b722d81823b4f7d4aae41bc5252f3c10fc2f9ef2196f37a77c7c3ab304d3443c5eaf330ddbfbdb8db098ae128ec26ab66b7100392b6985754f0762d0908
-  data.tar.gz: 17848420192907297507c09746fb955978cccc84a5e07ab7c21812c499fc8a7d46078552b8d0e8bf71b763255b3d62dd7c8ff2a3c80a6fa50c5dab32eec26df8
+  metadata.gz: 440b341b39ad63d13c36a233a6e1943bd7557a863e32a2a7393f25c2e42021afeb12c5b90d2718ffd5b37b5fa70c3890051ed43f3d8de9b060a4b3cf2d180884
+  data.tar.gz: 835c01c1bba6432b34c1817bfc7910bd05561a790b1363388f932e7f4e2d4bb7cdbc3daa5edaed7d585d7bc682f2d1b783f3d148eb2b28baac3a590362f9f667

data/README.md

@@ -20,7 +20,7 @@ Or stand alone:
 
 ### ActiveRecord
 
-Columns are expected to have the `_value` and `_unit` suffix, and be `DECIMAL` and `VARCHAR`, and defaults are accepted:
+Columns are expected to have the `_value` and `_unit` suffix, and be `DECIMAL` and `VARCHAR`, and defaults are accepted. Customizing the column used to hold units is supported, see below for details.
 
 ```ruby
 class AddWeightAndLengthToThings < ActiveRecord::Migration
@@ -43,6 +43,15 @@ class Thing < ActiveRecord::Base
 end
 ```
 
+You can optionally customize the model's unit column by specifying it in the `unit_field_name` option, as follows:
+
+```ruby
+class ThingWithCustomUnitAccessor < ActiveRecord::Base
+  measured_length :length, :width, :height,     unit_field_name: :size_unit
+  measured_weight :total_weight, :extra_weight, unit_field_name: :weight_unit
+end
+```
+
 There are some simpler methods for predefined types:
 
 ```ruby

data/lib/measured/rails/active_record.rb

@@ -5,6 +5,7 @@ module Measured::Rails::ActiveRecord
     def measured(measured_class, *fields)
       options = fields.extract_options!
       options = {}.merge(options)
+      defined_unit_accessors = []
 
       measured_class = measured_class.constantize if measured_class.is_a?(String)
 
@@ -14,12 +15,22 @@ module Measured::Rails::ActiveRecord
 
       fields.map(&:to_sym).each do |field|
         raise Measured::Rails::Error, "The field #{ field } has already been measured" if measured_fields.keys.include?(field)
+
         measured_fields[field] = options
 
+        if options[:unit_field_name]
+          unit_field_name = options[:unit_field_name].to_s
+          measured_fields[field][:unit_field_name] = unit_field_name
+        else
+          unit_field_name = "#{ field }_unit"
+        end
+
+        value_field_name = "#{ field }_value"
+
         # Reader to retrieve measured object
         define_method(field) do
-          value = public_send("#{ field }_value")
-          unit = public_send("#{ field }_unit")
+          value = public_send(value_field_name)
+          unit = public_send(unit_field_name)
 
           return nil unless value && unit
 
@@ -41,11 +52,10 @@ module Measured::Rails::ActiveRecord
         define_method("#{ field }=") do |incoming|
           if incoming.is_a?(measured_class)
             instance_variable_set("@measured_#{ field }", incoming)
-            value_field_name = "#{ field }_value"
             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  
@@ -53,20 +63,22 @@ module Measured::Rails::ActiveRecord
               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("#{ field }_unit=", incoming.unit)
+            public_send("#{ unit_field_name }=", incoming.unit)
           else
             instance_variable_set("@measured_#{ field }", nil)
-            public_send("#{ field }_value=", nil)
-            public_send("#{ field }_unit=", nil)
+            public_send("#{ value_field_name}=", nil)
+            public_send("#{ unit_field_name }=", nil)
           end
         end
 
+        next if defined_unit_accessors.include?(unit_field_name)
+
         # Writer to override unit assignment
-        define_method("#{ field }_unit=") do |incoming|
+        define_method("#{ unit_field_name }=") do |incoming|
+          defined_unit_accessors << unit_field_name
           incoming = measured_class.conversion.to_unit_name(incoming) if measured_class.valid_unit?(incoming)
-          write_attribute("#{ field }_unit", incoming)
+          write_attribute(unit_field_name, incoming)
         end
-
       end
     end
 

data/lib/measured/rails/validations.rb

@@ -9,10 +9,13 @@ class MeasuredValidator < ActiveModel::EachValidator
 
   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 = "#{ attribute }_value"
 
     measured_class = measured_config[:class]
-    measurable_unit = record.public_send("#{ attribute }_unit")
-    measurable_value = record.public_send("#{ attribute }_value")
+
+    measurable_unit = record.public_send(unit_field_name)
+    measurable_value = record.public_send(value_field_name)
 
     return unless measurable_unit.present? || measurable_value.present?
 

data/lib/measured/rails/version.rb

@@ -1,5 +1,5 @@
 module Measured
   module Rails
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

data/measured-rails.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "measured", Measured::Rails::VERSION
+
   spec.add_runtime_dependency "railties", ">= 4.0"
   spec.add_runtime_dependency "activemodel", ">= 4.0"
-  spec.add_runtime_dependency "measured", "1.5.0"
 
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.5.1"

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: measured
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: measured
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,6 @@ files:
 - lib/measured/rails/validations.rb
 - lib/measured/rails/version.rb
 - measured-rails.gemspec
-- repodb.yml
 - shipit.rubygems.yml
 homepage: https://github.com/Shopify/measured-rails
 licenses:

data/repodb.yml

@@ -1,3 +0,0 @@
-classification: library
-ci_urls:
-  - https://travis-ci.org/Shopify/measured-rails