unidom-party 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 880d93c7b67cc3ce1e60dd59ed90b260b9f4abac
-  data.tar.gz: 5c0a772a1e861375c0fcea35c66be01a402e2d3f
+  metadata.gz: da6a352066a2a8cbd63b3ac270db33368977474a
+  data.tar.gz: 6c1cf67ae25275213333777c8ed84b1a702386be
 SHA512:
-  metadata.gz: d272e1ea4e63e8661faf9bb1919cad06c60102fe92d9a467b81876351cb4636c2635b48f0e38e55659e56b747928e5ae54b4b2492e7d8b976a54bc0ea641326a
-  data.tar.gz: 4a023806269906e34633ff880c14cf0ec7c7a2e8a6b2115713150d7b4c3670cd7258545a970ca733c59c6d2cfbfcfe39b557eadaf273ec9cfcaeebfbdd30e5f2
+  metadata.gz: 49762cc91346d650622ebf88e8c802113fcf5f3515c6b9aa9aa742383c417e6fd7c1db6f0d7e094b284d482e66ac17575437553627a6108ba25026ab794b44bb
+  data.tar.gz: 3898dd908599567741c0964b31517bce7827b85177496102b0e4b3df90d7c04cfdabda04f0bde92ba84b32b7dce83d154c9a052c1c104d6b70e2440fa5517dda

data/README.md

@@ -40,6 +40,8 @@ relation = Unidom::Party::PartyRelation.relate! source_party: company, target_pa
 
 Unidom::Party::PartyRelation.source_party_is(company).target_party_is(person).valid_at.alive
 # Find all relationships from the company & the person, like employment
+
+Unidom::Party::Collaborating.create! collaboration: project, collaborator: person, role_code: 'PJMG', name: 'Project Manager'
 ```
 
 
@@ -54,8 +56,10 @@ include Unidom::Party::Concerns::AsTargetParty
 The As Source Party concern do the following tasks for the includer automatically:  
 1. Define the has_many :target_party_relations macro as: ``has_many :target_party_relations, class_name: 'Unidom::Party::PartyRelation', as: :source_party``
 2. Define the #relate! method as: ``relate!(to: nil, due_to: nil, at: Time.now)``
+3. Define the #relate? method as: ``relate?(to: nil, due_to: nil, at: Time.now)``
 
 ### As Target Party concern
 The As Target Party concern do the following tasks for the includer automatically:  
 1. Define the has_many :source_party_relations macro as: ``has_many :source_party_relations, class_name: 'Unidom::Party::PartyRelation', as: :target_party``
 2. Define the #is_related! method as: ``is_related!(to: nil, due_to: nil, at: Time.now)``
+3. Define the #is_related? method as: ``is_related?(to: nil, due_to: nil, at: Time.now)``

data/app/models/unidom/party/collaborating.rb

@@ -0,0 +1,17 @@
+# Collaborating 是参与者以特定的角色进行协作。
+
+class Unidom::Party::Collaborating < ActiveRecord::Base
+
+  self.table_name = 'unidom_collaboratings'
+
+  include Unidom::Common::Concerns::ModelExtension
+
+  validates :name, presence: true, length: { in: 2..self.columns_hash['name'].limit }
+
+  belongs_to :collaboration, polymorphic: true
+  belongs_to :collaborator,  polymorphic: true
+
+  scope :collaboration_is, ->(collaboration) { where collaboration: collaboration }
+  scope :collaborated_by,  ->(collaborator)  { where collaborator:  collaborator  }
+
+end

data/app/models/unidom/party/concerns/as_source_party.rb

@@ -10,9 +10,9 @@ module Unidom::Party::Concerns::AsSourceParty
       target_party_relations.create! target_party: to, linkage_code: due_to, opened_at: at
     end
 
-    #def relate?(to: nil, due_to: nil, at: Time.now)
-    #  target_party_relations.target_party_is(to).linkage_coded_as(due_to).valid_at(now: at).alive.exists?
-    #end
+    def relate?(to: nil, due_to: nil, at: Time.now)
+      target_party_relations.target_party_is(to).linkage_coded_as(due_to).valid_at(now: at).alive.exists?
+    end
 
   end
 

data/app/models/unidom/party/concerns/as_target_party.rb

@@ -10,9 +10,9 @@ module Unidom::Party::Concerns::AsTargetParty
       source_party_relations.create! source_party: to, linkage_code: due_to, opened_at: at
     end
 
-    #def is_related?(to: nil, due_to: nil, at: Time.now)
-    #  source_party_relations.source_party_is(to).linkage_coded_as(due_to).valid_at(now: at).alive.exists?
-    #end
+    def is_related?(to: nil, due_to: nil, at: Time.now)
+      source_party_relations.source_party_is(to).linkage_coded_as(due_to).valid_at(now: at).alive.exists?
+    end
 
   end
 

data/db/migrate/20010111000000_create_unidom_collaboratings.rb

@@ -0,0 +1,36 @@
+class CreateUnidomCollaboratings < ActiveRecord::Migration
+
+  def change
+
+    create_table :unidom_collaboratings, id: :uuid do |t|
+
+      t.references :collaboration, type: :uuid, null: false,
+        polymorphic: { null: false, default: '', limit: 200 }
+      t.references :collaborator,  type: :uuid, null: false,
+        polymorphic: { null: false, default: '', limit: 200 }
+
+      t.column :role_code, 'char(4)', null: false, default: 'ZZZZ'
+
+      t.string  :name,     null: false, default: '', limit: 200
+      t.integer :priority, null: false, default: 0
+      t.integer :grade,    null: false, default: 0
+
+      t.text :description
+      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.boolean  :defunct,          null: false, default: false
+      t.jsonb    :notation,         null: false, default: {}
+
+      t.timestamps null: false
+
+    end
+
+    add_index :unidom_collaboratings, :collaboration_id
+    add_index :unidom_collaboratings, :collaborator_id
+
+  end
+
+end

data/lib/unidom/party/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Party
-    VERSION = '1.2'.freeze
+    VERSION = '1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-party
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -40,6 +40,7 @@ files:
 - app/assets/stylesheets/unidom/party/application.css
 - app/controllers/unidom/party/application_controller.rb
 - app/helpers/unidom/party/application_helper.rb
+- app/models/unidom/party/collaborating.rb
 - app/models/unidom/party/company.rb
 - app/models/unidom/party/concerns/as_source_party.rb
 - app/models/unidom/party/concerns/as_target_party.rb
@@ -54,6 +55,7 @@ files:
 - db/migrate/20010103000000_create_unidom_shops.rb
 - db/migrate/20010104000000_create_unidom_government_agencies.rb
 - db/migrate/20010105000000_create_unidom_companies.rb
+- db/migrate/20010111000000_create_unidom_collaboratings.rb
 - lib/tasks/party_tasks.rake
 - lib/unidom/party.rb
 - lib/unidom/party/engine.rb