unidom-product 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d95506197821fb2b86634f9ea4767b1b66eb970
-  data.tar.gz: 2582a40999d61d3699e43f22370e5b470d6c215f
+  metadata.gz: b967caae7491ed9756823e9db340f76f37697fc0
+  data.tar.gz: 237b58f54ca627f34fd702733838b15797d320b8
 SHA512:
-  metadata.gz: 450b179167a954f7cf03345416b43b2135bb6052386254e6284544510813d2273cc54fd0c2b006e1f5301726eb8dd41404f8bd7f814bbf44f406d8d758adf145
-  data.tar.gz: 95a98fb6e2cf23a8b35eb0b51d32fc75a26cac4c012326fc57693ae9722d7c0be3cdf33fd5da30f8ce3b9ae7d8ff7044b4b42188b890263c7995241a012c98b1
+  metadata.gz: 9a825adf7fef7ad823157e23b10e4b554e205eaf63f03d5a7401981e2a7d7e2ba56d777b6ea15e806d0bb8d5e6da5854ad37bea7e3aac17eae566a98c9a04fc2
+  data.tar.gz: ac4ccee09405d24f5a774f8a0ed6b24d493cd2803986db95ba65abba08f2e6d3299d7d477d24bd7663365a07e99e1b927c64421b285b70ec9c8a8281b46b9034

data/app/models/unidom/product/concerns/as_source_product.rb

@@ -11,16 +11,6 @@ module Unidom::Product::Concerns::AsSourceProduct
     has_many :target_product_associatings, class_name: 'Unidom::Product::ProductAssociating', foreign_key: :source_id
     has_many :target_products,             through:    :target_product_associatings,          source: :target
 
-    def associate?(target, due_to: nil, at: Time.now)
-
-      assert_present! :target, target
-      assert_present! :due_to, due_to
-      assert_present! :at,     at
-
-      target_product_associatings.target_is(target).product_association_coded_as(due_to).valid_at(now: at).alive.exists?
-
-    end
-
     def associate!(target, due_to: nil, at: Time.now, ordinal: 1)
 
       assert_present! :target,  target
@@ -32,6 +22,16 @@ module Unidom::Product::Concerns::AsSourceProduct
 
     end
 
+    def associate?(target, due_to: nil, at: Time.now)
+
+      assert_present! :target, target
+      assert_present! :due_to, due_to
+      assert_present! :at,     at
+
+      target_product_associatings.target_is(target).product_association_coded_as(due_to).valid_at(now: at).alive.exists?
+
+    end
+
   end
 
   module ClassMethods

data/app/models/unidom/product/concerns/as_target_product.rb

@@ -11,24 +11,24 @@ module Unidom::Product::Concerns::AsTargetProduct
     has_many :source_product_associatings, class_name: 'Unidom::Product::ProductAssociating', foreign_key: :target_id
     has_many :source_products,             through:    :source_product_associatings,          source:      :source
 
-    def is_associated?(source, due_to: nil, at: Time.now)
+    def is_associated!(source, due_to: nil, at: Time.now, ordinal: 1)
 
       assert_present! :source, source
       assert_present! :due_to, due_to
       assert_present! :at,     at
+      assert_present! :ordinal, ordinal
 
-      source_product_associatings.source_is(source).product_association_coded_as(due_to).valid_at(now: at).alive.exists?
+      source_product_associatings.source_is(source).product_association_coded_as(due_to).valid_at(now: at).alive.first_or_create! ordinal: ordinal, opened_at: at
 
     end
 
-    def is_associated!(source, due_to: nil, at: Time.now, ordinal: 1)
+    def is_associated?(source, due_to: nil, at: Time.now)
 
       assert_present! :source, source
       assert_present! :due_to, due_to
       assert_present! :at,     at
-      assert_present! :ordinal, ordinal
 
-      source_product_associatings.source_is(source).product_association_coded_as(due_to).valid_at(now: at).alive.first_or_create! ordinal: ordinal, opened_at: at
+      source_product_associatings.source_is(source).product_association_coded_as(due_to).valid_at(now: at).alive.exists?
 
     end
 

data/app/models/unidom/product/product_associating.rb

@@ -18,7 +18,7 @@ class Unidom::Product::ProductAssociating < Unidom::Product::ApplicationRecord
   include Unidom::Common::Concerns::ModelExtension
   include ProgneTapera::EnumCode
 
-  validates :quantity, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+  validates :quantity, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: Unidom::Common::MAXIMUM_AMOUNT }
 
   belongs_to :source, class_name: 'Unidom::Product::Product'
   belongs_to :target, class_name: 'Unidom::Product::Product'

data/db/migrate/20020201000000_create_unidom_products.rb

@@ -16,8 +16,8 @@ class CreateUnidomProducts < ActiveRecord::Migration
 
       t.string   :slug,             null: false, default: nil, limit: 200
       t.column   :state, 'char(1)', null: false, default: 'C'
-      t.datetime :opened_at,        null: false, default: ::Time.utc(1970)
-      t.datetime :closed_at,        null: false, default: ::Time.utc(3000)
+      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
       t.jsonb    :notation,         null: false, default: {}
 

data/db/migrate/20020211000000_create_unidom_product_associatings.rb

@@ -16,8 +16,8 @@ class CreateUnidomProductAssociatings < ActiveRecord::Migration
       t.text :instruction
 
       t.column   :state, 'char(1)', null: false, default: 'C'
-      t.datetime :opened_at,        null: false, default: Time.utc(1970)
-      t.datetime :closed_at,        null: false, default: Time.utc(3000)
+      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
       t.jsonb    :notation,         null: false, default: {}
 

data/lib/unidom/product/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-product
 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-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 description: Unidom (UNIfied Domain Object Model) is a series of domain model engines.
   The Product domain model engine includes Product and its relative models. Unidom
   (统一领域对象模型)是一系列的领域模型引擎。产品领域模型引擎包括产品及其相关的模型。