unidom-shopping 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19549b0781e7a5a0740dacc5edaaf663856b27ab1e9fa75945af8cd885254a34
-  data.tar.gz: 5bb273a96325c1d43f22cea07b07f69fab9a788cbfbb16e22833962a791f4f78
+  metadata.gz: edaaa6056e98d80899e568f4e560c3ddb5b523ee9199485a9ae8a6205aad0cab
+  data.tar.gz: 55661d4d5ffb161836913e4ca20e32a109194f951262231c8b815d137f7a4f3b
 SHA512:
-  metadata.gz: d0d760891d68cb4fb09c15f6807a566d393362e0ea8ecbd7fecd648f57dc6c4b0be8df067b9cbd70e68ca5b3aeb86b768f29fe9c994af22040b3528b56c0389b
-  data.tar.gz: b3e238a6198eb80537d64156a06a21502e99ad535245c917f11f9cc48f0307b5fbdb10c02409d5ab291c309d510c9c981a4e28fc92c18df264b627694235a91f
+  metadata.gz: 1450d0f6f35b1ddee35d628dfe87e41bf93f42e6e7602f8f065543f398f1b2d80d8086e2eb5e224b49ed9e7ec17cc6680d70d91ba718439cf188a97efdfe1108
+  data.tar.gz: 919daf5e47c28c18f599dc7f20e173aef698f9771c6c87786b06573ada9e1889fd2f892b9597780dbda9f7593b647669db5443912b2ec741d88f86994343ad09

data/app/controllers/unidom/shopping/application_controller.rb

@@ -1,6 +1,12 @@
 ##
 # Application controller 是模块内所有控制器的基类。
 
-class Unidom::Shopping::ApplicationController < ActionController::Base
-  protect_from_forgery with: :exception
+module Unidom
+  module Shopping
+
+    class ApplicationController < ActionController::Base
+      protect_from_forgery with: :exception
+    end
+
+  end
 end

data/app/helpers/unidom/shopping/application_helper.rb

@@ -1,2 +1,8 @@
-module Unidom::Shopping::ApplicationHelper
+module Unidom
+  module Shopping
+
+    module ApplicationHelper
+    end
+
+  end
 end

data/app/jobs/unidom/shopping/application_job.rb

@@ -1,5 +1,11 @@
 ##
 # Application job 是模块内所有异步任务的基类。
 
-class Unidom::Shopping::ApplicationJob < ActiveJob::Base
+module Unidom
+  module Shopping
+
+    class ApplicationJob < ActiveJob::Base
+    end
+
+  end
 end

data/app/mailers/unidom/shopping/application_mailer.rb

@@ -1,7 +1,13 @@
 ##
 # Application mailer 是模块内所有电子邮件发送类的基类。
 
-class Unidom::Shopping::ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
-  layout 'mailer'
+module Unidom
+  module Shopping
+
+    class ApplicationMailer < ActionMailer::Base
+      default from: 'from@example.com'
+      layout 'mailer'
+    end
+
+  end
 end

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

@@ -1,6 +1,12 @@
 ##
 # Application record 是模块内所有模型的抽象基类。
 
-class Unidom::Shopping::ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
+module Unidom
+  module Shopping
+
+    class ApplicationRecord < ActiveRecord::Base
+      self.abstract_class = true
+    end
+
+  end
 end

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

@@ -1,33 +1,41 @@
 ##
 # As Cart Shopper 是购物车所有者的领域逻辑关注点。
 
-module Unidom::Shopping::Concerns::AsCartShopper
+module Unidom
+  module Shopping
+    module Concerns
 
-  extend  ActiveSupport::Concern
-  include Unidom::Common::Concerns::ArgumentValidation
+      module AsCartShopper
 
-  included do |includer|
+        extend  ActiveSupport::Concern
+        include Unidom::Common::Concerns::ArgumentValidation
 
-    has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shopper
+        included do |includer|
 
-    ##
-    # 以购物者的身份，从指定的商店 from 获取购物车。时间为 at ，缺省为当前时间。如：
-    # current_person.get_cart! from: shop
-    def get_cart!(from: nil, at: Time.now)
+          has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shopper
 
