measured-rails 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95f2b762444dc351bf41886d19054fe2679893ae
-  data.tar.gz: 233c3ddf282c3b5a54be7df01ed11c9220682a6d
+  metadata.gz: 62c58765bafe20ac024a6ffd00a2b50c7e2acdb5
+  data.tar.gz: 97df4dfbc6504706f2429e3ce7b1694eb567091f
 SHA512:
-  metadata.gz: 4eed05964aa33c9319aa450b20a44976736e7be1db767a55a18aa1787484a78a6f8bf85514668047efa08fe4d585125029f6c175aff4ba6db2e07ff1f0bee6dc
-  data.tar.gz: 4f757002ed6692ab97feefd2d3b19be9093e6f74dfdfc470736b6d2323500a114cafc0c63734d28e4461cecc9a0f79d1835b82a6fba17b14adf14eae1e1178dc
+  metadata.gz: 458d356fe3fce7b8b5f49867f87426e2afeebca08eb4f087ca4c6b310f482456bd614de0e62a0a182a73681485c2e4922e110c7fc5ce6468162ce2fa85ab950b
+  data.tar.gz: 1ddde28c5b1e1a3a60ca48ed83633b7f0466f38bb5792b5baa78e121a74ad27a38e96e65ad93b34d72addf81f826551ff39810816b07fcc1e364adbbc14b0ee8

data/README.md

@@ -87,8 +87,22 @@ Rather than `true` the validation can accept a hash with the following options:
 
 * `message`: Override the default "is invalid" message.
 * `units`: A subset of units available for this measurement. Units must be in existing measurement.
+* `greater_than`
+* `greater_than_or_equal_to`
+* `equal_to`
+* `less_than`
+* `less_than_or_equal_to`
 
-Validations can be combined with `presence` validator.
+**Special case** Comparison based validation against 0
+```ruby
+class Thing < ActiveRecord::Base
+  measured_length :non_negative_weight
+
+  validates :non_negative_weight, measured: {greater_than: 0}
+end
+```
+
+Most of these options replace the `numericality` validator which compares the measurement/method name/proc to the column's value. Validations can also be combined with `presence` validator.
 
 **Note:** Validations are strongly recommended since assigning an invalid unit will cause the measurement to return `nil`, even if there is a value:
 
@@ -118,3 +132,4 @@ $ bundle exec rake test
 ## Authors
 
 * [Kevin McPhillips](https://github.com/kmcphillips) at [Shopify](http://shopify.com/careers)
+* [Sai Warang](https://github.com/cyprusad) at [Shopify](http://shopify.com/careers)

data/lib/measured/rails/validations.rb

@@ -1,18 +1,58 @@
 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]
 
     measured_class = measured_config[:class]
-    measurable_unit = record.send("#{ attribute }_unit")
-    measurable_value = record.send("#{ attribute }_value")
+    measurable_unit = record.public_send("#{ attribute }_unit")
+    measurable_value = record.public_send("#{ attribute }_value")
+
+    return unless measurable_unit.present? || measurable_value.present?
 
-    message = options[:message] || "is not a valid unit"
+    record.errors.add(attribute, message) if [measurable_unit.blank?, measurable_value.blank?].any?
+
+    record.errors.add(attribute, message) unless measured_class.valid_unit?(measurable_unit)
 
     if options[:units]
       valid_units = [options[:units]].flatten.map{|u| measured_class.conversion.to_unit_name(u) }
       record.errors.add(attribute, message) unless valid_units.include?(measured_class.conversion.to_unit_name(measurable_unit))
     end
 
-    record.errors.add(attribute, message) unless measured_class.valid_unit?(measurable_unit)
+    options.slice(*CHECKS.keys).each do |option, value|
+      record.errors.add(attribute, message) unless measurable.public_send(CHECKS[option], value_for(value, record))
+    end
+  end
+
+  private
+
+  def message
+    options[:message] || "is not a valid unit"
+  end
+
+  def value_for(key, record)
+    value = case key
+    when Proc
+      key.call(record)
+    when Symbol
+      record.send(key)
+    else
+      key
+    end
+
+    if value.is_a?(Numeric)
+      raise ArgumentError, ":#{ value } is a scalar. Please validate against a Measurable object with correct units" unless value == 0
+      return value
+    end
+
+    raise ArgumentError, ":#{ value } must be a Measurable object" unless value.is_a?(Measured::Measurable)
+
+    value
   end
 end

data/lib/measured/rails/version.rb

@@ -1,5 +1,5 @@
 module Measured
   module Rails
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
   end
 end

data/measured-rails.gemspec

@@ -19,9 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "rails", ">= 4.0"
-  spec.add_runtime_dependency "measured", "0.0.4"
+  spec.add_runtime_dependency "measured", "0.0.7"
 
-  spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.5.1"
   spec.add_development_dependency "mocha", "~> 1.1.0"

data/shipit.rubygems.yml

@@ -0,0 +1 @@
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +134,7 @@ files:
 - lib/measured/rails/version.rb
 - measured-rails.gemspec
 - repodb.yml
+- shipit.rubygems.yml
 homepage: https://github.com/Shopify/measured-rails
 licenses:
 - MIT
@@ -168,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Rails adaptor for measured