unidom-certificate-china 1.1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b3a88baf364abb85d86828daf0e4d2e3bbd151
-  data.tar.gz: 2299f1495a23c74a4413ae21bc5d06e958e41c9f
+  metadata.gz: d68210d407c3089f6202c860ad025d92f32774c2
+  data.tar.gz: bedbe5bf19ce29d1e3ad71d7d0d4ed4ce647bc63
 SHA512:
-  metadata.gz: c0fb8c37cab26f2b1b0613b2c172d05d0c3fc545ba0b46cfd20d12888ca1c4bc0dca36b40693b63f74cf3260ace295225a57422023201b5fe0c301ffa14b5bc3
-  data.tar.gz: 13563bc8a078c30dd5de2642feca680edfee6652971d256cbccf9546311b9d4665746393519021b179dce5efc9e30946f7ca0060fe35bf742591d6425a76f589
+  metadata.gz: 2b542bd93325c5e00c606917c9d731eafeba22e3356eed1c6e0823d779bc4783d81ea3441c48049bf1678b2bb833032de7259328ec114be8afffaeaf0ad86b2e
+  data.tar.gz: 50407607004cc9d2e78727ecd1cbc5961dafec4e00c0dbe84db7613600953228ccc476465608078aa1dca48e39639a1f81c3c5feb274bee1006e85779c21908c

data/README.md

