unidom-category 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c7dcc861783a84dd34141a3adca54ac7d13048
-  data.tar.gz: 4c5e1bcfc43aa3cd3940bfcab897952b6eff5ede
+  metadata.gz: 8423dbd1e7303708f375a0e58a93cc98543b5c7a
+  data.tar.gz: a4da60fec09dc2008e9a64f03ee17f65496b67f0
 SHA512:
-  metadata.gz: 2c233281115ca22cb267b7b22814d70d534d1eb31e4f7106cd39b095f130e430a05e03bbd391545c3b9710b581cd09b81970a6d6ad99e450812e3d891f79de4e
-  data.tar.gz: e118354ada928dcbfdfd8a0bcdc217eb41ac9e4f6b0e28b28615a525c67dd77b4ff9650b352391afd916268b6c169b648e1a44ff27a466e12df496391660786c
+  metadata.gz: 59479915cc29a05a2ae89fb12b1c065da0cefd8142318bc5cba087f4172fe6e2c1c8934c33d375a234fdca770dc322e0ccd8e61ed1f09f7554ed8ffdd1cd69be
+  data.tar.gz: c4e6032865e7f79ad8d0760003b3e3e34360043f50200dcf71fab50007f47a7289f2eb91fcfe087a419ecbf70faad5083ab74ef216f8f157505d545dc5c813b8

data/app/models/unidom/category/category.rb

@@ -15,7 +15,7 @@ class Unidom::Category::Category < Unidom::Category::ApplicationRecord
 
   belongs_to :scheme, class_name: 'Unidom::Category::CategoryScheme', foreign_key: :scheme_id
 
-  scope :scheme_is,          ->(scheme) { where scheme_id: (scheme.respond_to?(:id) ? scheme.id : scheme )    }
+  scope :scheme_is,          ->(scheme) { where scheme_id: to_id(scheme)                                      }
   scope :code_length_is,     ->(length) { where 'LENGTH(code) = :code_length',  code_length:       length     }
   scope :code_starting_with, ->(prefix) { where 'code LIKE :prefix_expression', prefix_expression: prefix+'%' }
 

data/lib/rspec/models/unidom/category/category_spec.rb

@@ -62,6 +62,26 @@ describe Unidom::Category::Category, type: :model do
 
     it_behaves_like 'belongs_to', model_attributes, :scheme, Unidom::Category::CategoryScheme, scheme_attributes
 
+    it_behaves_like 'monomorphic scope', model_attributes, :scheme_is, :scheme
+
+    it_behaves_like 'scope', :code_length_is, [
+      { attributes_collection: [ model_attributes                    ], count_diff: 0, args: [ 1 ] },
+      { attributes_collection: [ model_attributes                    ], count_diff: 1, args: [ 2 ] },
+      { attributes_collection: [ model_attributes                    ], count_diff: 0, args: [ 3 ] },
+      { attributes_collection: [ model_attributes.merge(code: 'XCX') ], count_diff: 0, args: [ 2 ] },
+      { attributes_collection: [ model_attributes.merge(code: 'XCX') ], count_diff: 1, args: [ 3 ] },
+      { attributes_collection: [ model_attributes.merge(code: 'XCX') ], count_diff: 0, args: [ 4 ] }
+    ]
+
+    it_behaves_like 'scope', :code_starting_with, [
+      { attributes_collection: [ model_attributes                   ], count_diff: 0, args: [ 'C' ] },
+      { attributes_collection: [ model_attributes                   ], count_diff: 1, args: [ 'X' ] },
+      { attributes_collection: [ model_attributes                   ], count_diff: 0, args: [ 'A' ] },
+      { attributes_collection: [ model_attributes.merge(code: 'CX') ], count_diff: 1, args: [ 'C' ] },
+      { attributes_collection: [ model_attributes.merge(code: 'CX') ], count_diff: 0, args: [ 'X' ] },
+      { attributes_collection: [ model_attributes.merge(code: 'CX') ], count_diff: 0, args: [ 'A' ] }
+    ]
+
   end
 
 end

data/lib/unidom/category/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Category
-    VERSION = '1.6.2'.freeze
+    VERSION = '1.6.3'.freeze
   end
 end

metadata

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