unidom-shopping 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7597dd1cff04ef9d75f791bda37bf0d1f14ca4
-  data.tar.gz: cf390a74526ae4c4d4dcbb82719c5c14247c5f4e
+  metadata.gz: 42d829fc77ba0db5c34938988b0efd7aee86484c
+  data.tar.gz: 81fb85b40868d5affa293da912bf803728790d26
 SHA512:
-  metadata.gz: e885c0f7475bb243e5ba945c8762ac9d070591fb535ca36577facd5035c1a8f902bc3d69c075ef223979a4c093aed13f17fa14ccecf1e9c89b0427c4f731e3b8
-  data.tar.gz: 2460cd85756481f9afef5b8b9ca048cc5b2f6dfdaf8a560dc50e1cce48e9c18add1919e959449236d9d6c727887ac96555293af35d84519cd90356e15abc19e6
+  metadata.gz: 4fa9fb539419f36cff69d2e7760321dbbae92aead279e6fc2dd45731e4c0739153bffcbaa64e55dfb2a3b2278d029168464d0f6364c0140b649493d2bd29142f
+  data.tar.gz: 58f37b443f11ebc1ad4d482c620b7ed771170081c1a96ff1709d8612d66b7ca479ea185afe26f898c8f9aecb242e9970af985a1b076f7bb11db4749d8f7780c6

data/README.md

@@ -2,26 +2,39 @@
 
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](http://opensource.org/licenses/MIT)
 [![Gem Version](https://badge.fury.io/rb/unidom-shopping.svg)](https://badge.fury.io/rb/unidom-shopping)
+[![Dependency Status](https://gemnasium.com/badges/github.com/topbitdu/unidom-shopping.svg)](https://gemnasium.com/github.com/topbitdu/unidom-shopping)
 
 Unidom (UNIfied Domain Object Model) is a series of domain model engines. The Shopping domain model engine includes Shopping Cart and Shopping Item models.
 Unidom (统一领域对象模型)是一系列的领域模型引擎。购物领域模型引擎包括购物车和购物项的模型。
 
+
+
 ## Recent Update
+
 Check out the [Road Map](ROADMAP.md) to find out what's the next.
 Check out the [Change Log](CHANGELOG.md) to find out what's new.
 
+
+
 ## Usage in Gemfile
+
 ```ruby
 gem 'unidom-shopping'
 ```
 
+
+
 ## Run the Database Migration
+
 ```shell
 rake db:migrate
 ```
 The migration versions start with 200205.
 
+
+
 ## Call the Model
+
 ```ruby
 # Create Shopping Cart
 lady = Party.create name: 'Ann'
@@ -45,6 +58,7 @@ shopping_cart.items.valid_at.alive # fish & ball
 
 
 ## Include the Concerns
+
 ```ruby
 include Unidom::Shopping::Concerns::AsCartShopper
 include Unidom::Shopping::Concerns::AsItemShopper
@@ -53,21 +67,27 @@ include Unidom::Shopping::Concerns::AsShopped
 ```
 
 ### As Cart Shopper
+
 The As Cart Shopper concern do the following tasks for the includer automatically:  
-1. Define the has_many :shopping_carts macro as: ``has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shopper``
-2. Define the #get_cart! method as: ``get_cart!(from: nil, at: Time.now)``
+1. Define the has_many :shopping_carts macro as: ``has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shopper``  
+2. Define the #get_cart! method as: ``get_cart!(from: nil, at: Time.now)``  
 3. Define the #get_cart? method as: ``get_cart?(from: nil, at: Time.now)``
 
 ### As Item Shopper
+
 The As Item Shopper concern do the following tasks for the includer automatically:  
-1. Define the has_many :shopping_items macro as: ``has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopper``
-2. Define the #add! method as: ``add!(it, into: nil, at: Time.now, unit_price: 0, quantity: 1)``
+1. Define the has_many :shopping_items macro as: ``has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopper``  
+2. Define the #add! method as: ``add!(it, into: nil, at: Time.now, unit_price: 0, quantity: 1)``  
 3. Define the #add? method as: ``add?(it, into: nil, at: Time.now)``
 
 ### As Shop
+
 The As Shop concern do the following tasks for the includer automatically:  
-1. Define the has_many :shopping_carts macro as: ``has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shop``
+1. Define the has_many :shopping_carts macro as: ``has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shop``  
+2. Define the #get_cart! method as: ``get_cart!(by: nil, at: Time.now)``
 
 ### As Shopped
+
 The As Shopped concern do the following tasks for the includer automatically:  
-1. Define the has_many :shopping_items macro as: ``has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopped``
+1. Define the has_many :shopping_items macro as: ``has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopped``  
+2. Define the #is_added! method as: ``is_added!(into: nil, by: nil, at: Time.now, unit_price: 0, quantity: 1)``

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

@@ -11,7 +11,7 @@ module Unidom::Shopping::Concerns::AsItemShopper
       item  = query.first
       if item.present?
         item.unit_price = unit_price
-        item.increment! quantity: quantity
+        item.increment! :quantity, quantity
       else
         item = shopping_items.create! shopping_cart: into, shopped: it, unit_price: unit_price, quantity: quantity, opened_at: at
       end

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

@@ -6,6 +6,10 @@ module Unidom::Shopping::Concerns::AsShop
 
     has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shop
 
+    def get_cart!(by: nil, at: Time.now)
+      shopping_carts.shopped_by(by).valid_at(now: at).alive.first_or_create! opened_at: at
+    end
+
   end
 
   module ClassMethods

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

@@ -6,6 +6,26 @@ module Unidom::Shopping::Concerns::AsShopped
 
     has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopped
 
+    def is_added!(into: nil, by: nil, at: Time.now, unit_price: 0, quantity: 1)
+      query = shopping_items.shopping_cart_is(into).valid_at(now: at).alive
+      item  = query.first
+      if item.present?
+        item.unit_price = unit_price
+        item.shopper    = by
+        item.increment! :quantity, quantity
+      else
+        item = shopping_items.create! shopping_cart: into, shopper: by, unit_price: unit_price, quantity: quantity, opened_at: at
+      end
+      item
+    end
+
+    #def is_added?(into: nil, by: nil, at: Time.now)
+    #  query = shopping_items.shopping_cart_is(into)
+    #  query = query.shopped_by(by) if by.present?
+    #  query = query.valid_at(now: at).alive
+    #  query.exists?
+    #end
+
   end
 
   module ClassMethods

data/lib/unidom/shopping/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Shopping
-    VERSION = '1.4'.freeze
+    VERSION = '1.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-shopping
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common