gs1 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f15d386486f27cc92e1ba01d9c3d03f0633c7ac
-  data.tar.gz: e4f0b5717132652127aafeeccdda4253d68a8201
+  metadata.gz: ae7268afd40d4a599155c51582aacd7f7d3f8c52
+  data.tar.gz: 930790ac5f42cc782f3460aaa0e68671f53e0208
 SHA512:
-  metadata.gz: 3d3f0d9472329eafe49f3bdbf6326672c442d74b8132f07d3a21d0083d7d617fd1309af82d24ba78bd3585d61b7f6daf5ecec8fcad5f72595a29d2024afdea16
-  data.tar.gz: 03d8e6d2faf2249b3077c38d67d90535f6a82d6d2fb1aec42c71e90cf9054497ab122a89014478840420c23f0c969ea1fa2c9316ebd933e623c5d395c5521c64
+  metadata.gz: bd8d48770b37423a9abe783d4169294f81a7f519ca753b35ef399934e485f8684dabe2da64f96a5749f823a4f37123936116c1e15a92611f60d865e8432c7a8d
+  data.tar.gz: aeb9b655ddf9550c05fc755a7cd8a3a0705f0051ceb23e755a97cc316457115c2e3611c27d3087df92805e242c6ca94258975496df98e79e2db75ebf81f69855

data/lib/gs1/barcode/base.rb

@@ -6,6 +6,8 @@ module GS1
       include Definitions
 
       def initialize(options = {})
+        @params_order = options.keys
+
         self.class.records.each do |record|
           data = options.fetch(record.underscore_name, nil)
 

data/lib/gs1/barcode/healthcare.rb

@@ -8,13 +8,14 @@ module GS1
       def to_s(level: AIDCMarketingLevels::ENHANCED, separator: GS1.configuration.barcode_separator)
         return unless valid?(level: level)
 
-        [
-          gtin.to_ai,
-          expiration_date&.to_ai,
-          batch&.to_ai,
-          separator,
-          serial_number&.to_ai
-        ].compact.join
+        @params_order.each_with_object('') do |param, out|
+          record = send(param)
+
+          next unless record.to_ai
+
+          out << record.to_ai
+          out << separator if record.class.separator? && param != @params_order.last
+        end
       end
 
       def valid?(level: AIDCMarketingLevels::ENHANCED)

data/lib/gs1/batch.rb

@@ -29,5 +29,6 @@ module GS1
     AI = AI::BATCH_LOT
 
     define :length, allowed: 1..20
+    define :separator
   end
 end

data/lib/gs1/definitions.rb

@@ -15,7 +15,7 @@ module GS1
     module ClassMethods
       attr_reader :definitions
 
-      DEFINITIONS = %i[check_digit date date_month_based length].freeze
+      DEFINITIONS = %i[check_digit date date_month_based length separator].freeze
 
       def define(key, options = {})
         raise UnknownDefinition, "#{key} is not a valid definition" unless DEFINITIONS.include?(key)
@@ -40,6 +40,11 @@ module GS1
         {}
       end
 
+      # Boolean value
+      def normalize_separator_options(_options)
+        true
+      end
+
       # Defaults barcode length to allowed length if not explicitly defined, only
       # if there is one significant allowed.
       def normalize_length_options(options)
@@ -67,6 +72,10 @@ module GS1
         option_value
       end
 
+      def separator?
+        definitions[:separator]
+      end
+
       def barcode_length
         lengths[:barcode]
       end

data/lib/gs1/serial_number.rb

@@ -27,5 +27,6 @@ module GS1
     AI = AI::SERIAL
 
     define :length, allowed: 1..20
+    define :separator
   end
 end

data/lib/gs1/validations.rb

@@ -39,6 +39,8 @@ module GS1
 
       def validate
         self.class.definitions.each_key do |definition|
+          next if definition == :separator
+
           public_send("validate_#{definition}")
         end
       end

data/lib/gs1/version.rb

@@ -1,3 +1,3 @@
 module GS1
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gs1
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Stefan Åhman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler