unidom-price 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a61dafa0005f117a0f8a4399db39e38b378d0dd
-  data.tar.gz: 944c6ec8824681f2017b5d695b6d0730ea1225dc
+  metadata.gz: 5ecb6d6375efd70fbe8cd2303937b2a3c52f2a07
+  data.tar.gz: 592b4395a34337239111735e96ec33eb69223067
 SHA512:
-  metadata.gz: 151fe246663561bab24cb12ec9b8c7d5930e560a971f64f5842dee93f7c2db964f9cce6762de64be3289d633c7752cf42a92d91668474c779846276969383382
-  data.tar.gz: b10a1c96510d2fbf28db596b2d4e4b2012f248727999b6c58533e23250b191cdcb58f654c87a0340419c8136b1136caca705bd5003b0f0a27f085b66e44cb874
+  metadata.gz: e2e6f359f6eec0cc267459e2f61f85eba04dd9b770179d535cfa3fee06ff04252f9239c43bf821bf7923150e946d4bf8fb58219b5852796d86e1fcafb53fec98
+  data.tar.gz: 0b2ad63cacb6b151c68b592d96690df561a65fc2201c59cb500236ca67f2a31ba3351c0452e03fcf31fc69f6d70411a12d0ef0db90e0e10a8bbb2e0d4448e39c

data/app/models/unidom/price/price.rb

@@ -24,6 +24,14 @@ class Unidom::Price::Price < Unidom::Price::ApplicationRecord
   ##
   # 将物品 priced 定价为 amount ， 定价者是 pricer。
   def self.price!(priced, amount: 0, pricer: nil, calculation_code: 'AMNT', pricing_code: 'BASE', charging_code: 'ONCE', opened_at: Time.now)
+
+    assert_present! :priced,           priced
+    assert_present! :amount,           amount
+    assert_present! :calculation_code, calculation_code
+    assert_present! :pricing_code,     pricing_code
+    assert_present! :charging_code,    charging_code
+    assert_present! :opened_at,        opened_at
+
     price = priced_is(priced).calculation_coded_as(calculation_code).pricing_coded_as(pricing_code).charging_coded_as(charging_code).valid_at.alive.first
     if price.present?
       price.amount = amount

data/lib/rspec/models/unidom/price/concerns/as_priced_shared_examples.rb

@@ -10,9 +10,9 @@ shared_examples 'Unidom::Price::Concerns::AsPriced' do |model_attributes, pricer
 
   context '#is_priced!' do
 
-    it 'should reject the amount argument = nil' do expect { @priced.is_priced! nil,     by: pricer, at: Time.now }.to raise_error(ArgumentError, 'The amount argument is required.') end
-    it 'should reject the by argument = nil'     do expect { @priced.is_priced! @amount, by: nil,    at: Time.now }.to raise_error(ArgumentError, 'The by argument is required.')     end
-    it 'should reject the at argument = nil'     do expect { @priced.is_priced! @amount, by: pricer, at: nil      }.to raise_error(ArgumentError, 'The at argument is required.')     end
+    #it 'should reject the amount argument = nil' do expect { @priced.is_priced! nil,     by: pricer, at: Time.now }.to raise_error(ArgumentError, 'The amount argument is required.') end
+    #it 'should reject the by argument = nil'     do expect { @priced.is_priced! @amount, by: nil,    at: Time.now }.to raise_error(ArgumentError, 'The by argument is required.')     end
+    #it 'should reject the at argument = nil'     do expect { @priced.is_priced! @amount, by: pricer, at: nil      }.to raise_error(ArgumentError, 'The at argument is required.')     end
 
     it "should be able to be priced by #{pricer.inspect}" do
       price = @priced.is_priced! @amount, by: pricer
@@ -32,7 +32,7 @@ shared_examples 'Unidom::Price::Concerns::AsPriced' do |model_attributes, pricer
 
   context '#is_priced?' do
 
-    it 'should reject the at argument = nil' do expect { @priced.is_priced? at: nil }.to raise_error(ArgumentError, 'The at argument is required.') end
+    #it 'should reject the at argument = nil' do expect { @priced.is_priced? at: nil }.to raise_error(ArgumentError, 'The at argument is required.') end
 
     it "should be able to be priced by #{pricer.inspect}" do
       expect(@priced.is_priced?).to be_falsey
@@ -64,6 +64,11 @@ shared_examples 'Unidom::Price::Concerns::AsPriced' do |model_attributes, pricer
 
     it_behaves_like 'has_many', model_attributes, :prices, Unidom::Price::Price, [ price_1_attribtues, price_2_attribtues ]
 
+    model  = described_class.create! model_attributes
+    amount = 10.00
+    it_behaves_like 'assert_present!', model, :is_priced!, [ amount, { by: pricer, at: Time.now } ], [ { 0 => :amount }, :by, :at ]
+    it_behaves_like 'assert_present!', model, :is_priced?, [         {             at: Time.now } ], [                        :at ]
+
   end
 
 end

data/lib/rspec/models/unidom/price/concerns/as_pricer_shared_examples.rb

@@ -1,17 +1,21 @@
 shared_examples 'Unidom::Price::Concerns::AsPricer' do |model_attributes|
 
-  price_1_attribtues = {
-      priced_id:   SecureRandom.uuid,
-      priced_type: 'Unidom::Price::Priced::Mock',
-      amount:      10.00
-    }
+  context do
 
-  price_2_attribtues = {
-      priced_id:   SecureRandom.uuid,
-      priced_type: 'Unidom::Price::Priced::Mock',
-      amount:      21.00
-    }
+    price_1_attribtues = {
+        priced_id:   SecureRandom.uuid,
+        priced_type: 'Unidom::Price::Priced::Mock',
+        amount:      10.00
+      }
 
-  it_behaves_like 'has_many', model_attributes, :pricings, Unidom::Price::Price, [ price_1_attribtues, price_2_attribtues ]
+    price_2_attribtues = {
+        priced_id:   SecureRandom.uuid,
+        priced_type: 'Unidom::Price::Priced::Mock',
+        amount:      21.00
+      }
+
+    it_behaves_like 'has_many', model_attributes, :pricings, Unidom::Price::Price, [ price_1_attribtues, price_2_attribtues ]
+
+  end
 
 end

data/lib/unidom/price/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Price
-    VERSION = '1.7.5'.freeze
+    VERSION = '1.7.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-price
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common