ncs_mdes 0.10.0 → 0.11.0

data/lib/ncs_navigator/mdes/disposition_code.rb

@@ -4,14 +4,13 @@ module NcsNavigator::Mdes
   ##
   # One dispostion code in the MDES.
   class DispositionCode
+    ATTRIBUTES = %w(
+      category_code disposition event final_category final_code interim_code sub_category
+    )
 
-    attr_accessor :event
-    attr_accessor :final_category
-    attr_accessor :sub_category
-    attr_accessor :disposition
-    attr_accessor :category_code
-    attr_accessor :interim_code
-    attr_accessor :final_code
+    ATTRIBUTES.each do |attr|
+      attr_accessor attr
+    end
 
     ##
     # Given attributes (presumably loaded from a YAML file) create
@@ -19,9 +18,7 @@ module NcsNavigator::Mdes
     # 
     # @return [DispositionCode] the created instance.
     def initialize(attrs)
-      %w(event final_category sub_category disposition category_code interim_code final_code).each do |a|
-        self.send("#{a}=", attrs[a])
-      end
+      ATTRIBUTES.each { |a| send("#{a}=", attrs[a]) }
     end
 
     ##

data/lib/ncs_navigator/mdes/source_documents.rb

@@ -58,7 +58,9 @@ module NcsNavigator::Mdes
         when '3.0'
           create('3.0', '3.0/NCS_Transmission_Schema_3.0.00.09.xsd', '3.0.00.09')
         when '3.1'
-          create('3.1', '3.1/NCS_Transmission_Schema_3.1.00.00.xsd', '3.1.00.00')
+          create('3.1', '3.1/NCS_Transmission_Schema_3.1.01.00.xsd', '3.1.01.00')
+        when '3.2'
+          create('3.2', '3.2/NCS_Transmission_Schema_3.2.00.00.xsd', '3.2.00.00')
         else
           raise "MDES #{version} is not supported by this version of ncs_mdes"
         end

data/lib/ncs_navigator/mdes/variable.rb

@@ -75,20 +75,20 @@ module NcsNavigator::Mdes
           var.nillable = element['nillable'] == 'true'
           var.omittable = element['minOccurs'] == '0'
           var.pii =
-            case element['pii']
+            case element['ncsdoc:pii']
             when 'Y'; true;
             when 'P'; :possible;
             when nil; :unknown;
             when '';  false;
-            else element['pii'];
+            else element['ncsdoc:pii'];
             end
           var.status =
-            case element['status']
+            case element['ncsdoc:status']
             when '1'; :active;
             when '2'; :new;
             when '3'; :modified;
             when '4'; :retired;
-            else element['status'];
+            else element['ncsdoc:status'];
             end
           var.type =
             if element['type']

data/lib/ncs_navigator/mdes/variable_type.rb

@@ -75,10 +75,10 @@ module NcsNavigator::Mdes
               vt.min_length = elt['value'].to_i
             when 'enumeration'
               (vt.code_list ||= CodeList.new) << CodeListEntry.from_xsd_enumeration(elt, options)
-              if elt['desc'] =~ /\S/
+              if elt['ncsdoc:desc'] =~ /\S/
                 if vt.code_list.description.nil?
-                  vt.code_list.description = elt['desc']
-                elsif vt.code_list.description != elt['desc']
+                  vt.code_list.description = elt['ncsdoc:desc']
+                elsif vt.code_list.description != elt['ncsdoc:desc']
                   log.warn("Code list entry on line #{elt.line} unexpectedly has a different desc from the first entry")
                 end
               end
@@ -179,9 +179,9 @@ module NcsNavigator::Mdes
           log.warn("Missing value for code list entry on line #{enum.line}") unless enum['value']
 
           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']
+            cle.label = enum['ncsdoc:label']
+            cle.global_value = enum['ncsdoc:global_value']
+            cle.master_cl = enum['ncsdoc:master_cl']
           end
         end
       end

data/lib/ncs_navigator/mdes/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Mdes
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

data/ncs_mdes.gemspec

@@ -19,7 +19,7 @@ National Children's Study's Master Data Element Specification.
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'nokogiri', '~> 1.4'
+  s.add_dependency 'nokogiri', '~> 1.5.6'
 
   s.add_development_dependency 'rspec', '~> 2.6.0' # Can't use 2.7.0 due to #477
   s.add_development_dependency 'rake', '~> 0.9.2'

data/spec/ncs_navigator/mdes/source_documents_spec.rb

@@ -164,11 +164,25 @@ module NcsNavigator::Mdes
         include_context 'version docs'
 
         it 'has the correct path for the schema' do
-          subject.schema.should =~ %r{3.1/NCS_Transmission_Schema_3.1.00.00.xsd$}
+          subject.schema.should =~ %r{3.1/NCS_Transmission_Schema_3.1.01.00.xsd$}
         end
 
         it 'has a different specification_version' do
-          subject.specification_version.should == '3.1.00.00'
+          subject.specification_version.should == '3.1.01.00'
+        end
+      end
+
+      describe '3.2' do
+        let(:version) { '3.2' }
+
+        include_context 'version docs'
+
+        it 'has the correct path for the schema' do
+          subject.schema.should =~ %r{3.2/NCS_Transmission_Schema_3.2.00.00.xsd$}
+        end
+
+        it 'has a different specification_version' do
+          subject.specification_version.should == '3.2.00.00'
         end
       end
 

data/spec/ncs_navigator/mdes/specification_spec.rb

@@ -96,6 +96,13 @@ module NcsNavigator::Mdes
 
         include_examples 'tables fully resolved'
       end
+
+      context 'in version 3.2' do
+        let(:version) { '3.2' }
+        let(:expected_table_count) { 576 }
+
+        include_examples 'tables fully resolved'
+      end
     end
 
     describe '#specification_version' do
@@ -171,6 +178,14 @@ module NcsNavigator::Mdes
           disposition_codes.size.should == 332
         end
       end
+
+      context 'in version 3.2' do
+        let(:disposition_codes) { Specification.new('3.2', :log => logger).disposition_codes }
+
+        it 'has 332 codes' do
+          disposition_codes.size.should == 332
+        end
+      end
     end
 
     describe '#[]' do
@@ -252,6 +267,13 @@ module NcsNavigator::Mdes
 
         include_examples 'types fully resolved'
       end
+
+      context 'version 3.2' do
+        let(:version) { '3.2' }
+        let(:expected_type_count) { 651 }
+
+        include_examples 'types fully resolved'
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncs_mdes
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -133,10 +133,14 @@ files:
 - documents/3.0/disposition_codes.yml
 - documents/3.0/extract_disposition_codes.rb
 - documents/3.0/heuristic_overrides.yml
-- documents/3.1/NCS_Transmission_Schema_3.1.00.00.xsd
+- documents/3.1/NCS_Transmission_Schema_3.1.01.00.xsd
 - documents/3.1/disposition_codes.yml
 - documents/3.1/extract_disposition_codes.rb
 - documents/3.1/heuristic_overrides.yml
+- documents/3.2/NCS_Transmission_Schema_3.2.00.00.xsd
+- documents/3.2/disposition_codes.yml
+- documents/3.2/extract_disposition_codes.rb
+- documents/3.2/heuristic_overrides.yml
 - lib/ncs_navigator/mdes.rb
 - lib/ncs_navigator/mdes/disposition_code.rb
 - lib/ncs_navigator/mdes/source_documents.rb
@@ -169,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3213235128109408979
+      hash: -1622356402615803316
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3213235128109408979
+      hash: -1622356402615803316
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24