unidom-standard 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c558e6dc0b25a2d495c0f5da157597399fe7a3
-  data.tar.gz: fe2ab5890489f62da6e0a66094bdcdd7759e8f4e
+  metadata.gz: 2e4fdcb805d5792897f09e58c523dddcff3e415a
+  data.tar.gz: 304ba3dc1ed7df222f1d30d3b9b56b6727408a9a
 SHA512:
-  metadata.gz: d1d7ca3c30626e958be11cfd72a21205e4d329cb1afd192867e7db5ef397458655a7f4a9cb8b2fbffd9c4201e30ea2e9162beb57bd52c1eb57ec4a8e2756bf2d
-  data.tar.gz: b7dd1593a614430e5409fe44581893f5a880aeaf88160cdd394bbd774c0856e56b8d566884e92f88c947d09c6d0db25468544c9083470cd37ab75a1f3353c958
+  metadata.gz: 6bab4fb0ef02424ca5a111c5da147a70895854d01f62b62dafed4f46188666175e5538cb92dd5140e3c3986a1c5a11a74f0d90e2c505534eb8f2121508334bd4
+  data.tar.gz: 62a74d1a714d6c9949b375fe0edabe1c049128e34aa803a727baaa883967d2505634db8eac5d4feabd95f1fb33fd515b1667533cb79112cd771726d335af99a1

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

@@ -8,12 +8,12 @@ class Unidom::Standard::StandardAssociating < Unidom::Standard::ApplicationRecor
 
   include Unidom::Common::Concerns::ModelExtension
 
-  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) }
-
   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) }
+
   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
   end

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

@@ -16,6 +16,18 @@ 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]) ] } ]
+
   end
 
 end

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

@@ -44,6 +44,12 @@ describe Unidom::Standard::Standard, type: :model do
       { number: 'A'*name_max_length     } => 0,
       { number: 'A'*(name_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" ] } ]
+
   end
 
 end

data/lib/unidom/standard/version.rb

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

metadata

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