unidom-shopping 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad12157f35160f38a4612e987bbbf9d7c359727
-  data.tar.gz: c1c86f859f2000ed8bdbed9dc7b97d3bdf135b8a
+  metadata.gz: 1548647b8b13755ca7d414a601fbe6e94c317b1e
+  data.tar.gz: 0a163221d51585cfae5ebfb47a62f1b2bb6c6f7e
 SHA512:
-  metadata.gz: a718e6ddca9eda138882f5ee21ca7dc4e552eefb49dd3e83d4797b183f987d65f211e480886295eff8e0d2e2974439a02c06fea132bf121b75e72ecc7080342f
-  data.tar.gz: ea7f772ab9c5748009a7d93260ca5d6b4367f85b9bee476293562b785a09755909f09d192f226612bbbdff77f023f93a8984525d5ce97558881d3adb9cebe9b1
+  metadata.gz: 9ef062e2df7d18a3e388ca5b5a4852ddd673a3ac31f01f98073b6df500cfb6c67f9d9cc7ae24f4d2f0c4f37c71c3f372de3ebf8864811775213bc6573716ef25
+  data.tar.gz: 2465a6c0a6bae51c6ef4c8aba313e0e5ac3adc9f1d89965123f3cad9c3bf6565a90477aa3031e3751462d3163525cbeefb2419c1f7108fa6c5328bb3e76a82cc

data/README.md

@@ -136,6 +136,7 @@ def initialize_unidom
 
   Unidom::Party::Person.class_eval do
     include Unidom::Shopping::Concerns::AsCartShopper
+    include Unidom::Shopping::Concerns::AsItemShopper
   end
 
   Unidom::Party::Shop.class_eval do
@@ -165,6 +166,7 @@ describe Unidom::Party::Person, type: :model do
     }
 
     it_behaves_like 'Unidom::Shopping::Concerns::AsCartShopper', model_attribtues
+    it_behaves_like 'Unidom::Shopping::Concerns::AsItemShopper', model_attribtues
 
   end
 

data/app/models/unidom/shopping/concerns/as_cart_shopper.rb

@@ -3,7 +3,8 @@
 
 module Unidom::Shopping::Concerns::AsCartShopper
 
-  extend ActiveSupport::Concern
+  extend  ActiveSupport::Concern
+  include Unidom::Common::Concerns::ArgumentValidation
 
   included do |includer|
 
@@ -13,7 +14,11 @@ module Unidom::Shopping::Concerns::AsCartShopper
     # 以购物者的身份，从指定的商店 from 获取购物车。时间为 at ，缺省为当前时间。如：
     # current_person.get_cart! from: shop
     def get_cart!(from: nil, at: Time.now)
+
+      assert_present! :from, from
+
       shopping_carts.shop_is(from).valid_at(now: at).alive.first_or_create! opened_at: at
+
     end
 
     def get_cart?(from: nil, at: Time.now)

data/app/models/unidom/shopping/concerns/as_item_shopper.rb

@@ -3,7 +3,8 @@
 
 module Unidom::Shopping::Concerns::AsItemShopper
 
-  extend ActiveSupport::Concern
+  extend  ActiveSupport::Concern
+  include Unidom::Common::Concerns::ArgumentValidation
 
   included do |includer|
 
@@ -13,6 +14,9 @@ module Unidom::Shopping::Concerns::AsItemShopper
     # 以购物者的身份，将商品 it ，放入购物车 into 。购物时间是 at ，缺省为当前时间。单价是 unit_price ，缺省为 0 。数量是 quantity ，缺省为 1 。如：
     # current_person.add! coca_cola, into: shopping_cart, unit_price: 3.50, quantity: 3
     def add!(it, into: nil, at: Time.now, unit_price: 0, quantity: 1)
+
+      assert_present! :it, it
+
       query = shopping_items.shopping_cart_is(into).shopped_is(it).valid_at(now: at).alive
       item  = query.first
       if item.present?

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

@@ -19,6 +19,9 @@ class Unidom::Shopping::ShoppingCart < Unidom::Shopping::ApplicationRecord
   # 将商品 shopped 放入购物车。购物者为 by 。单价为 unit_price ，缺省值为 0 。数量为 quantity ，缺省值是 1 。时间为 at ，缺省为当前时间。如：
   # shopping_cart.add! coca_cola, by: current_person, unit_price: 3.50, quantity: 2
   def add!(shopped, by: nil, unit_price: 0, quantity: 1, at: Time.now)
+
+    assert_present! :shopped, shopped
+
     item = items.shopped_is(shopped).valid_at.alive.first
     if item.present?
       item.attributes = { shopper: by||shopper, unit_price: unit_price, quantity: quantity+item.quantity }

data/lib/rspec/models/unidom/shopping/concerns/as_item_shopper_shared_examples.rb

@@ -0,0 +1,29 @@
+shared_examples 'Unidom::Shopping::Concerns::AsItemShopper' do |model_attributes|
+
+  context do
+
+    shopping_item_1_attributes = {
+      shopping_cart_id: SecureRandom.uuid,
+      shopper_id:       SecureRandom.uuid,
+      shopper_type:     'Unidom::Shopping::Shopper::Mock',
+      shopped_id:       SecureRandom.uuid,
+      shopped_type:     'Unidom::Shopping::Shopped::Mock',
+      unit_price:       10.00,
+      quantity:         1.00
+    }
+
+    shopping_item_2_attributes = {
+      shopping_cart_id: SecureRandom.uuid,
+      shopper_id:       SecureRandom.uuid,
+      shopper_type:     'Unidom::Shopping::Shopper::Mock',
+      shopped_id:       SecureRandom.uuid,
+      shopped_type:     'Unidom::Shopping::Shopped::Mock',
+      unit_price:       12.00,
+      quantity:         3.00
+    }
+
+    it_behaves_like 'has_many', model_attributes, :shopping_items, Unidom::Shopping::ShoppingItem, [ shopping_item_1_attributes, shopping_item_2_attributes ]
+
+  end
+
+end

data/lib/unidom/shopping/rspec_shared_examples.rb

@@ -1,3 +1,4 @@
 require 'rspec/models/unidom/shopping/concerns/as_cart_shopper_shared_examples'
+require 'rspec/models/unidom/shopping/concerns/as_item_shopper_shared_examples'
 require 'rspec/models/unidom/shopping/concerns/as_shop_shared_examples'
 require 'rspec/models/unidom/shopping/concerns/as_shopped_shared_examples'

data/lib/unidom/shopping/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Shopping
-    VERSION = '1.7.7'.freeze
+    VERSION = '1.7.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-shopping
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -55,6 +55,7 @@ files:
 - db/migrate/20020501000000_create_unidom_shopping_carts.rb
 - db/migrate/20020502000000_create_unidom_shopping_items.rb
 - lib/rspec/models/unidom/shopping/concerns/as_cart_shopper_shared_examples.rb
+- lib/rspec/models/unidom/shopping/concerns/as_item_shopper_shared_examples.rb
 - lib/rspec/models/unidom/shopping/concerns/as_shop_shared_examples.rb
 - lib/rspec/models/unidom/shopping/concerns/as_shopped_shared_examples.rb
 - lib/rspec/models/unidom/shopping/shopping_cart_spec.rb