jan 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0effbb542c76db5c76ab38d7edc9a95e56aa47985b7d3f481aa4799629e4e02
-  data.tar.gz: 57c8f87ea36fe989cae817baa2d04981c28e723a838a848ea1672f35a24c8480
+  metadata.gz: 7b9f59ef9f5c098027f2bcce1c1d0274d441405ef3c815ca1add5ea85bc1c062
+  data.tar.gz: 44e0a9c709e86f11dd83f58b5e56579e731ac94883900da6d09bd798218b6ee3
 SHA512:
-  metadata.gz: cdb58db78040e27e525980eb5ea32c30cb38f3f31f60dedb87c5f57f39b5bd0acc2fcd9431a60bbd4566969c199c0bed2c8b08fc2ac3a3c1b57e47ad37105e63
-  data.tar.gz: 4efe19db1d9cacbea44eb314096e45d08f0f5d537104f8a0964153f554c4077f022e0a400385bac4f3561944f32045b6857acc4d8951b5d048f15297949f015d
+  metadata.gz: 2b9587535d3fa03d7a4b107f226aad058e7209a6b2a58b61e1420743e26006bc400ddd4f4eac9ad9e5111db8488a719b041fad9800fba9577e1129161b6290d5
+  data.tar.gz: afc558ce893d95fb4b06307eedc20d6e90e20b3da43421c46dbda24e5c4239988c4f8b5701282e0a650093cd3669920a2ed4b449d265c02e1fd83698ef993f06

data/lib/jan/symbol.rb

@@ -25,8 +25,17 @@ module Jan
 
     # @return [Array<String>]
     def codepoints
-      additional_digit, *digits = @code.each_char.to_a
-      variable_parity_encodation_sequence(additional_digit).zip(digits).map(&:join)
+      case @code.length
+      when 13
+        additional_digit, *digits = @code.each_char.to_a
+        variable_parity_encodation_sequence(additional_digit).zip(digits).map(&:join)
+      when 8
+        digits = @code.each_char.to_a
+        parity_encodation_sequence = %w[A A A A C C C C]
+        parity_encodation_sequence.zip(digits).map(&:join)
+      else
+        raise 'Invalid code length (code must be 13-digit or 8 digit)'
+      end
     end
 
     # EXPERIMENTAL
@@ -34,12 +43,13 @@ module Jan
     # @return [String]
     def svg
       x = 0
+      width = svg_width(@code)
       height = 60
 
       builder = Builder::XmlMarkup.new(indent: 2)
       builder.instruct!(:xml, version: '1.0', encoding: 'UTF-8')
-      builder.svg(xmlns: 'http://www.w3.org/2000/svg', width: 113, height: height) do |svg|
-        svg.rect(x: 0, y: 0, width: 113, height: 60, fill: 'white')
+      builder.svg(xmlns: 'http://www.w3.org/2000/svg', width: width, height: height) do |svg|
+        svg.rect(x: 0, y: 0, width: width, height: 60, fill: 'white')
         band_patterns.each do |band_pattern|
           svg.g(class: band_pattern.class.name.split('::').last) do |group|
             band_pattern.bands.each do |band|
@@ -55,16 +65,26 @@ module Jan
 
     # @return [Array<Jan::Symbol::BandPattern::SymbolCharacter>]
     def left_symbol_characters
-      codepoints[0..5].map { |codepoint|
-        BandPattern::SymbolCharacter.new(codepoint)
-      }
+      case @code.length
+      when 13
+        codepoints[0..5].map { |codepoint| BandPattern::SymbolCharacter.new(codepoint) }
+      when 8
+        codepoints[0..3].map { |codepoint| BandPattern::SymbolCharacter.new(codepoint) }
+      else
+        raise
+      end
     end
 
     # @return [Array<Jan::Symbol::BandPattern::SymbolCharacter>]
     def right_symbol_characters
