measured-rails 1.3.0 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 86e1a498be818adbbced7c5e65df996f43185d53
4
- data.tar.gz: 56e4f4fcfc8428dd895f2d65251173e800bf4dc2
3
+ metadata.gz: 18e7435ac5ed17774e92a41436794528b6cb9e34
4
+ data.tar.gz: b62507545c7f7077840398abdefb7060beed4155
5
5
  SHA512:
6
- metadata.gz: c2e38891f2943c3359ae87707a912c077f9ea6b88e92dc9c95b47c6f4d16f862f09e5e02bea6b9357dc75603b16a888aba5d1b3d673ed1e8fd5664abc07127c3
7
- data.tar.gz: ad6ec66a798f1cb2deb3644b1da0c5e8126812f04e4525a66966fe2ef69f47bddd8e93a071b0b544a8d5f54ecd97ccb052b26792fc8b7cffa9daec545ee35aa5
6
+ metadata.gz: 94d26842b24e7bd07eca89f74df8cebea6b90dee47ee249983fee9e412c4f0ca4f7341eb3f8eb17d44155aca8ec278e2bed67074232a380ff8c399c1bd2669f1
7
+ data.tar.gz: bee75e064ee7ef9bf363dca35bf8748d36b7daa3e122b95daf1b1990e342feba60f8395e723080d86a66fe7be533fb3947571531fd4861b6525b297282d0532a
@@ -25,11 +25,13 @@ class MeasuredValidator < ActiveModel::EachValidator
25
25
  record.errors.add(attribute, message("is not a valid unit")) unless valid_units.include?(measured_class.conversion.to_unit_name(measurable_unit))
26
26
  end
27
27
 
28
- options.slice(*CHECKS.keys).each do |option, value|
29
- comparable_value = value_for(value, record)
30
- comparable_value = measured_class.new(comparable_value, measurable_unit) if comparable_value.is_a?(Numeric)
31
- unless measurable.public_send(CHECKS[option], comparable_value)
32
- record.errors.add(attribute, message("#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
28
+ if measured_class.valid_unit?(measurable_unit)
29
+ options.slice(*CHECKS.keys).each do |option, value|
30
+ comparable_value = value_for(value, record)
31
+ comparable_value = measured_class.new(comparable_value, measurable_unit) if comparable_value.is_a?(Numeric)
32
+ unless measurable.public_send(CHECKS[option], comparable_value)
33
+ record.errors.add(attribute, message("#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
34
+ end
33
35
  end
34
36
  end
35
37
  end
@@ -49,7 +51,7 @@ class MeasuredValidator < ActiveModel::EachValidator
49
51
  else
50
52
  key
51
53
  end
52
-
54
+
53
55
  raise ArgumentError, ":#{ value } must be a number or a Measurable object" unless (value.is_a?(Numeric) || value.is_a?(Measured::Measurable))
54
56
  value
55
57
  end
@@ -1,5 +1,5 @@
1
1
  module Measured
2
2
  module Rails
3
- VERSION = "1.3.0"
3
+ VERSION = "1.3.1"
4
4
  end
5
5
  end
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
20
20
 
21
21
  spec.add_runtime_dependency "railties", ">= 4.0"
22
22
  spec.add_runtime_dependency "activemodel", ">= 4.0"
23
- spec.add_runtime_dependency "measured", "1.3.0"
23
+ spec.add_runtime_dependency "measured", "1.3.1"
24
24
 
25
25
  spec.add_development_dependency "rake", "~> 10.0"
26
26
  spec.add_development_dependency "minitest", "~> 5.5.1"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: measured-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 1.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kevin McPhillips
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-01-14 00:00:00.000000000 Z
11
+ date: 2016-01-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 1.3.0
47
+ version: 1.3.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 1.3.0
54
+ version: 1.3.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rake
57
57
  requirement: !ruby/object:Gem::Requirement