mods 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4766e2db997979fb002bc79e3191de2733138d
-  data.tar.gz: cdeee0ab68da7a35657d118e61a9a3945be678b1
+  metadata.gz: 6e0dbc17f9dd70f600b35f19e44e917590ab32b0
+  data.tar.gz: 2d423307ffb07736581493c22b40ba584c4b9d06
 SHA512:
-  metadata.gz: cac38861f43b3313e6a6f1fc3b2193bc2ec1f8cdb3d9b34ff35436070bccaf3f88e2f413bd3904c1b0933f501bc4c4203a70ca57326ba08c6e2750dc9e5cc246
-  data.tar.gz: d5adc0e7aa6a8d72ed9fd3d3aa919295ea4fb925d7a49c1ceb999699079c4ac94b3a8e83adc3b2c59a19e22fa37ee3093663950a93fa5d5505a448004d8f3af8
+  metadata.gz: bafb8e7068e4a8d831104b345106af6e0cb23b8fe0d7ab80aad059c616e4dd615e14dd09719586fd229fcb875b09299399c62fb2019e5fbfae8eb0b0d9d8d94f
+  data.tar.gz: 9ff214bcc0bc1ffa290c3382ccfc62db858a6d94e1774462fad3112b4f157c90394999c4ef24a31608551948f1fdc0175ba08f1adb872de8a4f9085b27844aa4

data/README.rdoc

@@ -44,7 +44,9 @@ Create a new Mods::Record from a file:
 == Releases
 
 =======
-* <b>0.1.0</b> Pinned version of nokogiri to < 1.6.6 because of addition of Node#lang in 1.6.6.1 which conflicts which currently used nodes
+* <b>2.0.1</b> Fixed nokogiri issue so no need to pin version number
+* <b>2.0.0</b> Pinned version of nokogiri to < 1.6.6 because of addition of Node#lang in 1.6.6.1 which conflicts which currently used nodes
+* <b>1.0.0</b> change jruby version in .travis to 1.7.9-d19; doesn't work with version 1.7.10
 * <b>0.0.23</b> minor bug and typo fixes
 * <b>0.0.22</b> add displayLabel and lang attributes to every element
 * <b>0.0.21</b> bug fix to check for nil values in name nodes

data/lib/mods.rb

@@ -1,18 +1,16 @@
-require 'mods/constants'
-require 'mods/nom_terminology'
-require 'mods/marc_country_codes'
-require 'mods/marc_geo_area_codes'
-require 'mods/marc_relator_codes'
-require 'mods/name'
-require 'mods/reader'
-require 'mods/record'
-require 'mods/subject'
-require 'mods/title_info'
-require 'mods/version'
-
 require 'nokogiri'
 require 'nom/xml'
 
 module Mods
-    
+  require 'mods/constants'
+  require 'mods/nom_terminology'
+  require 'mods/marc_country_codes'
+  require 'mods/marc_geo_area_codes'
+  require 'mods/marc_relator_codes'
+  require 'mods/name'
+  require 'mods/reader'
+  require 'mods/record'
+  require 'mods/subject'
+  require 'mods/title_info'
+  require 'mods/version'
 end

data/lib/mods/nom_terminology.rb

@@ -2,10 +2,12 @@ module Mods
   
   # from:  http://www.loc.gov/standards/mods/v3/mods-userguide-generalapp.html
   
-  # FIXME: didn't figure out a good way to deal with namespaced attribute for non-namespaced terminology
-#  LANG_ATTRIBS = ['lang', 'xml:lang', 'script', 'transliteration']
-  LANG_ATTRIBS = ['lang', 'script', 'transliteration']
+  LANG_ATTRIBS = ['script', 'transliteration']
   
+  if Nokogiri::VERSION < "1.6.6"
+    # Nokogiri 1.6.6 introduced lang as a built-in attribute
+    LANG_ATTRIBS += ['lang']
+  end
   LINKING_ATTRIBS = ['xlink', 'ID']
 
   DATE_ATTRIBS = ['encoding', 'point', 'keyDate', 'qualifier']

data/lib/mods/version.rb

@@ -1,4 +1,4 @@
 module Mods
   # this is the Ruby Gem version
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/mods.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ["lib"]
   
-  gem.add_dependency 'nokogiri', '< 1.6.6'  # v.1.6.6.1 added Node#lang which conflicts with currently used nodes
+  gem.add_dependency 'nokogiri'
   gem.add_dependency 'nom-xml'
   gem.add_dependency 'iso-639'
 

data/spec/name_spec.rb

@@ -33,6 +33,13 @@ describe "Mods <name> Element" do
       </name></mods>"
     @mods_w_pers_name_role_code = @mods_w_pers_name_role_code_ns.sub(" #{@ns_decl}", '')
   end
+
+  describe "lang" do
+    it "should have a lang attribute" do
+      @mods_rec.from_str("<mods #{@ns_decl}><name type='personal'><namePart xml:lang='fr-FR' type='given'>Jean</namePart><namePart xml:lang='en-US' type='given'>John</namePart></name></mods>")
+      expect(@mods_rec.personal_name.namePart.lang).to include "en-US", "fr-FR"
+    end
+  end
   
   context "personal name" do
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nom-xml
   requirement: !ruby/object:Gem::Requirement