bisac 0.9 → 0.9.1

data/README

@@ -1,6 +1,7 @@
 The Book Industry Standards and Communications (BISAC) Group is a US body that
 among other things, has defined a set of plain text data formats for electronic
-data exchange within the book industry.
+data exchange within the book industry. These formats are now deprecated, but
+are still in use in some place (including segments of the Australian market).
 
 This set of classes are just convenience wrappers around some of those formats,
 designed to make reading and writing them just a little less painful.

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/testtask'
 require "rake/gempackagetask"
 require 'spec/rake/spectask'
 
-PKG_VERSION = "0.9"
+PKG_VERSION = "0.9.1"
 PKG_NAME = "bisac"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBYFORGE_PROJECT = 'rbook'
@@ -72,7 +72,8 @@ spec = Gem::Specification.new do |spec|
 	spec.extra_rdoc_files = %w{README COPYING LICENSE}
 	spec.rdoc_options << '--title' << 'bisac Documentation' <<
 	                     '--main'  << 'README' << '-q'
-  spec.add_dependency('rbook-isbn', '>= 1.0')
+  spec.add_dependency('isbn10', '>= 1.0')
+  spec.add_dependency('ean13', '>= 1.0')
   spec.author = "James Healy"
 	spec.email = "jimmy@deefa.com"
 	spec.rubyforge_project = "rbook"

data/lib/bisac.rb

@@ -10,7 +10,8 @@ require 'bisac/poa'
 require 'bisac/poa_line_item'
 
 # require rubygems
-require 'rbook/isbn'
+require 'isbn10'
+require 'ean13'
 
 # Ruby module for reading and writing BISAC file formats.
 module Bisac

data/lib/bisac/po.rb

@@ -37,7 +37,7 @@ module Bisac
     attr_accessor :do_not_ship_before
     attr_accessor :items
 
-    # creates a new RBook::Bisac::PO object
+    # creates a new Bisac::PO object
     def initialize
       @items = []
 
@@ -50,7 +50,7 @@ module Bisac
     # reads a bisac text file into memory. input should be a string
     # that specifies the file path
     def self.load_from_file(input)
-      $stderr.puts "WARNING: RBook::Bisac::PO.load_from_file is deprecated. It only returns the first PO in the file. use parse_file instead."
+      $stderr.puts "WARNING: Bisac::PO.load_from_file is deprecated. It only returns the first PO in the file. use parse_file instead."
       self.parse_file(input) { |msg| return msg }
       return nil
     end
@@ -98,7 +98,7 @@ module Bisac
       yield self.build_message(data) if data.size > 0
     end
 
-    # creates a RBook::Bisac::PO object from a string. Input should
+    # creates a Bisac::PO object from a string. Input should
     # be a complete bisac file as a string
     def self.load_from_string(input)
       $stderr.puts "WARNING: Bisac::PO.load_from_string is deprecated. It only returns the first PO in the string. use parse_string instead."
@@ -152,8 +152,9 @@ module Bisac
       @items.each_with_index do |item, idx|
         item.line_item_number = idx + 1
         item.sequence_number  = sequence
-        lines    += item.to_s.split("\n")
-        sequence += 3
+        new_lines = item.to_s.split("\n")
+        lines     += new_lines
+        sequence  += new_lines.size
       end
 
       # PO control
@@ -173,11 +174,11 @@ module Bisac
       line[7,20]  = @items.size.to_s.rjust(13,"0")
       line[20,5]  = "00001" # total '10' (PO) records
       line[25,10] = total_qty.to_s.rjust(10,"0")
-      line[35,5]  = "00001" # number of '00'-'09' records
-      line[40,5]  = "00001" # number of '10'-'19' records
-      line[55,5]  = (@items.size * 3).to_s.rjust(5,"0") # number of '40'-'49' records
-      line[60,5]  = "00000" # number of '50'-'59' records
-      line[65,5]  = "00000" # number of '60'-'69' records
+      line[35,5]  = lines.select { |l| l[0,1] == "0"}.size.to_s.rjust(5,"0") # number of '00'-'09' records
+      line[40,5]  = lines.select { |l| l[0,1] == "0"}.size.to_s.rjust(5,"0") # number of '10'-'19' records
+      line[55,5]  = lines.select { |l| l[0,1] == "4"}.size.to_s.rjust(5,"0") # number of '40'-'49' records
+      line[60,5]  = lines.select { |l| l[0,1] == "5"}.size.to_s.rjust(5,"0") # number of '50'-'59' records
+      line[65,5]  = lines.select { |l| l[0,1] == "6"}.size.to_s.rjust(5,"0") # number of '60'-'69' records
       lines << line
 
       lines.join("\n")

data/lib/bisac/po_line_item.rb

