enhanced_marc 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c6480defdddee56ed969e37689f68200634a4c
-  data.tar.gz: eb238e80e3af04c515c424e988d0705a7a14a259
+  metadata.gz: 5d958751bf63a8d1012d728da09781e147ee5557
+  data.tar.gz: 36bca5ed28ea75195859aed6d6cfd58804777ccc
 SHA512:
-  metadata.gz: afc67a8415825b3647041ecb7c52bd0ff113352d8400247fbd96b5a33a2cd90ec20f3fac69c8dbcf096daedaba4dd0c0cb3e4405a433d8a48d9bcd2546cce0bf
-  data.tar.gz: aef1d2c9c28e26de017b6405d4e591ef51ea1914bd1ae290162fbfff81405fad33918fd9169f5beca57d24afd22ef30caeba8ce05d32e9b246253048a8fee3c2
+  metadata.gz: 3493fc88983365d2bae1555be334db1a00e14a9cfa754578b085e863bf1a1e9568ddbc2adbf8327722ca2f72874e6c955f9149e8548bbb3b649b25e7a8a032eb
+  data.tar.gz: cc4a2515ae5827be31aa7baa0188aec3ffa0dfbd1354d566a25248d163c6b58b23c3b789ae1885674fc1746ffa03b5594bc28ecd593f6027ad373e4989553444

data/Rakefile

@@ -1,41 +1,10 @@
-RUBY_ENHANCED_MARC_VERSION = '0.3.0'
-
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-
-task :default => [:test]
 
-Rake::TestTask.new('test') do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/tc_*.rb'
-  t.verbose = true
-  t.ruby_opts = ['-r marc', '-r test/unit']
-end
 
 Rake::RDocTask.new('doc') do |rd|
   rd.rdoc_files.include("enhanced_marc/**/*.rb")
   rd.main = 'MARC::Record'
   rd.rdoc_dir = 'doc'
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    
-    s.add_dependency('marc')
-    s.add_dependency('locale')
-    s.name = 'enhanced_marc'
-    s.author = 'Ross Singer'
-    s.email = 'rossfsinger@gmail.com'
-    s.homepage = 'http://github.com/rsinger/enhanced-marc/tree'
-    s.summary = 'A DSL for MARC data'
-    s.description = 'A set of enhancements to ruby-marc to make parsing MARC data easier'    
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/enhanced_marc.gemspec

@@ -1,6 +1,10 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'enhanced_marc/version'
 Gem::Specification.new do |s|
   s.name = %q{enhanced_marc}
-  s.version = "0.3.1"
+  s.version = MARC::EnhancedMARC::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ross Singer"]

data/lib/enhanced_marc/leader.rb

