unidom-standard 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ab89fdbec6549a33676cb976331004d2d82b15
-  data.tar.gz: 73d0e889a61027e8782ee8a08c53af62ec1adec8
+  metadata.gz: e64e20b9eb93af195a1485c47b5de002463d860e
+  data.tar.gz: fd9a944a3ecc71f738cb66f21aa1cea5b681f204
 SHA512:
-  metadata.gz: c7903c4b78ae5b28c2369f6549f7cff557fa6c9a5d725c2f14d9d51ac80eb9681c13530c03cb229a00dc43f3fd055dcca36a352976659d1ea03988927943574b
-  data.tar.gz: 7695693980fe07166e88115b3b590fedadac9bd681237896ec71dd0856ab476cdc6ab2c40f1f1aa36ac7137986a97d945dabf7804e82f42418ee0f5dc9bce5e5
+  metadata.gz: 72791825b90de002a221a516c7353347c87850553baa76f5d017c8ee7ba87370ab028c35876cb2df94b43dfd6cd4c48c075c349cb272fac66c1e431ac1e0e951
+  data.tar.gz: d630b93497c9518e728fdeba587e18230743424c8388ee8ce802c8afb8c32baac8555703d1ffd0256b8c914b9e9dfe52e3a706f2ef39b054c6f286e3fed5c3ce

data/app/models/unidom/standard/concerns/as_source_standard.rb

@@ -3,7 +3,8 @@
 
 module Unidom::Standard::Concerns::AsSourceStandard
 
-  extend ActiveSupport::Concern
+  extend  ActiveSupport::Concern
+  include Unidom::Common::Concerns::ArgumentValidation
 
   included do |includer|
 
@@ -11,11 +12,23 @@ module Unidom::Standard::Concerns::AsSourceStandard
     has_many :target_standards,    through:    :target_associatings,                    source:      :target
 
     def associate!(target, due_to: 'REVS', at: Time.now)
+
+      assert_present! :target, target
+      assert_present! :due_to, due_to
+      assert_present! :at,     at
+
       target_associatings.target_is(target).association_coded_as(due_to).valid_at(now: at).alive.first_or_create! opened_at: at
+
     end
 
     def associate?(target, due_to: 'REVS', at: Time.now)
+
+      assert_present! :target, target
+      assert_present! :due_to, due_to
+      assert_present! :at,     at
+
       target_associatings.target_is(target).association_coded_as(due_to).valid_at(now: at).alive.exists?
+
     end
 
   end

data/app/models/unidom/standard/concerns/as_target_standard.rb

@@ -3,7 +3,8 @@
 
 module Unidom::Standard::Concerns::AsTargetStandard
 
-  extend ActiveSupport::Concern
+  extend  ActiveSupport::Concern
+  include Unidom::Common::Concerns::ArgumentValidation
 
   included do |includer|
 
@@ -11,7 +12,11 @@ module Unidom::Standard::Concerns::AsTargetStandard
     has_many :source_standards,    through:    :source_associatings,                    source:      :source
 
     def is_associated!(source, due_to: 'REVS', at: Time.now)
+
+      assert_present! :source, source
+
       source_associatings.source_is(source).association_coded_as(due_to).valid_at(now: at).alive.first_or_create! opened_at: at
+
     end
 
     def is_associated?(source, due_to: 'REVS', at: Time.now)

data/lib/rspec/models/unidom/standard/concerns/as_source_standard_shared_examples.rb

@@ -12,6 +12,18 @@ shared_examples 'Unidom::Standard::Concerns::AsSourceStandard' do |model_attribu
 
     it_behaves_like 'has_many', model_attributes, :target_associatings, Unidom::Standard::StandardAssociating, [ target_associating_1_attributes, target_associating_2_attributes ]
 
+    model = described_class.create! model_attributes
+
+    target_attributes = {
+      name:     'Target Standard Name',
+      #number:   'GB/T 9999-1845.A',
+      ics_code: '01-02-03'
+    }
+    target = Unidom::Standard::Standard.number_is('GB/T 9999-1845.A').first_or_create! target_attributes
+
+    it_behaves_like 'assert_present!', model, :associate!, [ target, due_to: 'REVS', at: Time.now ], [ { 0 => :target }, :due_to, :at ]
+    it_behaves_like 'assert_present!', model, :associate?, [ target, due_to: 'REVS', at: Time.now ], [ { 0 => :target }, :due_to, :at ]
+
   end
 
 end