@@ -37,10 +37,10 @@ module Bisac
     end
 
     def isbn=(val)
-      if RBook::ISBN.valid_isbn13?(val)
+      if EAN13.valid?(val)
         @isbn = val
-      elsif RBook::ISBN.valid_isbn10?(val)
-        @isbn = RBook::ISBN.convert_to_isbn13(val)
+      elsif ISBN10.valid?(val)
+        @isbn = ISBN10.new(val).to_ean
       else
         @isbn = val
       end
@@ -48,19 +48,19 @@ module Bisac
 
     # is the isbn for this product valid?
     def isbn?
-      RBook::ISBN.valid_isbn13?(@isbn || "")
+      EAN13.valid?(@isbn)
     end
 
     def isbn10
-      if isbn?
-        RBook::ISBN.convert_to_isbn10(@isbn)
+      if isbn? && @isbn[0,3] == "978"
+        ISBN10.complete(@isbn[3,9])
       else
         @isbn
       end
     end
 
     def to_s
-      lines = ["","",""]
+      lines = [""]
       lines[0] << "40"
       lines[0] << @sequence_number.to_s.rjust(5,"0")
       lines[0] << " "
@@ -79,21 +79,25 @@ module Bisac
         lines[0] << @isbn
       end
 
-      lines << ""
-      lines[1] << "41"
-      lines[1] << (@sequence_number + 1).to_s.rjust(5,"0")
-      lines[1] << " "
-      lines[1] << @po_number.to_s.ljust(11," ")
-      lines[1] << "    "
-      lines[1] << pad_trunc(@title, 30)
-
-      lines << ""
-      lines[2] << "42"
-      lines[2] << (@sequence_number + 2).to_s.rjust(5,"0")
-      lines[2] << " "
-      lines[2] << @po_number.to_s.ljust(11," ")
-      lines[2] << "                  " # TODO
-      lines[2] << pad_trunc(@author, 30)
+      if @title && @title.to_s.size > 0
+        lines << ""
+        lines[1] << "41"
+        lines[1] << (@sequence_number + 1).to_s.rjust(5,"0")
+        lines[1] << " "
+        lines[1] << @po_number.to_s.ljust(11," ")
+        lines[1] << "    "
+        lines[1] << pad_trunc(@title, 30)
+      end
+
+      if @author && @author.to_s.size > 0
+        lines << ""
+        lines[2] << "42"
+        lines[2] << (@sequence_number + 2).to_s.rjust(5,"0")
+        lines[2] << " "
+        lines[2] << @po_number.to_s.ljust(11," ")
+        lines[2] << "                  " # TODO
+        lines[2] << pad_trunc(@author, 30)
+      end
 
       lines.join("\n")
     end

data/lib/bisac/poa_line_item.rb

@@ -45,8 +45,8 @@ module Bisac
     def isbn=(val)
       if val == ""
         @isbn = nil
-      elsif RBook::ISBN.valid_isbn10?(val)
-        @isbn = RBook::ISBN.convert_to_isbn13(val)
+      elsif ISBN10.valid?(val)
+        @isbn = ISBN10.new(val).to_ean
       else
         @isbn = val
       end
@@ -54,12 +54,12 @@ module Bisac
 
     # is the isbn for this product valid?
     def isbn?
-      RBook::ISBN.valid_isbn13?(@isbn || "")
+      EAN13.valid?(@isbn || "")
     end
 
     def isbn10
-      if isbn?
-        RBook::ISBN.convert_to_isbn10(@isbn)
+      if isbn? && @isbn[0,3] == "978"
+        ISBN10.complete(@isbn[3,9])
       else
         @isbn
       end

data/specs/new_bisac_spec.rb

@@ -4,7 +4,7 @@ require 'bisac'
 
 context "A new bisac object" do
 
-  setup do
+  before(:each) do
     @valid_item1 = Bisac::Product.new("0743285689")
     @valid_item1.title = "Enemy Combatant"
     @valid_item1.author = "Begg, Moazzam"

data/specs/new_po_line_item_spec.rb

@@ -4,7 +4,7 @@ require 'bisac'
 
 context "A new bisac purchase order line item object" do
 
-  setup do
+  before(:each) do
     @valid_row = "4000003 14976       Y000000000102978513220000100000000000000000000550000000"
     @valid_row_two = "4000033 13424       Y000000001107538214940000200000000000000000000400000000      \n"
     @valid_isbn13_row = "4000003 14627       Y000000000103855198500000600000000000000000000400000000     9780385519854"
@@ -49,4 +49,25 @@ context "A new bisac purchase order line item object" do
     lambda { Bisac::POLineItem.load_from_string(@invalid_row_nil) }.should raise_error(ArgumentError)
     lambda { Bisac::POLineItem.load_from_string(@invalid_row_num) }.should raise_error(ArgumentError)
   end
