ncs_mdes 0.8.1 → 0.9.0

data/documents/3.0/heuristic_overrides.yml

@@ -52,6 +52,9 @@ foreign_keys:
   eighteen_mth_mother_cond:
     eighteen_mth_habits_id: eighteen_mth_mother_habits
 
+  eighteen_mth_mother_lice_2:
+    eighteen_mth_mother_id: eighteen_mth_mother_2
+
   eighteen_mth_mother_saq:
     asq18_address_id: address
     r_p_id: participant

data/lib/ncs_navigator/mdes/source_documents.rb

@@ -54,9 +54,9 @@ module NcsNavigator::Mdes
         when '2.1'
           create('2.1', '2.1/NCS_Transmission_Schema_2.1.00.00.xsd', '2.1.00.00')
         when '2.2'
-          create('2.2', '2.2/NCS_Transmission_Schema_2.2.01.00.xsd', '2.2.01.00')
+          create('2.2', '2.2/NCS_Transmission_Schema_2.2.01.01.xsd', '2.2.01.01')
         when '3.0'
-          create('3.0', '3.0/NCS_Transmission_Schema_3.0.00.00.xsd', '3.0.00.00')
+          create('3.0', '3.0/NCS_Transmission_Schema_3.0.00.09.xsd', '3.0.00.09')
         else
           raise "MDES #{version} is not supported by this version of ncs_mdes"
         end

data/lib/ncs_navigator/mdes/variable_type.rb

@@ -178,7 +178,7 @@ module NcsNavigator::Mdes
 
           log.warn("Missing value for code list entry on line #{enum.line}") unless enum['value']
 
-          new(enum['value']).tap do |cle|
+          new(enum['value'] && enum['value'].strip).tap do |cle|
             cle.label = enum['label']
             cle.global_value = enum['global_value']
             cle.master_cl = enum['master_cl']

data/lib/ncs_navigator/mdes/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Mdes
-    VERSION = '0.8.1'
+    VERSION = '0.9.0'
   end
 end

data/spec/ncs_navigator/mdes/source_documents_spec.rb

@@ -136,11 +136,11 @@ module NcsNavigator::Mdes
         include_context 'version docs'
 
         it 'has the correct path for the schema' do
-          subject.schema.should =~ %r{2.2/NCS_Transmission_Schema_2.2.01.00.xsd$}
+          subject.schema.should =~ %r{2.2/NCS_Transmission_Schema_2.2.01.01.xsd$}
         end
 
         it 'has a different specification_version' do
-          subject.specification_version.should == '2.2.01.00'
+          subject.specification_version.should == '2.2.01.01'
         end
       end
 
@@ -150,11 +150,11 @@ module NcsNavigator::Mdes
         include_context 'version docs'
 
         it 'has the correct path for the schema' do
-          subject.schema.should =~ %r{3.0/NCS_Transmission_Schema_3.0.00.00.xsd$}
+          subject.schema.should =~ %r{3.0/NCS_Transmission_Schema_3.0.00.09.xsd$}
         end
 
         it 'has a different specification_version' do
-          subject.specification_version.should == '3.0.00.00'
+          subject.specification_version.should == '3.0.00.09'
         end
       end
 

data/spec/ncs_navigator/mdes/specification_spec.rb

@@ -85,7 +85,7 @@ module NcsNavigator::Mdes
 
       context 'in version 3.0' do
         let(:version) { '3.0' }
-        let(:expected_table_count) { 397 }
+        let(:expected_table_count) { 407 }
 
         include_examples 'tables fully resolved'
       end
@@ -226,7 +226,7 @@ module NcsNavigator::Mdes
 
       context 'version 3.0' do
         let(:version) { '3.0' }
-        let(:expected_type_count) { 514 }
+        let(:expected_type_count) { 517 }
 
         include_examples 'types fully resolved'
       end

data/spec/ncs_navigator/mdes/variable_type_spec.rb

@@ -172,6 +172,18 @@ module NcsNavigator::Mdes
           code_list_entry('<xs:enumeration ncsdoc:label="Foo"/>')
           logger[:warn].first.should == 'Missing value for code list entry on line 2'
         end
+
+        describe 'with external whitespace on the value' do
+          let(:missing) {
+            code_list_entry(<<-XSD)
+              <xs:enumeration value="  -4 " ncsdoc:label="Missing in Error" ncsdoc:desc="" ncsdoc:global_value="99-4" ncsdoc:master_cl="missing_data"/>
+            XSD
+          }
+
+          it 'removes the whitespace' do
+            missing.value.should == '-4'
+          end
+        end
       end
 
       describe "#label" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncs_mdes
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -125,11 +125,11 @@ files:
 - documents/2.1/disposition_codes.yml
 - documents/2.1/extract_disposition_codes.rb
 - documents/2.1/heuristic_overrides.yml
-- documents/2.2/NCS_Transmission_Schema_2.2.01.00.xsd
+- documents/2.2/NCS_Transmission_Schema_2.2.01.01.xsd
 - documents/2.2/disposition_codes.yml
 - documents/2.2/extract_disposition_codes.rb
 - documents/2.2/heuristic_overrides.yml
-- documents/3.0/NCS_Transmission_Schema_3.0.00.00.xsd
+- documents/3.0/NCS_Transmission_Schema_3.0.00.09.xsd
 - documents/3.0/disposition_codes.yml
 - documents/3.0/extract_disposition_codes.rb
 - documents/3.0/heuristic_overrides.yml