data/lib/rspec/models/unidom/standard/standard_associating_spec.rb

@@ -18,7 +18,7 @@ describe Unidom::Standard::StandardAssociating, type: :model do
 
     source_standard_attributes = {
       name:         'Source Name',
-      number:       'GB/T 3259-2008',
+      number:       'GB/T 8888-000',
       ics_code:     '11-23-68',
       published_on: Date.current-20.years,
       applied_on:   Date.current,
@@ -27,7 +27,7 @@ describe Unidom::Standard::StandardAssociating, type: :model do
 
     target_standard_attributes = {
       name:         'Target Name',
-      number:       'GB/T 3259-2018',
+      number:       'GB/T 8888-001',
       ics_code:     '11-23-68',
       published_on: Date.current+1.year,
       applied_on:   Date.current,

data/lib/rspec/models/unidom/standard/standard_spec.rb

@@ -20,15 +20,15 @@ describe Unidom::Standard::Standard, type: :model do
       obsoleted_on: Date.current+20.years
     }
 
-    it_behaves_like 'Unidom::Common::Concerns::ModelExtension',     model_attributes
-    it_behaves_like 'Unidom::Standard::Concerns::AsSourceStandard', model_attributes
-    it_behaves_like 'Unidom::Standard::Concerns::AsTargetStandard', model_attributes
+    it_behaves_like 'Unidom::Common::Concerns::ModelExtension',     model_attributes.merge(number: 'GB/T 9999-000')
+    it_behaves_like 'Unidom::Standard::Concerns::AsSourceStandard', model_attributes.merge(number: 'GB/T 9999-001')
+    it_behaves_like 'Unidom::Standard::Concerns::AsTargetStandard', model_attributes.merge(number: 'GB/T 9999-002')
 
-    it_behaves_like 'validates text', model_attributes, :name,
+    it_behaves_like 'validates text', model_attributes.merge(number: 'GB/T 9999-003'), :name,
       length: 2..described_class.columns_hash['name'].limit
 
     number_max_length = described_class.columns_hash['number'].limit
-    it_behaves_like 'validates', model_attributes, :number,
+    it_behaves_like 'validates', model_attributes.merge(number: 'GB/T 9999-004'), :number,
       {               } => 0,
       { number: nil   } => 2,
       { number: ''    } => 2,
@@ -40,10 +40,11 @@ describe Unidom::Standard::Standard, type: :model do
       { number: 'A'*(number_max_length+1) } => 1
 
     it_behaves_like 'scope', :number_is, [
-      { attributes_collection: [ model_attributes                                                ], count_diff: 1, args: [ model_attributes[:number]       ] },
-      { attributes_collection: [ model_attributes                                                ], count_diff: 0, args: [ "#{model_attributes[:number]}0" ] },
-      { attributes_collection: [ model_attributes.merge(number: "#{model_attributes[:number]}0") ], count_diff: 0, args: [ model_attributes[:number]       ] },
-      { attributes_collection: [ model_attributes.merge(number: "#{model_attributes[:number]}0") ], count_diff: 1, args: [ "#{model_attributes[:number]}0" ] } ]
+      { attributes_collection: [ model_attributes.merge(number: 'GB/T 9999-005') ], count_diff: 1, args: [ 'GB/T 9999-005' ] },
+      { attributes_collection: [ model_attributes.merge(number: 'GB/T 9999-006') ], count_diff: 0, args: [ 'GB/T 9999-005' ] },
+      { attributes_collection: [ model_attributes.merge(number: 'GB/T 9999-007') ], count_diff: 0, args: [ 'GB/T 9999-008' ] },
+      { attributes_collection: [ model_attributes.merge(number: 'GB/T 9999-008') ], count_diff: 1, args: [ 'GB/T 9999-008' ] }
+    ]
 
   end
 

data/lib/unidom/standard/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Standard
-    VERSION = '1.4.7'.freeze
+    VERSION = '1.4.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-standard
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common