-      assert_present! :from, from
+          ##
+          # 以购物者的身份，从指定的商店 from 获取购物车。时间为 at ，缺省为当前时间。如：
+          # current_person.get_cart! from: shop
+          def get_cart!(from: nil, at: Time.now)
 
-      shopping_carts.shop_is(from).valid_at(now: at).alive.first_or_create! opened_at: at
+            assert_present! :from, from
 
-    end
+            shopping_carts.shop_is(from).valid_at(now: at).alive.first_or_create! opened_at: at
 
-    def get_cart?(from: nil, at: Time.now)
-      shopping_carts.shop_is(from).valid_at(now: at).alive.exists?
-    end
+          end
 
-  end
+          def get_cart?(from: nil, at: Time.now)
+            shopping_carts.shop_is(from).valid_at(now: at).alive.exists?
+          end
 
-  module ClassMethods
-  end
+        end
 
+        module ClassMethods
+        end
+
+      end
+
+    end
+  end
 end

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

@@ -1,40 +1,48 @@
 ##
 # As Item Shopper 是购物项所有者的领域逻辑关注点。
 
-module Unidom::Shopping::Concerns::AsItemShopper
+module Unidom
+  module Shopping
+    module Concerns
 
-  extend  ActiveSupport::Concern
-  include Unidom::Common::Concerns::ArgumentValidation
+      module AsItemShopper
 
-  included do |includer|
+        extend  ActiveSupport::Concern
+        include Unidom::Common::Concerns::ArgumentValidation
 
-    has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopper
+        included do |includer|
 
-    ##
-    # 以购物者的身份，将商品 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)
+          has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopper
 
-      assert_present! :it, it
+          ##
+          # 以购物者的身份，将商品 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)
 
-      query = shopping_items.shopping_cart_is(into).shopped_is(it).valid_at(now: at).alive
-      item  = query.first
-      if item.present?
-        item.unit_price = unit_price
-        item.increment! :quantity, quantity
-      else
-        item = shopping_items.create! shopping_cart: into, shopped: it, unit_price: unit_price, quantity: quantity, opened_at: at
-      end
-      item
-    end
+            assert_present! :it, it
 
-    def add?(it, into: nil, at: Time.now)
-      shopping_items.shopping_cart_is(into).shopped_is(it).valid_at(now: at).alive.exists?
-    end
+            query = shopping_items.shopping_cart_is(into).shopped_is(it).valid_at(now: at).alive
+            item  = query.first
+            if item.present?
+              item.unit_price = unit_price
+              item.increment! :quantity, quantity
+            else
+              item = shopping_items.create! shopping_cart: into, shopped: it, unit_price: unit_price, quantity: quantity, opened_at: at
+            end
+            item
+          end
 
-  end
+          def add?(it, into: nil, at: Time.now)
+            shopping_items.shopping_cart_is(into).shopped_is(it).valid_at(now: at).alive.exists?
+          end
 
-  module ClassMethods
-  end
+        end
 
+        module ClassMethods
+        end
+
+      end
+
+    end
+  end
 end

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

@@ -1,24 +1,32 @@
 ##
 # As Shop 是购物场所的领域逻辑关注点。
 
-module Unidom::Shopping::Concerns::AsShop
+module Unidom
+  module Shopping
+    module Concerns
 
-  extend ActiveSupport::Concern
+      module AsShop
 
-  included do |includer|
+        extend ActiveSupport::Concern
 
-    has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shop
+        included do |includer|
 
-    ##
-    # 从当前商店中，获取购物车。购物者为 by 。获取时间为 at ，缺省为当前时间。如：
-    # shop.get_cart! by: current_person
-    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
+          has_many :shopping_carts, class_name: 'Unidom::Shopping::ShoppingCart', as: :shop
 
-  end
+          ##
+          # 从当前商店中，获取购物车。购物者为 by 。获取时间为 at ，缺省为当前时间。如：
+          # shop.get_cart! by: current_person
+          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
 
