unidom-article_number 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24f148994618c534ec06ae430b374bb20ad47a7
-  data.tar.gz: 70c026fb39b7b9d44c4940d40c0839f595adfc28
+  metadata.gz: f230184a9348c0a6540ff87054d0e237210f44a9
+  data.tar.gz: 1680b0164bcdf2569392dcac358db9c414c47092
 SHA512:
-  metadata.gz: 644ffbb30fd613ce1fc0af25f567424be8d841504714be6032bfbec9e04a1877be3528fa74bf2f3c8196167a7fa790e028375d95d512e5bf869a9f973c9b0753
-  data.tar.gz: ad827209dd0e5bfa3052cb4804707b32aab55c72cc8c668e9e4013f3b4b54773f6080768c6cc01e316aba055747c61e1c4ea0f0c2b2fdb0543173a86f715e73f
+  metadata.gz: 1ec8c735447b02c849a1b36479b895861ad88fd01e0f582df8e3586c455a7306c4b9f6eba335c53d454dc4204fa9758a204bc3caeabb1ea17784bc4064b7dac7
+  data.tar.gz: 34161d493bbf609110bcab81f9184b55bbaea889adc5294c141abec00a853f90eb27a6bc99523cd387893121ac9bc49a361e6d5466ccdeef61f219b1e41dac6e

data/app/models/unidom/article_number/ean13_barcode.rb

@@ -13,10 +13,10 @@ class Unidom::ArticleNumber::Ean13Barcode < Unidom::ArticleNumber::ApplicationRe
   include Unidom::ArticleNumber::Concerns::AsBarcode
 
   validates :code,           uniqueness: true, length: { minimum: 13 }, numericality: { only_integer: true }
-  validates :gs1_prefix,     presence: true,   length: { is:       3 }, numericality: { only_integer: true }
-  validates :company_number, presence: true,   length: { is:       4 }, numericality: { only_integer: true }
-  validates :item_reference, presence: true,   length: { is:       5 }, numericality: { only_integer: true }
-  validates :check_digit,    presence: true,   length: { is:       1 }, numericality: { only_integer: true }
+  validates :gs1_prefix,     presence:   true, length: { is:       3 }, numericality: { only_integer: true }
+  validates :company_number, presence:   true, length: { is:       4 }, numericality: { only_integer: true }
+  validates :item_reference, presence:   true, length: { is:       5 }, numericality: { only_integer: true }
+  validates :check_digit,    presence:   true, length: { is:       1 }, numericality: { only_integer: true }
 
   def code=(code)
     code = code.to_s

data/app/models/unidom/article_number/ean8_barcode.rb

@@ -11,10 +11,10 @@ class Unidom::ArticleNumber::Ean8Barcode < Unidom::ArticleNumber::ApplicationRec
   include Unidom::Common::Concerns::ModelExtension
   include Unidom::ArticleNumber::Concerns::AsBarcode
 
-  validates :code,           uniqueness: true,                  numericality: { only_integer: true }
-  validates :gs1_prefix,     presence: true, length: { is: 3 }, numericality: { only_integer: true }
-  validates :item_reference, presence: true, length: { is: 4 }, numericality: { only_integer: true }
-  validates :check_digit,    presence: true, length: { is: 1 }, numericality: { only_integer: true }
+  validates :code,           uniqueness: true, length: { minimum: 8 }, numericality: { only_integer: true }
+  validates :gs1_prefix,     presence:   true, length: { is:      3 }, numericality: { only_integer: true }
+  validates :item_reference, presence:   true, length: { is:      4 }, numericality: { only_integer: true }
+  validates :check_digit,    presence:   true, length: { is:      1 }, numericality: { only_integer: true }
 
   def code=(code)
     code = code.to_s

data/lib/rspec/models/unidom/article_number/ean8_barcode_spec.rb

@@ -12,8 +12,27 @@ describe Unidom::ArticleNumber::Ean8Barcode, type: :model do
       code: '12345678'
     }
 
+    code_max_length = described_class.columns_hash['code'].limit
+
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
+    it_behaves_like 'validates', model_attributes, :code,
+      {             } => 0,
+      { code: nil   } => 3,
+      { code: ''    } => 3,
+      { code: '1'   } => 1,
+      { code: 'A'   } => 2,
+      { code: '11'  } => 1,
+      { code: 'AA'  } => 2,
+      { code: '111' } => 1,
+      { code: 'AAA' } => 2,
+      { code: '1'*(code_max_length-1) } => 1,
+      { code: 'A'*(code_max_length-1) } => 2,
+      { code: '1'*code_max_length     } => 0,
+      { code: 'A'*code_max_length     } => 1,
+      { code: '1'*(code_max_length+1) } => 1,
+      { code: 'A'*(code_max_length+1) } => 2
+
   end
 
 end

data/lib/unidom/article_number/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module ArticleNumber
-    VERSION = '2.3.4'.freeze
+    VERSION = '2.3.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-article_number
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common