-      codepoints[6..11].map { |codepoint|
-        BandPattern::SymbolCharacter.new(codepoint)
-      }
+      case @code.length
+      when 13
+        codepoints[6..11].map { |codepoint| BandPattern::SymbolCharacter.new(codepoint) }
+      when 8
+        codepoints[4..7].map { |codepoint| BandPattern::SymbolCharacter.new(codepoint) }
+      else
+        raise
+      end
     end
 
     # @param digit [String]
@@ -93,5 +113,18 @@ module Jan
         %w[A B B A B A C C C C C C]
       end
     end
+
+    # @param code [String]
+    # @return [Integer]
+    def svg_width(code)
+      case code.length
+      when 13
+        113
+      when 8
+        85
+      else
+        raise
+      end
+    end
   end
 end

data/lib/jan/version.rb

@@ -1,3 +1,3 @@
 module Jan
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/jan/symbol_spec.rb

@@ -1,18 +1,22 @@
 require 'spec_helper'
 
 describe Jan::Symbol do
-  let(:symbol) { described_class.new('4901085188033') }
+  let(:symbol13) { described_class.new('4901085188033') }
+  let(:symbol8) { described_class.new('49377415') }
 
   describe 'initializer' do
-    it { expect(symbol).to be_an_instance_of Jan::Symbol }
+    it { expect(symbol13).to be_an_instance_of Jan::Symbol }
+    it { expect(symbol8).to be_an_instance_of Jan::Symbol }
   end
 
   describe '#band_patterns' do
-    it { expect(symbol.band_patterns).to be_an_instance_of Array }
-    it { expect(symbol.band_patterns).to all( be_an Jan::Symbol::BandPattern) }
+    it { expect(symbol13.band_patterns).to be_an_instance_of Array }
+    it { expect(symbol8.band_patterns).to be_an_instance_of Array }
+    it { expect(symbol13.band_patterns).to all( be_an Jan::Symbol::BandPattern) }
+    it { expect(symbol8.band_patterns).to all( be_an Jan::Symbol::BandPattern) }
 
     it 'has correct format' do
-      patterns = symbol.band_patterns
+      patterns = symbol13.band_patterns
 
       expect(patterns[0]).to be_an_instance_of Jan::Symbol::BandPattern::LeftQuietZone
       expect(patterns[1]).to be_an_instance_of Jan::Symbol::BandPattern::NormalGuardPattern
@@ -21,6 +25,16 @@ describe Jan::Symbol do
       expect(patterns[9..14]).to all( be_an Jan::Symbol::BandPattern::SymbolCharacter )
       expect(patterns[15]).to be_an_instance_of Jan::Symbol::BandPattern::NormalGuardPattern
       expect(patterns[16]).to be_an_instance_of Jan::Symbol::BandPattern::RightQuietZone
+
+      patterns = symbol8.band_patterns
+
+      expect(patterns[0]).to be_an_instance_of Jan::Symbol::BandPattern::LeftQuietZone
+      expect(patterns[1]).to be_an_instance_of Jan::Symbol::BandPattern::NormalGuardPattern
+      expect(patterns[2..5]).to all( be_an Jan::Symbol::BandPattern::SymbolCharacter )
+      expect(patterns[6]).to be_an_instance_of Jan::Symbol::BandPattern::CenterGuardPattern
+      expect(patterns[7..10]).to all( be_an Jan::Symbol::BandPattern::SymbolCharacter )
+      expect(patterns[11]).to be_an_instance_of Jan::Symbol::BandPattern::NormalGuardPattern
+      expect(patterns[12]).to be_an_instance_of Jan::Symbol::BandPattern::RightQuietZone
     end
   end
 
@@ -36,6 +50,7 @@ describe Jan::Symbol do
       '7123456789012' => %w[A1 B2 A3 B4 A5 B6 C7 C8 C9 C0 C1 C2],
       '8123456789012' => %w[A1 B2 A3 B4 B5 A6 C7 C8 C9 C0 C1 C2],
       '9123456789012' => %w[A1 B2 B3 A4 B5 A6 C7 C8 C9 C0 C1 C2],
+      '12345678' => %w[A1 A2 A3 A4 C5 C6 C7 C8],
     }
 
     mappings.each do |code, answer|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jan
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - OSA Shunsuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple gem for JAN code