barby 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad8050c7d031bdc4c866046b84740632b1f72b74
-  data.tar.gz: daf30f880b830c955b4653684d95996bd0906356
+  metadata.gz: 25c48f523056303c71f3477a056906f12613bde3
+  data.tar.gz: 1860f349c37684539345aef410f09a570a50f319
 SHA512:
-  metadata.gz: 9ba0fac4a2f56fd7c88689d1b09b69c72a1556e138d0e59a807e4dfe39aef3d1b775770e354fa19e0e2e1cd5e2b9525b6e6a9cfe8fc5c25920a2c0396ad7d7b7
-  data.tar.gz: ce42a339359f0a77ba6127b43be32fc10fc82078a4d99e2883e9a0882c8325f4b5a9b9fe7950841b424b818c8bd23ee895443355d395f6d43bc6448084a273f0
+  metadata.gz: a793a5c6a5a5fba522ec2300ec703a3340edd5c45d249b9ca5d2056c2460555e6f4944c0cc4d9ccb8863f6a068a1aa2083f5f5181820d0c70b7a79d2c9cf2799
+  data.tar.gz: f7acba5a08dea02a79c1620a2b4743e1b77a1f53469d83bf4d58229c5f5e618dc3f89959d2e858b8dbf80c0fef7ef33cfe211f5bdf28d750d9e578178d4bda6d

data/lib/barby/barcode/bookland.rb

@@ -3,36 +3,144 @@ require 'barby/barcode/ean_13'
 
 module Barby
 
-  #Bookland barcodes are EAN-13 barcodes with number system
-  #978 (hence "Bookland"). The data they encode is an ISBN
-  #with its check digit removed. This is a convenience class
-  #that takes an ISBN no instead of "pure" EAN-13 data.
+  # Bookland barcodes are EAN-13 barcodes with number system
+  # 978/979 (hence "Bookland"). The data they encode is an ISBN
+  # with its check digit removed. This is a convenience class
+  # that takes an ISBN number instead of "pure" EAN-13 data.
+  #
+  #   #These are all the same:
+  #   barcode = Bookland.new('978-0-306-40615-7')
+  #   barcode = Bookland.new('978-0-306-40615')
+  #   barcode = Bookland.new('0-306-40615-7')
+  #   barcode = Bookland.new('0-306-40615')
+  #
+  # If a prefix is not given, a default of 978 is used.
   class Bookland < EAN13
 
-    BOOKLAND_NUMBER_SYSTEM = '978'
-
-    attr_accessor :isbn
-
+    # isbn should be an ISBN number string, with or without an EAN prefix and an ISBN checksum
+    # non-number formatting like hyphens or spaces are ignored
+    #
+    # If a prefix is not given, a default of 978 is used.
     def initialize(isbn)
       self.isbn = isbn
       raise ArgumentError, 'data not valid' unless valid?
     end
 
     def data
-      BOOKLAND_NUMBER_SYSTEM+isbn_only
+      isbn.isbn
     end
 
-    #Removes any non-digit characters, number system and check digit
-    #from ISBN, so "978-82-92526-14-9" would result in "829252614"
-    def isbn_only
-      s = isbn.gsub(/[^0-9]/, '')
-      if s.size > 10#Includes number system
-        s[3,9]
-      else#No number system, may include check digit
-        s[0,9]
-      end
+    def isbn=(isbn)
+      @isbn = ISBN.new(isbn)
     end
 
-  end
+    #An instance of ISBN
+    def isbn
+      @isbn
+    end
+
+
+    # Encapsulates an ISBN number
+    #
+    # isbn = ISBN.new('978-0-306-40615')
+    class ISBN
+
+      DEFAULT_PREFIX = '978'
+      PATTERN = /\A(?<prefix>\d\d\d)?(?<number>\d{9})(?<checksum>\d)?\Z/
+
+      attr_reader :number
+
+
+      # Takes one argument, which is the ISBN string with or without prefix and/or check digit.
+      # Non-digit characters like hyphens and spaces are ignored.
+      #
+      # Prefix is 978 if not given.
+      def initialize(isbn)
+        self.isbn = isbn
+      end
+
+
+      def isbn=(isbn)
+        if match = PATTERN.match(isbn.gsub(/\D/, ''))
+          @number = match[:number]
+          @prefix = match[:prefix]
+        else
+          raise ArgumentError, "Not a valid ISBN: #{isbn}"
+        end
+      end
+
+      def isbn
+        "#{prefix}#{number}"
+      end
+
+      def isbn_with_checksum
+        "#{isbn}#{checksum}"
+      end
+
+      def isbn_10
+        number
+      end
+
+      def isbn_10_with_checksum
+        "#{number}#{checksum}"
+      end
+
+      def formatted_isbn
+        "#{prefix}-#{number}-#{checksum}"
+      end
+
+      def formatted_isbn_10
+        "#{number}-#{checksum}"
+      end
+
+
+      def prefix
+        @prefix || DEFAULT_PREFIX
+      end
+
+      def digits
+        (prefix+number).split('').map(&:to_i)
+      end
+
+      def isbn_10_digits
+        number.split('').map(&:to_i)
+      end
+
+
+      # Calculates the ISBN 13-digit checksum following the algorithm from:
+      # http://en.wikipedia.org/wiki/International_Standard_Book_Number#ISBN-13_check_digit_calculation
+      def checksum
+        (10 - (digits.each_with_index.inject(0) do |sum, (digit, index)|
+          sum + (digit * (index.even? ? 1 : 3))
+        end % 10)) % 10
+      end
+
+
+      ISBN_10_CHECKSUM_MULTIPLIERS = [10,9,8,7,6,5,4,3,2]
+
+      # Calculates the ISBN 10-digit checksum following the algorithm from:
+      # http://en.wikipedia.org/wiki/International_Standard_Book_Number#ISBN-10_check_digit_calculation
+      def isbn_10_checksum
+        isbn_10_digits.zip(ISBN_10_CHECKSUM_MULTIPLIERS).inject(0) do |sum, (digit, multiplier)|
+          sum + (digit * multiplier)
+        end
+      end
+
+
+      def to_s
+        isbn_with_checksum
+      end
+
+      def inspect
+        klass = (self.class.ancestors + [self.class.name]).join(':')
+        "#<#{self.class}:0x#{'%014x' % object_id} #{formatted_isbn}>"
+      end
+
+
+    end#class ISBN
+
+
+  end#class Bookland
+
 
-end
+end#module Barby

data/lib/barby/version.rb

@@ -2,7 +2,7 @@ module Barby #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barby
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Tore Darell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies: []
 description: Barby creates barcodes.
 email: toredarell@gmail.com