-  module ClassMethods
-  end
+        end
+
+        module ClassMethods
+        end
 
+      end
+
+    end
+  end
 end

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

@@ -1,40 +1,48 @@
 ##
 # As Shopped 是被购买的商品的领域逻辑关注点。
 
-module Unidom::Shopping::Concerns::AsShopped
-
-  extend ActiveSupport::Concern
-
-  included do |includer|
-
-    has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopped
-
-    ##
-    # 将当前商品放入购物车 into ，购物者是 by 。购物时间是 at ，缺省为当前时间。单价是 unit_price ，缺省为 0 。数量是 quantity ，缺省为 1 。如：
-    # coca_cola.is_added! into: shopping_cart, by: current_person, unit_price: 3.50, quantity: 2
-    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
+module Unidom
+  module Shopping
+    module Concerns
+
+      module AsShopped
+
+        extend ActiveSupport::Concern
+
+        included do |includer|
+
+          has_many :shopping_items, class_name: 'Unidom::Shopping::ShoppingItem', as: :shopped
+
+          ##
+          # 将当前商品放入购物车 into ，购物者是 by 。购物时间是 at ，缺省为当前时间。单价是 unit_price ，缺省为 0 。数量是 quantity ，缺省为 1 。如：
+          # coca_cola.is_added! into: shopping_cart, by: current_person, unit_price: 3.50, quantity: 2
+          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
+        end
+
       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
-  end
-
 end

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

@@ -1,34 +1,40 @@
 ##
 # Shopping Cart 是购物车。
 
-class Unidom::Shopping::ShoppingCart < Unidom::Shopping::ApplicationRecord
+module Unidom
+  module Shopping
 
-  self.table_name = 'unidom_shopping_carts'
+    class ShoppingCart < ApplicationRecord
 
-  include Unidom::Common::Concerns::ModelExtension
+      self.table_name = 'unidom_shopping_carts'
 
-  belongs_to :shopper, polymorphic: true
-  belongs_to :shop,    polymorphic: true
+      include Unidom::Common::Concerns::ModelExtension
 
-  has_many :items, class_name: 'Unidom::Shopping::ShoppingItem'
+      belongs_to :shopper, polymorphic: true
+      belongs_to :shop,    polymorphic: true
 
-  scope :shopped_by, ->(shopper) { where shopper: shopper }
-  scope :shop_is,    ->(shop)    { where shop:    shop    }
+      has_many :items, class_name: 'Unidom::Shopping::ShoppingItem'
 
-  ##
-  # 将商品 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)
+      scope :shopped_by, ->(shopper) { where shopper: shopper }
+      scope :shop_is,    ->(shop)    { where shop:    shop    }
 
-    assert_present! :shopped, shopped
+      ##
+      # 将商品 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)
 
-    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 }
-      item.save!
-    else
-      items.create! shopped: shopped, shopper: by||shopper, unit_price: unit_price, quantity: quantity, opened_at: at
-    end
-  end
+        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 }
+          item.save!
+        else
+          items.create! shopped: shopped, shopper: by||shopper, unit_price: unit_price, quantity: quantity, opened_at: at
+        end
+      end
 
-end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Shopping::ShoppingCart'
+    end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Shopping::ShoppingCart'
+
+  end
+end

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

@@ -1,21 +1,27 @@
 ##
 # Shopping Item 是购物项。
 
-class Unidom::Shopping::ShoppingItem < Unidom::Shopping::ApplicationRecord
+module Unidom
+  module Shopping
 
-  self.table_name = 'unidom_shopping_items'
+    class ShoppingItem < ApplicationRecord
 
-  include Unidom::Common::Concerns::ModelExtension
+      self.table_name = 'unidom_shopping_items'
 
-  validates :unit_price, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: Unidom::Common::MAXIMUM_AMOUNT }
-  validates :quantity,   presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: Unidom::Common::MAXIMUM_AMOUNT }
+      include Unidom::Common::Concerns::ModelExtension
 
