salsify-gtin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f279583cc76509f46898df34d5b66a27a7454db60d5f9f7fe8f05e161afaf51
-  data.tar.gz: b730b522cc2d9defbf1abbfc10d77658bc7a95dea0806f4481310dae2bca8ced
+  metadata.gz: bf85b1127e3fef3f0b0b68475014f14fe6fbe53af40d0af59f8e28e8925fbf17
+  data.tar.gz: 71ffc083ccd48af8d2872f5b6cb185fdea89f4faf29420f13eaa857603753cc6
 SHA512:
-  metadata.gz: 6f29318ae9ae3fccc96a401a19f7b6125a2531dbeec40e6fcaa993f7e6c25a1fc38835c09809479108b9e961fccfa01b633d6a7a55043ed57e0c5c856f570d7e
-  data.tar.gz: 10a357e7e16c526bd6278625699c73b035afdbc4542d605dc5fa371b48e11a68774a3799626740799978d1d6e803c47d37befea1e28e65da4888e21d5fbeb1e7
+  metadata.gz: 857e0fd70954caca95353b14963ed25983037027a6e0bc4e94d2c111b1409443f20e0284fd832b01804e0d383482d772add402daa74bc0c84df9950067626a79
+  data.tar.gz: 3317865cf3966e553d0b9783d5500131ed6aae374de7d3a9b86cbd45651d0ac7c03b08c03146ba8c46a6c41f7283e4f5b1bcd09b40cfda8e8f1b374f57130421

data/.circleci/config.yml

@@ -3,12 +3,16 @@ jobs:
   build:
     docker:
       - image: salsify/ruby_ci:2.5.1
-    working_directory: ~/gtin
+    environment:
+      RACK_ENV: "test"
+      RAILS_ENV: "test"
+      CIRCLE_TEST_REPORTS: "test-results"
+    working_directory: ~/salsify-gtin
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-gems-ruby-2.5.1-{{ checksum "salsify-jira.gemspec" }}-{{ checksum "Gemfile.lock" }}
+            - v1-gems-ruby-2.5.1-{{ checksum "gtin.gemspec" }}-{{ checksum "Gemfile" }}
             - v1-gems-ruby-2.5.1-
       - run:
           name: Install Gems
@@ -18,7 +22,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-2.5.1-{{ checksum "salsify-jira.gemspec" }}-{{ checksum "Gemfile.lock" }}
+          key: v1-gems-ruby-2.5.1-{{ checksum "gtin.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor"
@@ -30,4 +34,4 @@ jobs:
           command: |
             bundle exec rspec --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml --format progress spec
       - store_test_results:
-          path: 'test-results'
+          path: $CIRCLE_TEST_REPORTS

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 inherit_gem:
   salsify_rubocop: conf/rubocop.yml
 

data/.rubocop_todo.yml

@@ -0,0 +1,20 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-02-12 14:05:52 -0500 using RuboCop version 0.52.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Exclude:
+    - 'lib/gtin/gtin.rb'
+
+# Offense count: 10
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 134

data/gtin.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'
-
+  spec.add_development_dependency 'rspec_junit_formatter', '0.2.2'
   spec.add_development_dependency 'salsify_rubocop', '~> 0.52.1'
 end

data/lib/gtin/gtin.rb

@@ -31,8 +31,13 @@ module GTIN
   end
 
   def standardize(id_type, value, validate_checksum: true)
-    fail_on_invalid_checksum(id_type, value) if validate_checksum
     converter = get_converter(id_type, value.length)
+    if converter.nil?
+      raise GtinValidationError.new("#{id_type} standardization failed: no gtin converter for value with length #{value.length}")
+    end
+
+    fail_on_invalid_checksum(id_type, value) if validate_checksum
+
     send(converter.standardizer, value)
   end
 
@@ -41,7 +46,8 @@ module GTIN
       return converter if type_matcher.match?(id_type) && value_length == length
     end
 
-    raise GtinValidationError.new("No gtin converter found for #{id_type} with length #{value_length}")
+    # rubocop warns about this, but it's needed because #each returns its owner
+    return nil
   end
 
   def standardize_gtin(gtin)
@@ -76,12 +82,18 @@ module GTIN
 
   def valid_checksum?(id_type, identifier)
     converter = get_converter(id_type, identifier.length)
+    return false if converter.nil?
+
     expected_checksum = send(converter.checksum_computer, identifier[0..-2])
     identifier[-1] == expected_checksum
   end
 
   def fail_on_invalid_checksum(id_type, identifier)
     converter = get_converter(id_type, identifier.length)
+    if converter.nil?
+      raise GtinValidationError.new("Invalid checksum: gtin converter not found for #{id_type} with length #{value.length}")
+    end
+
     expected_checksum = send(converter.checksum_computer, identifier[0..-2])
     actual_checksum = identifier[-1]
     return if actual_checksum == expected_checksum

data/lib/gtin/version.rb

@@ -1,3 +1,3 @@
 module GTIN
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salsify-gtin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: salsify_rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +123,7 @@ files:
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile