unidom-certificate 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f0d25046797018dfe5c741814115360d3d4b769
-  data.tar.gz: f04c4580305a57426b1ef182db518c796b76bac5
+  metadata.gz: 59c1801b6a03f0ee8e7c04ea2bd1c58a11072674
+  data.tar.gz: 5b1b47d9ee6303419b3a2161e46ed0d8429c19b2
 SHA512:
-  metadata.gz: b19552378a35a01eea9708c188a4dfa1ab66edf5f7777404f772b30ddb7c236f58472647bed082ab53056a49b0ecdba5325f7084a0bf42746bd06fbac543719c
-  data.tar.gz: 0908409a75eb1347ea0e0b932d3a6616d6e8925dce2e8a1d3017a92833e3d1da726b82f47124fe5b3f1a75680564b49f33b7c53865dc0143b0d7a39d222d666c
+  metadata.gz: 5b8e65abb0589b461667a4a91a0470c00179a98111af544e73bb8d72d0ad705ef5122f12b5c1e48c7b6b20d8b82212df2964bcb220f3fd9f2028889bd52e1ed9
+  data.tar.gz: 28fa725945612250691713e0cde253e0694989edddff01b34f2e6642ef86c7578cbb1f27ff65a52bd42a3590152b32d0289ff8192205be5ecdd12f0242ee52e5

data/README.md

@@ -23,8 +23,22 @@ The migration versions start with 200102.
 
 ## Call the Model
 ```ruby
-officer       = Person.create name: 'John'
-mall          = Shop.create   name: 'WalMart'
-certification = BusinessLicense.create number: '8888-6666'
-certificating = Unidom::Certificate::Certificating.certificate(certification: certification, certificated: mall, certificator: officer, opened_at: Time.now)
+officer       = Unidom::Party::Person.create! name: 'John'
+mall          = Unidom::Party::Shop.create!   name: 'WalMart'
+certification = Unidom::Certificate::China::BusinessLicense.registration_number_is('123456789012345').valid_at.alive.first_or_create! name: 'WalMart', address: 'Beijing', legal_representative_name: 'Tim' 
+certificating = Unidom::Certificate::Certificating.certificate!(certification: certification, certificated: mall, certificator: officer, opened_at: Time.now)
 ```
+
+## Include the Concerns
+```ruby
+include Unidom::Certificate::Concerns::AsCertificated
+include Unidom::Certificate::Concerns::AsCertification
+```
+
+### As Certificated concern
+The As Certificated concern do the following tasks for the includer automatically:
+1. Define the has_many :certificatings macro as: ``has_many :certificatings, class_name: 'Unidom::Certificate::Certificating', as: :certificated``
+
+### As Certification concern
+The As Certification concern do the following tasks for the includer automatically:
+1. Define the has_many :certificatings macro as: ``has_many :certificatings, class_name: 'Unidom::Certificate::Certificating', as: :certification``

data/app/models/unidom/certificate/certificating.rb

@@ -15,14 +15,26 @@ class Unidom::Certificate::Certificating < ActiveRecord::Base
   scope :certification_is, ->(certification) { where certification: certification }
 
   def self.certificate(certification: nil, certificated: nil, certificator: nil, opened_at: Time.now)
+    certificate! certification: certification, certificated: certificated, certificator: certificator, opened_at: opened_at
+  end
 
-    raise ArgumentError.new('certification is required.') if certification.blank?
-    raise ArgumentError.new('certificated is required.')  if certificated.blank?
-
-    self.certification_is(certification).certificated_is(certificated).valid_at.alive.first_or_create! opened_at: opened_at,
-      certificator_id:   (certificator.present? ? certificator.id         : Unidom::Common::NULL_UUID),
-      certificator_type: (certificator.present? ? certificator.class.name : '')
+  def self.certificate!(certification: nil, certificated: nil, certificator: nil, opened_at: Time.now)
+    raise ArgumentError.new('The certification argument is required.') if certification.blank?
+    raise ArgumentError.new('The certificated argument is required.' ) if certificated.blank?
+    raise ArgumentError.new('The opened_at argument is required.'    ) if opened_at.blank?
+
+    attributes = { opened_at: opened_at }
+    if certificator.present?
+      attributes[:certificator] = certificator
+    else
+      attributes[:certificator_id]   = Unidom::Common::NULL_UUID
+      attributes[:certificator_type] = ''
+    end
+    self.certification_is(certification).certificated_is(certificated).valid_at.alive.first_or_create! attributes
+  end
 
+  class << self
+    deprecate certificate: :certificate!, deprecator: ActiveSupport::Deprecation.new('2.0', 'unidom-certificate')
   end
 
 end

data/app/models/unidom/certificate/concerns/as_certificated.rb

@@ -6,10 +6,6 @@ module Unidom::Certificate::Concerns::AsCertificated
 
     has_many :certificatings, class_name: 'Unidom::Certificate::Certificating', as: :certificated
 
-    def is_certificated_by!(certification, opened_at: Time.now)
-      certificatings.create! certification: certification, opened_at: opened_at
-    end
-
   end
 
 end

data/app/models/unidom/certificate/concerns/as_certification.rb

@@ -6,10 +6,6 @@ module Unidom::Certificate::Concerns::AsCertification
 
     has_many :certificatings, class_name: 'Unidom::Certificate::Certificating', as: :certification
 
-    def certificate!(certificated, opened_at: Time.now)
-      certificatings.create! certificated: certificated, opened_at: opened_at
-    end
-
   end
 
 end

data/lib/unidom/certificate/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Certificate
-    VERSION = '1.0'.freeze
+    VERSION = '1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-certificate
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -43,7 +43,6 @@ files:
 - app/models/unidom/certificate/certificating.rb
 - app/models/unidom/certificate/concerns/as_certificated.rb
 - app/models/unidom/certificate/concerns/as_certification.rb
-- app/models/unidom/certificate/concerns/as_certificator.rb
 - app/views/layouts/unidom/certificate/application.html.erb
 - config/routes.rb
 - db/migrate/20010201000000_create_unidom_certificatings.rb

data/app/models/unidom/certificate/concerns/as_certificator.rb

@@ -1,15 +0,0 @@
-module Unidom::Certificate::Concerns::AsCertificator
-
-  extend ActiveSupport::Concern
-
-  self.included do |includer|
-
-    has_many :certificatings, class_name: 'Unidom::Certificate::Certificating', as: :certificator
-
-    def certificate!(certificated: certificated, certification: certification, opened_at: Time.now)
-      certificatings.create! certificated: certificated, certification: certification, opened_at: opened_at
-    end
-
-  end
-
-end