unidom-order 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c98786e6271f1089c7b6496ffdabfe5e025bbb
-  data.tar.gz: b70f21a33fa5b80d831e2ce69fafa5ed13f31f86
+  metadata.gz: fa820b20584f04de082fc98253ec9d5f390916db
+  data.tar.gz: a224376ed7c857555400e2a8e251e600d14249f0
 SHA512:
-  metadata.gz: 986bd454ecd0d4d8235efc213baa888a016d9bb0ba110dc0be5b0c4f19c240ef19780ce53d670a218cc0270d09090022572a5fc1c4975c5210b8b97bc7bb6808
-  data.tar.gz: bc6b8da172abb251afb8800dbfc2bc6d53307a71fdac6a5fdbb0e66e96e9e05e8a096808427fcc31187def45e98ebaf99fe09103572b8033ade8288a64663ca3
+  metadata.gz: 29400ab1626f290b5d5b2446b169a73e83a2fdf5374ce4653848eb87f4f5d90bdb19a795c42a52494059e6bcfe4febbddaf272cdc0651e203e69cd905748bd30
+  data.tar.gz: 94aa20d3f93e25f77f3b0002f17da8844cec6b33839bb360ba49f4152fa759d3d65756b6adc8418c51af20336d4f1693f0f71fb4bbe9f5ad4038197dc8eb9813

data/app/models/unidom/order/order.rb

@@ -9,8 +9,8 @@ class Unidom::Order::Order < Unidom::Order::ApplicationRecord
   include Unidom::Order::Concerns::AsAdjusted
 
   validates :number,           presence: true, length:       { is: self.columns_hash['number'].limit }
-  validates :purchase_amount,  presence: true, numericality: { less_than: 1_000_000_000, greater_than: 0 }
-  validates :aggregate_amount, presence: true, numericality: { less_than: 1_000_000_000, greater_than: 0 }
+  validates :purchase_amount,  presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+  validates :aggregate_amount, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
 
   belongs_to :placer, polymorphic: true
   belongs_to :taker,  polymorphic: true

data/lib/rspec/models/unidom/order/order_adjustment_spec.rb

@@ -74,6 +74,8 @@ describe Unidom::Order::OrderAdjustment, type: :model do
     it_behaves_like 'belongs_to', model_attributes, :adjusted, Unidom::Order::Order,     order_attributes
     it_behaves_like 'belongs_to', model_attributes, :adjusted, Unidom::Order::OrderItem, order_item_attributes
 
+    it_behaves_like 'polymorphic scope', model_attributes, :adjusted_is, :adjusted, [ Unidom::Order::Order, Unidom::Order::OrderItem ]
+
   end
 
 end

data/lib/rspec/models/unidom/order/order_spec.rb

@@ -35,52 +35,10 @@ describe Unidom::Order::Order, type: :model do
       { number: '9'*(number_length+1) } => 1,
       { number: 'A'*(number_length+1) } => 1
 
-    it_behaves_like 'validates', model_attributes, :purchase_amount,
-      {                                     } => 0,
-      { purchase_amount: nil                } => 2,
-      { purchase_amount: ''                 } => 2,
-      { purchase_amount: '1'                } => 0,
-      { purchase_amount: 1                  } => 0,
-      { purchase_amount: 'A'                } => 1,
-      { purchase_amount: '1.23'             } => 0,
-      { purchase_amount: 1.23               } => 0,
-      { purchase_amount: '-0.01'            } => 1,
-      { purchase_amount: -0.01              } => 1,
-      { purchase_amount: '0'                } => 1,
-      { purchase_amount: 0                  } => 1,
-      { purchase_amount: '0.01'             } => 0,
-      { purchase_amount: 0.01               } => 0,
-      { purchase_amount: '999_999_999.99'   } => 0,
-      { purchase_amount: 999_999_999.99     } => 0,
-      { purchase_amount: '1_000_000_000'    } => 1,
-      { purchase_amount: 1_000_000_000      } => 1,
-      { purchase_amount: '1_000_000_000.01' } => 1,
-      { purchase_amount: 1_000_000_000.01   } => 1
-
-    it_behaves_like 'validates', model_attributes, :aggregate_amount,
-      {                                      } => 0,
-      { aggregate_amount: nil                } => 2,
-      { aggregate_amount: ''                 } => 2,
-      { aggregate_amount: '1'                } => 0,
-      { aggregate_amount: 1                  } => 0,
-      { aggregate_amount: 'A'                } => 1,
-      { aggregate_amount: '1.23'             } => 0,
-      { aggregate_amount: 1.23               } => 0,
-      { aggregate_amount: '-0.01'            } => 1,
-      { aggregate_amount: -0.01              } => 1,
-      { aggregate_amount: '0'                } => 1,
-      { aggregate_amount: 0                  } => 1,
-      { aggregate_amount: '0.01'             } => 0,
-      { aggregate_amount: 0.01               } => 0,
-      { aggregate_amount: '999_999_999.99'   } => 0,
-      { aggregate_amount: 999_999_999.99     } => 0,
-      { aggregate_amount: '1_000_000_000'    } => 1,
-      { aggregate_amount: 1_000_000_000      } => 1,
-      { aggregate_amount: '1_000_000_000.01' } => 1,
-      { aggregate_amount: 1_000_000_000.01   } => 1
-
-    #it_behaves_like 'validates numericality', model_attributes, :purchase_amount
-    #it_behaves_like 'validates numericality', model_attributes, :aggregate_amount
+    it_behaves_like 'validates numericality', model_attributes, :purchase_amount,
+      range: 0..1_000_000_000, minimum_inclusive: true, maximum_inclusive: true
+    it_behaves_like 'validates numericality', model_attributes, :aggregate_amount,
+      range: 0..1_000_000_000, minimum_inclusive: true, maximum_inclusive: true
 
     order_item_1_attributes = {
       ordered_id:      SecureRandom.uuid,

data/lib/unidom/order/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Order
-    VERSION = '1.5.3'.freeze
+    VERSION = '1.5.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-order
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common