unidom-accession 2.3 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d8125522a52f78315a477b57d999fbfedc8494
-  data.tar.gz: e49172c358917ebfd71f56aea682980b84cbb3d3
+  metadata.gz: fe5f5dc574296af56843985c519c3b5e942702b6
+  data.tar.gz: 5604258d182b419dc86cc9d1c971581e3d014636
 SHA512:
-  metadata.gz: e38a27c0ca70300a90d8c1bcb829b8d775a22c48a3fc4485b5d7ed331c0557e333c97f827d7eebc9d62d0e6f9c31f22a6e7fd070ff60385b3c1382c61aab1783
-  data.tar.gz: 38e3d6e71c1e51426bbcc5ebecb8ea9b6eaadc1a67025edbbb6dc381bd140fc740b9afb0a0faca50ae55c4f2e08318cc464c672ab6b201ea375e4fdeb860cf26
+  metadata.gz: 4a49645ecf78f4a07ce19d4b48be63aaaac7ab655163de2eefe29afa2373e162198d2d10f7d080c94e260d1c25bbde55bd65e783a492d61ad1e03c536bd5ac23
+  data.tar.gz: c469e50083172660c7d72b4ba5313e1217390fc12e17176f7ad0836431acac3f2e09120afb278fe9deb9b250a81282929ae7e8f8540a642c57261fb9ab6c27f0

data/app/models/unidom/accession/concerns/as_post_fulfilled.rb

@@ -10,12 +10,22 @@ module Unidom::Accession::Concerns::AsPostFulfilled
     has_many :post_fulfillments, class_name: 'Unidom::Accession::PostFulfillment', as:     :fulfilled
     has_many :fulfiller_people,  through:    :post_fulfillments,                   source: :fulfiller, source_type: 'Unidom::Party::Person'
 
+    ##
+    # 让当前岗位在指定时间 at 开始被指定的参与者 by 履行。指定时间缺省为当前时间。如：
+    # post.is_fulfilled_as_post! by: tom
+    # 或者
+    # post.is_fulfilled_as_post! by: tom, at: Time.now
     def is_fulfilled_as_post!(by: nil, at: Time.now)
       raise ArgumentError.new('The by argument is required.') if by.blank?
       raise ArgumentError.new('The at argument is required.') if at.blank?
       post_fulfillments.create! fulfiller: by, opened_at: at
     end
 
+    ##
+    # 判断当前岗位在指定时间 at 是否被指定的参与者 by 履行。指定时间缺省为当前时间。如：
+    # post.is_fulfilled_as_post? by: tom
+    # 或者
+    # post.is_fulfilled_as_post? by: tom, at: Time.now
     def is_fulfilled_as_post?(by: nil, at: Time.now)
       raise ArgumentError.new('The by argument is required.') if by.blank?
       raise ArgumentError.new('The at argument is required.') if at.blank?

data/app/models/unidom/accession/concerns/as_post_fulfiller.rb

@@ -10,12 +10,22 @@ module Unidom::Accession::Concerns::AsPostFulfiller
     has_many :post_fulfillments, class_name: 'Unidom::Accession::PostFulfillment', as:     :fulfiller
     has_many :fulfilled_posts,   through:    :post_fulfillments,                   source: :fulfilled, source_type: 'Unidom::Position::Post'
 
+    ##
+    # 让当前参与者在指定时间 at 开始履行岗位 post 。指定时间缺省为当前时间。如：
+    # selected_person.fulfill_post! post
+    # 或者
+    # selected_person.fulfill_post! post, at: Time.now-1.day
     def fulfill_post!(post, at: Time.now)
       raise ArgumentError.new('The post argument is required.') if post.blank?
       raise ArgumentError.new('The at argument is required.'  ) if at.blank?
       post_fulfillments.create! fulfilled: post, opened_at: at
     end
 
