measured-rails 1.6.0 → 2.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92ddafd5d1a33f79eee76d8b642bc787aacc8234
-  data.tar.gz: b31d4d3fefbfce82776255ce6dd9d035ffb2fb1c
+  metadata.gz: 231d75334806054c6ba6aeb54e255aa45cf3f25d
+  data.tar.gz: 7d1e18a0b4e5f3b06094bfac97d62d3e9daba644
 SHA512:
-  metadata.gz: 440b341b39ad63d13c36a233a6e1943bd7557a863e32a2a7393f25c2e42021afeb12c5b90d2718ffd5b37b5fa70c3890051ed43f3d8de9b060a4b3cf2d180884
-  data.tar.gz: 835c01c1bba6432b34c1817bfc7910bd05561a790b1363388f932e7f4e2d4bb7cdbc3daa5edaed7d585d7bc682f2d1b783f3d148eb2b28baac3a590362f9f667
+  metadata.gz: f6b6dee426c7e472116c2f8c269ea87f469f137a3d316d1a32dd3197ded8d06d0391851c7619e28393fb9b01a7dc7a08824ec9151cc868a5eaa3f22a2fbdfa44
+  data.tar.gz: 4380d58cd615d2a13fd2fc3674b8ae816944602755bc6e92680c720e077734c6ae10a1ff9779592058bac0b7d4578912ec5df0c1e4af9bf0c361d46b0df6fbce

data/.travis.yml

@@ -4,11 +4,22 @@ cache: bundler
 rvm:
   - 2.1.8
   - 2.2.4
-  - 2.3.0
+  - 2.3.1
+  - 2.4.0
 gemfile:
   - Gemfile
   - gemfiles/rails-4.2.gemfile
+  - gemfiles/rails-5.0.gemfile
+  - gemfiles/rails-master.gemfile
 matrix:
   exclude:
     - gemfile: Gemfile
       rvm: 2.1.8
+    - gemfile: gemfiles/rails-master.gemfile
+      rvm: 2.1.8
+    - gemfile: gemfiles/rails-5.0.gemfile
+      rvm: 2.1.8
+    - gemfile: gemfiles/rails-4.2.gemfile
+      rvm: 2.4.0
+  allow_failures:
+    - gemfile: gemfiles/rails-master.gemfile

data/README.md

@@ -66,7 +66,7 @@ This will allow you to access and assign a measurement object:
 ```ruby
 thing = Thing.new
 thing.minimum_weight = Measured::Weight.new(10, "g")
-thing.minimum_weight_unit      # "g"
+thing.minimum_weight_unit     # "g"
 thing.minimum_weight_value    # 10
 ```
 
@@ -75,7 +75,7 @@ Order of assignment does not matter, and each property can be assigned separatel
 ```ruby
 params = { total_length_unit: "cm", total_length_value: "3" }
 thing = Thing.new(params)
-thing.total_length   # #<Measured::Length: 3 cm>
+thing.total_length.to_s   # 3 cm
 ```
 
 ### Validations
@@ -102,16 +102,7 @@ Rather than `true` the validation can accept a hash with the following options:
 * `less_than`
 * `less_than_or_equal_to`
 
-**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.
+All comparison validations require `Measured::Measurable` values, not scalars. 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:
 
@@ -120,10 +111,8 @@ thing = Thing.new
 thing.total_length_value = 1
 thing.total_length_unit = "invalid"
 thing.total_length  # nil
-
 ```
 
-
 ## Tests
 
 ```

data/gemfiles/rails-5.0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 5.0'

data/gemfiles/rails-master.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', github: 'rails/rails'

data/lib/measured/rails/active_record.rb

@@ -8,21 +8,21 @@ module Measured::Rails::ActiveRecord
       defined_unit_accessors = []
 
       measured_class = measured_class.constantize if measured_class.is_a?(String)
