unidom-position 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc0bf6e11bdf01c9a08281323e491af07e9be04
-  data.tar.gz: 3295a37894a71f6a53716851c33c433b83b5225f
+  metadata.gz: b99b9647a75604a07d27ba14e061db245dbeb4e9
+  data.tar.gz: abac026ed73cd646d380c6e2b92cf14aab54eda6
 SHA512:
-  metadata.gz: 082985ba3c2628b465d8193b3afb50173a8708a1baee92ad40d6e6defad5a52751b60cda54b9800e9d80360df1a02a434eb806ae207ed55c23d79ce4fe223f8c
-  data.tar.gz: 622f6171cd2c65eae430f6d1a6a01070b668d78be9c61735a705743310dffcdc684368fb6035434e0351a8da49a7e23ed7aafa3a3a63d5ab98bb8f82e5b7718e
+  metadata.gz: ed6e5b1df0b221d3f20963e04aecada1ed2c795f023107e4adf2ea501f77516e74096a86c7eea9fa00fc4a136352d72228c08267996583262f3aeb0e3ed71860
+  data.tar.gz: 63d9dc98150ab98e4401e5c26a56accd0cc4031e593f1b4df13a5932195b345470db54452e64e8e36b992cfc86413bb14d70218ece062ac1f972a00cd61582b4

data/README.md

@@ -19,7 +19,7 @@ gem 'unidom-position'
 ```shell
 rake db:migrate
 ```
-The migration versions start with 200101.
+The migration versions start with 200402.
 
 ## Call the Model
 ```ruby
@@ -41,3 +41,20 @@ Unidom::Position::PostReportingStructure.report!(superior_post: chief_programmer
 ```shell
 bundle exec rake unidom:position:occupation:import file=/data.csv from_date=2009-11-01 thru_date=2015-10-01 scheme_id= scheme_type=
 ```
+
+## Include the Concerns
+The Post model already includes the following concerns:
+```ruby
+include Unidom::Position::Concerns::AsInferiorPost
+include Unidom::Position::Concerns::AsSuperiorPost
+```
+
+### As Inferior Post
+The As Inferior Post concern do the following tasks for the includer automatically:  
+1. Define the has_many :superior_post_reporting_structures macro as: ``has_many :superior_post_reporting_structures, class_name: 'Unidom::Position::PostReportingStructure', source: :inferior_post, foreign_key: :inferior_post_id``  
+2. Define the has_many :superior_posts macro as: ``has_many :superior_posts, through: :superior_post_reporting_structures, source: :superior_post``  
+
+### As Superior Post
+The As Superior Post concern do the following tasks for the includer automatically:  
+1. Define the has_many :inferior_post_reporting_structures macro as: ``has_many :inferior_post_reporting_structures, class_name: 'Unidom::Position::PostReportingStructure', source: :superior_post, foreign_key: :superior_post_id``  
+2. Define the has_many :inferior_posts macro as: ``has_many :inferior_posts, through: :inferior_post_reporting_structures, source: :inferior_post``  

data/app/models/unidom/position/concerns/as_inferior_post.rb

@@ -0,0 +1,12 @@
+module Unidom::Position::Concerns::AsInferiorPost
+
+  extend ActiveSupport::Concern
+
+  self.included do |includer|
+
+    has_many :superior_post_reporting_structures, class_name: 'Unidom::Position::PostReportingStructure', source: :inferior_post, foreign_key: :inferior_post_id
+    has_many :superior_posts,                     through:    :superior_post_reporting_structures,        source: :superior_post
+
+  end
+
+end

data/app/models/unidom/position/concerns/as_superior_post.rb

@@ -0,0 +1,12 @@
+module Unidom::Position::Concerns::AsSuperiorPost
+
+  extend ActiveSupport::Concern
+
+  self.included do |includer|
+
+    has_many :inferior_post_reporting_structures, class_name: 'Unidom::Position::PostReportingStructure', source: :superior_post, foreign_key: :superior_post_id
+    has_many :inferior_posts,                     through:    :inferior_post_reporting_structures,        source: :inferior_post
+
+  end
+
+end

data/app/models/unidom/position/post.rb

@@ -5,16 +5,12 @@ class Unidom::Position::Post < ActiveRecord::Base
   self.table_name = 'unidom_posts'
 
   include Unidom::Common::Concerns::ModelExtension
+  include Unidom::Position::Concerns::AsInferiorPost
+  include Unidom::Position::Concerns::AsSuperiorPost
 
   validates :name, presence: true, length: { in: 2..self.columns_hash['name'].limit }
 
   belongs_to :organization, polymorphic: true
   belongs_to :position,     class_name:  'Unidom::Position::Position'
 
-  has_many :inferior_post_reporting_structures, class_name: 'Unidom::Position::PostReportingStructure', foreign_key: :superior_post_id, source: :superior_post
-  has_many :superior_post_reporting_structures, class_name: 'Unidom::Position::PostReportingStructure', foreign_key: :inferior_post_id, source: :inferior_post
-
-  has_many :inferior_posts, through: :inferior_post_reporting_structures, source: :inferior_post
-  has_many :superior_posts, through: :superior_post_reporting_structures, source: :superior_post
-
 end

data/app/models/unidom/position/post_reporting_structure.rb

@@ -12,10 +12,10 @@ class Unidom::Position::PostReportingStructure < ActiveRecord::Base
   scope :superior_post_is, ->(superior_post) { where superior_post_id: to_id(superior_post) }
   scope :inferior_post_is, ->(inferior_post) { where inferior_post_id: to_id(inferior_post) }
 
-  def self.report!(superior_post: nil, inferior_post: nil, opened_at: Time.now, elemental: true)
+  def self.report!(superior_post: nil, inferior_post: nil, elemental: true, opened_at: Time.now)
     raise ArgumentError.new('The superior_post argument is required.') if superior_post.blank?
     raise ArgumentError.new('The inferior_post argument is required.') if inferior_post.blank?
-    self.inferior_post_is(inferior_post).superior_post_is(superior_post).valid_at.alive.first_or_create! opened_at: opened_at, elemental: elemental
+    self.inferior_post_is(inferior_post).superior_post_is(superior_post).valid_at.alive.first_or_create! elemental: elemental, opened_at: opened_at
   end
 
 end

data/lib/unidom/position/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Position
-    VERSION = '1.1'.freeze
+    VERSION = '1.2'.freeze
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: unidom-position
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Unidom (UNIfied Domain Object Model) is a series of domain model engines.
@@ -40,6 +40,8 @@ files:
 - app/assets/stylesheets/unidom/position/application.css
 - app/controllers/unidom/position/application_controller.rb
 - app/helpers/unidom/position/application_helper.rb
+- app/models/unidom/position/concerns/as_inferior_post.rb
+- app/models/unidom/position/concerns/as_superior_post.rb
 - app/models/unidom/position/occupation.rb
 - app/models/unidom/position/position.rb
 - app/models/unidom/position/post.rb