@@ -2,26 +2,39 @@
 
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](http://opensource.org/licenses/MIT)
 [![Gem Version](https://badge.fury.io/rb/unidom-certificate-china.svg)](https://badge.fury.io/rb/unidom-certificate-china)
+[![Dependency Status](https://gemnasium.com/badges/github.com/topbitdu/unidom-certificate-china.svg)](https://gemnasium.com/github.com/topbitdu/unidom-certificate-china)
 
 Unidom (UNIfied Domain Object Model) is a series of domain model engines. The China Certificate domain model engine includes Identity Card, Driving License, and Business License models.
 Unidom (统一领域对象模型)是一系列的领域模型引擎。中国证件领域模型引擎包括中国大陆的身份证、驾驶证、营业执照等模型。
 
+
+
 ## Recent Update
+
 Check out the [Road Map](ROADMAP.md) to find out what's the next.
 Check out the [Change Log](CHANGELOG.md) to find out what's new.
 
+
+
 ## Usage in Gemfile
+
 ```ruby
 gem 'unidom-certificate-china'
 ```
 
+
+
 ## Run the Database Migration
+
 ```shell
 rake db:migrate
 ```
 The migration versions start with 2001029156.
 
+
+
 ## Call the Model
+
 ```ruby
 identity_card = Unidom::Certificate::China::IdentityCard.identification_number_is('51010519801231123X').first_or_create(
   name:                   'John',
@@ -44,18 +57,31 @@ Unidom::Certificate::China::BusinessLicense.registration_number_is('510105012345
 )
 ```
 
+
+
 ## Include the Concerns
+
 ```ruby
 include Unidom::Certificate::China::Concerns::AsBusinessLicenseCertificated
 include Unidom::Certificate::China::Concerns::AsIdentityCardCertificated
 ```
 
 ### As Business License Certificated
+
 The As Business License Certificated do the following tasks for the includer automatically:
-1. Include the [As Certificated](http://https://github.com/topbitdu/unidom-certificated) concern
+1. Include the [As Certificated](http://https://github.com/topbitdu/unidom-certificated) concern  
 2. Define the has_many :china_business_licenses macro as: ``has_many :china_business_licenses, through: :certificatings, source: :certification, source_type: 'Unidom::Certificate::China::BusinessLicense'``
 
 ### As Identity Card Certificated
+
 The As Identity Card Certificated do the following tasks for the includer automatically:
-1. Include the [As Certificated](http://https://github.com/topbitdu/unidom-certificated) concern
+1. Include the [As Certificated](http://https://github.com/topbitdu/unidom-certificated) concern  
 2. Define the has_many :china_identity_cards macro as: ``has_many :china_identity_cards, through: :certificatings, source: :certification, source_type: 'Unidom::Certificate::China::IdentityCard'``
+
+
+
+## Validator
+
+```ruby
+validates :identification_number, presence: true, identification_number: true
+```

data/Rakefile

@@ -10,7 +10,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Unidom Certificate China'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
@@ -20,5 +20,5 @@ load 'rails/tasks/statistics.rake'
 
 
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 

data/app/assets/config/unidom-certificate-china_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts/unidom/certificate/china .js
+//= link_directory ../stylesheets/unidom/certificate/china .css

data/app/assets/javascripts/unidom/certificate/china/application.js

@@ -5,7 +5,7 @@
 // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.

data/app/assets/stylesheets/unidom/certificate/china/application.css

@@ -6,9 +6,9 @@
  * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
  *= require_self
  */

data/app/controllers/unidom/certificate/china/application_controller.rb

@@ -1,4 +1,6 @@
 module China
   class ApplicationController < ActionController::Base
-  end
+  protect_from_forgery with: :exception
+end
+
 end

data/app/jobs/unidom/certificate/china/application_job.rb

@@ -0,0 +1,2 @@
+class Unidom::Certificate::China::ApplicationJob < ActiveJob::Base
+end

data/app/mailers/unidom/certificate/china/application_mailer.rb

@@ -0,0 +1,4 @@
+class Unidom::Certificate::China::ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

data/app/models/unidom/certificate/china/application_record.rb

@@ -0,0 +1,3 @@
+class Unidom::Certificate::China::ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/app/models/unidom/certificate/china/business_license.rb

@@ -1,6 +1,6 @@
 # Business License 是中国的工商营业执照。
 
-class Unidom::Certificate::China::BusinessLicense < ActiveRecord::Base
+class Unidom::Certificate::China::BusinessLicense < Unidom::Certificate::China::ApplicationRecord
 
   FORMAT_VALIDATION_REGEX = /\A\d{15}\z/
 

data/app/models/unidom/certificate/china/concerns/as_business_license_certificated.rb

@@ -4,7 +4,7 @@ module Unidom::Certificate::China::Concerns::AsBusinessLicenseCertificated
 
   include Unidom::Certificate::Concerns::AsCertificated
 
-  self.included do |includer|
+  included do |includer|
 
     has_many :china_business_licenses, through: :certificatings, source: :certification, source_type: 'Unidom::Certificate::China::BusinessLicense'
 

data/app/models/unidom/certificate/china/concerns/as_identity_card_certificated.rb

@@ -4,7 +4,7 @@ module Unidom::Certificate::China::Concerns::AsIdentityCardCertificated
 
   include Unidom::Certificate::Concerns::AsCertificated
 
-  self.included do |includer|
+  included do |includer|
 
     has_many :china_identity_cards, through: :certificatings, source: :certification, source_type: 'Unidom::Certificate::China::IdentityCard'
 

data/app/models/unidom/certificate/china/identity_card.rb

@@ -1,6 +1,6 @@
 # Identity Card 是中国身份证。
 
-class Unidom::Certificate::China::IdentityCard < ActiveRecord::Base
+class Unidom::Certificate::China::IdentityCard < Unidom::Certificate::China::ApplicationRecord
 
   FORMAT_VALIDATION_REGEX = /\A\d{17}[\dx]\z/i
 
@@ -18,10 +18,12 @@ class Unidom::Certificate::China::IdentityCard < ActiveRecord::Base
 
   scope :identification_number_is, ->(identification_number) { where identification_number: identification_number }
 
-  before_validation do
-    self.identification_number = self.identification_number.upcase
-    self.birth_date            = Date.parse "#{identification_number[6..9]}-#{identification_number[10..11]}-#{identification_number[12..13]}"
-    self.gender_code           = identification_number[16].to_i.odd? ? '1' : '2'
+  after_validation do
+    if errors.blank?
+      self.identification_number = self.identification_number.upcase
+      self.birth_date            = Date.parse "#{identification_number[6..9]}-#{identification_number[10..11]}-#{identification_number[12..13]}"
+      self.gender_code           = identification_number[16].to_i.odd? ? '1' : '2'
+    end
   end
 
 end

data/app/validators/unidom/certificate/china/identification_number_validator.rb

@@ -0,0 +1,16 @@
+class Unidom::Certificate::China::IdentificationNumberValidator < ActiveModel::EachValidator
+
+  WEIGHTS      = [ 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 ].freeze
+  CHECK_DIGITS = %w{1 0 X 9 8 7 6 5 4 3 2}.freeze
+
+  def validate_each(record, attribute, value)
+
+    value = value.to_s
+    sum   = 0
+    value[0..16].chars.each_with_index do |char, index| sum += char.to_i*WEIGHTS[index] end
+
+    record.errors[attribute] << (options[:message]||'is invalid') unless CHECK_DIGITS[sum%11]==value[17]
+
+  end
+
+end

data/lib/unidom/certificate/china/version.rb

@@ -1,7 +1,7 @@
 module Unidom
   module Certificate
     module China
-      VERSION = '1.1.1'.freeze
+      VERSION = '1.2'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-certificate-china
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: '1.2'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -50,14 +50,19 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/unidom-certificate-china_manifest.js
 - app/assets/javascripts/unidom/certificate/china/application.js
 - app/assets/stylesheets/unidom/certificate/china/application.css
 - app/controllers/unidom/certificate/china/application_controller.rb
 - app/helpers/unidom/certificate/china/application_helper.rb
+- app/jobs/unidom/certificate/china/application_job.rb
+- app/mailers/unidom/certificate/china/application_mailer.rb
+- app/models/unidom/certificate/china/application_record.rb
 - app/models/unidom/certificate/china/business_license.rb
 - app/models/unidom/certificate/china/concerns/as_business_license_certificated.rb
 - app/models/unidom/certificate/china/concerns/as_identity_card_certificated.rb
 - app/models/unidom/certificate/china/identity_card.rb
+- app/validators/unidom/certificate/china/identification_number_validator.rb
 - app/views/layouts/unidom/certificate/china/application.html.erb
 - config/routes.rb
 - db/migrate/20010291560010_create_unidom_china_identity_cards.rb