unidom-standard 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e4fdcb805d5792897f09e58c523dddcff3e415a
-  data.tar.gz: 304ba3dc1ed7df222f1d30d3b9b56b6727408a9a
+  metadata.gz: 337e62c070e6119891f65796769c5a3a220bfc8f
+  data.tar.gz: 50f8291641b9353702b0b553fcf263070a60f342
 SHA512:
-  metadata.gz: 6bab4fb0ef02424ca5a111c5da147a70895854d01f62b62dafed4f46188666175e5538cb92dd5140e3c3986a1c5a11a74f0d90e2c505534eb8f2121508334bd4
-  data.tar.gz: 62a74d1a714d6c9949b375fe0edabe1c049128e34aa803a727baaa883967d2505634db8eac5d4feabd95f1fb33fd515b1667533cb79112cd771726d335af99a1
+  metadata.gz: a8090e10fd94919eae6a69024f7e29f0c07f07a8c61abefc9e3a05a5d41c64c87ce9e2e345485709d7a69cc0cbbe427ce9aeef4f9b4ba282b255e2ce0d3d4547
+  data.tar.gz: 16d6e18fb1918ab74626c6be6e67fab1c0ec41757390c652787c207f0614c7a5625fde025efaf790690c0e98cbc72246d7dc9992f10929c057362b894ac1c3c7

data/app/models/unidom/standard/standard_associating.rb

@@ -11,8 +11,8 @@ class Unidom::Standard::StandardAssociating < Unidom::Standard::ApplicationRecor
   belongs_to :source, class_name: 'Unidom::Standard::Standard', foreign_key: :source_id
   belongs_to :target, class_name: 'Unidom::Standard::Standard', foreign_key: :target_id
 
-  scope :source_is, ->(source) { where source_id: (source.respond_to?(:id) ? source.id : source) }
-  scope :target_is, ->(target) { where target_id: (target.respond_to?(:id) ? target.id : target) }
+  scope :source_is, ->(source) { where source: source }
+  scope :target_is, ->(target) { where target: target }
 
   def self.associate!(source, with: target, due_to: 'REVS', at: Time.now)
     create! source_id: to_id(source), target_id: to_id(with), association_code: due_to, opened_at: at

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

@@ -16,17 +16,29 @@ describe Unidom::Standard::StandardAssociating, type: :model do
 
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
-    it_behaves_like 'scope', :source_is, [
-      { attributes_collection: [ model_attributes                                     ], count_diff: 1, args: [ model_attributes[:source_id]                                     ] },
-      { attributes_collection: [ model_attributes                                     ], count_diff: 1, args: [ Unidom::Standard::Standard.new(id: model_attributes[:source_id]) ] },
-      { attributes_collection: [ model_attributes.merge(source_id: SecureRandom.uuid) ], count_diff: 0, args: [ model_attributes[:source_id]                                     ] },
-      { attributes_collection: [ model_attributes.merge(source_id: SecureRandom.uuid) ], count_diff: 0, args: [ Unidom::Standard::Standard.new(id: model_attributes[:source_id]) ] } ]
-
-    it_behaves_like 'scope', :target_is, [
-      { attributes_collection: [ model_attributes                                     ], count_diff: 1, args: [ model_attributes[:target_id]                                     ] },
-      { attributes_collection: [ model_attributes                                     ], count_diff: 1, args: [ Unidom::Standard::Standard.new(id: model_attributes[:target_id]) ] },
-      { attributes_collection: [ model_attributes.merge(target_id: SecureRandom.uuid) ], count_diff: 0, args: [ model_attributes[:target_id]                                     ] },
-      { attributes_collection: [ model_attributes.merge(target_id: SecureRandom.uuid) ], count_diff: 0, args: [ Unidom::Standard::Standard.new(id: model_attributes[:target_id]) ] } ]
+    source_standard_attributes = {
+      name:         'Source Name',
+      number:       'GB/T 3259-2008',
+      ics_code:     '11-23-68',
+      published_on: Date.current-20.years,
+      applied_on:   Date.current,
+      obsoleted_on: Date.current+1.year
+    }
+
+    target_standard_attributes = {
+      name:         'Target Name',
+      number:       'GB/T 3259-2018',
+      ics_code:     '11-23-68',
+      published_on: Date.current+1.year,
+      applied_on:   Date.current,
+      obsoleted_on: Date.current+20.years
+    }
+
+    it_behaves_like 'belongs_to', model_attributes, :source, Unidom::Standard::Standard, source_standard_attributes
+    it_behaves_like 'belongs_to', model_attributes, :target, Unidom::Standard::Standard, target_standard_attributes
+
+    it_behaves_like 'monomorphic scope', model_attributes, :source_is, :source
+    it_behaves_like 'monomorphic scope', model_attributes, :target_is, :target
 
   end
 

data/lib/unidom/standard/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Standard
-    VERSION = '1.4.2'.freeze
+    VERSION = '1.4.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-standard
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common