+    ##
+    # 判断当前参与者在指定时间 at 是否被履行制定的岗位 post 。指定时间缺省为当前时间。如：
+    # post.fulfill_post? post
+    # 或者
+    # post.fulfill_post? post, at: Time.now
     def fulfill_post?(post, at: Time.now)
       raise ArgumentError.new('The post argument is required.') if post.blank?
       raise ArgumentError.new('The at argument is required.'  ) if at.blank?

data/app/models/unidom/accession/post_fulfillment.rb

@@ -16,8 +16,12 @@ class Unidom::Accession::PostFulfillment < Unidom::Accession::ApplicationRecord
   scope :part_time, ->(part_time = true) { where part_time: part_time }
   scope :temporary, ->(temporary = true) { where temporary: temporary }
 
+  ##
+  # 将工作岗位 fulfilled 和履行者 fulfiller 在给定的时间 opened_at 关联起来。 opened_at 缺省为当前时间。如：
+  # Unidom::Accession::PostFulfillment.fulfill! fulfilled: post, fulfiller: selected_person
   def self.fulfill!(fulfilled: nil, fulfiller: nil, opened_at: Time.now)
-    raise ArgumentError.new('Argument fulfilled is required.') if fulfilled.blank?
+    assert_present! :fulfilled, fulfilled
+    #raise ArgumentError.new('Argument fulfilled is required.') if fulfilled.blank?
     raise ArgumentError.new('Argument fulfiller is required.') if fulfiller.blank?
     raise ArgumentError.new('Argument opened_at is required.') if opened_at.blank?
     self.create! fulfiller: fulfiller, fulfilled: fulfilled, opened_at: opened_at

data/lib/rspec/models/unidom/accession/post_fulfillment_spec.rb

@@ -6,29 +6,6 @@ describe Unidom::Accession::PostFulfillment, type: :model do
   after :each do
   end
 
-=begin
-  context '.validates' do
-
-    model_attributes = { name: 'Tim' }
-
-    it_behaves_like 'validates', model_attributes, :name,
-      {             } => 0,
-      { name: nil   } => 2,
-      { name: ''    } => 2,
-      { name: 'A'   } => 1,
-      { name: 'AA'  } => 0,
-      { name: 'AAA' } => 0,
-      { name: '0'   } => 1,
-      { name: '00'  } => 0,
-      { name: '000' } => 0,
-      { name: 0     } => 1,
-      { name: 'A'*(described_class.columns_hash['name'].limit-1) } => 0,
-      { name: 'A'*described_class.columns_hash['name'].limit     } => 0,
-      { name: 'A'*(described_class.columns_hash['name'].limit+1) } => 1
-
-  end
-=end
-
   context do
 
     model_attributes = {
@@ -40,6 +17,18 @@ describe Unidom::Accession::PostFulfillment, type: :model do
 
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
+    it_behaves_like 'scope', :part_time, [
+      { attributes_collection: [ model_attributes                        ], count_diff: 0, args: [ true  ] },
+      { attributes_collection: [ model_attributes                        ], count_diff: 1, args: [ false ] },
+      { attributes_collection: [ model_attributes.merge(part_time: true) ], count_diff: 1, args: [ true  ] },
+      { attributes_collection: [ model_attributes.merge(part_time: true) ], count_diff: 0, args: [ false ] } ]
+
+    it_behaves_like 'scope', :temporary, [
+      { attributes_collection: [ model_attributes                        ], count_diff: 0, args: [ true  ] },
+      { attributes_collection: [ model_attributes                        ], count_diff: 1, args: [ false ] },
+      { attributes_collection: [ model_attributes.merge(temporary: true) ], count_diff: 1, args: [ true  ] },
+      { attributes_collection: [ model_attributes.merge(temporary: true) ], count_diff: 0, args: [ false ] } ]
+
   end
 
 end

data/lib/unidom/accession/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Accession
-    VERSION = '2.3'.freeze
+    VERSION = '2.3.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-accession
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: 2.3.1
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common