unidom-product 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c80f934669ce3fa10183670be3001512c03d0c
-  data.tar.gz: 47c73d4f27f96cdcfe84fccc66cdb1a09682f728
+  metadata.gz: 172e90aae1105935a4ac3c721620d615b99ad739
+  data.tar.gz: 4bfb57d960ca4e93aacdfb5b90f1f13ca1725761
 SHA512:
-  metadata.gz: b484aecc01964febd43697a2728aeae4f4c3bee8fa49ad102eeb05c56bcdb8e725e0f39c032b32071d2f5839161c357fc2e887e83b26999420fe308094f4d9d0
-  data.tar.gz: 272c521a7397b04298d6e0835be5a5955102866c95b99354207b248670ab42d7c0d0be5b758d5ca96c7af569ab0d0aef3c0dbbb57de796d4a4bcbad06ad4aac1
+  metadata.gz: 48d82e46e446bcfcb937a42c58666d297df4b5abb99bc11039119b53909b0f2f8c44f29274f2835452cd5739591317747cb11c96d86834becefe87b4ac287b46
+  data.tar.gz: ef3aee8a9fa7ea06ffdecbc5d33b10ee34f1a22ba2aa9203d5b794e690f10499247d440ddcad6576c11102ee304bc69ee9bf0e3f6d1e68b561aa4c828972579b

data/app/models/unidom/product/product_associating.rb

@@ -18,7 +18,7 @@ class Unidom::Product::ProductAssociating < Unidom::Product::ApplicationRecord
   include Unidom::Common::Concerns::ModelExtension
   include ProgneTapera::EnumCode
 
-  validates :quantity, presence: true, numericality: { greater_than_or_equal_to: 0, less_than: 1_000_000_000 }
+  validates :quantity, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
 
   belongs_to :source, class_name: 'Unidom::Product::Product'
   belongs_to :target, class_name: 'Unidom::Product::Product'

data/lib/rspec/models/unidom/product/product_associating_spec.rb

@@ -18,27 +18,8 @@ describe Unidom::Product::ProductAssociating, type: :model do
 
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
-    it_behaves_like 'validates', model_attributes, :quantity,
-      {                               } => 0,
-      { quantity: nil                 } => 2,
-      { quantity: ''                  } => 2,
-      { quantity: '1'                 } => 0,
-      { quantity: 1                   } => 0,
-      { quantity: 'A'                 } => 1,
-      { quantity: '1.23'              } => 0,
-      { quantity: 1.23                } => 0,
-      { quantity: '-0.01'             } => 1,
-      { quantity: -0.01               } => 1,
-      { quantity: '0'                 } => 0,
-      { quantity: 0                   } => 0,
-      { quantity: '0.01'              } => 0,
-      { quantity: 0.01                } => 0,
-      { quantity: '999_999_999.99'    } => 0,
-      { quantity: 999_999_999.99      } => 0,
-      { quantity: '1_000_000_000'     } => 1,
-      { quantity: 1_000_000_000       } => 1,
-      { quantity: '1_000_000_000.01'  } => 1,
-      { quantity: 1_000_000_000.01    } => 1
+    it_behaves_like 'validates numericality', model_attributes, :quantity,
+      range: 0..1_000_000_000, minimum_inclusive: true, maximum_inclusive: true
 
     it_behaves_like 'ProgneTapera::EnumCode', described_class.new(model_attributes), :product_association, Unidom::Product::ProductAssociation
 

data/lib/rspec/models/unidom/product/product_spec.rb

@@ -16,56 +16,16 @@ describe Unidom::Product::Product, type: :model do
       formset_code:     'WARE'
     }
 
-    name_max_length             = described_class.columns_hash['name'].limit
-    abbreviation_max_length     = described_class.columns_hash['abbreviation'].limit
-    measurement_unit_max_length = described_class.columns_hash['measurement_unit'].limit
-    packing_norm_max_length     = described_class.columns_hash['packing_norm'].limit
-
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
-    it_behaves_like 'validates', model_attributes, :name,
-      {             } => 0,
-      { name: nil   } => 2,
-      { name: ''    } => 2,
-      { name: 'A'   } => 1,
-      { name: 'AA'  } => 0,
-      { name: 'AAA' } => 0,
-      { name: 'A'*(name_max_length-1) } => 0,
-      { name: 'A'*name_max_length     } => 0,
-      { name: 'A'*(name_max_length+1) } => 1
-
-    it_behaves_like 'validates', model_attributes, :abbreviation,
-      {                     } => 0,
-      { abbreviation: nil   } => 2,
-      { abbreviation: ''    } => 2,
-      { abbreviation: 'A'   } => 0,
-      { abbreviation: 'AA'  } => 0,
-      { abbreviation: 'AAA' } => 0,
-      { abbreviation: 'A'*(abbreviation_max_length-1) } => 0,
-      { abbreviation: 'A'*abbreviation_max_length     } => 0,
-      { abbreviation: 'A'*(abbreviation_max_length+1) } => 1
-
-    it_behaves_like 'validates', model_attributes, :measurement_unit,
-      {                         } => 0,
-      { measurement_unit: nil   } => 2,
-      { measurement_unit: ''    } => 2,
-      { measurement_unit: 'A'   } => 0,
-      { measurement_unit: 'AA'  } => 0,
-      { measurement_unit: 'AAA' } => 0,
-      { measurement_unit: 'A'*(measurement_unit_max_length-1) } => 0,
-      { measurement_unit: 'A'*measurement_unit_max_length     } => 0,
-      { measurement_unit: 'A'*(measurement_unit_max_length+1) } => 1
-
-    it_behaves_like 'validates', model_attributes, :packing_norm,
-      {                     } => 0,
-      { packing_norm: nil   } => 2,
-      { packing_norm: ''    } => 2,
-      { packing_norm: 'A'   } => 0,
-      { packing_norm: 'AA'  } => 0,
-      { packing_norm: 'AAA' } => 0,
-      { packing_norm: 'A'*(packing_norm_max_length-1) } => 0,
-      { packing_norm: 'A'*packing_norm_max_length     } => 0,
-      { packing_norm: 'A'*(packing_norm_max_length+1) } => 1
+    it_behaves_like 'validates text', model_attributes, :name,
+      length: 2..described_class.columns_hash['name'].limit
+    it_behaves_like 'validates text', model_attributes, :abbreviation,
+      length: 1..described_class.columns_hash['abbreviation'].limit
+    it_behaves_like 'validates text', model_attributes, :measurement_unit,
+      length: 1..described_class.columns_hash['measurement_unit'].limit
+    it_behaves_like 'validates text', model_attributes, :packing_norm,
+      length: 1..described_class.columns_hash['packing_norm'].limit
 
     it_behaves_like 'ProgneTapera::EnumCode', described_class.new(model_attributes), :formset, Unidom::Product::Formset
 

data/lib/unidom/product/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Product
-    VERSION = '1.7.3'.freeze
+    VERSION = '1.7.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-product
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common