unidom-shopping 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5276d58133bb310c90d7012437cffe72bda62a52
-  data.tar.gz: 50c27ce29d77fa06bb3bd955ac0d7aa77b6b0eec
+  metadata.gz: d2d10a943cfa1d8866729d933e502d44923a4b24
+  data.tar.gz: 48ac384eee11e6eb1514638122acf1bcbc089df7
 SHA512:
-  metadata.gz: d726037483b38c8ada6a3135a1de53de5a2eb5161ee4f68222b64c7b4a04ed5f77f83a003461d2d28e0a85674c585739f598e85f738e33207274ef050e1fb65a
-  data.tar.gz: 6e1ed21dcdca1f290c3d3bebfc042e817c2e601bc365a463d2a622a5118e715a54f1776777ab7ab50afddadda16afcd39724faffd69866d0edeea35ae123318e
+  metadata.gz: 7612c368bab2ac58f8cdeac6d299c8c6477e6dec539273a0849b54055817b452fc140c255a22e1a4ee3e907f1eb639a3f12b52df3fb131da45cec1a8af7ca815
+  data.tar.gz: 057cbb45b67aa01ce1e082bc7fc07e769bda3b84c550d8d480b73efb8437166f0a4f9d47d49aee70e8a7046349b2cd43313265ccf7cb9c8b52aa1f878a78d19d

data/app/models/unidom/shopping/shopping_item.rb

@@ -7,15 +7,15 @@ class Unidom::Shopping::ShoppingItem < Unidom::Shopping::ApplicationRecord
 
   include Unidom::Common::Concerns::ModelExtension
 
-  validates :unit_price, presence: true, numericality: { greater_than: 0, less_than: 1_000_000_000 }
-  validates :quantity,   presence: true, numericality: { greater_than: 0, less_than: 1_000_000_000 }
+  validates :unit_price, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 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 :shopping_cart, class_name: 'Unidom::Shopping::ShoppingCart'
   belongs_to :shopper,       polymorphic: true
   belongs_to :shopped,       polymorphic: true
 
-  scope :shopping_cart_is, ->(shopping_cart) { where shopping_cart_id: (shopping_cart.respond_to?(:id) ? shopping_cart.id : shopping_cart) }
-  scope :shopped_by,       ->(shopper)       { where shopper: shopper }
-  scope :shopped_is,       ->(shopped)       { where shopped: shopped }
+  scope :shopping_cart_is, ->(shopping_cart) { where shopping_cart_id: to_id(shopping_cart) }
+  scope :shopped_by,       ->(shopper)       { where shopper:          shopper              }
+  scope :shopped_is,       ->(shopped)       { where shopped:          shopped              }
 
 end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Shopping::ShoppingItem'

data/lib/rspec/models/unidom/shopping/shopping_item_spec.rb

@@ -20,49 +20,10 @@ describe Unidom::Shopping::ShoppingItem, type: :model do
 
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
-    it_behaves_like 'validates', model_attributes, :unit_price,
-      {                                } => 0,
-      { unit_price: nil                } => 2,
-      { unit_price: ''                 } => 2,
-      { unit_price: '1'                } => 0,
-      { unit_price: 1                  } => 0,
-      { unit_price: 'A'                } => 1,
-      { unit_price: '1.23'             } => 0,
-      { unit_price: 1.23               } => 0,
-      { unit_price: '-0.01'            } => 1,
-      { unit_price: -0.01              } => 1,
-      { unit_price: '0'                } => 1,
-      { unit_price: 0                  } => 1,
-      { unit_price: '0.01'             } => 0,
-      { unit_price: 0.01               } => 0,
-      { unit_price: '999_999_999.99'   } => 0,
-      { unit_price: 999_999_999.99     } => 0,
-      { unit_price: '1_000_000_000'    } => 1,
-      { unit_price: 1_000_000_000      } => 1,
-      { unit_price: '1_000_000_000.01' } => 1,
-      { unit_price: 1_000_000_000.01   } => 1
-
-    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'                } => 1,
-      { quantity: 0                  } => 1,
-      { 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, :unit_price,
+      range: 0..1_000_000_000, minimum_inclusive: true, maximum_inclusive: true
+    it_behaves_like 'validates numericality', model_attributes, :quantity,
+      range: 0..1_000_000_000, minimum_inclusive: true, maximum_inclusive: true
 
     shopping_cart_attributes = {
       shopper_id:   SecureRandom.uuid,

data/lib/unidom/shopping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-shopping
 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-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common