barcodevalidation 2.1.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 897dd3cdb0c9e0bf7d9f50bfeb98b0ac8be7b79d
-  data.tar.gz: 93fb7cc3b723a9ce5c935c6eba57bfadad217d6a
+SHA256:
+  metadata.gz: 6aa7aea902c16d451d7a53b8b69979013f1b8d438165cf8f4c3c3940be359047
+  data.tar.gz: ea0ca124f7e9e5cdf919c791747f3663215ab33f073140832a88e936a6f11a9b
 SHA512:
-  metadata.gz: 5a6cee629384d5ff836f8ca9df2a29bbbd3a982498cd3d5f232bfd5b8b86dde9c6cbc569ae2ca01658fd0b887d24c185e5ee523ff82b90f21aa2f280e133b21d
-  data.tar.gz: 2d6659bfb3bf670a7b28d7c55e25ecc81412706421ffeee3ea19043f0d28df50e16d7e4f51d0f6f093d959435725e48d38c74b771af1d5f50229499654a07809
+  metadata.gz: cbc4e8901c64e54995f4f62dec98e3711a386b88dd693bacc571e22ea4f3e7ae48a6910a75c562456b8e7c788a65a18b1c571395c34a129f3a4da9844e9782a6
+  data.tar.gz: ee148eacfcae331bbcc83fa454ed564024668145e3580d01f21cc21622d976bd2f9ac17872c69b7eb63050e040edd7fb69223f640ec3407aeea59abb3f4d0a64

data/README.md

@@ -1,11 +1,11 @@
 barcodevalidation
 =================
 
-[![Build Status][travis-badge]][travis]
+[![Build Status][ci-badge]][ci]
 [![Gem Version][rubygems-badge]][rubygems]
 
-[travis]: <https://travis-ci.org/marketplacer/barcodevalidation>
-[travis-badge]: <https://travis-ci.org/marketplacer/barcodevalidation.svg?branch=master>
+[ci]: <https://buildkite.com/marketplacer/barcodevalidation>
+[ci-badge]: <https://badge.buildkite.com/d0d578653bc319cd41e9adb2ac23f1c0d59cf56ee6cc329d78.svg?branch=main>
 [rubygems]: <https://badge.fury.io/rb/barcodevalidation>
 [rubygems-badge]: <https://badge.fury.io/rb/barcodevalidation.svg>
 
@@ -40,20 +40,26 @@ and it's pretty flexible about what you give it.
 
 ```ruby
 gtin = BarcodeValidation.scan("937179-004167")
-# => #<BarcodeValidation::GTIN(937179004167)>
+# => #<BarcodeValidation::GTIN::GTIN12(937179004167)>
 gtin.to_s        # => "937179004167"
 gtin.valid?      # => true
 gtin.check_digit # => #<BarcodeValidation::GTIN::CheckDigit(7)>
 gtin.first(6)    # => #<BarcodeValidation::DigitSequence(937179)>
 gtin.slice(0..5) # => #<BarcodeValidation::DigitSequence(937179)>
+gtin.to_gtin_13  # => #<BarcodeValidation::GTIN::GTIN13(0937179004167)>
+gtin.to_all_valid
+# => [#<BarcodeValidation::GTIN::GTIN12(937179004167)>,
+#<BarcodeValidation::GTIN::GTIN123(0937179004167)>]
 
 bad = BarcodeValidation.scan(937_179_004_162)
-# => #<BarcodeValidation::GTIN(937179004162)>
+# => #<BarcodeValidation::InvalidGTIN(937179004162)>
 bad.valid?               # => false
 bad.check_digit          # => #<BarcodeValidation::GTIN::CheckDigit(2) invalid: expected 7>
 bad.check_digit.valid?   # => false
 bad.check_digit.actual   # => #<BarcodeValidation::Digit(2)>
 bad.check_digit.expected # => #<BarcodeValidation::Digit(7)>
+bad.to_gtin_13           # => #<BarcodeValidation::InvalidGTIN(937179004162)>
+bad.to_all_valid         # => []
 ```
 
 
@@ -97,11 +103,10 @@ bin/rubocop --help
 
 
 
-Continuous Integration
+Tests & Publishing
 ----------------------
 