+
+  specify "Should render into a single line if no title or author are provided" do
+    item = Bisac::POLineItem.load_from_string(@valid_isbn13_row)
+
+    item.to_s.split("\n").size.should eql(1)
+  end
+
+  specify "Should render into two lines if a title is provided" do
+    item = Bisac::POLineItem.load_from_string(@valid_isbn13_row)
+    item.title = "test title"
+
+    item.to_s.split("\n").size.should eql(2)
+  end
+
+  specify "Should render into three lines if a title and author are provided" do
+    item = Bisac::POLineItem.load_from_string(@valid_isbn13_row)
+    item.title = "test title"
+    item.author = "test author"
+
+    item.to_s.split("\n").size.should eql(3)
+  end
 end

data/specs/new_po_spec.rb

@@ -4,7 +4,7 @@ require 'bisac'
 
 context "A new bisac purchase order object" do
 
-  setup do
+  before(:each) do
     @valid_file = File.dirname(__FILE__) + "/data/bisac_po.txt"
     @valid_multi_file = File.dirname(__FILE__) + "/data/bisac_multi_po.txt"
     @invalid_file_no_header = File.dirname(__FILE__) + "/data/bisac_po_no_header.txt"

data/specs/poa_line_item_spec.rb

@@ -4,7 +4,7 @@ require 'bisac'
 
 context "A new bisac purchase order line item object" do
 
-  setup do
+  before(:each) do
     @valid_row = "40000030000000019629000000000107112260670000100000000000000000  000000000101    "
     @valid_isbn13_row = "40000030000000019629000000000107112260670000100000000000000000  000000000101    9780711226067"
   end

data/specs/poa_spec.rb

@@ -4,7 +4,7 @@ require 'bisac'
 
 context "The BISAC POA Class" do
 
-  setup do
+  before(:each) do
     @valid_file = File.dirname(__FILE__) + "/data/valid_poa.txt"
     @invalid_file_onix = File.dirname(__FILE__) + "/data/single_product.xml"
   end
@@ -26,7 +26,7 @@ end
 
 context "A BISAC POA object" do
 
-  setup do
+  before(:each) do
     @valid_file = File.dirname(__FILE__) + "/data/valid_poa.txt"
     @invalid_file_onix = File.dirname(__FILE__) + "/data/single_product.xml"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bisac
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: 0.9.1
 platform: ruby
 authors: 
 - James Healy
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-24 00:00:00 +11:00
+date: 2010-02-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rbook-isbn
+  name: isbn10
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -22,7 +22,17 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
-description: This library is designed to make working with various BISAC file formats easier.
+- !ruby/object:Gem::Dependency 
+  name: ean13
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+description: "  This library is designed to make working with various BISAC\n  file formats easier.\n"
 email: jimmy@deefa.com
 executables: []
 
@@ -34,33 +44,33 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - lib/bisac.rb
-- lib/bisac
-- lib/bisac/message.rb
+- lib/bisac/utils.rb
+- lib/bisac/poa_line_item.rb
 - lib/bisac/po.rb
+- lib/bisac/message.rb
+- lib/bisac/poa.rb
 - lib/bisac/po_line_item.rb
 - lib/bisac/product.rb
-- lib/bisac/poa.rb
-- lib/bisac/poa_line_item.rb
-- lib/bisac/utils.rb
-- specs/data
-- specs/data/bisac_multi_po.txt
+- specs/new_po_spec.rb
+- specs/new_bisac_spec.rb
+- specs/poa_spec.rb
+- specs/poa_line_item_spec.rb
 - specs/data/bisac_po.txt
-- specs/data/bisac_po_no_footer.txt
-- specs/data/bisac_po_no_header.txt
+- specs/data/valid_poa.txt
 - specs/data/valid_bisac.txt
+- specs/data/bisac_multi_po.txt
+- specs/data/bisac_po_no_header.txt
 - specs/data/single_product.xml
-- specs/data/valid_poa.txt
-- specs/new_bisac_spec.rb
+- specs/data/bisac_po_no_footer.txt
 - specs/new_po_line_item_spec.rb
-- specs/new_po_spec.rb
-- specs/poa_spec.rb
-- specs/poa_line_item_spec.rb
 - Rakefile
 - README
 - COPYING
 - LICENSE
 has_rdoc: true
 homepage: http://rbook.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -85,13 +95,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rbook
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A library for manipulating BISAC files
 test_files: 
-- specs/new_bisac_spec.rb
-- specs/new_po_line_item_spec.rb
 - specs/new_po_spec.rb
+- specs/new_bisac_spec.rb
 - specs/poa_spec.rb
 - specs/poa_line_item_spec.rb
+- specs/new_po_line_item_spec.rb