-
-      raise Measured::Rails::Error, "Expecting #{ measured_class } to be a subclass of Measured::Measurable" if !measured_class.is_a?(Class) || !measured_class.ancestors.include?(Measured::Measurable)
+      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.keys.include?(field)
+        raise Measured::Rails::Error, "The field #{ field } has already been measured" if measured_fields.key?(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
+        unit_field_name = if options[:unit_field_name]
+          measured_fields[field][:unit_field_name] = options[:unit_field_name].to_s
         else
-          unit_field_name = "#{ field }_unit"
+          "#{ field }_unit"
         end
 
         value_field_name = "#{ field }_value"
@@ -41,7 +41,7 @@ module Measured::Rails::ActiveRecord
             nil
           end
 
-          if instance && instance == new_instance
+          if instance == new_instance
             instance
           else
             instance_variable_set("@measured_#{ field }", new_instance)
@@ -58,12 +58,13 @@ module Measured::Rails::ActiveRecord
 
             max = self.class.measured_fields[field][:max_on_assignment]
             if max && rounded_to_scale_value > 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)
+            public_send("#{ unit_field_name }=", incoming.unit.name)
           else
             instance_variable_set("@measured_#{ field }", nil)
             public_send("#{ value_field_name}=", nil)
@@ -76,8 +77,8 @@ module Measured::Rails::ActiveRecord
         # Writer to override unit assignment
         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(unit_field_name, incoming)
+          unit_name = measured_class.unit_system.unit_for(incoming).try!(:name)
+          write_attribute(unit_field_name, unit_name || incoming)
         end
       end
     end

data/lib/measured/rails/validations.rb

@@ -14,22 +14,23 @@ class MeasuredValidator < ActiveModel::EachValidator
 
     measured_class = measured_config[:class]
 
-    measurable_unit = record.public_send(unit_field_name)
+    measurable_unit_name = record.public_send(unit_field_name)
     measurable_value = record.public_send(value_field_name)
 
-    return unless measurable_unit.present? || measurable_value.present?
+    return unless measurable_unit_name.present? || measurable_value.present?
 
-    record.errors.add(attribute, message("is not a valid unit")) unless measured_class.valid_unit?(measurable_unit)
+    measurable_unit = measured_class.unit_system.unit_for(measurable_unit_name)
+    record.errors.add(attribute, message("is not a valid unit")) unless measurable_unit
 
     if options[:units]
-      valid_units = [options[:units]].flatten.map{|u| measured_class.conversion.to_unit_name(u) }
-      record.errors.add(attribute, message("is not a valid unit")) unless valid_units.include?(measured_class.conversion.to_unit_name(measurable_unit))
+      valid_units = Array(options[:units]).map { |unit| measured_class.unit_system.unit_for(unit) }
+      record.errors.add(attribute, message("is not a valid unit")) unless valid_units.include?(measurable_unit)
     end
 
-    if measured_class.valid_unit?(measurable_unit) && measurable_value.present?
+    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) if comparable_value.is_a?(Numeric)
+        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("#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
         end

data/lib/measured/rails/version.rb

@@ -1,5 +1,5 @@
 module Measured
   module Rails
-    VERSION = "1.6.0"
+    VERSION = "2.0.0.pre4"
   end
 end

data/measured-rails.gemspec

@@ -20,12 +20,13 @@ Gem::Specification.new do |spec|
 
   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 "railties", ">= 4.2"
+  spec.add_runtime_dependency "activemodel", ">= 4.2"
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.5.1"
-  spec.add_development_dependency "mocha", "~> 1.1.0"
+  spec.add_development_dependency "rake", "> 10.0"
+  spec.add_development_dependency "minitest", "> 5.5.1"
+  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "mocha", "> 1.1.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0.pre4
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: measured
@@ -16,82 +16,96 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0.pre4
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 5.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 5.5.1
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
@@ -140,6 +154,8 @@ files:
 - bin/setup
 - dev.yml
 - gemfiles/rails-4.2.gemfile
+- gemfiles/rails-5.0.gemfile
+- gemfiles/rails-master.gemfile
 - lib/measured-rails.rb
 - lib/measured/rails/active_record.rb
 - lib/measured/rails/base.rb
@@ -165,12 +181,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails adaptor for measured