-  belongs_to :shopping_cart, class_name: 'Unidom::Shopping::ShoppingCart'
-  belongs_to :shopper,       polymorphic: true
-  belongs_to :shopped,       polymorphic: true
+      validates :unit_price, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: Unidom::Common::MAXIMUM_AMOUNT }
+      validates :quantity,   presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: Unidom::Common::MAXIMUM_AMOUNT }
 
-  scope :shopping_cart_is, ->(shopping_cart) { where shopping_cart: shopping_cart }
-  scope :shopped_by,       ->(shopper)       { where shopper:       shopper       }
-  scope :shopped_is,       ->(shopped)       { where shopped:       shopped       }
+      belongs_to :shopping_cart, class_name: 'Unidom::Shopping::ShoppingCart'
+      belongs_to :shopper,       polymorphic: true
+      belongs_to :shopped,       polymorphic: true
 
-end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Shopping::ShoppingItem'
+      scope :shopping_cart_is, ->(shopping_cart) { where shopping_cart: 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'
+
+  end
+end

data/app/views/layouts/unidom/shopping/application.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Unidom Shopping</title>
-  <%= stylesheet_link_tag "unidom/shopping/application", media: "all" %>
+  <%= stylesheet_link_tag 'unidom/shopping/application', media: 'all' %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/db/migrate/20020501000000_create_unidom_shopping_carts.rb

@@ -1,4 +1,4 @@
-class CreateUnidomShoppingCarts < ActiveRecord::Migration
+class CreateUnidomShoppingCarts < ActiveRecord::Migration[6.0]
 
   def change
 
@@ -9,7 +9,7 @@ class CreateUnidomShoppingCarts < ActiveRecord::Migration
       t.references :shop,    type: :uuid, null: false,
         polymorphic: { null: false, default: '', limit: 200 }
 
-      t.column   :state, 'char(1)', null: false, default: 'C'
+      t.column   :state, 'char(1)', null: false, default: Unidom::Common::STATE
       t.datetime :opened_at,        null: false, default: Unidom::Common::OPENED_AT
       t.datetime :closed_at,        null: false, default: Unidom::Common::CLOSED_AT
       t.boolean  :defunct,          null: false, default: false

data/db/migrate/20020502000000_create_unidom_shopping_items.rb

@@ -1,4 +1,4 @@
-class CreateUnidomShoppingItems < ActiveRecord::Migration
+class CreateUnidomShoppingItems < ActiveRecord::Migration[6.0]
 
   def change
 
@@ -13,7 +13,7 @@ class CreateUnidomShoppingItems < ActiveRecord::Migration
       t.decimal :unit_price, null: false, default: 0.0, precision: 12, scale: 2
       t.decimal :quantity,   null: false, default: 0.0, precision: 12, scale: 2
 
-      t.column   :state, 'char(1)', null: false, default: 'C'
+      t.column   :state, 'char(1)', null: false, default: Unidom::Common::STATE
       t.datetime :opened_at,        null: false, default: Unidom::Common::OPENED_AT
       t.datetime :closed_at,        null: false, default: Unidom::Common::CLOSED_AT
       t.boolean  :defunct,          null: false, default: false
@@ -23,7 +23,7 @@ class CreateUnidomShoppingItems < ActiveRecord::Migration
 
     end
 
-    add_index :unidom_shopping_items, :shopping_cart_id
+    #add_index :unidom_shopping_items, :shopping_cart_id
     add_index :unidom_shopping_items, :shopper_id
     add_index :unidom_shopping_items, :shopped_id
 

data/lib/unidom/shopping/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Shopping
-    VERSION = '2.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-shopping
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
 platform: ruby
 authors:
 - Topbit Du
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -68,11 +68,11 @@ files:
 - lib/unidom/shopping/types_rspec.rb
 - lib/unidom/shopping/validators_rspec.rb
 - lib/unidom/shopping/version.rb
-homepage: https://github.com/topbitdu/unidom-shopping
+homepage: https://gitee.com/Unidom/unidom-shopping
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Unidom Shopping Domain Model Engine 购物领域模型引擎
 test_files: []