@@ -73,7 +73,7 @@ module MARC
 
       rec_types = {
         'BKS' => { type: /[at]{1}/,	blvl: /[acdm]{1}/ },
-        'SER' => { type: /[a]{1}/,	blvl: /[bs]{1}/ },
+        'SER' => { type: /[a]{1}/,	blvl: /[bis]{1}/ },
         'VIS' => { type: /[gkro]{1}/,	blvl: /[abcdims]{1}/ },
         'MIX' => { type: /[p]{1}/,	blvl: /[cd]{1}/ },
         'MAP' => { type: /[ef]{1}/,	blvl: /[abcdims]{1}/ },

data/lib/enhanced_marc/serial_record.rb

@@ -1,37 +1,43 @@
 module MARC
 
+  # TODO: rename to ContinuingResource
   # A class that represents an individual MARC record. Every record
-  # is made up of a collection of MARC::Field objects. 
-
+  # is made up of a collection of MARC::Field objects.
   class SerialRecord < Record
 
     def initialize
       super
       @leader[6] = 'a' if @leader[6,1] == ' '
-      @leader[7] = 's' if @leader[7,1] == ' '    
-      @record_type = 'SER'  
+      @leader[7] = 's' if @leader[7,1] == ' '
+      @record_type = 'SER'
       @bibliographic_level = @leader.get_blvl
-      self.extend SerialType      
-      self.inspect_fixed_fields      
+      extend SerialType
+      inspect_fixed_fields
     end
-    
-    def is_valid_type?
-      return false unless @leader[6,1].match('a')
-      return true
+
+    def valid_type?
+      return false unless @leader[6, 1] == 'a'
+      true
     end
-    def is_valid_blvl?
-      return false unless @leader[7,1].match(/[bis]{1}/)    
-      return true
+    alias is_valid_type? valid_type?
+    def valid_blvl?
+      return false unless @leader[7, 1] =~ /[bis]{1}/
+      true
     end
+    alias is_valid_blvl? valid_blvl?
+
     def self.new_from_record(record)
       rec = SerialRecord.new
       record.instance_variables.each { | var |
         rec.instance_variable_set(var, record.instance_variable_get(var))
       }
-      return Exception.new("Incorrect type declaration in leader") unless rec.is_valid_type?
-      return Exception.new("Incorrect bibliographic declaration in leader") unless rec.is_valid_blvl?
-      return rec
-    end    
-    
+      error = rec.valid_type? ? nil : 'Incorrect type declaration in leader'
+      if !error && !rec.valid_blvl?
+        error = 'Incorrect bibliographic declaration in leader'
+      end
+      return Exception.new(error) if error
+      rec
+    end
+
   end
-end
+end

data/lib/enhanced_marc/sound_record.rb

@@ -1,37 +1,42 @@
 module MARC
 
   # A class that represents an individual MARC record. Every record
-  # is made up of a collection of MARC::Field objects. 
+  # is made up of a collection of MARC::Field objects.
 
   class SoundRecord < Record
 
     def initialize
       super
-      @leader[6] = 'i' if @leader[6,1] == ' '
-      @leader[7] = 'm' if @leader[7,1] == ' '    
-      @record_type = 'REC'  
+      @leader[6] = 'i' if @leader[6, 1] == ' '
+      @leader[7] = 'm' if @leader[7, 1] == ' '
+      @record_type = 'REC'
       @bibliographic_level = @leader.get_blvl
-      self.extend SoundType      
-      self.inspect_fixed_fields      
+      extend SoundType
+      inspect_fixed_fields
     end
-    
-    def is_valid_type?
-      return false unless @leader[6,1].match(/[ij]{1}/)
-      return true
+
+    def valid_type?
+      return false unless @leader[6, 1] =~ /[ij]{1}/
+      true
     end
-    def is_valid_blvl?
-      return false unless @leader[7,1].match(/[abcdims]{1}/)
-      return true
+    alias is_valid_type? valid_type?
+
+    def valid_blvl?
+      return false unless @leader[7, 1] =~ /[abcdims]{1}/
+      true
     end
+    alias is_valid_blvl? valid_blvl?
     def self.new_from_record(record)
       rec = SoundRecord.new
       record.instance_variables.each { | var |
         rec.instance_variable_set(var, record.instance_variable_get(var))
       }
-      return Exception.new("Incorrect type declaration in leader") unless rec.is_valid_type?
-      return Exception.new("Incorrect bibliographic declaration in leader") unless rec.is_valid_blvl?
-      return rec
-    end    
-    
+      error = rec.valid_type? ? nil : 'Incorrect type declaration in leader'
+      if !error && !rec.valid_blvl?
+        error = 'Incorrect bibliographic declaration in leader'
+      end
+      return Exception.new(error) if error
+      rec
+    end
   end
-end
+end

data/lib/enhanced_marc/visual_record.rb

@@ -1,37 +1,43 @@
 module MARC
 
   # A class that represents an individual MARC record. Every record
-  # is made up of a collection of MARC::Field objects. 
-
+  # is made up of a collection of MARC::Field objects.
   class VisualRecord < Record
 
     def initialize
       super
       @leader[6] = 'g' if @leader[6,1] == ' '
-      @leader[7] = 'm' if @leader[7,1] == ' '    
-      @record_type = 'VIS'  
+      @leader[7] = 'm' if @leader[7,1] == ' '
+      @record_type = 'VIS'
       @bibliographic_level = @leader.get_blvl
-      self.extend VisualType      
-      self.inspect_fixed_fields      
+      extend VisualType
+      inspect_fixed_fields
     end
-    
-    def is_valid_type?
-      return false unless @leader[6,1].match(/[gkro]{1}/)
-      return true
+
+    def valid_type?
+      return false unless @leader[6, 1] =~ /[gkro]{1}/
+      true
     end
-    def is_valid_blvl?
-      return false unless @leader[7,1].match(/[abcdims]{1}/)    
-      return true
+    alias is_valid_type? valid_type?
+
+    def valid_blvl?
+      return false unless @leader[7, 1] =~ /[abcdims]{1}/
+      true
     end
+    alias is_valid_blvl? valid_blvl?
+
     def self.new_from_record(record)
       rec = VisualRecord.new
       record.instance_variables.each { | var |
         rec.instance_variable_set(var, record.instance_variable_get(var))
       }
-      return Exception.new("Incorrect type declaration in leader") unless rec.is_valid_type?
-      return Exception.new("Incorrect bibliographic declaration in leader") unless rec.is_valid_blvl?
-      return rec
-    end    
-    
+      error = rec.valid_type? ? nil : 'Incorrect type declaration in leader'
+      if !error && !rec.valid_blvl?
+        error = 'Incorrect bibliographic declaration in leader'
+      end
+      return Exception.new(error) if error
+      rec
+    end
+
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enhanced_marc
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ross Singer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marc