-Code is automatically tested with each push, on both Travis CI and
-Marketplacer's internal Buildkite.
+Code is automatically tested with each push on Buildkite. Assuming all tests pass, commits on `main` will be parsed with [Semantic Release](https://github.com/semantic-release/semantic-release) to produce new Git tags, and to publish to RubyGems.
 
 
 
@@ -133,4 +138,4 @@ This project is licensed under the [MIT License]. See [LICENSE.md] for
 the full text.
 
 [MIT License]: <https://opensource.org/licenses/MIT>
-[LICENSE.md]: <https://github.com/marketplacer/barcodevalidation/blob/master/LICENSE.md>
+[LICENSE.md]: <https://github.com/marketplacer/barcodevalidation/blob/main/LICENSE.md>

data/barcodevalidation.gemspec

@@ -1,9 +1,11 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "barcodevalidation/version"
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = ">= 2.5"
   spec.name          = "barcodevalidation"
   spec.version       = BarcodeValidation::VERSION
   spec.authors       = ["Marketplacer"]
@@ -14,14 +16,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/marketplacer/#{spec.name}"
   spec.license       = "MIT"
 
-  spec.files         = %w(LICENSE.md README.md barcodevalidation.gemspec
-                          config/*.rb lib/**/*.rb)
+  spec.files         = %w[LICENSE.md README.md barcodevalidation.gemspec
+                          config/*.rb lib/**/*.rb]
                        .flat_map { |pattern| Dir.glob(pattern) }
                        .reject { |f| File.directory?(f) }
   spec.bindir        = "exe"
   spec.executables   = spec.files
                            .grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "adamantium"
 end

data/config/boot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This script sets up the common environment for the project
 #
 # Require this file using:

data/lib/barcodevalidation/digit.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "delegate"
+require_relative "error/argument_error_class"
 
 module BarcodeValidation
   class Digit < DelegateClass(Integer)
-    include Adamantium
     include Mixin::ValueObject
 
     INTEGER_CAST_ERRORS = [::ArgumentError, ::TypeError].freeze
@@ -10,6 +12,7 @@ module BarcodeValidation
     def initialize(input)
       value = Integer(input)
       raise ::ArgumentError unless (0..9).cover? value
+
       super(value)
     rescue *INTEGER_CAST_ERRORS
       raise Digit::ArgumentError, input

data/lib/barcodevalidation/digit_sequence.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "forwardable"
+require_relative "error/argument_error_class"
 
 module BarcodeValidation
   class DigitSequence < Array
     extend Forwardable
-    include Adamantium::Flat
     include Mixin::ValueObject
 
     delegate to_s: :join
@@ -18,6 +20,7 @@ module BarcodeValidation
     def initialize(values)
       values = cast(values)
       raise ArgumentError, values unless values.respond_to? :map
+
       super(values.map { |value| BarcodeValidation::Digit.new(value) })
     end
 
@@ -28,6 +31,10 @@ module BarcodeValidation
       end
     end
 
+    def *(other)
+      self.class.new(super)
+    end
+
     ArgumentError = Error::ArgumentErrorClass.new(DigitSequence)
   end
 end

data/lib/barcodevalidation/error/argument_error_class.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "forwardable"
 
 module BarcodeValidation

data/lib/barcodevalidation/error.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative "error/argument_error_class"

data/lib/barcodevalidation/gtin/base.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module BarcodeValidation
+  module GTIN
+    class Base < BarcodeValidation::DigitSequence
+      MODULUS = 10
+
+      extend Forwardable
+
+      attr_reader :input
+
+      def initialize(input)
+        @input = input
+
+        super
+      rescue BarcodeValidation::Error => e
+        BarcodeValidation::InvalidGTIN.new(input, error: e)
+      end
+
+      def valid?
+        valid_length == length && check_digit.valid?
+      end
+
+      def valid_length
+        raise(AbstractMethodError, "Concrete classes must define the VALID_LENGTH constant") unless self.class.const_defined?(:VALID_LENGTH)
+
+        self.class::VALID_LENGTH
+      end
+
+      class AbstractMethodError < StandardError; end
+
+      def to_all_valid
+        [
+          to_gtin_8,
+          to_gtin_12,
+          to_gtin_13,
+          to_gtin_14,
+        ].select(&:valid?)
+      end
+
+      def to_gtin_8
+        is_a?(GTIN8) ? self : transcode_to(GTIN8)
+      end
+
+      def to_gtin_12
+        is_a?(GTIN12) ? self : transcode_to(GTIN12)
+      end
+
+      def to_gtin_13
+        is_a?(GTIN13) ? self : transcode_to(GTIN13)
+      end
+
+      def to_gtin_14
+        is_a?(GTIN14) ? self : transcode_to(GTIN14)
+      end
+
+      private
+
+      def check_digit
+        CheckDigit.new(last, expected: expected_check_digit)
+      end
+
+      def expected_check_digit
+        (MODULUS - weighted_checkable_digit_sum) % MODULUS
+      end
+
+      def weighted_checkable_digit_sum
+        checkable_digits
+          .zip([3, 1].cycle)
+          .map { |digit, factor| digit * factor }
+          .reduce(&:+)
+      end
+
+      def checkable_digits
+        take(length - 1).reverse.map(&:to_i)
+      end
+
+      # Instantiates the given class with the string value of this instance
+      # with any leading zeros stripped out, and then zero-padded up to the
+      # valid length of the given class. If the resulting string is <> the
+      # valid length of the target format, the returned object will be a
+      # BarcodeValidation::InvalidGTIN with valid? = false and a meaningful
+      # error message.
+      def transcode_to(klass)
+        gtin = klass.new(format("%0#{klass::VALID_LENGTH}d", to_s.gsub(/^0+/, "")))
+
+        if gtin.valid?
+          gtin
+        else
+          BarcodeValidation::InvalidGTIN.new(
+            input,
+            error: klass::ConversionError.new(klass).exception(input),
+          )
+        end
+      end
+
+      ConversionError = Error::ArgumentErrorClass.new(self)
+    end
+  end
+end

data/lib/barcodevalidation/gtin/check_digit.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module BarcodeValidation
+  module GTIN
+    class CheckDigit < DelegateClass(Digit)
+      include Mixin::ValueObject
+
+      attr_reader :actual, :expected
+
+      def initialize(actual, expected: nil)
+        expected = actual if expected.nil?
+        @expected = Digit.new(expected)
+        @actual = Digit.new(actual)
+        super(@actual)
+      end
+
+      def valid?
+        actual == expected
+      end
+
+      def inspect
+        return super if valid?
+
+        "#<#{self.class}(#{actual}) invalid: expected #{expected}>"
+      end
+    end
+  end
+end

data/lib/barcodevalidation/gtin/gtin12.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module BarcodeValidation
+  module GTIN
+    class GTIN12 < BarcodeValidation::GTIN::Base
+      VALID_LENGTH = 12
+    end
+  end
+end

data/lib/barcodevalidation/gtin/gtin13.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module BarcodeValidation
+  module GTIN
+    class GTIN13 < BarcodeValidation::GTIN::Base
+      VALID_LENGTH = 13
+    end
+  end
+end

data/lib/barcodevalidation/gtin/gtin14.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module BarcodeValidation
+  module GTIN
+    class GTIN14 < BarcodeValidation::GTIN::Base
+      VALID_LENGTH = 14
+    end
+  end
+end

data/lib/barcodevalidation/gtin/gtin8.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module BarcodeValidation
+  module GTIN
+    class GTIN8 < BarcodeValidation::GTIN::Base
+      VALID_LENGTH = 8
+    end
+  end
+end

data/lib/barcodevalidation/gtin.rb

@@ -1,42 +1,27 @@
+# frozen_string_literal: true
+
 require "forwardable"
+require_relative "invalid_gtin"
+require_relative "gtin/base"
+require_relative "gtin/check_digit"
+require_relative "gtin/gtin8"
+require_relative "gtin/gtin12"
+require_relative "gtin/gtin13"
+require_relative "gtin/gtin14"
 
 module BarcodeValidation
-  class GTIN < BarcodeValidation::DigitSequence
-    extend Forwardable
-    include Mixin::HasCheckDigit
-
-    VALID_LENGTHS = [8, 12, 13, 14].freeze
-
-    def self.new(input)
-      super
-    rescue BarcodeValidation::Error => e
-      return InvalidGTIN.new(input, error: e)
-    end
-
-    def valid?
-      VALID_LENGTHS.include?(length) && check_digit.valid?
-    end
-
-    class CheckDigit < DelegateClass(Digit)
-      include Adamantium::Flat
-      include Mixin::ValueObject
-
-      attr_reader :actual, :expected
-
-      def initialize(actual, expected: nil)
-        expected = actual if expected.nil?
-        @expected = Digit.new(expected)
-        @actual = Digit.new(actual)
-        super(@actual)
+  module GTIN
+    class << self
+      def new(input)
+        (class_for_input(input) || BarcodeValidation::InvalidGTIN).new(input)
       end
 
-      def valid?
-        actual == expected
-      end
+      private
 
-      def inspect
-        return super if valid?
-        "#<#{self.class}(#{actual}) invalid: expected #{expected}>"
+      def class_for_input(input)
+        [GTIN8, GTIN12, GTIN13, GTIN14].find do |klass|
+          input.to_s.size == klass::VALID_LENGTH
+        end
       end
     end
   end

data/lib/barcodevalidation/invalid_gtin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "delegate"
 
 module BarcodeValidation
@@ -17,7 +19,28 @@ module BarcodeValidation
 
     def error_message
       return @error.message if @error.respond_to? :message
+
       @error.inspect
     end
+
+    def to_all_valid
+      []
+    end
+
+    def to_gtin_8
+      self
+    end
+
+    def to_gtin_12
+      self
+    end
+
+    def to_gtin_13
+      self
+    end
+
+    def to_gtin_14
+      self
+    end
   end
 end

data/lib/barcodevalidation/mixin/has_check_digit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BarcodeValidation
   module Mixin
     # Wraps #last as a CheckDigit

data/lib/barcodevalidation/mixin/value_object.rb

@@ -1,4 +1,4 @@
-require "adamantium"
+# frozen_string_literal: true
 
 module BarcodeValidation
   module Mixin
@@ -8,10 +8,6 @@ module BarcodeValidation
       end
 
       module ClassMethods
-        # Memoizes return values based on the inputs
-        def new(*args)
-          (@__new_cache ||= {})[args] ||= super
-        end
       end
 
       def eql?(other)
@@ -22,8 +18,8 @@ module BarcodeValidation
         "#<#{description}>"
       end
 
-      def pretty_print(pp)
-        pp.text inspect
+      def pretty_print(value)
+        value.text inspect
       end
 
       private

data/lib/barcodevalidation/mixin.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require_relative "mixin/has_check_digit"
 require_relative "mixin/value_object"

data/lib/barcodevalidation/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BarcodeValidation
-  VERSION = "2.1.0".freeze
+  VERSION = "2.4.0"
 end

data/lib/barcodevalidation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "barcodevalidation/mixin"
 require "barcodevalidation/error"
 require "barcodevalidation/digit"
@@ -23,6 +25,7 @@ module BarcodeValidation
     # Strips punctuation
     def sanitize(input)
       return input.gsub(/(\s|[-_])/, "") if input.respond_to? :gsub
+
       input
     end
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: barcodevalidation
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Marketplacer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: adamantium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2022-02-03 00:00:00.000000000 Z
+dependencies: []
 description: A RubyGem to parse and validate barcodes
 email:
 - it@marketplacer.com
@@ -41,6 +27,12 @@ files:
 - lib/barcodevalidation/error.rb
 - lib/barcodevalidation/error/argument_error_class.rb
 - lib/barcodevalidation/gtin.rb
+- lib/barcodevalidation/gtin/base.rb
+- lib/barcodevalidation/gtin/check_digit.rb
+- lib/barcodevalidation/gtin/gtin12.rb
+- lib/barcodevalidation/gtin/gtin13.rb
+- lib/barcodevalidation/gtin/gtin14.rb
+- lib/barcodevalidation/gtin/gtin8.rb
 - lib/barcodevalidation/invalid_gtin.rb
 - lib/barcodevalidation/mixin.rb
 - lib/barcodevalidation/mixin/has_check_digit.rb
@@ -58,15 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Parses and validates barcodes